On Wed, 22 Apr 2009, Stephen Rothwell wrote:
> Hi Alan,
>
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/usb/serial/usb-serial.c between commit
> 098aa19445c918bb8430f9b5cb840b546de570f2 ("USB: serial: fix lifetime and
> locking problems") from the usb.current tree and commit
> 1156df675ae541b21dc343912413f201f87a3909 ("tty-usb-use-port") from the
> ttydev tree.
>
> OK, I can't figure this out easily, so I have used the ttydev version of
> the file - effectively reverting the usb.current change.
>
> Alan (Cox), when the usb.current change goes into Linus' tree (it is
> destined for 2.6.30), you will have to fix the conflict. You could do
> this now by adding that patch to your series and fixing the mess ... Alan
> (Stern) you may want to help with this. I can cope with having the same
> patch on both sides of the merge (I won't even complain :-)).
I'll be happy to help, although no doubt Alan Cox is quite capable of
resolving the conflicts on his own.
Alan Stern
--
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
