Re: [GIT PULL] tracing: Updates for 5.18

[Linus Torvalds]

On Mon, Mar 21, 2022 at 7:56 AM Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:
>
> My tree has a branch called:
>
>   trace-merge-next-20220315
>
> That resolved both of the above issues.

Oh, and that was completely pointless.

That isn't actually a tree that shows the resolution, that's literally
the linux-next tree.

So I did my normal merge, and then after that decided "ok, let's see
how Steven did it" and did my normal

     git checkout -b test-merge HEAD^
     git pull ..yourtree.. trace-merge-next-20220315

but that doesn't work at all because your trace-merge-next-20220315
has not just the tracing tree, but EVERYTHING. So it just conflicts
EVEN MORE.

So that "trace-merge" branch is only pointless noise. For it to be
useful, it should have contained the conflicting stuff, but *only* the
conflicting stuff. Not everything else too, that just causes even more
conflicts.

Anyway, when I actually compare my resolution to what is in
linux-next, it turns out they are fairly different. But I think my
resolution is the correct one in that it actually makes the sockaddr
cases match the other cases, and the original patch that added them.

I'm not particularly happy with my resolution either, but that's
because I'm not super-happy with that code, but whatever.

               Linus