On Tue, Aug 19, 2008 at 05:43:10PM +1000, Stephen Rothwell wrote:
> Hi Alan,
>
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/usb/serial/safe_serial.c between commit
> 8aac48f4f2460b00468fd5f1101addf3df04e94c ("USB: remove info() macro from
> usb.h") from the usb tree and commit
> 5e6c4a742d494b0b049d7f01ce00da5b351d2cb8 ("tty-usbserial-kref") from the
> ttydev tree.
>
> These changes modify each others context. I fixed it up (see below) and
> can carry the fix.
Looks fine to me, thanks for doing this.
greg k-h
--
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
