From patchwork Mon Jul 27 10:16:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11686715 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AD029722 for ; Mon, 27 Jul 2020 10:18:01 +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 851EC2070B for ; Mon, 27 Jul 2020 10:18:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="x4YxYk9Z"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="ThjCtYRK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 851EC2070B 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+patchwork-linux-arm=patchwork.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=Wl5F4JHx8RoicYLilSvBleRuibnPNAq7kKnHCYy7/ng=; b=x4Y xYk9ZIaiUG0i2nlm2sU1Xnc4r5xE4upLS+A6lOBA88GbdFQ9kjTw0FLiijEV5XT8P2QLUg2qf4AnE uIWlbeP1i9Bs22N0RCIEQbP+tUt7VMpV9J739VdkzFibu+z9n7Pxoxqx0oqQIsq2Q7hsAgZkeF95k WReg72LdqkqWj56/656u8WCC88FNXX7QoG2nUPafaiKtk0fGt0u3zWmdu6BwjLO3WH4B9qR9w7vtG UjNI/GR7jPeukWCQimSO5S/ybRA4WuOUMcJHKWVndodJZmn7kq1kNIRGMRShiE3WbGe9Ti7mZlamn mHcifhdjoz7frnOc3oAINQLzujJtCBw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k00Az-0000xf-Og; Mon, 27 Jul 2020 10:16:09 +0000 Received: from ozlabs.org ([2401:3900:2:1::2]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k00Ax-0000wp-Oo for linux-arm-kernel@lists.infradead.org; Mon, 27 Jul 2020 10:16:09 +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 4BFbL948qpz9sPf; Mon, 27 Jul 2020 20:16:01 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1595844963; bh=Wv52XDR7c826tRwrnj73BR2SJR4h7Dgq22Ma1+JBJvA=; h=Date:From:To:Cc:Subject:From; b=ThjCtYRKH51WECpigrW3SjBcgegD12ity5tRyrBFJ4VT+S52OCuJvhU7MxmeJLyl6 IswDOZ1Tkbp54ltK/hvcNsdOAKRhunZ0X+50tTjzyGKG3t7ZVeECA1Dc8wPilsT6w7 9VFKxXo4qPBl7pP46eiuxDJX7ZzIsmkx/qR5uK1jqxzqFZUWDaaeu1cza6ri6Edr+T 5FLp2qvsU5ewGl6vCLbxHwufoaapyNtSZ0m8DTcF6i4GffKU2KsPCiifbLrtlaLRs/ C4hbvqJcpM+looB1QFgd3b69cCuPbbMXWFtXiYYbEvOQtqDGVzPKbJ2UpgF25yM42k iSFQjUgntwnow== Date: Mon, 27 Jul 2020 20:16:00 +1000 From: Stephen Rothwell To: Chanwoo Choi , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the devfreq tree with the arm-soc tree Message-ID: <20200727201600.7d3b31c8@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200727_061608_194791_70A0C01A X-CRM114-Status: GOOD ( 19.17 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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: Dmitry Osipenko , Linux Next Mailing List , Linux Kernel Mailing List , Krzysztof Kozlowski Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the devfreq tree got a conflict in: MAINTAINERS between commit: 8a9ff8758159 ("MAINTAINERS: Add Krzysztof Kozlowski as maintainer of memory controllers") from the arm-soc tree and commit: 34886407581b ("PM / devfreq: tegra: Add Dmitry as a maintainer") from the devfreq 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 MAINTAINERS index 2b1d2d3fbd4e,e2e95c877f0b..000000000000 --- a/MAINTAINERS