From patchwork Sun Jan 24 21:28:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12042649 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDBD3C433DB for ; Sun, 24 Jan 2021 21:31:07 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 94B6422BEF for ; Sun, 24 Jan 2021 21:31:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94B6422BEF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=l8U1uZYv9JwUWJy+8AZhlxkKV4JhrgNUs645A065cB4=; b=kWf S4Mz+abOLAXcLVlwuixU6DT5JUDIif9xAkamQdPk9eBOeMG+wsHlZzTBZf5oY4iJpj8vW5Y0ewVRU X7igi8LskndwLC1XF2eCL4Tii1xesIlWZyjBJdjfoqaSiuUGX7K3p/TuZwiT7h+nWB7fgVzwg+1mM LFquVJnuRoYCkGS846C6fBjrhAesEZt2RTPIDqBD56Tf4czw3/j2EEM+lz5tHunlJHV61Sd788lIW U6JHfVWEE8ZCF6AE6SNG0LRfilxO8ZGiQud3tg8KGyo6/YvAMPBQFOF8xzP2VkDqYNOV5X7msodz9 NJuJo+6cy6OYfjD+p32IrvKRlFYd3yw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l3mwf-000866-HJ; Sun, 24 Jan 2021 21:29:17 +0000 Received: from bilbo.ozlabs.org ([203.11.71.1] helo=ozlabs.org) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l3mwc-00084u-DR for linux-arm-kernel@lists.infradead.org; Sun, 24 Jan 2021 21:29:15 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4DP5hs08WBz9sRR; Mon, 25 Jan 2021 08:28:43 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1611523732; bh=XYlX9VRt2Pc+n5aeFtuJiMo2Ke4l25R8f+CfEvWGFAk=; h=Date:From:To:Cc:Subject:From; b=lOlXRjPX3uUIAFNG2G4DREWuJW0+HCKJ13L2CldiOc01yszX7CDUCf4pFgT2ebHjD aeQgaDNll2oE8cxJTDtUDrn/8IMUzPKvDVhcl/UPKryEK6//VX4rJI4CtpanEzBWRw cJSwaBFAlC67Eb5/kOha06YwmNSisJYVl13Xt7diQnt1iVArYRDNYKnh9Yww/GomMa czywkw3x0022IKGMq6migmnyZYpNigeacXR8PkNa/+1j/pAvBDpqRTyHy9mNTiv9E7 oHbtsJOLMZyaYhpP98oKmd/aPo/pcjgAzbhi65ZZ1xbCUQiR9EWD5t49OxN9GZ0e4B imOgB5BwNFf2w== Date: Mon, 25 Jan 2021 08:28:37 +1100 From: Stephen Rothwell To: Philipp Zabel , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the reset tree with the arm-soc tree Message-ID: <20210125082837.49db69eb@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210124_162914_778869_8EF856A6 X-CRM114-Status: GOOD ( 17.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Linux Next Mailing List , Linux Kernel Mailing List Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the reset tree got a conflict in: drivers/reset/Kconfig between commit: 89d4f98ae90d ("ARM: remove zte zx platform") from the arm-soc tree and commit: def26913b66f ("reset: simple: add BCM4908 MISC PCIe reset controller support") from the reset tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/reset/Kconfig index 8dd99ca2192c,752bef7e564f..000000000000 --- a/drivers/reset/Kconfig