[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110513140821.bfef61a3.sfr@canb.auug.org.au>
Date: Fri, 13 May 2011 14:08:21 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Max Vozeler <max@...terhof.net>,
matt mooney <mfm@...eddisk.com>
Subject: linux-next: manual merge of the staging tree with Linus' tree
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/usbip/vhci_sysfs.c between commit d1b2e95ab016 ("staging:
usbip: vhci: fix oops on subsequent attach") from Linus' tree and commit
7aaacb43ed97 ("staging: usbip: fix header includes") from the staging
tree.
The latter superceded the former for the conflict in the includes.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists