On Wed, Sep 08, 2010 at 12:15:06PM -0300, Mauro Carvalho Chehab wrote: > Em 08-09-2010 11:24, Jarod Wilson escreveu: > > On Wed, Sep 08, 2010 at 11:48:50AM +0200, Jiri Kosina wrote: > >> On Wed, 8 Sep 2010, Dmitry Torokhov wrote: > >> > >>> Hi Mauro, > >>> > >>> I guess I better get off my behind and commit the changes to support large > >>> scancodes, or they will not make to 2.6.37 either... There isn't much > >>> changes, except I followed David's suggestion and changed boolean index > >>> field into u8 flags field. Still, please glance it over once again and > >>> shout if you see something you do not like. > >>> > >>> Jiri, how do you want to handle the changes to HID? I could either push > >>> them through my tree together with the first patch or you can push through > >>> yours once the first change hits mainline. > >> > >> I think that there will unlikely be any conflict in .37 merge window in > >> this area (and if there were, I'll sort it out). > >> > >> So please add > >> > >> Acked-by: Jiri Kosina <jkosina@xxxxxxx> > >> > >> to the hid-input.c bits and feel free to take it through your tree, if it > >> is convenient for you. > > > > It'll conflict a little bith with the tivo slide patch I posted yesterday, > > but mostly just minor context changes. I can redo that patch on top of > > these changes if that's preferred. > > I can handle those context changes when merging the patches at linux-next and > when merging upstream. We just need to sync in a way that Dmitry send his patch > series before mine when sending them to Linus, and I'll take care of fixing the > merge conflicts. Ah, the specific conflicts I was referring here are confined to drivers/hid/hid-input.c, and I sent the patch thinking it would go in via the hid tree. It *is* for a remote, but its a pure HID device in this case. -- Jarod Wilson jarod@xxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
