Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
Feedback-ID: i787e41f1:Fastmail
Date:   Fri, 3 Nov 2023 09:45:04 +0100
From:   Greg KH <greg@kroah.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Bartosz Golaszewski <brgl@bgdev.pl>,
        Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= 
        <u.kleine-koenig@pengutronix.de>, Wentong Wu <wentong.wu@intel.com>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the usb tree
Message-ID: <2023110355-reuse-spoken-9945@gregkh>
References: <20231016134159.11d8f849@canb.auug.org.au>
 <20231102112950.4706f887@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231102112950.4706f887@canb.auug.org.au>
Precedence: bulk

On Thu, Nov 02, 2023 at 11:29:50AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 16 Oct 2023 13:41:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > Today's linux-next merge of the gpio-brgl tree got a conflict in:
> > 
> >   drivers/gpio/gpio-ljca.c
> > 
> > between commit:
> > 
> >   1034cc423f1b ("gpio: update Intel LJCA USB GPIO driver")
> > 
> > from the usb tree and commit:
> > 
> >   da2ad5fe2292 ("gpio: ljca: Convert to platform remove callback returning void")
> > 
> > from the gpio-brgl tree.
> 
> This is now a conflict between the usb tree and Linus' tree.

Thanks, I'll note this in my pull request to Linus.

greg k-h