From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Steven Whitehouse <swhiteho@redhat•com>,
Bob Peterson <rpeterso@redhat•com>
Cc: Al Viro <viro@ZenIV•linux.org.uk>,
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: Tue, 22 Jun 2021 11:38:35 +1000 [thread overview]
Message-ID: <20210622113835.58589c3d@canb.auug.org.au> (raw)
In-Reply-To: <20210611111231.7750bb60@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]
Hi Steven,
On Fri, 11 Jun 2021 11:12:31 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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.
I got more conflicts today.
Can we please get that (old, buggy) version of this topic branch
removed from the gfs2 tree (and replaced with a merge of the new less
buggy version (assuming Al will guarantee that it won't change again).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-06-22 1:38 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
2021-06-11 14:45 ` Andreas Gruenbacher
2021-06-22 1:38 ` Stephen Rothwell [this message]
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=20210622113835.58589c3d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agruenba@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rpeterso@redhat$(echo .)com \
--cc=swhiteho@redhat$(echo .)com \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/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