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

[Daniel Golle]

On Thu, Aug 28, 2025 at 11:33:46PM +0300, 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@xxxxxxxxxxxxxx>
> > ---
> > 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've prepared a tree rebasing your tree

https://github.com/vladimiroltean/linux/commits/lantiq-gswip/

onto current net-next:

https://github.com/dangowrt/linux/commits/lantiq_gswip-fixes-for-vladimiroltean/

If you don't have time to submit the patches from this tree yourself I
can do that on your behalf, just let me know which of the patches you'd
like to submit as fixes, I'll find the causing commit, add the Fixes:-tag
and send them to netdev@ for the net tree after the next net-next -> net
merge.

Or, in case that makes more sense, send the patches to 'net' now and
then solve the conflicts at the next net-next -> net merge, what ever
works better.