Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-14 15:35:07 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-14 15:35:07 +0200
commit25966158d5321328eb1e107b01a0feabb061986a (patch)
tree9652586dfb2ef1f44f174a6216e9601ede1c264d
parent090f833e35727e6fe426a67792a0c12bcbe9a374 (diff)
parentce908a06a674717bfaaef591de0fa89bb3e57219 (diff)
Merge branch 'users/fbaumanis/SLE15/for-next' into SLE15
Pull dt fix from Fabian Baumanis
-rw-r--r--patches.fixes/0001-dt-bindings-net-Fix-a-typo-in-the-phy-mode-list-for-.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.fixes/0001-dt-bindings-net-Fix-a-typo-in-the-phy-mode-list-for-.patch b/patches.fixes/0001-dt-bindings-net-Fix-a-typo-in-the-phy-mode-list-for-.patch
new file mode 100644
index 0000000000..af7026daec
--- /dev/null
+++ b/patches.fixes/0001-dt-bindings-net-Fix-a-typo-in-the-phy-mode-list-for-.patch
@@ -0,0 +1,37 @@
+From 822dd046d7e22a8d01728200a003da230e4c6f7f Mon Sep 17 00:00:00 2001
+From: Maxime Chevallier <maxime.chevallier@bootlin.com>
+Date: Tue, 7 May 2019 17:35:55 +0200
+Subject: [PATCH] dt-bindings: net: Fix a typo in the phy-mode list for
+ ethernet bindings
+Git-commit: 822dd046d7e22a8d01728200a003da230e4c6f7f
+Patch-mainline: v5.1
+References: bsc#1129770
+
+The phy_mode "2000base-x" is actually supposed to be "1000base-x", even
+though the commit title of the original patch says otherwise.
+
+Fixes: 55601a880690 ("net: phy: Add 2000base-x, 2500base-x and rxaui modes")
+Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Reviewed-by: Fabian Baumanis <fabian.baumanis@suse.com>
+---
+ Documentation/devicetree/bindings/net/ethernet.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt
+index a68621580584..d45b5b56fa39 100644
+--- a/Documentation/devicetree/bindings/net/ethernet.txt
++++ b/Documentation/devicetree/bindings/net/ethernet.txt
+@@ -36,7 +36,7 @@ Documentation/devicetree/bindings/phy/phy-bindings.txt.
+ * "smii"
+ * "xgmii"
+ * "trgmii"
+- * "2000base-x",
++ * "1000base-x",
+ * "2500base-x",
+ * "rxaui"
+ * "xaui"
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index cfacde8fb2..f56ed5f036 100644
--- a/series.conf
+++ b/series.conf
@@ -21808,6 +21808,7 @@
patches.drivers/mwl8k-Fix-rate_idx-underflow.patch
patches.drivers/rtlwifi-rtl8723ae-Fix-missing-break-in-switch-statem.patch
patches.drivers/brcm80211-potential-NULL-dereference-in-brcmf_cfg802.patch
+ patches.fixes/0001-dt-bindings-net-Fix-a-typo-in-the-phy-mode-list-for-.patch
patches.drivers/usb-storage-Set-virt_boundary_mask-to-avoid-SG-overf.patch
patches.drivers/USB-cdc-acm-fix-unthrottle-races.patch
patches.fixes/0001-UAS-fix-alignment-of-scatter-gather-segments.patch