From: broonie@kernel•org
To: Chuck Lever <chuck.lever@oracle•com>
Cc: "J . Bruce Fields" <bfields@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the cel tree with the origin tree
Date: Mon, 13 Dec 2021 12:41:51 +0000 [thread overview]
Message-ID: <20211213124151.2045975-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the cel tree got a conflict in:
fs/nfsd/nfs4state.c
between commit:
2e3f00c5f29f0 ("nfsd: improve stateid access bitmask documentation")
from the origin tree and commit:
98beab5dca06f ("nfsd: improve stateid access bitmask documentation")
from the cel tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when yGour tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc fs/nfsd/nfs4state.c
index f07fe7562d4dd,3214257767743..0000000000000
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
reply other threads:[~2021-12-13 12:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20211213124151.2045975-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=bfields@redhat$(echo .)com \
--cc=chuck.lever@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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