Re: linux-next: manual merge of the ceph tree with Linus' tree

[Sage Weil]

Hi Stephen,

On Fri, 14 May 2010, Stephen Rothwell wrote:
> Hi Sage,
> 
> Today's linux-next merge of the ceph tree got a conflict in
> fs/ceph/super.c between commit 5dfc589a8467470226feccdc50f1b32713318e7b
> ("ceph: unregister bdi before kill_anon_super releases device name") from
> Linus' tree and commits 9f2a2a1faa0fd990d4930605583a67d7dff28bff ("ceph:
> use ceph_sb_to_client instead of ceph_client") and
> c72b09ba224e6f2c00bcf810a0a62059fcf405f7 ("ceph: name bdi ceph-%d instead
> of major:minor") from the ceph tree.

Aie, sorry...  I rebased everything queued for the next window yesterday 
but forgot to update the for-next tag.  These conflicts should all 
disappear next time around.

Thanks!
sage
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/