[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20161014.110544.269842399219820528.davem@davemloft.net>
Date: Fri, 14 Oct 2016 11:05:44 -0400 (EDT)
From: David Miller <davem@...emloft.net>
To: allan.nielsen@...rosemi.com
Cc: netdev@...r.kernel.org, andrew@...n.ch, f.fainelli@...il.com,
raju.lakkaraju@...rosemi.com
Subject: Re: [PATCH net-next v11 1/1] net: phy: Cleanup the Edge-Rate
feature in Microsemi PHYs.
From: "Allan W. Nielsen" <allan.nielsen@...rosemi.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@...rosemi.com>
> Signed-off-by: Raju Lakkaraju <raju.lakkaraju@...rosemi.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@...p-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.
Powered by blists - more mailing lists