* [GIT PULL] HID for 6.11
@ 2024-07-16 13:34 Benjamin Tissoires
2024-07-18 0:29 ` Linus Torvalds
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: Benjamin Tissoires @ 2024-07-16 13:34 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Jiri Kosina, linux-kernel
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:
=====
- rewrite of the HID-BPF internal implementation to use bpf struct_ops
instead of a tracing endpoint (Benjamin Tissoires)
- add 2 new HID-BPF hooks to be able to intercept userspace calls
targetting a HID device and filtering them (Benjamin Tissoires)
- add support for various new devices through HID-BPF filters (Benjamin
Tissoires)
- add support for the magic keyboard backlight (Orlando Chamberlain)
- add the missing MODULE_DESCRIPTION() macros in HID drivers (Jeff Johnson)
- use of kvzalloc in case memory gets too fragmented (Hailong Liu)
- retrieve the device firmware node in the child HID device (Danny Kaehn)
- some hid-uclogic improvements (José Expósito)
- some more typos, trivial fixes, kernel doctext and unused functions
cleanups
=====
You are going to get a trivial conflict with the mm tree in include/linux/hid_bpf.h
which is documented here:
https://lore.kernel.org/all/20240709112544.190ffda4@canb.auug.org.au/
You will also get a build failure after merging with the
bpf-next/net-next tree in drivers/hid/bpf/hid_bpf_struct_ops.c which is
documented here:
https://lore.kernel.org/all/ZnB9X1Jj6c04ufC0@sirena.org.uk/
Please let me know in case you'd like me to fix those and prepare a merged
branch for you.
Thanks!
----------------------------------------------------------------
Benjamin Tissoires (41):
HID: rename struct hid_bpf_ops into hid_ops
HID: bpf: add hid_get/put_device() helpers
HID: bpf: implement HID-BPF through bpf_struct_ops
selftests/hid: convert the hid_bpf selftests with struct_ops
HID: samples: convert the 2 HID-BPF samples into struct_ops
HID: bpf: add defines for HID-BPF SEC in in-tree bpf fixes
HID: bpf: convert in-tree fixes into struct_ops
HID: bpf: remove tracing HID-BPF capability
selftests/hid: add subprog call test
Documentation: HID: amend HID-BPF for struct_ops
Documentation: HID: add a small blurb on udev-hid-bpf
HID: bpf: Artist24: remove unused variable
HID: bpf: error on warnings when compiling bpf objects
bpf: allow bpf helpers to be used into HID-BPF struct_ops
HID: bpf: rework hid_bpf_ops_btf_struct_access
HID: bpf: make part of struct hid_device writable
HID: bpf: fix dispatch_hid_bpf_device_event uninitialized ret value
HID: add source argument to HID low level functions
HID: bpf: protect HID-BPF prog_list access by a SRCU
HID: bpf: add HID-BPF hooks for hid_hw_raw_requests
HID: bpf: prevent infinite recursions with hid_hw_raw_requests hooks
selftests/hid: add tests for hid_hw_raw_request HID-BPF hooks
HID: bpf: add HID-BPF hooks for hid_hw_output_report
selftests/hid: add tests for hid_hw_output_report HID-BPF hooks
HID: bpf: make hid_bpf_input_report() sleep until the device is ready
selftests/hid: add wq test for hid_bpf_input_report()
HID: bpf: allow hid_device_event hooks to inject input reports on self
selftests/hid: add another test for injecting an event from an event hook
selftests/hid: add an infinite loop test for hid_bpf_try_input_report
selftests/hid: ensure CKI can compile our new tests on old kernels
HID: bpf: fix gcc warning and unify __u64 into u64
HID: bpf: doc fixes for hid_hw_request() hooks
HID: bpf: doc fixes for hid_hw_request() hooks
HID: bpf: Add a HID report composition helper macros
HID: bpf: add a driver for the Huion Inspiroy 2S (H641P)
HID: bpf: move the BIT() macro to hid_bpf_helpers.h
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
HID: samples: fix the 2 struct_ops definitions
Chen Ni (1):
HID: mcp2221: Remove unnecessary semicolon
Colin Ian King (1):
HID: Fix spelling mistakes "Kensigton" -> "Kensington"
Danny Kaehn (1):
HID: usbhid: Share USB device firmware node with child HID device
Hailong.Liu (1):
HID: Use kvzalloc instead of kzalloc in hid_register_field()
Jeff Johnson (7):
HID: intel-ish-hid: fix ishtp_wait_resume() kernel-doc
HID: intel-ish-hid: add MODULE_DESCRIPTION()
HID: letsketch: add missing MODULE_DESCRIPTION() macro
HID: lg-g15: add missing MODULE_DESCRIPTION() macro
HID: logitech-dj: add missing MODULE_DESCRIPTION() macro
HID: add missing MODULE_DESCRIPTION() macros
HID: add more missing MODULE_DESCRIPTION() macros
Jiapeng Chong (1):
HID: nintendo: Remove some unused functions
José Expósito (4):
HID: uclogic: Support HUION devices with up to 20 buttons
HID: uclogic: Use Rx and Ry for touch strips
HID: uclogic: Avoid linking common code into multiple modules
HID: uclogic: Add module description
Luis Felipe Hernandez (1):
hid: bpf: Fix grammar
Orlando Chamberlain (1):
HID: apple: Add support for magic keyboard backlight on T2 Macs
Thorsten Blum (1):
HID: hid-steam: Fix typo in goto label
Documentation/hid/hid-bpf.rst | 173 ++---
drivers/hid/Makefile | 6 +-
drivers/hid/bpf/Makefile | 2 +-
drivers/hid/bpf/entrypoints/Makefile | 93 ---
drivers/hid/bpf/entrypoints/README | 4 -
drivers/hid/bpf/entrypoints/entrypoints.bpf.c | 25 -
drivers/hid/bpf/entrypoints/entrypoints.lskel.h | 248 -------
drivers/hid/bpf/hid_bpf_dispatch.c | 419 ++++++------
drivers/hid/bpf/hid_bpf_dispatch.h | 13 +-
drivers/hid/bpf/hid_bpf_jmp_table.c | 565 ----------------
drivers/hid/bpf/hid_bpf_struct_ops.c | 307 +++++++++
drivers/hid/bpf/progs/FR-TEC__Raptor-Mach-2.bpf.c | 9 +-
drivers/hid/bpf/progs/HP__Elite-Presenter.bpf.c | 6 +-
drivers/hid/bpf/progs/Huion__Dial-2.bpf.c | 614 +++++++++++++++++
drivers/hid/bpf/progs/Huion__Inspiroy-2-S.bpf.c | 534 +++++++++++++++
drivers/hid/bpf/progs/Huion__Kamvas-Pro-19.bpf.c | 9 +-
drivers/hid/bpf/progs/IOGEAR__Kaliber-MMOmentum.bpf.c | 6 +-
drivers/hid/bpf/progs/Makefile | 2 +-
drivers/hid/bpf/progs/{Microsoft__XBox-Elite-2.bpf.c => Microsoft__Xbox-Elite-2.bpf.c} | 21 +-
drivers/hid/bpf/progs/Thrustmaster__TCA-Yoke-Boeing.bpf.c | 144 ++++
drivers/hid/bpf/progs/Wacom__ArtPen.bpf.c | 6 +-
drivers/hid/bpf/progs/XPPen__Artist24.bpf.c | 12 +-
drivers/hid/bpf/progs/XPPen__ArtistPro16Gen2.bpf.c | 24 +-
drivers/hid/bpf/progs/XPPen__DecoMini4.bpf.c | 231 +++++++
drivers/hid/bpf/progs/hid_bpf.h | 6 +
drivers/hid/bpf/progs/hid_bpf_helpers.h | 1 +
drivers/hid/bpf/progs/hid_report_helpers.h | 2960 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/hid/hid-a4tech.c | 1 +
drivers/hid/hid-apple.c | 88 +++
drivers/hid/hid-aureal.c | 1 +
drivers/hid/hid-belkin.c | 1 +
drivers/hid/hid-betopff.c | 1 +
drivers/hid/hid-bigbenff.c | 1 +
drivers/hid/hid-cherry.c | 1 +
drivers/hid/hid-chicony.c | 1 +
drivers/hid/hid-core.c | 133 ++--
drivers/hid/hid-cypress.c | 1 +
drivers/hid/hid-dr.c | 1 +
drivers/hid/hid-elecom.c | 1 +
drivers/hid/hid-elo.c | 1 +
drivers/hid/hid-emsff.c | 1 +
drivers/hid/hid-evision.c | 1 +
drivers/hid/hid-ezkey.c | 1 +
drivers/hid/hid-gaff.c | 1 +
drivers/hid/hid-google-hammer.c | 1 +
drivers/hid/hid-google-stadiaff.c | 1 +
drivers/hid/hid-gyration.c | 1 +
drivers/hid/hid-holtek-kbd.c | 1 +
drivers/hid/hid-holtek-mouse.c | 1 +
drivers/hid/hid-ite.c | 1 +
drivers/hid/hid-kensington.c | 3 +-
drivers/hid/hid-keytouch.c | 1 +
drivers/hid/hid-kye.c | 1 +
drivers/hid/hid-lcpower.c | 1 +
drivers/hid/hid-lenovo.c | 1 +
drivers/hid/hid-letsketch.c | 1 +
drivers/hid/hid-lg-g15.c | 1 +
drivers/hid/hid-lg.c | 1 +
drivers/hid/hid-logitech-dj.c | 1 +
drivers/hid/hid-magicmouse.c | 1 +
drivers/hid/hid-maltron.c | 1 +
drivers/hid/hid-mcp2221.c | 2 +-
drivers/hid/hid-megaworld.c | 1 +
drivers/hid/hid-mf.c | 1 +
drivers/hid/hid-microsoft.c | 1 +
drivers/hid/hid-monterey.c | 1 +
drivers/hid/hid-nintendo.c | 21 -
drivers/hid/hid-ntrig.c | 1 +
drivers/hid/hid-ortek.c | 1 +
drivers/hid/hid-petalynx.c | 1 +
drivers/hid/hid-pl.c | 1 +
drivers/hid/hid-primax.c | 1 +
drivers/hid/hid-prodikeys.c | 1 +
drivers/hid/hid-razer.c | 1 +
drivers/hid/hid-redragon.c | 1 +
drivers/hid/hid-retrode.c | 1 +
drivers/hid/hid-saitek.c | 1 +
drivers/hid/hid-samsung.c | 1 +
drivers/hid/hid-semitek.c | 1 +
drivers/hid/hid-sjoy.c | 1 +
drivers/hid/hid-sony.c | 1 +
drivers/hid/hid-speedlink.c | 1 +
drivers/hid/hid-steam.c | 5 +-
drivers/hid/hid-steelseries.c | 1 +
drivers/hid/hid-sunplus.c | 1 +
drivers/hid/hid-tivo.c | 1 +
drivers/hid/hid-tmff.c | 1 +
drivers/hid/hid-topseed.c | 1 +
drivers/hid/hid-twinhan.c | 1 +
drivers/hid/hid-uclogic-core.c | 2 +
drivers/hid/hid-uclogic-rdesc-test.c | 2 +
drivers/hid/hid-uclogic-rdesc.c | 11 +-
drivers/hid/hid-viewsonic.c | 1 +
drivers/hid/hid-vivaldi-common.c | 1 +
drivers/hid/hid-waltop.c | 1 +
drivers/hid/hid-winwing.c | 1 +
drivers/hid/hid-xinmo.c | 1 +
drivers/hid/hid-zpff.c | 1 +
drivers/hid/hid-zydacron.c | 1 +
drivers/hid/hidraw.c | 10 +-
drivers/hid/intel-ish-hid/ishtp/bus.c | 2 +
drivers/hid/usbhid/hid-core.c | 2 +
include/linux/hid.h | 7 +
include/linux/hid_bpf.h | 202 ++++--
samples/hid/Makefile | 5 +-
samples/hid/hid_bpf_attach.bpf.c | 18 -
samples/hid/hid_bpf_attach.h | 14 -
samples/hid/hid_mouse.bpf.c | 26 +-
samples/hid/hid_mouse.c | 39 +-
samples/hid/hid_surface_dial.bpf.c | 10 +-
samples/hid/hid_surface_dial.c | 53 +-
tools/testing/selftests/hid/hid_bpf.c | 426 +++++++++++-
tools/testing/selftests/hid/progs/hid.c | 392 ++++++++++-
tools/testing/selftests/hid/progs/hid_bpf_helpers.h | 46 +-
114 files changed, 6443 insertions(+), 1579 deletions(-)
delete mode 100644 drivers/hid/bpf/entrypoints/Makefile
delete mode 100644 drivers/hid/bpf/entrypoints/README
delete mode 100644 drivers/hid/bpf/entrypoints/entrypoints.bpf.c
delete mode 100644 drivers/hid/bpf/entrypoints/entrypoints.lskel.h
delete mode 100644 drivers/hid/bpf/hid_bpf_jmp_table.c
create mode 100644 drivers/hid/bpf/hid_bpf_struct_ops.c
create mode 100644 drivers/hid/bpf/progs/Huion__Dial-2.bpf.c
create mode 100644 drivers/hid/bpf/progs/Huion__Inspiroy-2-S.bpf.c
rename drivers/hid/bpf/progs/{Microsoft__XBox-Elite-2.bpf.c => Microsoft__Xbox-Elite-2.bpf.c} (89%)
create mode 100644 drivers/hid/bpf/progs/Thrustmaster__TCA-Yoke-Boeing.bpf.c
create mode 100644 drivers/hid/bpf/progs/XPPen__DecoMini4.bpf.c
create mode 100644 drivers/hid/bpf/progs/hid_report_helpers.h
delete mode 100644 samples/hid/hid_bpf_attach.bpf.c
delete mode 100644 samples/hid/hid_bpf_attach.h
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] HID for 6.11
2024-07-16 13:34 [GIT PULL] HID for 6.11 Benjamin Tissoires
@ 2024-07-18 0:29 ` Linus Torvalds
2024-07-18 1:27 ` pr-tracker-bot
2024-07-22 12:46 ` Konrad Dybcio
2 siblings, 0 replies; 13+ messages in thread
From: Linus Torvalds @ 2024-07-18 0:29 UTC (permalink / raw)
To: Benjamin Tissoires; +Cc: Jiri Kosina, linux-kernel
On Tue, 16 Jul 2024 at 06:34, Benjamin Tissoires <bentiss@kernel.org> wrote:
>
> Please let me know in case you'd like me to fix those and prepare a merged
> branch for you.
No, that note about the issues and pointers to the resolution was
perfect. Thanks,
Linus
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] HID for 6.11
2024-07-16 13:34 [GIT PULL] HID for 6.11 Benjamin Tissoires
2024-07-18 0:29 ` Linus Torvalds
@ 2024-07-18 1:27 ` pr-tracker-bot
2024-07-22 12:46 ` Konrad Dybcio
2 siblings, 0 replies; 13+ messages in thread
From: pr-tracker-bot @ 2024-07-18 1:27 UTC (permalink / raw)
To: Benjamin Tissoires; +Cc: Linus Torvalds, Jiri Kosina, linux-kernel
The pull request you sent on Tue, 16 Jul 2024 15:34:30 +0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git tags/for-linus-2024071601
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/6e504d2c61244a01226c5100c835e44fb9b85ca8
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] HID for 6.11
2024-07-16 13:34 [GIT PULL] HID for 6.11 Benjamin Tissoires
2024-07-18 0:29 ` Linus Torvalds
2024-07-18 1:27 ` pr-tracker-bot
@ 2024-07-22 12:46 ` Konrad Dybcio
2024-07-22 12:51 ` Krzysztof Kozlowski
` (2 more replies)
2 siblings, 3 replies; 13+ messages in thread
From: Konrad Dybcio @ 2024-07-22 12:46 UTC (permalink / raw)
To: Benjamin Tissoires, Linus Torvalds
Cc: Jiri Kosina, linux-kernel, Konstantin Ryabitsev,
Krzysztof Kozlowski
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
Konrad
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] HID for 6.11
2024-07-22 12:46 ` Konrad Dybcio
@ 2024-07-22 12:51 ` Krzysztof Kozlowski
2024-07-22 12:56 ` Krzysztof Kozlowski
2024-07-22 13:32 ` Krzysztof Kozlowski
2024-07-22 18:17 ` Konstantin Ryabitsev
2 siblings, 1 reply; 13+ messages in thread
From: Krzysztof Kozlowski @ 2024-07-22 12:51 UTC (permalink / raw)
To: Konrad Dybcio, Benjamin Tissoires, Linus Torvalds
Cc: Jiri Kosina, linux-kernel, Konstantin Ryabitsev
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@kernel.org/
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.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] HID for 6.11
2024-07-22 12:51 ` Krzysztof Kozlowski
@ 2024-07-22 12:56 ` Krzysztof Kozlowski
2024-07-22 13:51 ` Benjamin Tissoires
0 siblings, 1 reply; 13+ messages in thread
From: Krzysztof Kozlowski @ 2024-07-22 12:56 UTC (permalink / raw)
To: Konrad Dybcio, Benjamin Tissoires, Linus Torvalds
Cc: Jiri Kosina, linux-kernel, Konstantin Ryabitsev
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@kernel.org/
>
> 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.
Also, this was not present in next-20240717 and earlier. It was added in
20240719, so few days ago during merge window.
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.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] HID for 6.11
2024-07-22 12:46 ` Konrad Dybcio
2024-07-22 12:51 ` Krzysztof Kozlowski
@ 2024-07-22 13:32 ` Krzysztof Kozlowski
2024-07-22 13:58 ` Konstantin Ryabitsev
2024-07-22 18:17 ` Konstantin Ryabitsev
2 siblings, 1 reply; 13+ messages in thread
From: Krzysztof Kozlowski @ 2024-07-22 13:32 UTC (permalink / raw)
To: Konrad Dybcio, Benjamin Tissoires, Linus Torvalds
Cc: Jiri Kosina, linux-kernel, Konstantin Ryabitsev
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
Konrad gave me idea which could at least protect final tree from such
mistakes - commit hook for merges, something like:
https://github.com/krzk/tools/blob/master/linux/verify_b4.sh
https://github.com/krzk/tools/blob/master/linux/git-hooks-post-merge
(maybe also post-commit in case of conflicts?)
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] HID for 6.11
2024-07-22 12:56 ` Krzysztof Kozlowski
@ 2024-07-22 13:51 ` Benjamin Tissoires
2024-07-22 13:59 ` Benjamin Tissoires
2024-08-06 22:04 ` Jacob Keller
0 siblings, 2 replies; 13+ messages in thread
From: Benjamin Tissoires @ 2024-07-22 13:51 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Konrad Dybcio, Linus Torvalds, Jiri Kosina, linux-kernel,
Konstantin Ryabitsev
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@kernel.org/
> >
> > 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.
Is there anything we can do to rip off that commit from the tree and fix
b4?
Cheers,
Benjamin
>
> Best regards,
> Krzysztof
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] HID for 6.11
2024-07-22 13:32 ` Krzysztof Kozlowski
@ 2024-07-22 13:58 ` Konstantin Ryabitsev
0 siblings, 0 replies; 13+ messages in thread
From: Konstantin Ryabitsev @ 2024-07-22 13:58 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Konrad Dybcio, Benjamin Tissoires, Linus Torvalds, Jiri Kosina,
linux-kernel
On Mon, Jul 22, 2024 at 03:32:48PM GMT, Krzysztof Kozlowski wrote:
> > this commit broke b4 for everyone starting next-20240719, as it's
> > an empty cover letter with b4 tracking information
>
> Konrad gave me idea which could at least protect final tree from such
> mistakes - commit hook for merges, something like:
>
> https://github.com/krzk/tools/blob/master/linux/verify_b4.sh
> https://github.com/krzk/tools/blob/master/linux/git-hooks-post-merge
I'll include something like this into the contrib section.
Unfortunately, I'm not sure we can ever completely avoid this, but perhaps
linux-next can add a check to see if any of the commits in a merge contain
"--b4-submit-tracking--" and then refuse to consider it?
-K
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] HID for 6.11
2024-07-22 13:51 ` Benjamin Tissoires
@ 2024-07-22 13:59 ` Benjamin Tissoires
2024-08-06 22:04 ` Jacob Keller
1 sibling, 0 replies; 13+ messages in thread
From: Benjamin Tissoires @ 2024-07-22 13:59 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Konrad Dybcio, Linus Torvalds, Jiri Kosina, linux-kernel,
Konstantin Ryabitsev
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@kernel.org/
> > >
> > > 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
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] HID for 6.11
2024-07-22 12:46 ` Konrad Dybcio
2024-07-22 12:51 ` Krzysztof Kozlowski
2024-07-22 13:32 ` Krzysztof Kozlowski
@ 2024-07-22 18:17 ` Konstantin Ryabitsev
2024-07-23 11:26 ` Konrad Dybcio
2 siblings, 1 reply; 13+ messages in thread
From: Konstantin Ryabitsev @ 2024-07-22 18:17 UTC (permalink / raw)
To: Konrad Dybcio
Cc: Benjamin Tissoires, Linus Torvalds, Jiri Kosina, linux-kernel,
Krzysztof Kozlowski
On Mon, Jul 22, 2024 at 02:46:39PM GMT, Konrad Dybcio wrote:
> this commit broke b4 for everyone starting next-20240719, as it's
> an empty cover letter with b4 tracking information
I just committed a change that ignores any cover letters not made by the user
themselves. This is not a perfect fix, but I believe it should help in such
situations.
-K
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] HID for 6.11
2024-07-22 18:17 ` Konstantin Ryabitsev
@ 2024-07-23 11:26 ` Konrad Dybcio
0 siblings, 0 replies; 13+ messages in thread
From: Konrad Dybcio @ 2024-07-23 11:26 UTC (permalink / raw)
To: Konstantin Ryabitsev
Cc: Benjamin Tissoires, Linus Torvalds, Jiri Kosina, linux-kernel,
Krzysztof Kozlowski
On 22.07.2024 8:17 PM, Konstantin Ryabitsev wrote:
> On Mon, Jul 22, 2024 at 02:46:39PM GMT, Konrad Dybcio wrote:
>> this commit broke b4 for everyone starting next-20240719, as it's
>> an empty cover letter with b4 tracking information
>
> I just committed a change that ignores any cover letters not made by the user
> themselves. This is not a perfect fix, but I believe it should help in such
> situations.
This sounds very reasonable, thanks Konstantin
Konrad
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] HID for 6.11
2024-07-22 13:51 ` Benjamin Tissoires
2024-07-22 13:59 ` Benjamin Tissoires
@ 2024-08-06 22:04 ` Jacob Keller
1 sibling, 0 replies; 13+ messages in thread
From: Jacob Keller @ 2024-08-06 22:04 UTC (permalink / raw)
To: Benjamin Tissoires, Krzysztof Kozlowski
Cc: Konrad Dybcio, Linus Torvalds, Jiri Kosina, linux-kernel,
Konstantin Ryabitsev
On 7/22/2024 6:51 AM, Benjamin Tissoires wrote:
> Is there anything we can do to rip off that commit from the tree and fix
> b4?
>
>
A bit late, but I just got bit by this comment and i worked around it
using a replace ref:
$ git replace --edit 3a904d2c771115154380caaae7ffaaf0095fb88f
This let me generate a replacement commit with an edited commit message
so that b4 scanning for a commit won't find this particular b4 meta-data.
It is only local (as refs/replace does not generally get shared to
others via normal push/pull) but it worked well for me.
I thought I would share this with other folks as a potential workaround
for their setup. replace refs are special refs which git will
automatically use in place of a regular commit when it finds a matching ref.
https://git-scm.com/docs/git-replace
Thanks,
Jake
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-08-06 22:04 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-16 13:34 [GIT PULL] HID for 6.11 Benjamin Tissoires
2024-07-18 0:29 ` Linus Torvalds
2024-07-18 1:27 ` pr-tracker-bot
2024-07-22 12:46 ` Konrad Dybcio
2024-07-22 12:51 ` Krzysztof Kozlowski
2024-07-22 12:56 ` Krzysztof Kozlowski
2024-07-22 13:51 ` Benjamin Tissoires
2024-07-22 13:59 ` Benjamin Tissoires
2024-08-06 22:04 ` Jacob Keller
2024-07-22 13:32 ` Krzysztof Kozlowski
2024-07-22 13:58 ` Konstantin Ryabitsev
2024-07-22 18:17 ` Konstantin Ryabitsev
2024-07-23 11:26 ` Konrad Dybcio
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.