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 Kleine-König" <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
Date: Fri, 3 Nov 2023 09:45:04 +0100 [thread overview]
Message-ID: <2023110355-reuse-spoken-9945@gregkh> (raw)
In-Reply-To: <20231102112950.4706f887@canb.auug.org.au>
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
prev parent reply other threads:[~2023-11-03 8:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-16 2:41 linux-next: manual merge of the gpio-brgl tree with the usb tree Stephen Rothwell
2023-10-16 6:46 ` Bartosz Golaszewski
2023-10-16 7:16 ` Uwe Kleine-König
2023-11-02 0:29 ` Stephen Rothwell
2023-11-03 8:45 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2023110355-reuse-spoken-9945@gregkh \
--to=greg@kroah.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=brgl@bgdev.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=u.kleine-koenig@pengutronix.de \
--cc=wentong.wu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).