linux-next: manual merge of the devicetree tree with the net-next tree

[Stephen Rothwell]

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
drivers/of/of_net.c between commit 8a2fe56e8827 ("net: phy: re-design
phy_modes to be self-contained") from the net-next tree and commit
cf4c9eb5a451 ("of: make of_get_phy_mode parse 'phy-connection-type'")
from the devicetree tree.

I fixed it up (I applied the following merge fix patch) and can carry the
fix as necessary (no action is required).

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 14 Feb 2014 14:14:31 +1100
Subject: [PATCH] net: of: merges fix for a moved comment

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 include/linux/phy.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 42f1bc7eaeb0..bc77c174e0a3 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -79,8 +79,8 @@ typedef enum {
 
 /**
  * It maps 'enum phy_interface_t' found in include/linux/phy.h
- * into the device tree binding of 'phy-mode', so that Ethernet
- * device driver can get phy interface from device tree.
+ * into the device tree binding of 'phy-mode' or 'phy-connection-type',
+ * so that Ethernet device driver can get phy interface from device tree.
  */
 static inline const char *phy_modes(phy_interface_t interface)
 {
-- 
1.9.0.rc3

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpOsRcG6Fb86.pgp
Description: PGP signature