Hi Eric, On Wed, 21 Sep 2011 09:10:31 -0500 Eric Van Hensbergen <ericvh@xxxxxxxxx> wrote: > > You can switch the v9fs tree to pull from the for-next branch of > github.com:ericvh/linux.git until kernel.org gets back. Hopefully > that will resolve the reported merge conflict. OK, I will switch to this tree from tomorrow - assuming that the real Eric does't complain :-). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpEe2Le6gaCT.pgp
Description: PGP signature