From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BAF8B804 for ; Mon, 14 Oct 2024 04:12:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728879153; cv=none; b=HemGGadrINo5ACihhebFNlXFpO2kBSenZveWnRf/d+1ReJdIS3u6eepteOGW+BRIgrueRg6YyqpaTpfI+2A10cgq7HMCpG0pqfHAC0xY98chvykJezvA41LMdUTPkBAy0y8At2nJBS5W2pTbQLwjPKHhlFFF/ajgDEM82kJGmi4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728879153; c=relaxed/simple; bh=RIQXMzexzGIQ4bTGfFfCCt+ia1WE3jl0+awUhyXq2HQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=PJ0OFM5pAykUj8Hr7PgkG9ukpmdoP+tUr1WgcwQ5Sd2cUQ/tPMWk4SfRJ0poAWe1nNoeGFXg6zv0G1nUZLRAOtsNU7uFQby/3YFnO7m+9HLvZZrm3QORUfghclsYdN8piDNkHh8tV2EEyN+J3WMERqHfbYwq1VUbbqiY20QYiW8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lL6GLHfE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lL6GLHfE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0518CC4CECE; Mon, 14 Oct 2024 04:12:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728879153; bh=RIQXMzexzGIQ4bTGfFfCCt+ia1WE3jl0+awUhyXq2HQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lL6GLHfEaH2+TcAm6Q4DuyXJO/sorKNdBQbE0MGjnSzFghPRknWpD17ZXAFt4lPaY lG69eUgB8TiBy+eW+NrCWXRzSlGXPdI1W60BwF2zsVhcirq6VT4mNlkul0LcxSZoW7 H2HxgCohzH2KnLt0BjVzs4wjiCqaB68rr4xRYULC21rMg5J2pWuq4WWGkdbjzum//y UNiSOK8ysaywJkP/Hgsk94/vBr3CU1cAbfWqeBu9eHyovuxIzSXd/jzSA8XEvG8Jhy TihQX1/lvP2GatZFv7bnzTFLJEY6kSBfg0qUqQ3A9L7sTjGM4zdJjmonPamccm3+Ap VG1jf2zH/F8ZA== Date: Mon, 14 Oct 2024 00:12:30 -0400 From: Sasha Levin To: Carlos Llamas Cc: stable@vger.kernel.org, boqun.feng@gmail.com, bvanassche@acm.org, gregkh@linuxfoundation.org, longman@redhat.com, paulmck@kernel.org, xuewen.yan@unisoc.com, zhiguo.niu@unisoc.com, kernel-team@android.com, penguin-kernel@i-love.sakura.ne.jp, peterz@infradead.org Subject: Re: [PATCH 5.4.y 0/4] lockdep: deadlock fix and dependencies Message-ID: References: <20241012232244.2768048-1-cmllamas@google.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: On Sun, Oct 13, 2024 at 03:29:34PM +0000, Carlos Llamas wrote: >On Sun, Oct 13, 2024 at 10:23:26AM -0400, Sasha Levin wrote: >> On Sat, Oct 12, 2024 at 11:22:40PM +0000, Carlos Llamas wrote: >> > This patchset adds the dependencies to apply commit a6f88ac32c6e >> > ("lockdep: fix deadlock issue between lockdep and rcu") to the >> > 5.4-stable tree. See the "FAILED" report at [1]. >> > >> > Note the dependencies actually fix a UAF and a bad recursion pattern. >> > Thus it makes sense to also backport them. >> >> Hm, it does not seem to apply on 5.4 for me. Could you please take a >> look? > >I'm not sure where the disconnect is, I am able to do ... > >$ git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y >$ git fetch FETCH_HEAD >$ b4 shazam https://lore.kernel.org/all/20241012232244.2768048-1-cmllamas@google.com/ > >... with no issues. I don't have anything on my gitconfig that would >change the default behavior of `git am` or `git cherry-pick` either. > >Anything else I should try or look into? Sorry, my bad, now queued up. -- Thanks, Sasha