From: Vlastimil Babka <vbabka@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Waiman Long <longman@redhat.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the slab tree
Date: Tue, 21 Dec 2021 01:10:07 +0100 [thread overview]
Message-ID: <3ec33e65-1080-96be-f8bb-0012e3b87387@suse.cz> (raw)
In-Reply-To: <20211217233953.28062c5b@canb.auug.org.au>
On 12/17/21 13:39, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 3 Dec 2021 18:19:51 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the akpm-current tree got a conflict in:
>>
>> mm/memcontrol.c
>>
>> between commit:
>>
>> eefa12e18a92 ("mm/memcg: Convert slab objcgs from struct page to struct slab")
>>
>> from the slab tree and commit:
>>
>> 93e959c235eb ("mm/memcg: relocate mod_objcg_mlstate(), get_obj_stock() and put_obj_stock()")
>>
>> from the akpm-current 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.
>>
...
>> -int memcg_alloc_page_obj_cgroups(struct page *page, struct kmem_cache *s,
>> - gfp_t gfp, bool new_page)
>> +int memcg_alloc_slab_cgroups(struct slab *slab, struct kmem_cache *s,
>> + gfp_t gfp, bool new_slab)
>> {
>> - unsigned int objects = objs_per_slab_page(s, page);
>> + unsigned int objects = objs_per_slab(s, slab);
>> unsigned long memcg_data;
>> void *vec;
>>
>
> This is now a conflict between the slab tree and Linus' tree.
Thanks, rebased slab-next to v5.16-rc6 to avoid the conflict.
next prev parent reply other threads:[~2021-12-21 0:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-03 7:19 linux-next: manual merge of the akpm-current tree with the slab tree Stephen Rothwell
2021-12-17 12:39 ` Stephen Rothwell
2021-12-21 0:10 ` Vlastimil Babka [this message]
2021-12-03 7:22 Stephen Rothwell
2022-01-11 11:51 ` 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=3ec33e65-1080-96be-f8bb-0012e3b87387@suse.cz \
--to=vbabka@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=longman@redhat.com \
--cc=sfr@canb.auug.org.au \
/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).