From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>, David Howells <dhowells@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Vishal Moola (Oracle)" <vishal.moola@gmail.com>
Subject: Re: linux-next: manual merge of the block tree with the mm tree
Date: Thu, 15 Jun 2023 20:50:14 -0700 [thread overview]
Message-ID: <20230615205014.8d7eb4457ca9bc676a79d2db@linux-foundation.org> (raw)
In-Reply-To: <20230616115856.3ce7682c@canb.auug.org.au>
On Fri, 16 Jun 2023 11:58:56 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the block tree got a conflict in:
>
> mm/gup.c
>
> between commit:
>
> 0f3f569eca46 ("mm/gup.c: reorganize try_get_folio()")
>
> from the mm tree and commit:
>
> c8070b787519 ("mm: Don't pin ZERO_PAGE in pin_user_pages()")
>
> from the block tree.
>
> I fixed it up (I think - 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.
That's getting a bit nasty. Maybe David's patches are in the wrong tree.
next prev parent reply other threads:[~2023-06-16 3:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-16 1:58 linux-next: manual merge of the block tree with the mm tree Stephen Rothwell
2023-06-16 3:50 ` Andrew Morton [this message]
2023-06-16 9:56 ` David Howells
2023-06-16 16:07 ` Jens Axboe
2023-06-16 19:44 ` Vishal Moola
-- strict thread matches above, loose matches on Subject: below --
2024-04-02 0:27 Stephen Rothwell
2024-05-13 23:41 ` Stephen Rothwell
2024-05-13 23:43 ` Edgecombe, Rick P
2024-02-14 0:25 Stephen Rothwell
2024-03-11 21:54 ` Stephen Rothwell
2023-06-16 1:50 Stephen Rothwell
2023-03-22 23:02 Stephen Rothwell
2023-03-22 23:13 ` David Howells
2023-03-22 23:15 ` Jens Axboe
2023-03-22 23:26 ` Andrew Morton
2023-03-23 0:03 ` Stephen Rothwell
2023-03-23 0:04 ` David Howells
2023-03-23 0:49 ` Jens Axboe
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=20230615205014.8d7eb4457ca9bc676a79d2db@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vishal.moola@gmail.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