Re: linux-next: manual merge of the akpm-current tree with the slab tree

[Vlastimil Babka]

On 12/17/21 13:39, Stephen Rothwell wrote:
> Hi all,
> 
> On Fri, 3 Dec 2021 18:19:51 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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.