From: Jakub Kicinski <kuba@kernel.org>
To: Martin Habets <habetsm.xilinx@gmail.com>
Cc: edumazet@google.com, pabeni@redhat.com, davem@davemloft.net,
netdev@vger.kernel.org, ecree.xilinx@gmail.com
Subject: Re: [PATCH net-next v3 00/13]: Move Siena into a separate subdirectory
Date: Thu, 5 May 2022 09:28:53 -0700 [thread overview]
Message-ID: <20220505092853.2ea45aec@kernel.org> (raw)
In-Reply-To: <20220505130024.rqsiwd6zrmjxsze6@gmail.com>
On Thu, 5 May 2022 14:00:24 +0100 Martin Habets wrote:
> > Still funky:
> >
> > $ git pw series apply 638179
> > Applying: sfc: Disable Siena support
> > Using index info to reconstruct a base tree...
> > M drivers/net/ethernet/sfc/Kconfig
> > M drivers/net/ethernet/sfc/Makefile
> > M drivers/net/ethernet/sfc/efx.c
> > M drivers/net/ethernet/sfc/nic.h
> > Falling back to patching base and 3-way merge...
> > No changes -- Patch already applied.
>
> git is right, this got applied by Dave with commit
> https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=0c38a5bd60eb
>
> > Applying: sfc: Move Siena specific files
> > Applying: sfc: Copy shared files needed for Siena (part 1)
> > Applying: sfc: Copy shared files needed for Siena (part 2)
> > Applying: sfc: Copy a subset of mcdi_pcol.h to siena
> > Using index info to reconstruct a base tree...
> > Falling back to patching base and 3-way merge...
> > No changes -- Patch already applied.
>
> git is right, this got applied by Dave with commit
> https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=6b73f20ab6c401a1a7860f02734ab11bf748e69b
>
> > Applying: sfc/siena: Remove build references to missing functionality
> > Applying: sfc/siena: Rename functions in efx headers to avoid conflicts with sfc
> > Applying: sfc/siena: Rename RX/TX functions to avoid conflicts with sfc
> > Applying: sfc/siena: Rename peripheral functions to avoid conflicts with sfc
> > Applying: sfc/siena: Rename functions in mcdi headers to avoid conflicts with sfc
> > Applying: sfc/siena: Rename functions in nic_common.h to avoid conflicts with sfc
> > Applying: sfc/siena: Inline functions in sriov.h to avoid conflicts with sfc
> > Applying: sfc: Add a basic Siena module
>
> The other patches I don't see upstream.
> There is also merge commit
> https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=39e85fe01127cfb1b4b59a08e5d81fed45ee5633
> but that only covers the ones that got applied.
>
> So my summary is that patch 1 and 5 are in, but the others are not.
> Pretty confusing stuff. I wonder if the --find-copies-harder option is too
> clever.
>
> From what I can see net-next is not broken, other than Siena NICs being
> disabled. Your git pw series apply seems correct.
Oh. Well. That I did not suspect. I ignored the confused pw-bot replies.
Would you prefer me to revert what's in the tree or send incremental
patches?
Either way I'd prefer if you posted once more, if that's okay, so that
the pw build bot can take a swing at the series. Looks like the patches
were merged before the build bot got to them this time.
next prev parent reply other threads:[~2022-05-05 16:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-04 7:49 [PATCH net-next v3 00/13]: Move Siena into a separate subdirectory Martin Habets
2022-05-04 7:49 ` [PATCH net-next v3 01/13] sfc: Disable Siena support Martin Habets
2022-05-04 7:50 ` [PATCH net-next v3 02/13] sfc: Move Siena specific files Martin Habets
2022-05-04 7:50 ` [PATCH net-next v3 03/13] sfc: Copy shared files needed for Siena (part 1) Martin Habets
2022-05-04 7:50 ` [PATCH net-next v3 04/13] sfc: Copy shared files needed for Siena (part 2) Martin Habets
2022-05-04 7:50 ` [PATCH net-next v3 05/13] sfc: Copy a subset of mcdi_pcol.h to siena Martin Habets
2022-05-04 7:50 ` [PATCH net-next v3 06/13] sfc/siena: Remove build references to missing functionality Martin Habets
2022-05-04 7:51 ` [PATCH net-next v3 07/13] sfc/siena: Rename functions in efx headers to avoid conflicts with sfc Martin Habets
2022-05-04 7:51 ` [PATCH net-next v3 08/13] sfc/siena: Rename RX/TX functions " Martin Habets
2022-05-04 7:51 ` [PATCH net-next v3 09/13] sfc/siena: Rename peripheral " Martin Habets
2022-05-04 7:51 ` [PATCH net-next v3 10/13] sfc/siena: Rename functions in mcdi headers " Martin Habets
2022-05-04 7:51 ` [PATCH net-next v3 11/13] sfc/siena: Rename functions in nic_common.h " Martin Habets
2022-05-04 7:52 ` [PATCH net-next v3 12/13] sfc/siena: Inline functions in sriov.h " Martin Habets
2022-05-04 7:52 ` [PATCH net-next v3 13/13] sfc: Add a basic Siena module Martin Habets
2022-05-04 10:10 ` [PATCH net-next v3 00/13]: Move Siena into a separate subdirectory patchwork-bot+netdevbpf
2022-05-04 10:20 ` patchwork-bot+netdevbpf
2022-05-05 3:45 ` Jakub Kicinski
2022-05-05 13:00 ` Martin Habets
2022-05-05 16:28 ` Jakub Kicinski [this message]
2022-05-09 8:13 ` Martin Habets
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=20220505092853.2ea45aec@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=ecree.xilinx@gmail.com \
--cc=edumazet@google.com \
--cc=habetsm.xilinx@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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;
as well as URLs for NNTP newsgroup(s).