[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20231211140546.5c39b819@kernel.org>
Date: Mon, 11 Dec 2023 14:05:46 -0800
From: Jakub Kicinski <kuba@...nel.org>
To: Christian Marangi <ansuelsmth@...il.com>
Cc: Lee Jones <lee@...nel.org>, Pavel Machek <pavel@....cz>,
Andrew Lunn <andrew@...n.ch>,
Marek BehĂșn <kabel@...nel.org>,
"David S. Miller" <davem@...emloft.net>,
Li Zetao <lizetao1@...wei.com>, linux-kernel@...r.kernel.org,
linux-leds@...r.kernel.org, Daniel Golle <daniel@...rotopia.org>
Subject: Re: [PATCH v3 1/2] leds: trigger: netdev: extend speeds up to 10G
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
Powered by blists - more mailing lists