From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Sebastian Reichel <sre@kernel•org>, Lee Jones <lee@kernel•org>
Cc: "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: linux-next: manual merge of the battery tree with the leds-lj tree
Date: Tue, 9 Jul 2024 13:34:20 +1000 [thread overview]
Message-ID: <20240709133420.55645c59@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1356 bytes --]
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?
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.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/leds.h
index 99f87587a132,517b6198df07..000000000000
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@@ -107,7 -107,7 +107,8 @@@ struct led_classdev
#define LED_BRIGHT_HW_CHANGED BIT(21)
#define LED_RETAIN_AT_SHUTDOWN BIT(22)
#define LED_INIT_DEFAULT_TRIGGER BIT(23)
-#define LED_MULTI_COLOR BIT(24)
+#define LED_REJECT_NAME_CONFLICT BIT(24)
++#define LED_MULTI_COLOR BIT(25)
/* set_brightness_work / blink_timer flags, atomic, private. */
unsigned long work_flags;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-07-09 3:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 3:34 Stephen Rothwell [this message]
2024-07-09 6:17 ` linux-next: manual merge of the battery tree with the leds-lj tree Stephen Rothwell
2024-07-09 9:23 ` Lee Jones
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=20240709133420.55645c59@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=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=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