linux-next: manual merge of the battery tree with the leds-lj tree

[Stephen Rothwell]

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: pgp9vfKENfGIP.pgp
Description: OpenPGP digital signature