From patchwork Mon Nov 4 22:39:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11226715 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 6CFC31515 for ; Mon, 4 Nov 2019 22:39:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 484B02084D for ; Mon, 4 Nov 2019 22:39:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="EfEN9gyE"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="qCZfwWIe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 484B02084D 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=bombadil.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=+2ZWCUNgQf/zPwcBPddNLsoaudyWKrYMyXTGqR2mbLA=; b=EfE N9gyEPif5IU0/7vuIbIJbiuxnU8p+N8uiKXnNhohI9vDVlm/ujMgx/uxFnsqGCiD42XzwKiQ7Li3d MUsolf5hfyfV01gwZeEUPICDntB60+P84Qh010MAGqbVTVtkhxSxRftF/KYFENJzfVbvtBl1h7SYL ZaElfW6kiXmI0LKhyFve+0T1ehqFLE8qkabPeIaO6+L9TnBH+IyiQ77jaIKn0QiuAwBbQvI3bzgEo snoWJw2BtlUib2sW7zk1AYiMqrkc3MKGXB78l7LVfkBRtALC9MKS1ovQjorrzD4cQr4i24ZuoFJ43 Y0+9i5N6FZCn1TQSv4tt4ukMlpXAIiA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iRl0Y-0000vV-Sd; Mon, 04 Nov 2019 22:39:34 +0000 Received: from ozlabs.org ([203.11.71.1]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iRl0W-0000sh-DG for linux-arm-kernel@lists.infradead.org; Mon, 04 Nov 2019 22:39:33 +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 476SQk0J3jz9s4Y; Tue, 5 Nov 2019 09:39:26 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1572907166; bh=9oLJgy9YhD2/uxYf9HCCJm4CgrXLkCKAqUiXoi7Lzm0=; h=Date:From:To:Cc:Subject:From; b=qCZfwWIeGg949YF6o72C31LNMDkkKUwtcNqN0j08fNYuzB8MHGKlEqt81xEtP/0Cl x348o6g69/g+bLLm/5aExm0eWwK9p6oLaALBeQEsorkv7ssimIaKRSjb2N42v/uGZa CigtPL0tZeX5ujIFCApkB8YTTYqFgbqPwiSXkUSgqOQZl8/8T+6Wf6RK65Rd3/lx6x qf9973MdWppY+BRsqHewyMHrlv2pLMkrD/35CTHpjrM/F/QBiejfVuWeRG1lS4d5R7 nIognTgoS2osyNNHgQnk+DnamR5ls4JtR/FfDrB6LpZ4paYbKztHJOnhyEqh/U7pBP gNWdDRx/QIJ6g== Date: Tue, 5 Nov 2019 09:39:20 +1100 From: Stephen Rothwell To: Andy Gross , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the qcom tree with the arm-soc tree Message-ID: <20191105093920.7869c1eb@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191104_143932_611066_190075EA X-CRM114-Status: UNSURE ( 7.73 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.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_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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: Zhou Wang , Linux Next Mailing List , Linux Kernel Mailing List , Wei Xu , Bjorn Andersson 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 qcom tree got a conflict in: arch/arm64/configs/defconfig between commit: af24cb20689d ("arm64: defconfig: Enable HiSilicon ZIP controller") from the arm-soc tree and commit: ca1561a3d8e4 ("arm64: defconfig: Enable Qualcomm pseudo rng") from the qcom 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 arch/arm64/configs/defconfig index d3a289e12c92,0de751801c98..000000000000 --- a/arch/arm64/configs/defconfig