From: Vlastimil Babka <vbabka@suse•cz>
To: broonie@kernel•org
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Matthew Wilcox <willy@infradead•org>
Subject: Re: linux-next: manual merge of the slab tree with the origin tree
Date: Tue, 22 Feb 2022 02:35:39 +0100 [thread overview]
Message-ID: <c19d1ff8-ab19-a118-17e6-bbf74059954b@suse.cz> (raw)
In-Reply-To: <20220222010824.3406817-1-broonie@kernel.org>
On 2/22/2022 2:08 AM, broonie@kernel•org wrote:
> Hi all,
>
> Today's linux-next merge of the slab tree got a conflict in:
>
> mm/slab.h
>
> between commit:
>
> 07f910f9b7295 ("mm: Remove slab from struct page")
> d122019bf061c ("mm: Split slab into its own type")
> 4b5f8d9a895ad ("mm/memcg: Convert slab objcgs from struct page to struct slab")
>
> from the origin tree and commit:
>
> b9059d7a5face ("mm: Split slab into its own type")
> 90fbf2f30c38f ("mm/memcg: Convert slab objcgs from struct page to struct slab")
Weird, these commits are old and unreachable, this is from before the merge
window. The slab tree for-next is here, Stephen has been incorporating it for
some time:
https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git/log/?h=for-next
Same thing with your other mail wrt mm/zsmalloc.c
>
> from the slab tree.
>
> I fixed it up (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.
>
> [I took the origin versions]
next prev parent reply other threads:[~2022-02-22 1:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 1:08 linux-next: manual merge of the slab tree with the origin tree broonie
2022-02-22 1:35 ` Vlastimil Babka [this message]
2022-02-22 12:08 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2022-02-22 1:12 broonie
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=c19d1ff8-ab19-a118-17e6-bbf74059954b@suse.cz \
--to=vbabka@suse$(echo .)cz \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=willy@infradead$(echo .)org \
/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