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
Date: Wed, 18 May 2022 08:55:12 -0700 [thread overview]
Message-ID: <20220518085512.00094bfd@kernel.org> (raw)
In-Reply-To: <20220518113310.28132-1-harini.katakam@xilinx.com>
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.
prev parent reply other threads:[~2022-05-18 15:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-18 11:33 [PATCH net v2 0/2] Macb PTP one step fix Harini Katakam
2022-05-18 11:33 ` [PATCH net v2 1/2] include: ptp: Add common two step flag mask Harini Katakam
2022-05-18 11:33 ` [PATCH net v2 2/2] net: macb: Fix PTP one step sync support Harini Katakam
2022-05-18 15:55 ` Jakub Kicinski [this message]
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=20220518085512.00094bfd@kernel.org \
--to=kuba@kernel.org \
--cc=claudiu.beznea@microchip.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=harini.katakam@xilinx.com \
--cc=harinikatakamlinux@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=pabeni@redhat.com \
--cc=radhey.shyam.pandey@xilinx.com \
--cc=richardcochran@gmail.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).