* linux-next: manual merge of the slab tree with the origin tree
@ 2022-02-22 1:08 broonie
2022-02-22 1:35 ` Vlastimil Babka
0 siblings, 1 reply; 4+ messages in thread
From: broonie @ 2022-02-22 1:08 UTC (permalink / raw)
To: Vlastimil Babka
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Matthew Wilcox
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")
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]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the slab tree with the origin tree
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
2022-02-22 12:08 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Vlastimil Babka @ 2022-02-22 1:35 UTC (permalink / raw)
To: broonie; +Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Matthew Wilcox
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]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the slab tree with the origin tree
2022-02-22 1:35 ` Vlastimil Babka
@ 2022-02-22 12:08 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2022-02-22 12:08 UTC (permalink / raw)
To: Vlastimil Babka
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Matthew Wilcox
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
On Tue, Feb 22, 2022 at 02:35:39AM +0100, Vlastimil Babka wrote:
> 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
Yes, there was a problem picking up new versions of trees which I've
already sorted. Things should be fine today (modulo any conflicts).
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the slab tree with the origin tree
@ 2022-02-22 1:12 broonie
0 siblings, 0 replies; 4+ messages in thread
From: broonie @ 2022-02-22 1:12 UTC (permalink / raw)
To: Vlastimil Babka
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Matthew Wilcox
Hi all,
Today's linux-next merge of the slab tree got a conflict in:
mm/zsmalloc.c
between commits:
ffedd09fa9b06 ("zsmalloc: Stop using slab fields in struct page")
a41ec880aa7be ("zsmalloc: move huge compressed obj from page to zspage")
from the origin tree and commit:
a593db30a7365 ("zsmalloc: Stop using slab fields in struct page")
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.
[Used the origin version again]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-22 12:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2022-02-22 12:08 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2022-02-22 1:12 broonie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox