Re: [GIT PULL] Ceph updates for 3.8

2013-01-02 Thread J. Bruce Fields
On Fri, Dec 21, 2012 at 10:59:55AM -0800, Sage Weil wrote: > On Fri, 21 Dec 2012, J. Bruce Fields wrote: > > On Thu, Dec 20, 2012 at 01:29:49PM -0800, Sage Weil wrote: > > > Hi Linus, > > > > > > Please pull the following Ceph updates for 3.8 from > > > > > > git://git.kernel.org/pub/scm/linux/

Re: [GIT PULL] Ceph updates for 3.8

2012-12-21 Thread Sage Weil
On Fri, 21 Dec 2012, J. Bruce Fields wrote: > On Thu, Dec 20, 2012 at 01:29:49PM -0800, Sage Weil wrote: > > Hi Linus, > > > > Please pull the following Ceph updates for 3.8 from > > > > git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git > > for-linus > > > > There's a trivial

Re: [GIT PULL] Ceph updates for 3.8

2012-12-21 Thread J. Bruce Fields
On Thu, Dec 20, 2012 at 01:29:49PM -0800, Sage Weil wrote: > Hi Linus, > > Please pull the following Ceph updates for 3.8 from > > git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git for-linus > > There's a trivial conflict in net/ceph/osd_client.c dealing with rbtree > node in

[GIT PULL] Ceph updates for 3.8

2012-12-20 Thread Sage Weil
Hi Linus, Please pull the following Ceph updates for 3.8 from git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git for-linus There's a trivial conflict in net/ceph/osd_client.c dealing with rbtree node initialization; the resolution is to keep the RB_CLEAR_NODE() call (see 4c19