Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934342AbcKPHYc (ORCPT ); Wed, 16 Nov 2016 02:24:32 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:34832 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932124AbcKPHYb (ORCPT ); Wed, 16 Nov 2016 02:24:31 -0500 Date: Wed, 16 Nov 2016 08:24:42 +0100 From: Greg Kroah-Hartman To: "Maciej S. Szmigiero" Cc: Jiri Slaby , Dmitry Torokhov , Samuel Thibault , linux-kernel Subject: Re: [PATCH] vt: fix Scroll Lock LED trigger name Message-ID: <20161116072442.GA19957@kroah.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1628 Lines: 39 On Wed, Nov 16, 2016 at 12:55:57AM +0100, Maciej S. Szmigiero wrote: > There is a disagreement between drivers/tty/vt/keyboard.c and > drivers/input/input-leds.c with regard to what is a Scroll Lock LED > trigger name: input calls it "kbd-scrolllock", but vt calls it > "kbd-scrollock" (two l's). > This prevents Scroll Lock LED trigger from binding to this LED by default. > > Since it is a scroLL Lock LED, this interface was introduced only about a > year ago and in an Internet search people seem to reference this trigger > only to set it to this LED let's simply rename it to "kbd-scrolllock". > > Also, it looks like this was supposed to be changed before this code was > merged: https://lkml.org/lkml/2015/6/9/697 but it was done only on > the input side. > > Signed-off-by: Maciej S. Szmigiero > --- > drivers/tty/vt/keyboard.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c > index d5d81d4d3c04..3dd6a491cdba 100644 > --- a/drivers/tty/vt/keyboard.c > +++ b/drivers/tty/vt/keyboard.c > @@ -982,7 +982,7 @@ static void kbd_led_trigger_activate(struct led_classdev *cdev) > KBD_LED_TRIGGER((_led_bit) + 8, _name) > > static struct kbd_led_trigger kbd_led_triggers[] = { > - KBD_LED_TRIGGER(VC_SCROLLOCK, "kbd-scrollock"), > + KBD_LED_TRIGGER(VC_SCROLLOCK, "kbd-scrolllock"), > KBD_LED_TRIGGER(VC_NUMLOCK, "kbd-numlock"), > KBD_LED_TRIGGER(VC_CAPSLOCK, "kbd-capslock"), > KBD_LED_TRIGGER(VC_KANALOCK, "kbd-kanalock"), So, how far back should this change be backported to? thanks, greg k-h