linux-kernel - linux-next: manual merge of the nfsd tree with the nfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150210115549.6067ffc1@canb.auug.org.au>
Date:	Tue, 10 Feb 2015 11:55:49 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"J. Bruce Fields" <bfields@...ldses.org>,
	Trond Myklebust <trond.myklebust@....uio.no>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tom Haynes <loghyr@...marydata.com>,
	Christoph Hellwig <hch@....de>
Subject: linux-next: manual merge of the nfsd tree with the nfs tree

Hi,

Today's linux-next merge of the nfsd tree got a conflict in
include/linux/nfs4.h between commit d67ae825a59d ("pnfs/flexfiles: Add
the FlexFile Layout Driver") from the nfs tree and commit 6cae0a4648c0
("nfs: add LAYOUT_TYPE_MAX enum value") from the nfsd tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/linux/nfs4.h
index de7c91ca427e,bc10d687f2ce..000000000000
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@@ -516,7 -517,7 +517,8 @@@ enum pnfs_layouttype 
  	LAYOUT_NFSV4_1_FILES  = 1,
  	LAYOUT_OSD2_OBJECTS = 2,
  	LAYOUT_BLOCK_VOLUME = 3,
 +	LAYOUT_FLEX_FILES = 4,
+ 	LAYOUT_TYPE_MAX
  };
  
  /* used for both layout return and recall */

Content of type "application/pgp-signature" skipped