From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jens Axboe <axboe@kernel.dk>, Keith Busch <kbusch@kernel.org>,
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 block tree with the vfs tree
Date: Mon, 18 Jul 2022 12:59:32 +1000 [thread overview]
Message-ID: <20220718125932.1ab89122@canb.auug.org.au> (raw)
In-Reply-To: <YtC9AgqezKXuUoy6@ZenIV>
[-- Attachment #1: Type: text/plain, Size: 728 bytes --]
Hi Al,
On Fri, 15 Jul 2022 02:04:02 +0100 Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> On Fri, Jul 15, 2022 at 01:52:25AM +0100, Al Viro wrote:
>
> > Ones from Keith's branch - #alignment-fixes-rebased in there. Looks like
> > one of the commits in it got changed since then - the difference in
> > __bio_iov_iter_get_pages() (unsigned int i initialization).
> >
> > Sigh... I'll rebase on top of that.
>
> Rebased and pushed out (with copy_pipe_to_iter() fix folded in as well)
BTW, these still cause a conflict. As long as you are sharing patches
(and then adding changes to the same areas), there will be conflicts.
You need to share commits i.e. a shared branch.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-07-18 2:59 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-14 2:08 linux-next: manual merge of the block tree with the vfs tree Stephen Rothwell
2022-07-14 16:36 ` Jens Axboe
2022-07-15 0:52 ` Al Viro
2022-07-15 1:04 ` Al Viro
2022-07-18 2:59 ` Stephen Rothwell [this message]
2022-07-18 4:58 ` Al Viro
2022-07-19 16:52 ` Jens Axboe
2022-07-20 2:45 ` Al Viro
2022-07-20 3:00 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2022-11-28 0:20 Stephen Rothwell
2022-07-15 3:09 Stephen Rothwell
2022-07-11 3:57 Stephen Rothwell
2022-07-11 3:38 Stephen Rothwell
2022-05-23 2:28 Stephen Rothwell
2022-05-23 2:58 ` Jens Axboe
2022-05-23 22:54 ` Stephen Rothwell
2021-01-27 3:24 Stephen Rothwell
2019-12-20 1:36 Stephen Rothwell
2019-12-20 5:34 ` Jens Axboe
2020-01-20 1:40 ` Stephen Rothwell
2020-01-20 2:45 ` Jens Axboe
2020-01-20 2:57 ` Jens Axboe
2018-05-29 4:37 Stephen Rothwell
2018-05-29 4:33 Stephen Rothwell
2018-05-29 8:12 ` Christoph Hellwig
2018-05-29 14:22 ` Jens Axboe
2018-05-29 21:40 ` Stephen Rothwell
2018-05-29 22:17 ` Jens Axboe
2017-02-02 2:44 Stephen Rothwell
2017-02-21 22:14 ` Stephen Rothwell
2016-12-12 1:31 Stephen Rothwell
2016-12-12 1:44 ` Al Viro
2016-12-12 2:00 ` Ming Lei
2015-02-09 3:55 Stephen Rothwell
2015-01-27 3:57 Stephen Rothwell
2015-01-27 4:00 ` Jens Axboe
2015-01-27 4:54 ` Al Viro
2015-01-28 17:11 ` Christoph Hellwig
2015-01-29 5:15 ` Al Viro
2015-02-01 5:56 ` Al Viro
2015-02-02 8:06 ` Christoph Hellwig
2013-04-04 2:16 Stephen Rothwell
2010-05-18 3:04 Stephen Rothwell
2010-05-18 15:37 ` H Hartley Sweeten
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=20220718125932.1ab89122@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).