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

From: Stephen Rothwell
Date: Tue Jul 09 2013 - 21:24:26 EST

Next message: Chen Gang: "[Information] gcc '-O2' may skip some of uninitialized variableswarnings (exist almost 10 years)."
Previous message: Zhang Yanfei: "Re: [RFC PATCH 0/5] Support multiple pages allocation"
Next in thread: Sage Weil: "Re: linux-next: manual merge of the ceph tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Sage,

Today's linux-next merge of the ceph tree got conflicts in
drivers/block/rbd.c and net/ceph/osd_client.c because the ceph tree was
rebased before being sent to Linus and it looks like one patch
was dropped and several more added.

I just used the upstream version of the cpeh tree for today - please
clean up.

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Chen Gang: "[Information] gcc '-O2' may skip some of uninitialized variableswarnings (exist almost 10 years)."
Previous message: Zhang Yanfei: "Re: [RFC PATCH 0/5] Support multiple pages allocation"
Next in thread: Sage Weil: "Re: linux-next: manual merge of the ceph tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]