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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E7A5CD98FE for ; Wed, 11 Oct 2023 08:15:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230270AbjJKIP6 (ORCPT ); Wed, 11 Oct 2023 04:15:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230090AbjJKIPy (ORCPT ); Wed, 11 Oct 2023 04:15:54 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E54292; Wed, 11 Oct 2023 01:15:52 -0700 (PDT) Received: from lhrpeml500005.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4S55Bh3CbLz6K5rr; Wed, 11 Oct 2023 16:13:48 +0800 (CST) Received: from localhost (10.202.227.76) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 11 Oct 2023 09:15:48 +0100 Date: Wed, 11 Oct 2023 09:15:48 +0100 From: Jonathan Cameron To: Stephen Rothwell CC: Luca Ceresoli , Rob Herring , Linux Kernel Mailing List , Linux Next Mailing List , Subject: Re: linux-next: duplicate patch in the iio tree Message-ID: <20231011091548.0000396b@Huawei.com> In-Reply-To: <20231011081114.2f4d36e4@canb.auug.org.au> References: <20231011081114.2f4d36e4@canb.auug.org.au> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.202.227.76] X-ClientProxiedBy: lhrpeml500001.china.huawei.com (7.191.163.213) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Wed, 11 Oct 2023 08:11:14 +1100 Stephen Rothwell wrote: > Hi all, > > The following commit is also in Linus Torvalds' tree as a different commit > (but the same patch): > > 25a0741b55b1 ("dt-bindings: trivial-devices: Fix MEMSIC MXC4005 compatible string") > > This is commit > > 19007c629c63 ("dt-bindings: trivial-devices: Fix MEMSIC MXC4005 compatible string") > > in Linus' tree. > That's near the top of my tree so fixing it shouldn't make too much of a mess. I'll drop it when I'm next on the right machine. Thanks, Jonathan