Hi Willy,
On Wed, 15 Oct 2008 18:26:15 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the semaphore-removal tree got a conflict in
> net/9p/trans_virtio.c between commits
> 5c1f7a7bf4c0baea08f6f3e913dd67cb17e78c20 ("9p: move request management to
> client code") and 6a29d78c78b9cc4178997695f8d518d0506a87a9 ("9p:
> consolidate transport structure") from the v9fs tree and commit
> 2a0e26c90de6245213ac53390b1f125c749ebba9 ("9p: Convert from mutex to
> spinlock") from the semaphore-removal tree.
>
> The context was changed by the v9fs changes. I fixed it up (see below).
These changes from the v9fs tree are now in Linus' tree (since
2.6.28-rc1) and the conflict persists, so I am dropping the
semaphore-removal tree for today.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpSeCeCQcwZC.pgp
Description: PGP signature
