Date: Tue, 10 Feb 2015 10:34:37 -0500
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Tom Haynes <loghyr@primarydata.com>,
        Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the nfsd tree with the nfs tree
Message-ID: <20150210153437.GE28949@fieldses.org>
References: <20150210115549.6067ffc1@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150210115549.6067ffc1@canb.auug.org.au>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1174
Lines: 38

On Tue, Feb 10, 2015 at 11:55:49AM +1100, Stephen Rothwell wrote:
> 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).

Thanks!--b.

> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.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 */


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