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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D5ACC3DA4A for ; Sat, 10 Aug 2024 20:30:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D4E16B008A; Sat, 10 Aug 2024 16:30:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 55DB26B0092; Sat, 10 Aug 2024 16:30:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D7596B0095; Sat, 10 Aug 2024 16:30:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1E42A6B008A for ; Sat, 10 Aug 2024 16:30:46 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 96DA912029B for ; Sat, 10 Aug 2024 20:30:45 +0000 (UTC) X-FDA: 82437479250.08.0774627 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf21.hostedemail.com (Postfix) with ESMTP id 5F0D71C0004 for ; Sat, 10 Aug 2024 20:30:42 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=i74G9X5s; spf=pass (imf21.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723321754; h=from:from:sender:reply-to:subject:subject: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:dkim-signature; bh=JYUdtS/d2mtDy6Wb9t2R6ES48f69PR1f8oh7pik78XA=; b=4D4P1eXEfw1jdJkIFuut2X/Jn6TwQjvoJTsmpbwEjeYHKkjCp922jO0hOK+jDqmgHC271N sKzvDMeQ2LVtRVrl2MksiQZMvO5McAmThOGKrgGHjuTVndZ9pAD8AM+3XUQ9sZxhRMOHty PJB1TaYY7hWT7nHeyfupW3WRo3hPFWU= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=i74G9X5s; spf=pass (imf21.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723321754; a=rsa-sha256; cv=none; b=Gg4U2Z5NWBwFT6rpVnrJK0sfm1kh/1bqexEwPVGrJDVq8muGWsy6KaO+BwSF2V2pspGJpl RTQ1tjMnbxyRA8aTYsbxPC2w8JmL/EioIgN5TWXCEk8lbxBDwzi61onZMy3QhCkybtyxl0 zaQ8vdYzH39tYLQIBqdw8pn17VnKJaY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 53B1DCE0B5C; Sat, 10 Aug 2024 20:30:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A254BC32781; Sat, 10 Aug 2024 20:30:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1723321836; bh=kSnRQocWSq3naynHnxtVJuyGiXsM9l+OaEt9HNds17s=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=i74G9X5sIfkUC+QCxMkvK9Af7K+3Mdmy8TqNWIJQ36dipYpugi9rA2NxDDEbwSYZT esGw5TmmRlSXBkT9v1wRapKtLsCsj2q+UDWDIZvI83LlRyjAqNGC4cFwW6LE0/eO5P 9Q0Jhill/gi61D/JaXjGnKzruOrtapitA/vQ2Ar0= Date: Sat, 10 Aug 2024 13:30:34 -0700 From: Andrew Morton To: Vlastimil Babka Cc: Stephen Rothwell , Jann Horn , "Paul E. McKenney" , Joel Fernandes , Josh Triplett , Boqun Feng , Christoph Lameter , David Rientjes , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Julia Lawall , Jakub Kicinski , "Jason A. Donenfeld" , "Uladzislau Rezki (Sony)" , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, rcu@vger.kernel.org, Alexander Potapenko , Marco Elver , Dmitry Vyukov , kasan-dev@googlegroups.com, Mateusz Guzik Subject: Re: [-next conflict imminent] Re: [PATCH v2 0/7] mm, slub: handle pending kfree_rcu() in kmem_cache_destroy() Message-Id: <20240810133034.433d3e1338d3bd8a0c90bf45@linux-foundation.org> In-Reply-To: <167495c0-187b-4fb8-8de5-63db0aef193e@suse.cz> References: <20240807-b4-slab-kfree_rcu-destroy-v2-0-ea79102f428c@suse.cz> <54d62d5a-16e3-4ea9-83c6-8801ee99855e@suse.cz> <20240809171115.9e5faf65d43143efb57a7c96@linux-foundation.org> <167495c0-187b-4fb8-8de5-63db0aef193e@suse.cz> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 5F0D71C0004 X-Stat-Signature: nkwfqj7ystkarieuu7gxb4pgsnoi9ifx X-Rspam-User: X-HE-Tag: 1723321842-377076 X-HE-Meta: U2FsdGVkX1+ilgbbr+tDwSYY4EF11X7x4dSECneHlM1uaGtTe02bykVq002+hrVd0fdnle/0C0c/8mlkvksBnvKZeJv07tnBCqbYpNiv+KzrsRwq/fa+yAVk5r4WNI64RsNmnK46Wg2dcFVuAbmYGt0J1dRmVGX73na4nKjQgUXtRXAttj+3KiGgimXKi4Xixem4MXB4VXsOYiOEC3oqiywWN98HtM+1uqfqvKITLvRWC+I5k2PZcyQo3h6z5Yb0kmLGynS8tSX3ba0mc5i9Gkwoaa+EcgocRryJBQse9kC/7w6o7sX3dn1IAQ5gyWtZOYmkaG79ul1Dtyc+qLM5ju+4ZfZli9y+/ss87cEIY7m/6dwNGDFFCmvGhmkUpduFF8vo/wNDpQjO0tuFGUQS4/47tiaiFv/JCbairSIIvFMr5tmMzYyVgyIV5hMy+Lu0Ed7VKhbNao5BDhw2UNO8ivKnO0IkM5gtvpH98BlohSfHYD2IfPe+OfEmSUTxn/wP/aIypdGxplRpTK/gD/ghAgE5nDAVo1XYTUNHpr9y5qcyT7RNe503g2Z+TgjNBQYTLS9xjzIIZL0v/l014fh488GhO3qzmI46RPJjFNLCao8ia/9na77uiVoY+5SpkD/rJLqiyAgWpeRna3aqoJNneD1tJWmKSA0ZX+UQ3fVeQD2ugrie1zEiRn9YyGmDLpZyrPign/kF6A7ZDbCn1KZdQ1K3HFdDTQPexm7nNeUISPbrOfugtJdSM4JpaJxyTL65jzLMjlnwDZk7fqmkhLCvtjE8swgQ6lgDTrCM4HhpyLWajIGyzbVz1UzePCmvUd0kE3JkvKYRaPd9xC2fqASoFceaYYWkWRWaz/YGcK2VMj6GaO2TIfT4Vz/R5fYY9IiF6NSEbdtSONWxfUMbCoflvPNZ/lbtdZRmZJtzBCV6nevNhhj58ZLKOYWMpvAiX1N2unzNuP08JhYL+tG3IiC 7txAhOqT 0OH1YlI9odL7VyE3cKbQHqM0AnJ/dZVfZTyKHcZ4G2ikJ2Q6SPNEpFf/8AjrneZzS+SjCUCDavdVPCUhpaLi0xSe31dppcBLq++ff8wJ8E7EvttK5I9jD53GypRIGwFOiINjkHRDoXW1uUHCtBwV02aYDhFzN3f2i2F6K+ic1SnjEKEVdJjUS6vw6c6qX8cdkQdZMGadoikSpjYx4IhGchxnCbPX3SEg/rp6bkWASkjbOWp7qyqWDr0z6awG1wAsgNlJ6MV/C6VVSuhd8Pq4ln7HwjVP6umqmDJ18M9Rr1uugJBzNNCeS+5X//FnjoYLiAbVTLJg/j549Y5IpaYF4sV6vOw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Sat, 10 Aug 2024 22:25:05 +0200 Vlastimil Babka wrote: > >> I guess it would be easiest to send a -fix to Andrew as it's rather minor > >> change. Thanks! > > > > That's quite a large conflict. How about we carry Jann's patchset in > > the slab tree? > > OK I've done that and pushed to slab/for-next. Had no issues applying > the kasan parts and merge with mm-unstable (locally rebased with Jann's > commits dropped) had no conflicts either so it should work fine. Thanks! Cool. I have dropped the copy of v8 from mm.git.