Hi Andy, Darren, I've created stable branch dell-laptop-changes-for-4.12 in the repository git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git for you to merge due to the conflict in linux-next: Today's linux-next merge of the leds tree got a conflict in: drivers/platform/x86/dell-laptop.c between commit: 573eedacfba3 ("platform/x86: dell-*: Call new led hw_changed API on kbd brightness change") from the drivers-x86 tree and commit: 44319ab7e0ed ("platform/x86: dell-laptop: import dell_micmute_led_set() from drivers/leds/dell-led.c") from the leds tree. Thanks, Jacek Anaszewski