Re: [PATCH net-next v2 1/6] net: dsa: lantiq_gswip: move to dedicated folder

[Daniel Golle <daniel@makrotopia.org>]

On Thu, Aug 28, 2025 at 10:49:18PM +0200, Hauke Mehrtens wrote:
> On 8/28/25 22:33, Vladimir Oltean wrote:
> > On Wed, Aug 27, 2025 at 12:05:28AM +0100, Daniel Golle wrote:
> > > Move the lantiq_gswip driver to its own folder and update
> > > MAINTAINERS file accordingly.
> > > This is done ahead of extending the driver to support the MaxLinear
> > > GSW1xx series of standalone switch ICs, which includes adding a bunch
> > > of files.
> > > 
> > > Signed-off-by: Daniel Golle <daniel@makrotopia.org>
> > > ---
> > > v2: move driver to its own folder
> > > 
> > >   MAINTAINERS                                 | 3 +--
> > >   drivers/net/dsa/Kconfig                     | 8 +-------
> > >   drivers/net/dsa/Makefile                    | 2 +-
> > >   drivers/net/dsa/lantiq/Kconfig              | 7 +++++++
> > >   drivers/net/dsa/lantiq/Makefile             | 1 +
> > >   drivers/net/dsa/{ => lantiq}/lantiq_gswip.c | 0
> > >   drivers/net/dsa/{ => lantiq}/lantiq_gswip.h | 0
> > >   drivers/net/dsa/{ => lantiq}/lantiq_pce.h   | 0
> > >   8 files changed, 11 insertions(+), 10 deletions(-)
> > >   create mode 100644 drivers/net/dsa/lantiq/Kconfig
> > >   create mode 100644 drivers/net/dsa/lantiq/Makefile
> > >   rename drivers/net/dsa/{ => lantiq}/lantiq_gswip.c (100%)
> > >   rename drivers/net/dsa/{ => lantiq}/lantiq_gswip.h (100%)
> > >   rename drivers/net/dsa/{ => lantiq}/lantiq_pce.h (100%)
> > 
> > I don't have a problem with this patch per se, but it will make it
> > harder to avoid conflicts for the known and unsubmitted bug fixes, like:
> > https://github.com/dangowrt/linux/commit/c7445039b965e1a6aad1a4435e7efd4b7cb30f5b
> > https://github.com/dangowrt/linux/commit/48d5cac46fc95a826b5eb49434a3a68b75a8ae1a
> > which I haven't found the time to submit (sorry). Are we okay with that?
> 
> I think git cherry-pick will still work.
> 
> I would like to have these fixes also in the stable kernel, if cherry pick
> does not work you can also send modified version to linux stable.

Cherry-pick anyway already won't work any more because of

https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=6e8e6baf16ce7d2310959ae81d0194a56874e0d2

However, I've already rebased the series with Vladimir's fixes on top of
that and this pending series, see

https://github.com/dangowrt/linux/commits/1be5db5457b6956e606af37b03fb1dc86aadd392/