On Wed, 13 Dec 2023 11:27:05 +0000 Lee Jones <lee@xxxxxxxxxx> wrote: > On Mon, 11 Dec 2023, Jakub Kicinski wrote: > > > On Mon, 11 Dec 2023 22:53:55 +0100 Christian Marangi wrote: > > > Soo that it's problematic to also have on net-next? (Sorry for the > > > stupid question) > > > > Unless I pull from Lee the patch would be duplicated, we'd have two > > commits with different hashes and the same diff. And if I pull we'd > > get a lot of netdev-unrelated stuff into net-next: > > > > $ git merge f07894d3b384344c43be1bcf61ef8e2fded0efe5 > > Auto-merging drivers/leds/trigger/ledtrig-netdev.c > > Merge made by the 'ort' strategy. > > .../ABI/testing/sysfs-class-led-trigger-netdev | 39 ++ > > .../ABI/testing/sysfs-class-led-trigger-tty | 56 ++ > > .../bindings/leds/allwinner,sun50i-a100-ledc.yaml | 137 +++++ > > Documentation/devicetree/bindings/leds/common.yaml | 2 +- > > drivers/leds/Kconfig | 21 + > > drivers/leds/Makefile | 2 + > > drivers/leds/leds-max5970.c | 109 ++++ > > drivers/leds/leds-sun50i-a100.c | 580 +++++++++++++++++++++ > > drivers/leds/leds-syscon.c | 3 +- > > drivers/leds/leds-tca6507.c | 30 +- > > drivers/leds/rgb/leds-qcom-lpg.c | 52 +- > > drivers/leds/trigger/ledtrig-gpio.c | 26 +- > > drivers/leds/trigger/ledtrig-netdev.c | 32 +- > > drivers/leds/trigger/ledtrig-tty.c | 247 +++++++-- > > drivers/tty/tty_io.c | 28 +- > > include/linux/leds.h | 3 + > > include/linux/tty.h | 1 + > > 17 files changed, 1247 insertions(+), 121 deletions(-) > > create mode 100644 Documentation/devicetree/bindings/leds/allwinner,sun50i-a100-ledc.yaml > > create mode 100644 drivers/leds/leds-max5970.c > > create mode 100644 drivers/leds/leds-sun50i-a100.c > > No, please don't do that. None of the branches I maintain are stable. > > It allows me to do things like this: > > The following changes since commit b85ea95d086471afb4ad062012a4d73cd328fa86: > > Linux 6.7-rc1 (2023-11-12 16:19:07 -0800) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git ib-leds-netdev-v6.8 > > for you to fetch changes up to ee8bfb47222a5cc59dee345b7369c5f2068e78cd: > > docs: ABI: sysfs-class-led-trigger-netdev: Add new modes and entry (2023-12-13 11:24:55 +0000) > > ---------------------------------------------------------------- > Immutable branch between LEDs and NetDev due for the v6.8 merge window > > ---------------------------------------------------------------- > Daniel Golle (2): > leds: trigger: netdev: Extend speeds up to 10G > docs: ABI: sysfs-class-led-trigger-netdev: Add new modes and entry Please don't pull this. The sysfs documentation for the link_* files does not specify that they are available only if the underlying speeds are supported. Let's first fix this and then merge it. Christian sent the patch leds: trigger: netdev: display only supported link speed attribute It needs some updating first, but only after it is fixed should this be merged. Marek
