From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CBDFAC2BD09 for ; Wed, 10 Jul 2024 02:33:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc: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:List-Owner; bh=yYtU1h1eDFudRupuFjOmskdIRg/MaZB4WUfDNPnHm4U=; b=PLmBj41wyCv2QgSjxIe8U5C2jr +rbB20Ub0rZWUDPE0wOWl9S2dyuRAPhriva9Rynq+xaRDrzZJ5X0ts2AE2x295Qw5AmLOQtL7BjPs OLbvgtILRnriV0ZpSvFdjt/p8wZu9Y9b0fzBgOYGOF4Gzgcvd8fkUBXIG7mDz/VUK2k+i8PSIA1kR 8K04w/IMJjf+P2uAbwz910YJcfekUwT5XLvT5SLsb0ITqszYOWPplYJZvkDu1obkRXYkmQg3JC49H S6GanLnEJGv1XPlXCjk2mMfFxj/bMxGc9E9Cja5iCJWSXeN0/iNSIkFpAXvPbLvNWcoCqfGee2u+o UxjBKVpA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sRN8v-00000009CKZ-3g1U; Wed, 10 Jul 2024 02:33:17 +0000 Received: from mail-m16.yeah.net ([1.95.21.14]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sRN8e-00000009CJ3-1urv for linux-arm-kernel@lists.infradead.org; Wed, 10 Jul 2024 02:33:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yeah.net; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version: Content-Type; bh=yYtU1h1eDFudRupuFjOmskdIRg/MaZB4WUfDNPnHm4U=; b=HRhv7ptD6fO4Nz6uzsXGaCdpdM6+xJE9ru6t4KQORSTA1Aa3caWMNkbQ0DwQw6 Ga4IxOvHMWK7bVxwshI+7CG4Tke7lFujMFeIJ6Mb/j7TSEjOLAWkIWbX8Srr2BYr kRIqIJOnZDUy16utzMXenXfVZQIxyeJQyWkJNjDGjyrg8= Received: from dragon (unknown [117.62.10.72]) by gzsmtp1 (Coremail) with SMTP id Mc8vCgDnjz6W8o1mWkWBAA--.32164S3; Wed, 10 Jul 2024 10:31:52 +0800 (CST) Date: Wed, 10 Jul 2024 10:31:50 +0800 From: Shawn Guo To: Stephen Rothwell Cc: Shawn Guo , Olof Johansson , Arnd Bergmann , Fabio Estevam , ARM , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: duplicate patch in the imx-mxs tree Message-ID: References: <20240710115319.10dae8e2@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240710115319.10dae8e2@canb.auug.org.au> X-CM-TRANSID: Mc8vCgDnjz6W8o1mWkWBAA--.32164S3 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUwT5lDUUUU X-Originating-IP: [117.62.10.72] X-CM-SenderInfo: pvkd40hjxrjqh1hdxhhqhw/1tbiCRgYZWZv-fryrAAAs8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240709_193301_185457_555FC9B2 X-CRM114-Status: UNSURE ( 9.57 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Jul 10, 2024 at 11:53:19AM +1000, Stephen Rothwell wrote: > Hi all, > > The following commit is also in the arm-soc tree as a different commit > (but the same patch): > > 3898bc187cde ("arm64: defconfig: Enable the IWLWIFI driver") > > This is commit > > 465830ad2534 ("arm64: defconfig: Enable the IWLWIFI driver") > > in the arm-soc tree. Thanks for reporting! It happened because of that my for-next branch is outdated. I just updated it. Shawn