Re: [PATCH 0/6] Large scancode handling

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Sep 08, 2010 at 09:56:07AM -0700, Dmitry Torokhov wrote:
> On Wed, Sep 08, 2010 at 12:09:08PM -0400, Jarod Wilson wrote:
> > On Wed, Sep 08, 2010 at 05:25:13PM +0200, Jiri Kosina wrote:
> > > On Wed, 8 Sep 2010, Jarod Wilson wrote:
> > > 
> > > > > > 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.
> > 
> 
> Hmm, I do not see anything in there that would conflict with my
> changes...

Sorry, yeah, it *should* be solely context conflicts due to line offsets
and other misc drift, no functional conflicts with your changes.


-- 
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


[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux