[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20201029135415.GA3470996@kroah.com>
Date: Thu, 29 Oct 2020 14:54:15 +0100
From: "gregkh@...uxfoundation.org" <gregkh@...uxfoundation.org>
To: Barnabás Pőcze <pobrn@...tonmail.com>
Cc: "hj2.im@...sung.com" <hj2.im@...sung.com>,
"manivannan.sadhasivam@...aro.org" <manivannan.sadhasivam@...aro.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-input@...r.kernel.org" <linux-input@...r.kernel.org>,
"rydberg@...math.org" <rydberg@...math.org>,
Jungrae Kim <jryu.kim@...sung.com>
Subject: Re: [PATCH v2] input: add 2 kind of switch
On Thu, Oct 29, 2020 at 01:41:57PM +0000, Barnabás Pőcze wrote:
> Hi
>
> > [...]
> > diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
> > index 5b08a473cdba..897f5a3e7721 100644
> > --- a/include/linux/mod_devicetable.h
> > +++ b/include/linux/mod_devicetable.h
> > @@ -320,7 +320,7 @@ struct pcmcia_device_id {
> > #define INPUT_DEVICE_ID_LED_MAX 0x0f
> > #define INPUT_DEVICE_ID_SND_MAX 0x07
> > #define INPUT_DEVICE_ID_FF_MAX 0x7f
> > -#define INPUT_DEVICE_ID_SW_MAX 0x10
> > +#define INPUT_DEVICE_ID_SW_MAX 0x12
> > #define INPUT_DEVICE_ID_PROP_MAX 0x1f
> >
> > #define INPUT_DEVICE_ID_MATCH_BUS 1
> > diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
> > index 0c2e27d28e0a..8ca2acee1f92 100644
> > --- a/include/uapi/linux/input-event-codes.h
> > +++ b/include/uapi/linux/input-event-codes.h
> > @@ -889,7 +889,9 @@
> > #define SW_MUTE_DEVICE 0x0e /* set = device disabled */
> > #define SW_PEN_INSERTED 0x0f /* set = pen inserted */
> > #define SW_MACHINE_COVER 0x10 /* set = cover closed */
> > -#define SW_MAX 0x10
> > +#define SW_COVER_ATTACHED 0x11 /* set = cover attached */
> > +#define SW_EXT_PEN_ATTACHED 0x12 /* set = external pen attached */
> > +#define SW_MAX 0x12
> > #define SW_CNT (SW_MAX+1)
> > [...]
>
> This part of the patch conflicts with another one:
> https://lore.kernel.org/linux-input/20201026144512.621479-1-markpearson@lenovo.com/
Is that merged? If not, it's fine as-is until then, and someone has to
pick to go first :)
But, most importantly, the questions asked last time about this patch
have not been addressed at all :(
thanks,
greg k-h
Powered by blists - more mailing lists