On Wed, 8 Sep 2010, Jarod Wilson wrote:
quoted
quoted
quoted
quoted
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.
Umm, what patch are you talking about please? I don't seem to have
anything from you in my queue.
Gah. I suck. Forgot to cc you on it.
http://www.spinics.net/lists/linux-input/msg11007.html
Can resend and/or bounce you a copy if need be.
No need to resend, I'll dig it out from linux-input@ archives where I have
overlooked it and will start a discussion in that thread if needed, so
that we don't pollute this one.
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.