From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (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 583FB3B4EAD; Thu, 28 May 2026 11:15:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.50.34 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779966922; cv=none; b=bIQhuiB5JudYV7mnxsEYUGsOdWBf23lqN6CeqMzedvQHZ0t24X2Z29KBDPp4d6wMJN9hl+GaH/5aZgnLSWeodWSPCnbel6jp/TvDfJX62miDUUCLgQMTgYSVN11nMRumj07T95PsysVkd+h/jo4fnmBPS087Hmd/B75yYqhviS4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779966922; c=relaxed/simple; bh=/I0CF99Jdpn5/XvbnyrUxI6thBb0CM/e16ZRn0ipHX4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=g0VCALsHJPUOcFbunqIR7n4xB3SmdqBh5B7RawGREPGiF8kcb6Mf8BAa1Obup7NM57y4zhtgzQKbShY68sJ6s37NpmqDQbz65gZNpxy1o6XCh05eV0whRyOypAWX8rP3nCnGJ8ZBF14Bekfu1RwmUs0AUhjgviN54s+CJ8AUP5c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=infradead.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=B0BCQ+rt; arc=none smtp.client-ip=90.155.50.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="B0BCQ+rt" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=7nlaBPBrc7j+Jdi8uAiT5IlogI6WkYtvoBl6ML4kcPY=; b=B0BCQ+rtzb3To0ySwU8ZYZQjZI mEP86DPm4ZEN36m0UiSeZCSyMjD/N/ZZtWUMG1HdRfYaFrv/bdXsuv0N55mvmiBSvnSBYu4t2mqxS LlEBjpjVc/dtIhrreN4pquTeQvQNOvymnvNPv9rBvJ6nSGjtoiri0s+6ZxX/vLs/5k1p8mlemMhE9 A5ywOn2C+qSiZaTSkM1SaUmtWW5ZibbhLUWn5IvlVXtVqDwLijtF6Adp5CPKuuUe7s+PDd1UFPTWV yxdtvZ07yWgF40fYc+qlUDUjMU7X2vnqkfDfRD9TkhZdcc44nBuAvuCM2CB0moChQR8jDb8/x/3Kt 7QV0O8eQ==; Received: from 77-249-17-252.cable.dynamic.v4.ziggo.nl ([77.249.17.252] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.99.1 #2 (Red Hat Linux)) id 1wSYhr-00000004AEr-1E13; Thu, 28 May 2026 11:15:19 +0000 Received: by noisy.programming.kicks-ass.net (Postfix, from userid 1000) id 4B189300CB5; Thu, 28 May 2026 13:15:18 +0200 (CEST) Date: Thu, 28 May 2026 13:15:18 +0200 From: Peter Zijlstra To: Niklas Cassel Cc: linux-kernel@vger.kernel.org, linux-tip-commits@vger.kernel.org, Marco Elver , Nathan Chancellor , Bart Van Assche , x86@kernel.org, dlemoal@kernel.org Subject: Re: [tip: locking/core] compiler-context-analysis: Bump required Clang version to 23 Message-ID: <20260528111518.GJ343181@noisy.programming.kicks-ass.net> References: <20260515124426.2227783-1-elver@google.com> <177926568868.711.3058599932884307249.tip-bot2@tip-bot2> <20260528093722.GD343181@noisy.programming.kicks-ass.net> <20260528102703.GE343181@noisy.programming.kicks-ass.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Thu, May 28, 2026 at 12:44:02PM +0200, Niklas Cassel wrote: > On Thu, May 28, 2026 at 12:27:03PM +0200, Peter Zijlstra wrote: > > On Thu, May 28, 2026 at 11:37:22AM +0200, Peter Zijlstra wrote: > > > > > > Would it be possible for you to provide an immutable branch with only > > > > this specific commit, such that I could merge that immutable branch to > > > > libata/for-next (such that we carry the exact same SHA1) in both trees? > > > > > > I think that means I have to rebase tip/locking/core; pull out that > > > patch and stick it in a separate branch and then merge the two branches, > > > right? Git and me never really get along well. > > > > > > Let me see if I can do this without destroying stuff :-) > > Hehe :) > > It gives me a smile that you can debug intricate scheduler bugs, > but get worried about a simple git rebase :) Somewhere along the line I have failed to understand something fundamental about git and it just doesn't want to make sense to me :/ I can mostly get things done, but I'm never confident because of this misunderstanding, things feel off. There's things like: A...B, A..B, B..A, B...A for ranges that are all weirdly different (eg. I would expect A...B to get me the reverse diff from B...A, but afaiu that is very much not the case, and wtf is the two dots vs three dots thing anyway), and then there's sha:file but also sha -- file in random and mysterious ways. And there is bisection across non linear history, and then I never know WTF the thing does. Often I end up linearising things and then bisect that, but this can't be right. Anyway, I've tried to read the man page, and various random web ramblings on these things, but it just doesn't want to make sense. So I stick to mostly using quilt and occasionally touch git when I absolutely have to, like now. And actually doing rebases with conflicts is the absolute worst possible thing. I often just pull the patches from git, rebase using quilt and then re-commit. Git is just actively making that the most painful experience ever. Anyway, that's my rant done, sorry about that :-) > Just to be explicit: I assume that I have your approval to also carry this > single/exact SHA1: > f45c5c4adb27 ("compiler-context-analysis: Bump required Clang version to 23") Yes, that was the whole point of this exercise after all.