On Thu, 21 Aug 2008 18:03:08 +1000
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Alan,
>
> Today's linux-next merge of the ttydev tree got trivial conflicts in
> drivers/usb/serial/aircable.c and drivers/usb/serial/keyspan_pda.c
> between commit 7b4dc5ed3acb8410fd078a6876d01c206af803ed ("USB: remove use
> of err() in drivers/usb/serial") from the usb tree and commit
> 9c3656d0341bc2763b3f4abc9484776ff28c1c12 ("tty-usbserial-kref") from the
> ttydev tree.
>
> Just overlapping context of changes. I fixed it up (see below). I assume
> that the err -> dev_err changes could be added to your tree, Alan.
I took that as a hint and have done so.
--
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
