On Jul 25 2014 or thereabouts, Dmitry Torokhov wrote: > Hi Benjamin, > > On Thu, Jul 24, 2014 at 02:13:55PM -0400, Benjamin Tissoires wrote: > > Hi Dmitry, > > > > this is the second series I told you about for wacom.ko. This series also have > > a good number of removed lines of code. \o/ > > > > The first patch is Jason's one that I finally decided to take with me. His > > previous submission still applied correctly even after the moving of the files > > (git is definitively awesome). > > > > The second one is a patch I sent earlier and forgot to include in the v2 of > > the first series. It might have been dropped during my many rebases. So here > > he is. > > > > The rest is for one part enhancing the battery reporting system (to make it > > equal to the one in hid-wacom, and even slightly better). The other part > > is the actual merge of hid-wacom into wacom which gives the same user space API > > for bluetooth and USB devices, fixes the pad-in-a-separate-input-dev, and > > fixes the missing tools not supported in the previous implementation of > > hid-wacom for Intuos 4 BT. > > > > I ended up taking 3.16-rc6 and applying your first series and the first > 5 patches of this series to it. You should be able to see the result on > kernel.org in wacom branch. Cool. The resolution of the hid-core.c conflict is in fact better than what I proposed. It should not conflict with Jiri's pull request IMO. And when the two branches will hit Linus' we can then un-split hid-rmi and wacom processes. I also noticed few differences. Some of them you obviously made, I am fine with them BTW, and some other I think because your current next branch already has some wacom patches queued. I guess you will handle this just fine, as usual, but I'll try to keep an eye on it just in case git messed up the merge and forgot one branch. Thanks again Dmitry. And sorry for have pushed you regarding that. Cheers, Benjamin -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
