From: Hans de Goede <hdegoede@redhat•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Sebastian Reichel <sre@kernel•org>, Lee Jones <lee@kernel•org>
Cc: "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: Wed, 10 Jul 2024 10:07:23 +0200 [thread overview]
Message-ID: <66a6aa98-009f-42c5-84dc-4c763d484472@redhat.com> (raw)
In-Reply-To: <20240709133420.55645c59@canb.auug.org.au>
Hi Stephen,
On 7/9/24 5:34 AM, Stephen Rothwell wrote:
> Hi all,
>
> 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")
>
> from the leds-lj tree and commit:
>
> 5607ca92e627 ("leds: core: Add led_mc_set_brightness() function")
>
> from the battery tree.
>
> I assume that the bit number valuse don;t actually matter, right?
Correct, which bit is used for which flag does not matter.
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Thank you.
Regards,
Hans
prev parent reply other threads:[~2024-07-10 8:07 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
2024-07-09 12:26 ` Stephen Rothwell
2024-07-10 8:07 ` Hans de Goede [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=66a6aa98-009f-42c5-84dc-4c763d484472@redhat.com \
--to=hdegoede@redhat$(echo .)com \
--cc=lee@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@weissschuh$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sre@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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