From: Yosry Ahmed <yosryahmed@google.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vlastimil Babka <vbabka@suse.cz>,
Andrew Morton <akpm@linux-foundation.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 slab tree with the mm tree
Date: Tue, 4 Apr 2023 21:10:21 -0700 [thread overview]
Message-ID: <CAJD7tkYteBhds8iBi11ddYv_qyOELS136rfx3M3jtheYSFfPoA@mail.gmail.com> (raw)
In-Reply-To: <20230405140852.04a808e5@canb.auug.org.au>
On Tue, Apr 4, 2023 at 9:08 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the slab tree got a conflict in:
>
> mm/slob.c
>
> between commit:
>
> 3fb083757df1 ("mm: vmscan: refactor updating reclaimed pages in reclaim_state")
>
> from the mm tree and commit:
>
> 6630e950d532 ("mm/slob: remove slob.c")
>
> from the slab tree.
>
> I fixed it up (I just removed the file) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
Sounds good to me, thanks! Let me know if anything else needs to be done here.
> 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.
>
> --
> Cheers,
> Stephen Rothwell
next prev parent reply other threads:[~2023-04-05 4:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-05 4:08 linux-next: manual merge of the slab tree with the mm tree Stephen Rothwell
2023-04-05 4:10 ` Yosry Ahmed [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-02 4:34 Stephen Rothwell
2024-01-02 4:02 Stephen Rothwell
2023-12-21 6:34 Stephen Rothwell
2023-11-27 1:29 Stephen Rothwell
2023-06-19 4:03 Stephen Rothwell
2023-06-19 12:16 ` Catalin Marinas
2023-03-17 1:44 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=CAJD7tkYteBhds8iBi11ddYv_qyOELS136rfx3M3jtheYSFfPoA@mail.gmail.com \
--to=yosryahmed@google.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vbabka@suse.cz \
/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).