From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 612E3C433EF for ; Tue, 22 Feb 2022 01:35:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233227AbiBVBgH (ORCPT ); Mon, 21 Feb 2022 20:36:07 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:60862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230115AbiBVBgG (ORCPT ); Mon, 21 Feb 2022 20:36:06 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4572E24F19; Mon, 21 Feb 2022 17:35:42 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id CFAA4210F7; Tue, 22 Feb 2022 01:35:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1645493740; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TwiR4YqQHWTnyf8/p5OxQjzD8KArDMsS+IQIZpS4a6g=; b=eDzbWYmT9E+hHwQd3nmlNkYh4PsgHKB50Dqki5QT+oAVMGIlitYeQm/N+RRgqkKE1ayKfA 370Bo3/EmGPbiXv9GBS2mf+OhTbSwAnl8fOH9IkxaSPJBmDXB8AaTF9K4nsEaOx+RnjTk7 GuiWv5+sNfx9np5rpCPHRZyAFRykK7I= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1645493740; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TwiR4YqQHWTnyf8/p5OxQjzD8KArDMsS+IQIZpS4a6g=; b=f4Age2TN2CzpbL2S4NXMDRrzYcEDxZFncEe0dcObQrsDAjyf/1wyq1VRK+BcJCIdaNy3Pp bIZgBwrLpNC4YmAg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B8CC613519; Tue, 22 Feb 2022 01:35:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sVpuLOw9FGLuPQAAMHmgww (envelope-from ); Tue, 22 Feb 2022 01:35:40 +0000 Message-ID: Date: Tue, 22 Feb 2022 02:35:39 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 Subject: Re: linux-next: manual merge of the slab tree with the origin tree Content-Language: en-US To: broonie@kernel.org Cc: Linux Kernel Mailing List , Linux Next Mailing List , Matthew Wilcox References: <20220222010824.3406817-1-broonie@kernel.org> From: Vlastimil Babka In-Reply-To: <20220222010824.3406817-1-broonie@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.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]