Re: [GIT PULL] HID for 6.11

[Benjamin Tissoires]

On Jul 22 2024, Benjamin Tissoires wrote:
> On Jul 22 2024, Krzysztof Kozlowski wrote:
> > On 22/07/2024 14:51, Krzysztof Kozlowski wrote:
> > > On 22/07/2024 14:46, Konrad Dybcio wrote:
> > >>
> > >>
> > >> On 16.07.2024 3:34 PM, Benjamin Tissoires wrote:
> > >>> Linus,
> > >>>
> > >>> please pull from
> > >>>
> > >>>   git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git tags/for-linus-2024071601
> > >>>
> > >>> to receive HID subsystem updates for 6.11 merge window. Highlights:
> > >>>
> > >>
> > >> [...]
> > >>
> > >>>       HID: bpf: Add support for the XP-PEN Deco Mini 4
> > >>>       HID: bpf: Add Huion Dial 2 bpf fixup
> > >>>       HID: bpf: Thrustmaster TCA Yoke Boeing joystick fix
> > >>>       HID: fix for amples in for-6.11/bpf
> > >>
> > >> Hi,
> > >>
> > >> this commit broke b4 for everyone starting next-20240719, as it's
> > >> an empty cover letter with b4 tracking information
> > > 
> > > Uh, reminds me, I guess the same mistake of not seeing differences
> > > between git pull and git am...
> > > https://lore.kernel.org/all/311c8b64-be13-4740-a659-3a14cf68774a@xxxxxxxxxx/
> > > 
> > > So just to recap:
> > > 
> > > Please *do not merge your own trees* into kernel.org repos. Instead use
> > > b4 shazam to pick up entire patchset, even if it is yours. b4 allows to
> > > merge/apply also the cover letter, if this is your intention.
> 
> Oh s***. Sorry for that. I was not at home for the whole week and
> completely missed that the branch was the developement one (I usually
> use a different machine for applying branches and sending PR).
> 
> > 
> > Also, this was not present in next-20240717 and earlier. It was added in
> > 20240719, so few days ago during merge window.
> 
> That's when I prepared my PR to Linus, but as I mentioned above I forgot
> to reset that local branch.
> 
> > 
> > I think features should be in the next for some time before the merge
> > window starts, not added to next the moment they are sent to upstream.
> 
> Yes, completely agree and that's a big mistake for me. I made a diff
> with our for-next branch and didn't see anything. The only commit on top
> of that messed up b4 cover letter is a67a1deb11d9 ("HID: samples: fix the
> 2 struct_ops definitions"), which was already in linux-next on July 8
> as b35e0dc548aa ("HID: samples: fix the 2 struct_ops definitions"), so
> almost a week before the opening of the MR.
> 
> I'm still trying to understand if I forgot to merge that for-6.11/bpf
> branch into for-next at that time.

Looks like I still pushed the change to for-next as of 3959f155ad59 ("Merge
branch 'for-6.11/bpf' into for-next") which is not appearing on Linus'
tree as expected (on 2024-07-08).

So my only mistake was the messed up b4 cover letter, everything else
was in linux-next. Again, so sorry :(


> 
> Is there anything we can do to rip off that commit from the tree and fix
> b4?

This still stands :)

Cheers,
Benjamin