summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch49
-rw-r--r--baseconfig/CONFIG_NET_VENDOR_AQUANTIA2
-rw-r--r--baseconfig/arm/arm64/CONFIG_ACPI_CPPC_CPUFREQ2
-rwxr-xr-xfilter-modules.sh2
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config4
-rw-r--r--kernel-aarch64.config4
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel-i686-PAE.config2
-rw-r--r--kernel-i686-PAEdebug.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64-debug.config2
-rw-r--r--kernel-ppc64.config2
-rw-r--r--kernel-ppc64le-debug.config2
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-ppc64p7-debug.config2
-rw-r--r--kernel-ppc64p7.config2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config3
-rw-r--r--kernel-x86_64.config3
-rw-r--r--kernel.spec14
-rw-r--r--sources2
27 files changed, 91 insertions, 28 deletions
diff --git a/0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch b/0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch
new file mode 100644
index 000000000..3e4fade01
--- /dev/null
+++ b/0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch
@@ -0,0 +1,49 @@
+From 8bfbdce4d7da6353d1039148a4c90dd463f1fb8f Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@redhat.com>
+Date: Thu, 27 Jul 2017 13:52:17 -0700
+Subject: [PATCH] Revert "xgene: Don't fail probe, if there is no clk resource
+ for SGMII interfaces"
+
+This reverts commit 0db01097cabd97897d123b4c5d805d1a7b061d82.
+
+Signed-off-by: Laura Abbott <labbott@redhat.com>
+---
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 22 ++++++++++------------
+ 1 file changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+index 86058a9f3417..d3906f6b01bd 100644
+--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
++++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+@@ -1785,18 +1785,16 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
+
+ xgene_enet_gpiod_get(pdata);
+
+- if (pdata->phy_mode != PHY_INTERFACE_MODE_SGMII) {
+- pdata->clk = devm_clk_get(&pdev->dev, NULL);
+- if (IS_ERR(pdata->clk)) {
+- /* Abort if the clock is defined but couldn't be
+- * retrived. Always abort if the clock is missing on
+- * DT system as the driver can't cope with this case.
+- */
+- if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node)
+- return PTR_ERR(pdata->clk);
+- /* Firmware may have set up the clock already. */
+- dev_info(dev, "clocks have been setup already\n");
+- }
++ pdata->clk = devm_clk_get(&pdev->dev, NULL);
++ if (IS_ERR(pdata->clk)) {
++ /* Abort if the clock is defined but couldn't be retrived.
++ * Always abort if the clock is missing on DT system as
++ * the driver can't cope with this case.
++ */
++ if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node)
++ return PTR_ERR(pdata->clk);
++ /* Firmware may have set up the clock already. */
++ dev_info(dev, "clocks have been setup already\n");
+ }
+
+ if (pdata->phy_mode != PHY_INTERFACE_MODE_XGMII)
+--
+2.13.0
+
diff --git a/baseconfig/CONFIG_NET_VENDOR_AQUANTIA b/baseconfig/CONFIG_NET_VENDOR_AQUANTIA
index 91af5c7e0..f8ae0ca05 100644
--- a/baseconfig/CONFIG_NET_VENDOR_AQUANTIA
+++ b/baseconfig/CONFIG_NET_VENDOR_AQUANTIA
@@ -1 +1 @@
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
diff --git a/baseconfig/arm/arm64/CONFIG_ACPI_CPPC_CPUFREQ b/baseconfig/arm/arm64/CONFIG_ACPI_CPPC_CPUFREQ
index 5d20724da..5cc88132a 100644
--- a/baseconfig/arm/arm64/CONFIG_ACPI_CPPC_CPUFREQ
+++ b/baseconfig/arm/arm64/CONFIG_ACPI_CPPC_CPUFREQ
@@ -1 +1 @@
-# CONFIG_ACPI_CPPC_CPUFREQ is not set
+CONFIG_ACPI_CPPC_CPUFREQ=m
diff --git a/filter-modules.sh b/filter-modules.sh
index c3fbaad03..686f8ccf6 100755
--- a/filter-modules.sh
+++ b/filter-modules.sh
@@ -20,7 +20,7 @@ chardrvs="mwave pcmcia"
netdrvs="appletalk can dsa hamradio ieee802154 irda ppp slip usb wireless"
-ethdrvs="3com adaptec alteon amd atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell mellanox neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti wiznet xircom"
+ethdrvs="3com adaptec alteon amd aquantia atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell mellanox neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti wiznet xircom"
inputdrvs="gameport tablet touchscreen"
diff --git a/gitrev b/gitrev
index 7b157502b..56e440459 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-fd2b2c57ec2020ae1b5e24717a876c71e31e5ab8
+da08f35b0f82b0a7a79f518faf8d0c0b477f91bc
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 12b2ca603..45f7a87ae 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -51,7 +51,7 @@ CONFIG_ACPI_BGRT=y
CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_CONFIGFS=m
CONFIG_ACPI_CONTAINER=y
-# CONFIG_ACPI_CPPC_CPUFREQ is not set
+CONFIG_ACPI_CPPC_CPUFREQ=m
CONFIG_ACPI_CUSTOM_METHOD=m
# CONFIG_ACPI_DEBUGGER is not set
CONFIG_ACPI_DEBUG=y
@@ -3530,7 +3530,7 @@ CONFIG_NET_VENDOR_ALLWINNER=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 85b0f482f..2d3d223c3 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -51,7 +51,7 @@ CONFIG_ACPI_BGRT=y
CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_CONFIGFS=m
CONFIG_ACPI_CONTAINER=y
-# CONFIG_ACPI_CPPC_CPUFREQ is not set
+CONFIG_ACPI_CPPC_CPUFREQ=m
CONFIG_ACPI_CUSTOM_METHOD=m
# CONFIG_ACPI_DEBUGGER is not set
# CONFIG_ACPI_DEBUG is not set
@@ -3509,7 +3509,7 @@ CONFIG_NET_VENDOR_ALLWINNER=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 317d320dd..4bfa3935a 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3775,7 +3775,7 @@ CONFIG_NET_VENDOR_ALLWINNER=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 4cafd62f1..da3311cdb 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3604,7 +3604,7 @@ CONFIG_NET_VENDOR_ALLWINNER=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index d409775e9..80d177db7 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3583,7 +3583,7 @@ CONFIG_NET_VENDOR_ALLWINNER=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 6a5f04a3f..08a183a5f 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3754,7 +3754,7 @@ CONFIG_NET_VENDOR_ALLWINNER=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 26c9dc8ba..26685d2db 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3397,7 +3397,7 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index b4054037a..279602f9d 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3417,7 +3417,7 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 58fb384cb..c32b00dad 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3417,7 +3417,7 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index e2c1b1a8f..25f1d5c42 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3397,7 +3397,7 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 55e69482a..0efb78243 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -3244,7 +3244,7 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 09a9a960f..429d4bd18 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -3222,7 +3222,7 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index bd116b090..44f1fee89 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3189,7 +3189,7 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 1a7575b55..37b50330e 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3167,7 +3167,7 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index ad4838cbe..8e2362aa5 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -3188,7 +3188,7 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 28d066648..4bd445dce 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -3166,7 +3166,7 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 9494473d6..a69ba3478 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3121,7 +3121,7 @@ CONFIG_NET_TULIP=y
# CONFIG_NET_VENDOR_ALTEON is not set
# CONFIG_NET_VENDOR_AMAZON is not set
# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_VENDOR_ATHEROS is not set
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index a1d36eef3..870bed495 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3099,7 +3099,7 @@ CONFIG_NET_TULIP=y
# CONFIG_NET_VENDOR_ALTEON is not set
# CONFIG_NET_VENDOR_AMAZON is not set
# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_VENDOR_ATHEROS is not set
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index bfba8fc6b..02fc94229 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -220,6 +220,7 @@ CONFIG_APM_POWER=m
CONFIG_APPLE_GMUX=m
CONFIG_APPLE_PROPERTIES=y
# CONFIG_APPLICOM is not set
+CONFIG_AQTION=m
CONFIG_AQUANTIA_PHY=m
CONFIG_AR5523=m
# CONFIG_ARCH_MEMORY_PROBE is not set
@@ -3452,7 +3453,7 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 61d727c5c..37220c151 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -220,6 +220,7 @@ CONFIG_APM_POWER=m
CONFIG_APPLE_GMUX=m
CONFIG_APPLE_PROPERTIES=y
# CONFIG_APPLICOM is not set
+CONFIG_AQTION=m
CONFIG_AQUANTIA_PHY=m
CONFIG_AR5523=m
# CONFIG_ARCH_MEMORY_PROBE is not set
@@ -3432,7 +3433,7 @@ CONFIG_NET_VENDOR_AGERE=y
CONFIG_NET_VENDOR_ALTEON=y
CONFIG_NET_VENDOR_AMAZON=y
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
# CONFIG_NET_VENDOR_AURORA is not set
diff --git a/kernel.spec b/kernel.spec
index 382acc6ca..9c507baf4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 2
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -638,6 +638,9 @@ Patch320: bcm283x-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO
# Revert it while I engage upstream to work out what's going on
Patch322: Revert-ARM-dts-bcm2835-Add-the-DSI-module-nodes-and-.patch
+# Breaking mustang booting
+Patch323: 0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch
+
# 400 - IBM (ppc/s390x) patches
# 500 - Temp fixes/CVEs etc
@@ -2212,6 +2215,15 @@ fi
#
#
%changelog
+* Thu Jul 27 2017 Laura Abbott <labbott@fedoraproject.org>
+- Revert patch breaking mustang boot
+
+* Thu Jul 27 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc2.git2.1
+- Linux v4.13-rc2-27-gda08f35b0f82
+
+* Thu Jul 27 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable ACPI CPPC CPUFreq driver on aarch64
+
* Wed Jul 26 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc2.git1.1
- Linux v4.13-rc2-22-gfd2b2c57ec20
diff --git a/sources b/sources
index 187ab5e55..ee129e369 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c
SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
SHA512 (patch-4.13-rc2.xz) = 0ebedff0a8e1ec90959918863710523247aefd7627ab327436caddcb768e1f6269820e816ccc5f8447ab8d2ca6fe665119556e7e15a9753ae061fbfbfb01410f
-SHA512 (patch-4.13-rc2-git1.xz) = b5200c4295f2432a6f989692c0bd57c1b3f48950d8e8435161615223037b2b8382194b7fa9168a824680363e5d5df88f96174b6bddfa5ca7a873c21c3ec68cc7
+SHA512 (patch-4.13-rc2-git2.xz) = 10da8936866df1b153ce128800b97c9bc61f13622152316a87ba2d4000d4ff57190833ece1ebf65c3222f1bd4764888a99c8ca762c12e878dcc8dc7a89931b55