From: Lee Jones <lee@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Sebastian Reichel" <sre@kernel.org>,
"Hans de Goede" <hdegoede@redhat.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Thomas Weißschuh" <linux@weissschuh.net>
Subject: Re: linux-next: manual merge of the battery tree with the leds-lj tree
Date: Tue, 9 Jul 2024 10:23:37 +0100 [thread overview]
Message-ID: <20240709092337.GB501857@google.com> (raw)
In-Reply-To: <20240709161729.27935749@canb.auug.org.au>
On Tue, 09 Jul 2024, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 9 Jul 2024 13:34:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the battery tree got a conflict in:
> >
> > include/linux/leds.h
> >
> > between commit:
> >
> > 6b0d3355e5a5 ("leds: class: Add flag to avoid automatic renaming of LED devices")
>
> This is also in the mfd tree.
That's intentional. It's a shared branch.
Same commit ID, right?
--
Lee Jones [李琼斯]
next prev parent reply other threads:[~2024-07-09 9:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 3:34 linux-next: manual merge of the battery tree with the leds-lj tree Stephen Rothwell
2024-07-09 6:17 ` Stephen Rothwell
2024-07-09 9:23 ` Lee Jones [this message]
2024-07-09 12:26 ` Stephen Rothwell
2024-07-10 8:07 ` Hans de Goede
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=20240709092337.GB501857@google.com \
--to=lee@kernel.org \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@weissschuh.net \
--cc=sfr@canb.auug.org.au \
--cc=sre@kernel.org \
/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