From: Al Viro <viro@zeniv.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Whitehouse <swhiteho@redhat.com>,
Bob Peterson <rpeterso@redhat.com>,
Andreas Gruenbacher <agruenba@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 gfs2 tree with the vfs tree
Date: Fri, 11 Jun 2021 01:46:24 +0000 [thread overview]
Message-ID: <YMLAcExtFTEYl5Bi@zeniv-ca.linux.org.uk> (raw)
In-Reply-To: <20210611111231.7750bb60@canb.auug.org.au>
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...
next prev parent reply other threads:[~2021-06-11 1:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 1:12 linux-next: manual merge of the gfs2 tree with the vfs tree Stephen Rothwell
2021-06-11 1:46 ` Al Viro [this message]
2021-06-11 14:45 ` Andreas Gruenbacher
2021-06-22 1:38 ` Stephen Rothwell
2021-06-22 6:48 ` Andreas Gruenbacher
2021-06-22 21:56 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-06-09 2:13 Stephen Rothwell
2019-07-08 3:48 Stephen Rothwell
2019-07-12 0:56 ` Stephen Rothwell
2010-01-27 0:17 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=YMLAcExtFTEYl5Bi@zeniv-ca.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=agruenba@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rpeterso@redhat.com \
--cc=sfr@canb.auug.org.au \
--cc=swhiteho@redhat.com \
/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
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;
as well as URLs for NNTP newsgroup(s).