Messages in this thread | | | Date | Wed, 24 May 2023 12:56:45 +0300 | From | Vladimir Oltean <> | Subject | Re: [PATCH net-next v4 0/2] Add support for VSC85xx DT RGMII delays |
| |
Hi Harini,
On Mon, May 22, 2023 at 05:58:27PM +0530, Harini Katakam wrote: > Provide an option to change RGMII delay value via devicetree. > > v4: > - Remove VSC8531_02 support. Existing code will identify VSC8531_01/02 > and there is no unique functionality to be added for either version. > - Correct type of rx/tx_delay to accept correct return value. > - Added Andrew's tag to patch 1
Would you mind waiting until this patch set for "net" is merged first, then rebasing your "net-next" work on top of it? https://patchwork.kernel.org/project/netdevbpf/cover/20230523153108.18548-1-david.epping@missinglinkelectronics.com/
You should be able to resend your patch set tomorrow, after the net pull request and the subsequent net -> net-next merge.
There are going to be merge conflicts if your series gets applied simultaneously, and they're ugly enough that I would prefer you to deal with them locally, before submitting, rather than leaving the netdev maintainers do it.
| |