Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Date:   Wed, 18 May 2022 08:55:12 -0700
From:   Jakub Kicinski <kuba@kernel.org>
To:     Harini Katakam <harini.katakam@xilinx.com>
Cc:     <nicolas.ferre@microchip.com>, <davem@davemloft.net>,
        <richardcochran@gmail.com>, <claudiu.beznea@microchip.com>,
        <edumazet@google.com>, <pabeni@redhat.com>,
        <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <michal.simek@xilinx.com>, <harinikatakamlinux@gmail.com>,
        <radhey.shyam.pandey@xilinx.com>
Subject: Re: [PATCH net v2 0/2] Macb PTP one step fix
Message-ID: <20220518085512.00094bfd@kernel.org>
In-Reply-To: <20220518113310.28132-1-harini.katakam@xilinx.com>
References: <20220518113310.28132-1-harini.katakam@xilinx.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Wed, 18 May 2022 17:03:08 +0530 Harini Katakam wrote:
> Split from "Macb PTP updates" series
> https://lore.kernel.org/netdev/20220517135525.GC3344@hoboy.vegasvil.org/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.