From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "J. Bruce Fields" <bfields@fieldses•org>,
Trond Myklebust <trond.myklebust@fys•uio.no>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Tom Haynes <loghyr@primarydata•com>,
Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the nfsd tree with the nfs tree
Date: Tue, 10 Feb 2015 11:55:49 +1100 [thread overview]
Message-ID: <20150210115549.6067ffc1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
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@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 */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-02-10 0:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-10 0:55 Stephen Rothwell [this message]
2015-02-10 15:34 ` linux-next: manual merge of the nfsd tree with the nfs tree J. Bruce Fields
-- strict thread matches above, loose matches on Subject: below --
2025-03-20 22:11 Stephen Rothwell
2025-03-21 13:32 ` Chuck Lever
2025-03-21 13:37 ` Trond Myklebust
2025-03-21 13:40 ` Chuck Lever
2021-10-24 23:59 Stephen Rothwell
2021-10-25 0:10 ` Stephen Rothwell
2009-08-10 0:58 Stephen Rothwell
2009-08-10 16:05 ` J. Bruce Fields
2009-08-10 18:08 ` Trond Myklebust
2009-08-10 18:17 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150210115549.6067ffc1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bfields@fieldses$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=loghyr@primarydata$(echo .)com \
--cc=trond.myklebust@fys$(echo .)uio.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox