From: Jakub Kicinski <kuba@kernel.org>
To: Christian Marangi <ansuelsmth@gmail.com>
Cc: "Lee Jones" <lee@kernel.org>, "Pavel Machek" <pavel@ucw.cz>,
"Andrew Lunn" <andrew@lunn.ch>, "Marek Behún" <kabel@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
"Li Zetao" <lizetao1@huawei.com>,
linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org,
"Daniel Golle" <daniel@makrotopia.org>
Subject: Re: [PATCH v3 1/2] leds: trigger: netdev: extend speeds up to 10G
Date: Mon, 11 Dec 2023 14:05:46 -0800 [thread overview]
Message-ID: <20231211140546.5c39b819@kernel.org> (raw)
In-Reply-To: <657784f6.5d0a0220.617b5.20ee@mx.google.com>
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
next prev parent reply other threads:[~2023-12-11 22:05 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-28 4:00 [PATCH v3 1/2] leds: trigger: netdev: extend speeds up to 10G Daniel Golle
2023-11-28 4:00 ` [PATCH v3 2/2] docs: ABI: sysfs-class-led-trigger-netdev: add new modes and entry Daniel Golle
2023-12-07 16:30 ` Marek Behún
2023-12-01 10:57 ` [PATCH v3 1/2] leds: trigger: netdev: extend speeds up to 10G Lee Jones
2023-12-11 15:57 ` Christian Marangi
2023-12-11 16:46 ` Jakub Kicinski
2023-12-11 21:53 ` Christian Marangi
2023-12-11 22:05 ` Jakub Kicinski [this message]
2023-12-11 22:17 ` Christian Marangi
2023-12-13 9:56 ` Andrew Lunn
2023-12-13 11:27 ` [GIT PULL] Immutable branch between LEDs and NetDev due for the v6.8 merge window:wq Lee Jones
2023-12-13 12:05 ` Marek Behún
2023-12-13 15:39 ` Jakub Kicinski
2023-12-07 16:29 ` [PATCH v3 1/2] leds: trigger: netdev: extend speeds up to 10G Marek Behún
2023-12-07 17:11 ` Andrew Lunn
2023-12-07 17:22 ` Daniel Golle
2023-12-08 6:58 ` Marek Behún
2023-12-08 13:08 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231211140546.5c39b819@kernel.org \
--to=kuba@kernel.org \
--cc=andrew@lunn.ch \
--cc=ansuelsmth@gmail.com \
--cc=daniel@makrotopia.org \
--cc=davem@davemloft.net \
--cc=kabel@kernel.org \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=lizetao1@huawei.com \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.