summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-04-22 19:36:28 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-04-22 19:36:28 -0400
commit0d59e0e8af8a60327898c9719e9e7b6970cfdcb2 (patch)
tree61a44bc95187d0961f1f260837ca8121a54ef050
parent0c5496756dfe2880ec1f3bb7e1531a46e9529542 (diff)
downloadkernel-0d59e0e8af8a60327898c9719e9e7b6970cfdcb2.tar.gz
kernel-0d59e0e8af8a60327898c9719e9e7b6970cfdcb2.tar.xz
kernel-0d59e0e8af8a60327898c9719e9e7b6970cfdcb2.zip
Update from exploded git tree
Change patch name to reflect new Subject:
-rw-r--r--amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch (renamed from net-amd-Add-xgbe-a0-driver.patch)31
-rw-r--r--kernel.spec4
2 files changed, 17 insertions, 18 deletions
diff --git a/net-amd-Add-xgbe-a0-driver.patch b/amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
index 9d1db983c..31fe32a74 100644
--- a/net-amd-Add-xgbe-a0-driver.patch
+++ b/amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
@@ -1,6 +1,5 @@
-From 60097639ec70f8677303d73c8f351e77773fa780 Mon Sep 17 00:00:00 2001
From: Tom Lendacky <thomas.lendacky@amd.com>
-Date: Thu, 2 Apr 2015 19:03:41 -0400
+Date: Sat, 21 Feb 2015 12:25:12 -0500
Subject: [PATCH] amd-xgbe-a0: Add support for XGBE on A0
Add XGBE driver support for A0 hardware.
@@ -37,7 +36,7 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
create mode 100644 drivers/net/ethernet/amd/xgbe-a0/xgbe.h
diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile
-index a38a2dc..bf0cf2f 100644
+index a38a2dce3eb3..bf0cf2f8d2db 100644
--- a/drivers/net/ethernet/amd/Makefile
+++ b/drivers/net/ethernet/amd/Makefile
@@ -18,3 +18,4 @@ obj-$(CONFIG_PCNET32) += pcnet32.o
@@ -47,7 +46,7 @@ index a38a2dc..bf0cf2f 100644
+obj-$(CONFIG_AMD_XGBE) += xgbe-a0/
diff --git a/drivers/net/ethernet/amd/xgbe-a0/Makefile b/drivers/net/ethernet/amd/xgbe-a0/Makefile
new file mode 100644
-index 0000000..561116f
+index 000000000000..561116faadae
--- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/Makefile
@@ -0,0 +1,8 @@
@@ -61,7 +60,7 @@ index 0000000..561116f
+amd-xgbe-a0-$(CONFIG_DEBUG_FS) += xgbe-debugfs.o
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h b/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h
new file mode 100644
-index 0000000..75b08c6
+index 000000000000..75b08c63d39f
--- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h
@@ -0,0 +1,1142 @@
@@ -1209,7 +1208,7 @@ index 0000000..75b08c6
+#endif
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c
new file mode 100644
-index 0000000..343301c
+index 000000000000..343301cbf7b4
--- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c
@@ -0,0 +1,269 @@
@@ -1484,7 +1483,7 @@ index 0000000..343301c
+}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c
new file mode 100644
-index 0000000..ecfa6f9
+index 000000000000..ecfa6f91da22
--- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c
@@ -0,0 +1,373 @@
@@ -1863,7 +1862,7 @@ index 0000000..ecfa6f9
+}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c
new file mode 100644
-index 0000000..5dd5777
+index 000000000000..5dd57779c82c
--- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c
@@ -0,0 +1,636 @@
@@ -2505,7 +2504,7 @@ index 0000000..5dd5777
+}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c
new file mode 100644
-index 0000000..2d88739
+index 000000000000..2d88739de41c
--- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c
@@ -0,0 +1,2930 @@
@@ -5441,7 +5440,7 @@ index 0000000..2d88739
+}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c
new file mode 100644
-index 0000000..ca4af9e
+index 000000000000..ca4af9e508b8
--- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c
@@ -0,0 +1,2218 @@
@@ -7665,7 +7664,7 @@ index 0000000..ca4af9e
+}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c
new file mode 100644
-index 0000000..165ff1c
+index 000000000000..165ff1ceedcc
--- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c
@@ -0,0 +1,616 @@
@@ -8287,7 +8286,7 @@ index 0000000..165ff1c
+}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c
new file mode 100644
-index 0000000..a85fb49
+index 000000000000..a85fb4965835
--- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c
@@ -0,0 +1,643 @@
@@ -8936,7 +8935,7 @@ index 0000000..a85fb49
+module_platform_driver(xgbe_a0_driver);
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c
new file mode 100644
-index 0000000..b84d048
+index 000000000000..b84d0481bed8
--- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c
@@ -0,0 +1,312 @@
@@ -9254,7 +9253,7 @@ index 0000000..b84d048
+}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c
new file mode 100644
-index 0000000..1016aeb
+index 000000000000..1016aeb96162
--- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c
@@ -0,0 +1,278 @@
@@ -9538,7 +9537,7 @@ index 0000000..1016aeb
+}
diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe.h b/drivers/net/ethernet/amd/xgbe-a0/xgbe.h
new file mode 100644
-index 0000000..04c00d2
+index 000000000000..04c00d236c49
--- /dev/null
+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe.h
@@ -0,0 +1,868 @@
@@ -10411,5 +10410,5 @@ index 0000000..04c00d2
+
+#endif
--
-1.9.3
+2.1.0
diff --git a/kernel.spec b/kernel.spec
index 92abc23ad..189c7614b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -573,7 +573,7 @@ Patch15000: watchdog-Disable-watchdog-on-virtual-machines.patch
# PPC
# ARM64
-Patch21000: net-amd-Add-xgbe-a0-driver.patch
+Patch21000: amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
Patch21001: amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch
Patch21002: arm64-avoid-needing-console-to-enable-serial-console.patch
Patch21003: usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
@@ -1188,7 +1188,7 @@ ApplyPatch lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
# PPC
# ARM64
-ApplyPatch net-amd-Add-xgbe-a0-driver.patch
+ApplyPatch amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
ApplyPatch amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch
ApplyPatch arm64-avoid-needing-console-to-enable-serial-console.patch
ApplyPatch usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch