From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39BA03E49F4 for ; Tue, 4 Aug 2026 08:26:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.69 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785831978; cv=none; b=Z5ffJUHntEb8rBIts+DZNLZUAzPfZI+0jIh+YmcRFcuDzixILFjQD0DCXXX82i3BhUsqi0C9OiUXMf4eNbLAU3NldnalxFllc/o+PAsM5M1+kD5MvDC5mpzvm6F8lyu7PBiFkGS77cxyVsVcym5qTJrD7EYcFiqoSU4KgGwly3E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785831978; c=relaxed/simple; bh=J9Cht0yRH7rxT5ujSeWuU7p72gCgVFUxHAyVYpYEWw4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Lz1h0x+IrNxvqdrQmCwI7anebTS/Xkrpm72GTzd1eNMftmHDros0viElUyretS/kw3MalZSEoYh2g8BfZcONJ6OcXD+DbgKCDW8Y2hA+tfZQHpRHr0aLbpScgr11xgYRMrxugJIygEebTtEjMnKnR87FSSaHNnkrYY1taLKjXWM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=dsLTu91g; arc=none smtp.client-ip=209.85.128.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dsLTu91g" Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4954fe32d6eso13179335e9.1 for ; Tue, 04 Aug 2026 01:26:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785831971; x=1786436771; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=lPOuC+cdb9P9bTryHSvHSPjFUa2kyhcweUAMjN3kNPk=; b=dsLTu91glPD/TmtrTI02RUEvKcIWD6NykeEA0xwa3VvBjWRiDpEaAhDag3HRW3BVW6 2Y9UCvjFLR3DNZo25yTyiYhRuujAKbZ9w1QoPi+SiMSk3Ce+Cr6OD8tet6CoGO46ag9j NJMz5xDKOAL3EQgUeSX2iD8SThc4sIUiGBu6SlSlmpkQOEkqjQNLST2uZyVLHeZWWd+n tbcKh1WsoJBuRo5+jkMDLetFNH1exnD81UcxNOcOGPOMh/aMDTXT2Cj+KgNU3HW+4sR9 RHrKJapodXr2SYrJvTGwzZtRdxclk6FEf0FTiP2BnmSd8rUwLoie2RDz+vMt1gWIkmJX HouQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785831971; x=1786436771; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=lPOuC+cdb9P9bTryHSvHSPjFUa2kyhcweUAMjN3kNPk=; b=a5c0DMvYzDbGM83TRO/0qKEYIj7G9brKHk1cVxLeSxSJjxfaYJ2/I58/lRJlfPqRSP aRfhHf4IOfYc8JEWgpyeYHTrFb+uGMThIeJU6WIHk5CrM+IXmgAzF8nzGR5k47yCKZQq XHvvuDLwV6sUwRJ45TKBXFJ4OAPRok0OgSfFFhRQ7HvGR/vKFGL4go+3D7XifAu3ixO1 8pwFAGeUj1kNdRAe9S49nrzXhgs27PM5cRM7K5buFxD0UASi9Ut6YXgxNlaoXbfTlifb WRdN0HvieslcdSgWfThot7Wwgi9X4WyBQOGv9OeUoewGKPP/+j5FJtsNMQrP778a87cg oZuA== X-Forwarded-Encrypted: i=1; AHgh+RqbAxLEOQtA6D/R0tLzVIvhQO06hzYIPBoow0jrPXdu2bIUv/Dekh/tkoGCykGnvhS+H43kjzm9GVJRtmc=@vger.kernel.org X-Gm-Message-State: AOJu0YxiZc91bnj1P/JdWmPDRqRv5L3ejPxx96CGxA/L2+ILp6YlfDqn w2JPWow82EbigZcztubHtTepME1ohQPGp9C1zr711GLlUyegUdGbcJ/FaQDYYjL6Yquzx4pMRpp ESmmLei1rkmupHvzy5Q== X-Received: from wmbhu8.prod.google.com ([2002:a05:600c:a288:b0:493:d884:f722]) (user=aliceryhl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:500d:b0:495:737a:7afe with SMTP id 5b1f17b1804b1-4980c6519d2mr330090645e9.15.1785831971266; Tue, 04 Aug 2026 01:26:11 -0700 (PDT) Date: Tue, 4 Aug 2026 08:26:10 +0000 In-Reply-To: <20260731220137.GA3307698@ax162> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260731075644.20215-1-ojeda@kernel.org> <20260731220137.GA3307698@ax162> Message-ID: Subject: Re: linux-next: manual merge of the slab tree with the rcu tree From: Alice Ryhl To: Nathan Chancellor Cc: Boqun Feng , Miguel Ojeda , broonie@kernel.org, harry@kernel.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, paulmck@kernel.org, puranjay@kernel.org, vbabka@kernel.org, vbabka@suse.cz, Greg Kroah-Hartman , Bert Karwatzki Content-Type: text/plain; charset="utf-8" On Fri, Jul 31, 2026 at 03:01:37PM -0700, Nathan Chancellor wrote: > On Fri, Jul 31, 2026 at 11:14:42PM +0200, Alice Ryhl wrote: > > I like Nathan's fix as well. > > > > Not sure if it needs to be done in the merge commit, or if we can > > apply it as a patch to char-misc despite the unknown CFG_*? > > It would need to be applied at the merge of the two trees because > CONFIG_KVFREE_RCU_BATCHED was introduced back in 6.15 in commit > c9f8f1242a4c ("slab: don't batch kvfree_rcu() with SLUB_TINY"). Is that required? Yes, the cfg(CONFIG_KVFREE_RCU_BATCHED) will fail in Greg's tree because the CFG doesn't exist and is hence not enabled ... but the cfg not applying is what we want. The main risk I can think of is a warning about an unknown CFG being used. Perhaps we could silence the warning? Or I mean, we can also just fix it in the merge commit if that works for everyone. Alice