From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Chuck Lever <chuck.lever@oracle•com>
Cc: Jeff Layton <jlayton@kernel•org>,
"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: Re: linux-next: manual merge of the file-locks tree with the cel tree
Date: Tue, 31 Aug 2021 11:13:38 +1000 [thread overview]
Message-ID: <20210831111338.2e3a222c@canb.auug.org.au> (raw)
In-Reply-To: <20210824100737.4bd6d815@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]
Hi all,
On Tue, 24 Aug 2021 10:07:37 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the file-locks tree got a conflict in:
>
> fs/nfs/file.c
>
> between commit:
>
> c045f1c40a48 ("nfs: don't allow reexport reclaims")
>
> from the cel tree and commit:
>
> f7e33bdbd6d1 ("fs: remove mandatory file locking support")
>
> from the file-locks 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 your 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/nfs/file.c
> index 7411658f8b05,514be5d28d70..000000000000
> --- a/fs/nfs/file.c
> +++ b/fs/nfs/file.c
> @@@ -806,13 -806,6 +806,9 @@@ int nfs_lock(struct file *filp, int cmd
>
> nfs_inc_stats(inode, NFSIOS_VFSLOCK);
>
> + if (fl->fl_flags & FL_RECLAIM)
> + return -ENOGRACE;
> +
> - /* No mandatory locks over NFS */
> - if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)
> - goto out_err;
> -
> if (NFS_SERVER(inode)->flags & NFS_MOUNT_LOCAL_FCNTL)
> is_local = 1;
>
This is now a conflict between the cel tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2021-08-31 1:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-24 0:07 linux-next: manual merge of the file-locks tree with the cel tree Stephen Rothwell
2021-08-31 1:13 ` Stephen Rothwell [this message]
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=20210831111338.2e3a222c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bfields@redhat$(echo .)com \
--cc=chuck.lever@oracle$(echo .)com \
--cc=jlayton@kernel$(echo .)org \
--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