From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jan Kara <jack@suse.cz>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patch in the mm-nonmm-stable tree
Date: Tue, 21 Feb 2023 10:45:29 +1100 [thread overview]
Message-ID: <20230221104529.631ac4c9@canb.auug.org.au> (raw)
In-Reply-To: <20230220151211.1cdec7528db28a00320a855f@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 1382 bytes --]
Hi Andrew,
On Mon, 20 Feb 2023 15:12:11 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Tue, 21 Feb 2023 09:08:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > The following commit is also in Linus Torvalds' tree as a different commit
> > (but the same patch):
> >
> > bf470202dd9f ("fs: gracefully handle ->get_block not mapping bh in __mpage_writepage")
>
> CommitDate: Thu Feb 2 22:50:07 2023 -0800
>
> > This is commit
> >
> > 7010839ccfd4 ("fs: gracefully handle ->get_block not mapping bh in __mpage_writepage")
> >
> > in Linus' tree.
>
> CommitDate: Thu Jan 26 16:46:35 2023 +0100
>
>
> So I'm wondering why this came to light on Feb 20?
Sorry about that, but I wouldn't worry about it too much as it doesn't
seem to be causing a conflict.
The latter commit was in the ext3 tree before being merged by Linus and
I guess I missed it initially because sometimes the check for
duplicates in the mm tree produces a longish list when the mm tree is
updated during the day and the mm-hotfixes tree has already been merged
(and gets rebased as part of the mm tree rebase).
It would have been put in the list of things to ignore until it turned
up in Linus's tree today (which is an earlier and check and has a
separate ignore list).
I'll try to be more careful.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-02-20 23:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 22:08 linux-next: duplicate patch in the mm-nonmm-stable tree Stephen Rothwell
2023-02-20 23:12 ` Andrew Morton
2023-02-20 23:45 ` Stephen Rothwell [this message]
2023-02-21 0:29 ` Andrew Morton
2024-03-12 5:58 Stephen Rothwell
2024-04-28 21:25 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=20230221104529.631ac4c9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).