linux-kernel - Re: linux-next: build failure after merge of the ftrace tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHk-=wjSKCbbQHr7gm9G0z_hdjBSprCyMidi4LhYL7YECdRfqw@mail.gmail.com>
Date: Wed, 6 Nov 2024 07:47:52 -1000
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Steven Rostedt <rostedt@...dmis.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Masami Hiramatsu <mhiramat@...nel.org>, 
	Michael Ellerman <mpe@...erman.id.au>, Naveen N Rao <naveen@...nel.org>, 
	PowerPC <linuxppc-dev@...ts.ozlabs.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the ftrace tree

On Wed, 6 Nov 2024 at 05:02, Steven Rostedt <rostedt@...dmis.org> wrote:
>
> This fix looks fine to me. How should we handle this when we send our pull
> requests to Linus? I may forgot about this issue, and it also matters who's
> tree goes first.

So just mention the issue in the pull request - preferably on both
sides. Particularly for something like this that won't show up as an
actual conflict, and that I won't catch in my build test because it's
ppc-specific, I'd really like both trees to note this, so that
regardless of ordering I'll be aware.

And hey, sometimes people forget, and we'll see this issue (again) in
mainline. It happens. Particularly with these kinds of semantic
conflicts that are so easy to miss.

I've seen this report, of course, but I will have lots of pull
requests the next merge window, so the likelihood of me forgetting
this detail is probably higher than the likelihood of individual
maintainers forgetting about it when they generate their one (or few)
pull request.

                  Linus