On Thu, Dec 06, 2018 at 10:24:11AM +0100, Benjamin Tissoires wrote: > On Thu, Dec 6, 2018 at 9:36 AM Martin Kepplinger > <[email protected]> wrote: > > > > On 06.12.18 00:03, Peter Hutterer wrote: > > > ABS_RESERVED was added in d9ca1c990a7 and accidentally removed as part of > > > ffe0e7cf290f5c9 when the high-resolution scrolling code was removed. > > > > > > Signed-off-by: Peter Hutterer <[email protected]> > > > > Reviewed-by: Martin Kepplinger <[email protected]> > > Acked-by: Benjamin Tissoires <[email protected]> > > Dmitry, I do not think this one will conflict with the high res wheel > patches, so I think it should be safe to take it through your tree. > If you think it'll be an issue, I can also take it through the HID one.
fwiw, patch was made on top of v4.20-rc5, so it shouldn't conflict. Cheers, Peter

