lkml.org 
[lkml]   [2021]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the gfs2 tree with the vfs tree
On Fri, Jun 11, 2021 at 11:12:31AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the gfs2 tree got conflicts in:
>
> Documentation/filesystems/porting.rst
> include/linux/uio.h
> lib/iov_iter.c
>
> between various commits from the vfs tree and the same, older version,
> of the commits from the gfs2 tree.
>
> I fixed it up (I used the vfs tree versions) 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.

IMO iov_iter_fault_in_writeable() is a bloody bad idea to start with...

\
 
 \ /
  Last update: 2021-06-11 03:47    [W:1.579 / U:0.684 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site