From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bartosz Golaszewski <brgl@bgdev.pl>, Greg KH <greg@kroah.com>
Cc: "Bartosz Golaszewski" <bartosz.golaszewski@linaro.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.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: Thu, 2 Nov 2023 11:29:50 +1100 [thread overview]
Message-ID: <20231102112950.4706f887@canb.auug.org.au> (raw)
In-Reply-To: <20231016134159.11d8f849@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-11-02 0:30 UTC|newest]
Thread overview: 7+ 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 [this message]
2023-11-03 8:45 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2025-09-18 14:15 Mark Brown
2025-09-18 16:16 ` Greg Kroah-Hartman
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=20231102112950.4706f887@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bartosz.golaszewski@linaro.org \
--cc=brgl@bgdev.pl \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.