Subject: Re: [PATCH net v2 0/2] Macb PTP one step fix

From: Jakub Kicinski <[email-masked]>
Date: Wed, 18 May 2022 08:55:12 -0700

On Wed, 18 May 2022 17:03:08 +0530 Harini Katakam wrote:
> Split from "Macb PTP updates" series
> https://lore.kernel.org/netdev/[email-masked]/T/
> - Fix Macb PTP one step.
> - Add common twoStepflag field definition.

The series does not apply cleanly to net:

  Applying: include: ptp: Add common two step flag mask
  Applying: net: macb: Fix PTP one step sync support
  Using index info to reconstruct a base tree...
  M	drivers/net/ethernet/cadence/macb_main.c
  Falling back to patching base and 3-way merge...
  Auto-merging drivers/net/ethernet/cadence/macb_main.c
  CONFLICT (content): Merge conflict in drivers/net/ethernet/cadence/macb_main.c
  error: Failed to merge in the changes.
  hint: Use 'git am --show-current-patch=diff' to see the failed patch
  Patch failed at 0002 net: macb: Fix PTP one step sync support

You need to rebase on top of this:
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/

Also you can merge the patches together, no need to make the header
change separate.