linux-next: manual merge of the net-next tree with the ceph tree

linux-next: manual merge of the net-next tree with the ceph tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1328 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/ceph/osdmap.c between commit 8b3932690084 ("crush: warn on do_rule
failure") from the ceph tree and commit 95c961747284 ("net: cleanup
unsigned to unsigned int") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/ceph/osdmap.c
index 2592f3c,56e561a..0000000
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@@ -991,11 -998,12 +991,11 @@@ int ceph_calc_object_layout(struct ceph
  			    struct ceph_file_layout *fl,
  			    struct ceph_osdmap *osdmap)
  {
- 	unsigned num, num_mask;
+ 	unsigned int num, num_mask;
  	struct ceph_pg pgid;
 -	s32 preferred = (s32)le32_to_cpu(fl->fl_pg_preferred);
  	int poolid = le32_to_cpu(fl->fl_pg_pool);
  	struct ceph_pg_pool_info *pool;
- 	unsigned ps;
+ 	unsigned int ps;
  
  	BUG_ON(!osdmap);
  
@@@ -1027,7 -1045,8 +1027,7 @@@ static int *calc_pg_raw(struct ceph_osd
  	struct ceph_pg_mapping *pg;
  	struct ceph_pg_pool_info *pool;
  	int ruleno;
- 	unsigned poolid, ps, pps, t, r;
 -	unsigned int poolid, ps, pps, t;
 -	int preferred;
++	unsigned int poolid, ps, pps, t, r;
  
  	poolid = le32_to_cpu(pgid.pool);
  	ps = le16_to_cpu(pgid.ps);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]