Subject: [folded-merged] input-route-kbd-leds-through-the-generic-leds-layer-fix.patch removed from -mm tree To: blogic@xxxxxxxxxxx,dmitry.torokhov@xxxxxxxxx,ralf@xxxxxxxxxxxxxx,samuel.thibault@xxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 15 Nov 2013 14:16:49 -0800 The patch titled Subject: input: CONFIG_INPUT_LEDS stubs should be static inline has been removed from the -mm tree. Its filename was input-route-kbd-leds-through-the-generic-leds-layer-fix.patch This patch was dropped because it was folded into input-route-kbd-leds-through-the-generic-leds-layer.patch ------------------------------------------------------ From: John Crispin <blogic@xxxxxxxxxxx> Subject: input: CONFIG_INPUT_LEDS stubs should be static inline The following commit breaks compile when CONFIG_INPUT_LEDS is not selected. commit 0eb6ee2db914ebb594cb9bc8ae97e3c362c3475a Author: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx> Date: Wed Oct 30 11:45:16 2013 +1100 input: route kbd LEDs through the generic LEDs layer Signed-off-by: John Crispin <blogic@xxxxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx> Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/input.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN include/linux/input.h~input-route-kbd-leds-through-the-generic-leds-layer-fix include/linux/input.h --- a/include/linux/input.h~input-route-kbd-leds-through-the-generic-leds-layer-fix +++ a/include/linux/input.h @@ -540,12 +540,12 @@ void input_led_disconnect(struct input_d #else -int input_led_connect(struct input_dev *dev) +static inline int input_led_connect(struct input_dev *dev) { return 0; } -void input_led_disconnect(struct input_dev *dev) +static inline void input_led_disconnect(struct input_dev *dev) { } _ Patches currently in -mm which might be from blogic@xxxxxxxxxxx are origin.patch input-route-kbd-leds-through-the-generic-leds-layer.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html