linux-next: manual merge of the ttydev tree with the usb.current tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-next@vger.kernel.org,
	Alan Stern <stern@rowland.harvard.edu>, Greg KH <greg@kroah.com>
Subject: linux-next: manual merge of the ttydev tree with the usb.current tree
Date: Wed, 22 Apr 2009 13:38:21 +1000	[thread overview]
Message-ID: <20090422133821.804bf9d6.sfr@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 939 bytes --]

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 :-)).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]