Re: [git pull] Input patches for 2.6.19

[Andrew Morton]

On Fri, 08 Dec 2006 12:59:44 +0100
Marcel Holtmann <marcel@xxxxxxxxxxxx> wrote:

> > >  b/drivers/usb/input/hid-core.c                 |    7 
> > >  b/drivers/usb/input/hid-input.c                |    4 
> > >  b/drivers/usb/input/hid.h                      |    1 
> > 
> > OK, this is going to break the merge from Greg's tree of generic HID 
> > layer, which was planned for today.
> > 
> > The merge will probably emit a large .rej files, due to the large blocks 
> > of code being moved around, but it seems that most of the changes which 
> > would conflict with the merge could be trivially solved by hand.
> > 
> > Greg, should I prepare a new version of the generic HID patches against 
> > merged Linus' + Dmitry's trees and send them to you?
> 
> yes please, because Linus already merged Dmitry's patches.

I suggest that you leave it for 12 hours - there's a lot more stuff in flight and
there might be overlaps.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/