From: Vladimir Oltean <olteanv@gmail.com>
To: Lukasz Majewski <lukma@denx.de>
Cc: Tristram.Ha@microchip.com, Eric Dumazet <edumazet@google.com>,
Andrew Lunn <andrew@lunn.ch>,
davem@davemloft.net, Woojung Huh <woojung.huh@microchip.com>,
Oleksij Rempel <o.rempel@pengutronix.de>,
Florian Fainelli <f.fainelli@gmail.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
UNGLinuxDriver@microchip.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v5 net-next 0/5] net: dsa: hsr: Enable HSR HW offloading for KSZ9477
Date: Fri, 22 Sep 2023 14:31:36 +0300 [thread overview]
Message-ID: <20230922113136.jgfo2waalz2pya6b@skbuf> (raw)
In-Reply-To: <20230922131838.4bab19e7@wsk>
On Fri, Sep 22, 2023 at 01:18:38PM +0200, Lukasz Majewski wrote:
> By mistake my net-next repo was pointing to:
> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
>
> Please correct me if I'm wrong but it looks like the net repo for
> current mainline fixes...
Yes, net.git is for fixes to the current mainline branch, and net-next
is for new features to be included in mainline during the next merge window.
They are the same at the beginning of the development cycle and then
they start to diverge.
> However, after fetching net-next - I can apply v5 without issues on top
> of it.
>
> SHA1: 5a1b322cb0b7d0d33a2d13462294dc0f46911172
> "Merge branch 'mlxsw-multicast'"
>
> https://source.denx.de/linux/linux-ksz9477/-/commits/net-next-ksz-HSR-devel-v5?ref_type=heads
> Linux version from `uname -a`: 6.6.0-rc2+
>
> However, it looks like I would need to prepare v6 anyway...
I don't know. "git rebase" is a bit smarter than "git am" and can
automatically resolve some conflicts, on which "git am" will simply bail
out if even the context is not identical. Either way, both patchwork and
me failed to apply your v5 series on net-next, and the patches won't be
accepted without build testing.
next prev parent reply other threads:[~2023-09-22 11:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 11:43 [PATCH v5 net-next 0/5] net: dsa: hsr: Enable HSR HW offloading for KSZ9477 Lukasz Majewski
2023-09-20 11:43 ` [PATCH v5 net-next 1/5] net: dsa: propagate extack to ds->ops->port_hsr_join() Lukasz Majewski
2023-09-21 17:47 ` Florian Fainelli
2023-09-20 11:43 ` [PATCH v5 net-next 2/5] net: dsa: notify drivers of MAC address changes on user ports Lukasz Majewski
2023-09-21 17:49 ` Florian Fainelli
2023-09-20 11:43 ` [PATCH v5 net-next 3/5] net: dsa: tag_ksz: Extend ksz9477_xmit() for HSR frame duplication Lukasz Majewski
2023-09-21 17:50 ` Florian Fainelli
2023-09-21 19:12 ` Vladimir Oltean
2023-09-20 11:43 ` [PATCH v5 net-next 4/5] net: dsa: microchip: move REG_SW_MAC_ADDR to dev->info->regs[] Lukasz Majewski
2023-09-21 17:50 ` Florian Fainelli
2023-09-20 11:43 ` [PATCH v5 net-next 5/5] net: dsa: microchip: Enable HSR offloading for KSZ9477 Lukasz Majewski
2023-09-21 17:52 ` Florian Fainelli
2023-09-21 19:32 ` Vladimir Oltean
2023-09-22 11:29 ` Lukasz Majewski
2023-09-22 11:43 ` Vladimir Oltean
2023-09-21 19:23 ` [PATCH v5 net-next 0/5] net: dsa: hsr: Enable HSR HW " Vladimir Oltean
2023-09-22 11:18 ` Lukasz Majewski
2023-09-22 11:31 ` Vladimir Oltean [this message]
2023-09-22 11:47 ` Lukasz Majewski
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=20230922113136.jgfo2waalz2pya6b@skbuf \
--to=olteanv@gmail.com \
--cc=Tristram.Ha@microchip.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukma@denx.de \
--cc=netdev@vger.kernel.org \
--cc=o.rempel@pengutronix.de \
--cc=pabeni@redhat.com \
--cc=woojung.huh@microchip.com \
/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