From: "Marek Behún" <kabel@kernel.org>
To: Lee Jones <lee@kernel.org>, Jakub Kicinski <kuba@kernel.org>
Cc: Christian Marangi <ansuelsmth@gmail.com>,
Pavel Machek <pavel@ucw.cz>, Andrew Lunn <andrew@lunn.ch>,
"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: [GIT PULL] Immutable branch between LEDs and NetDev due for the v6.8 merge window:wq
Date: Wed, 13 Dec 2023 13:05:55 +0100 [thread overview]
Message-ID: <20231213130555.406aa2ef@dellmb> (raw)
In-Reply-To: <20231213112705.GI111411@google.com>
On Wed, 13 Dec 2023 11:27:05 +0000
Lee Jones <lee@kernel.org> 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
next prev parent reply other threads:[~2023-12-13 12:06 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
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 [this message]
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=20231213130555.406aa2ef@dellmb \
--to=kabel@kernel.org \
--cc=andrew@lunn.ch \
--cc=ansuelsmth@gmail.com \
--cc=daniel@makrotopia.org \
--cc=davem@davemloft.net \
--cc=kuba@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox