From: "Allan W. Nielsen" <allan.nielsen@microsemi•com>
To: David Miller <davem@davemloft•net>
Cc: <netdev@vger•kernel.org>, <andrew@lunn•ch>,
<f.fainelli@gmail•com>, <raju.lakkaraju@microsemi•com>
Subject: Re: [PATCH net-next v11 1/1] net: phy: Cleanup the Edge-Rate feature in Microsemi PHYs.
Date: Fri, 14 Oct 2016 20:48:39 +0200 [thread overview]
Message-ID: <20161014184838.GA9670@microsemi.com> (raw)
In-Reply-To: <20161014.110544.269842399219820528.davem@davemloft.net>
Hi David,
I'm really sorry if I messed up, or is not following the protocol...
But you have applied it already:
http://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/commit/?id=4f58e6dceb0e44ca8f21568ed81e1df24e55964c
> commit 4f58e6dceb0e44ca8f21568ed81e1df24e55964c
> Author: Allan W. Nielsen <allan.nielsen@microsemi•com>
> AuthorDate: Wed Oct 12 15:47:51 2016 +0200
> Commit: David S. Miller <davem@davemloft•net>
> CommitDate: Fri Oct 14 10:06:13 2016 -0400
>
> net: phy: Cleanup the Edge-Rate feature in Microsemi PHYs.
>
> Edge-Rate cleanup include the following:
> - Updated device tree bindings documentation for edge-rate
> - The edge-rate is now specified as a "slowdown", meaning that it is now
> being specified as positive values instead of negative (both
> documentation and implementation wise).
> - Only explicitly documented values for "vsc8531,vddmac" and
> "vsc8531,edge-slowdown" are accepted by the device driver.
> - Deleted include/dt-bindings/net/mscc-phy-vsc8531.h as it was not needed.
> - Read/validate devicetree settings in probe instead of init
>
> Signed-off-by: Allan W. Nielsen <allan.nielsen@microsemi•com>
> Signed-off-by: Raju Lakkaraju <raju.lakkaraju@microsemi•com>
> Signed-off-by: David S. Miller <davem@davemloft•net>
Maybe the misunderstanding was caused by me posting the re-based version in
another thread.
Anyway, thanks a lot for the big effort you put into maintaining this
sub-system. I will be more care full next time to avoid such confusions.
Best regards
Allan W. Nielsen
On 14/10/16 11:05, David Miller wrote:
> EXTERNAL EMAIL
>
>
> From: "Allan W. Nielsen" <allan.nielsen@microsemi•com>
> Date: Thu, 13 Oct 2016 20:21:30 +0200
>
> > Edge-Rate cleanup include the following:
> > - Updated device tree bindings documentation for edge-rate
> > - The edge-rate is now specified as a "slowdown", meaning that it is now
> > being specified as positive values instead of negative (both
> > documentation and implementation wise).
> > - Only explicitly documented values for "vsc8531,vddmac" and
> > "vsc8531,edge-slowdown" are accepted by the device driver.
> > - Deleted include/dt-bindings/net/mscc-phy-vsc8531.h as it was not needed.
> > - Read/validate devicetree settings in probe instead of init
> >
> > Signed-off-by: Allan W. Nielsen <allan.nielsen@microsemi•com>
> > Signed-off-by: Raju Lakkaraju <raju.lakkaraju@microsemi•com>
>
> This patch does not apply to the net-next tree.
>
> Take my tree, put this email of your's into a file, and run this:
>
> bash$ git am file
>
> and you will get:
>
> [davem@dhcp-10-15-49-210 net-next]$ git am --signoff net-next-v11-1-1-net-phy-Cleanup-the-Edge-Rate-feature-in-Microsemi-PHYs..patch
> Applying: net: phy: Cleanup the Edge-Rate feature in Microsemi PHYs.
> error: patch failed: Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt:6
> error: Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt: patch does not apply
> error: patch failed: drivers/net/phy/mscc.c:12
> error: drivers/net/phy/mscc.c: patch does not apply
> error: include/dt-bindings/net/mscc-phy-vsc8531.h: does not exist in index
> Patch failed at 0001 net: phy: Cleanup the Edge-Rate feature in Microsemi PHYs.
> The copy of the patch that failed is found in:
> /home/davem/src/GIT/net-next/.git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> Please do not resubmit this patch until you can successfully email the
> patch to yourself and apply it cleanly to the net-next tree.
>
>
next prev parent reply other threads:[~2016-10-14 18:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-10 14:13 [PATCH net-next v10 0/1] net: phy: Cleanup the Edge-Rate feature in Microsemi PHYs Allan W. Nielsen
2016-10-10 14:13 ` [PATCH net-next v10 1/1] " Allan W. Nielsen
2016-10-11 13:09 ` Andrew Lunn
2016-10-12 9:14 ` Florian Fainelli
2016-10-13 14:01 ` David Miller
2016-10-13 18:21 ` [PATCH net-next v11 0/1] net: phy: Cleanup the Edge-Rate feature in Microsemi PHYs (rebase) Allan W. Nielsen
2016-10-13 18:21 ` [PATCH net-next v11 1/1] net: phy: Cleanup the Edge-Rate feature in Microsemi PHYs Allan W. Nielsen
2016-10-14 15:05 ` David Miller
2016-10-14 18:48 ` Allan W. Nielsen [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-10-12 13:47 [PATCH net-next v11 0/1] net: phy: Rebase Edge-Rate clean up Allan W. Nielsen
2016-10-12 13:47 ` [PATCH net-next v11 1/1] net: phy: Cleanup the Edge-Rate feature in Microsemi PHYs Allan W. Nielsen
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=20161014184838.GA9670@microsemi.com \
--to=allan.nielsen@microsemi$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=raju.lakkaraju@microsemi$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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