On Sun, 24 Aug 2008, Greg KH wrote:
> > Today's linux-next merge of the hid tree got a conflict in
> > drivers/hid/usbhid/hid-core.c between commit
> > 42c057049eb3ca9bad38fb0acc6290771a11d9ff ("USB: remove warn() macro from
> > usb.h") from the usb tree and commit
> > 128fc1f24bbb042b8d586dfba4db9ee7caac52bd ("HID: indent switches/cases")
> > from the hid tree.
> > I did the obvious fixups (see below).
> > Jiri, you should be able to apply the appropriate part of Greg's patch to
> > your tree as it only depends on stuff that is already in Linus' tree. I
> > have added that partial patch below. (Greg, do you want to Sign-off on
> > that, please?) (I don't mind if the patch is in both trees - Greg you
> > might consider breaking up those warn() and info() (and err()?) removal
> > patches and sending them to the appropriate maintainers.)
> They are going to get split up and sent to them later this week.
So if Stephen is able to carry the fixup patch in -next tree until you
send out the split-up patches to maintainers, I'll wait for that to
happen, if OK with Stephen. Thanks.
--
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
