All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Howells <dhowells@redhat.com>,
	Christian Brauner <christian.brauner@ubuntu.com>
Cc: 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 fscache tree with the pidfd tree
Date: Mon, 15 Feb 2021 08:14:39 +1100	[thread overview]
Message-ID: <20210215081439.1d0b2b33@canb.auug.org.au> (raw)
In-Reply-To: <20210127100038.1d04e444@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 2325 bytes --]

Hi all,

On Wed, 27 Jan 2021 10:00:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the fscache tree got a conflict in:
> 
>   include/linux/fs.h
> 
> between commit:
> 
>   ba73d98745be ("namei: handle idmapped mounts in may_*() helpers")
> 
> from the pidfd tree and commit:
> 
>   0de0bdfa19fa ("vfs: Export rw_verify_area() for use by cachefiles")
> 
> from the fscache 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 include/linux/fs.h
> index 7762d3d75230,493804856ab3..000000000000
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@@ -2839,22 -2756,11 +2839,23 @@@ static inline int bmap(struct inode *in
>   }
>   #endif
>   
>  -extern int notify_change(struct dentry *, struct iattr *, struct inode **);
>  -extern int inode_permission(struct inode *, int);
>  -extern int generic_permission(struct inode *, int);
>  -extern int __check_sticky(struct inode *dir, struct inode *inode);
>  +int notify_change(struct user_namespace *, struct dentry *,
>  +		  struct iattr *, struct inode **);
>  +int inode_permission(struct user_namespace *, struct inode *, int);
>  +int generic_permission(struct user_namespace *, struct inode *, int);
>  +static inline int file_permission(struct file *file, int mask)
>  +{
>  +	return inode_permission(file_mnt_user_ns(file),
>  +				file_inode(file), mask);
>  +}
>  +static inline int path_permission(const struct path *path, int mask)
>  +{
>  +	return inode_permission(mnt_user_ns(path->mnt),
>  +				d_inode(path->dentry), mask);
>  +}
>  +int __check_sticky(struct user_namespace *mnt_userns, struct inode *dir,
>  +		   struct inode *inode);
> + extern int rw_verify_area(int, struct file *, const loff_t *, size_t);
>   
>   static inline bool execute_ok(struct inode *inode)
>   {

With the merge window about to open, this is a reminder that this
conflict still exists.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2021-02-14 21:15 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-26 23:00 Stephen Rothwell
2021-02-14 21:14 ` Stephen Rothwell [this message]
2021-02-24 22:40   ` Stephen Rothwell
2021-12-05 22:07 Stephen Rothwell

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=20210215081439.1d0b2b33@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=christian.brauner@ubuntu.com \
    --cc=dhowells@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --subject='Re: linux-next: manual merge of the fscache tree with the pidfd tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.