diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-12 08:23:22 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-12 08:23:22 +0200 |
commit | 7bddfcc2716bbdfe5ec367221a0adfe1274fec0b (patch) | |
tree | 296d5c09ad28e3c802d95e3b33c7e0818292ddf8 | |
parent | 12566869d34f107fe1903ac60dac8d938d892068 (diff) | |
parent | 3a2f515354b28762922c8ec3e60235a1ff9f37c4 (diff) | |
download | kernel-7bddfcc2716bbdfe5ec367221a0adfe1274fec0b.tar.gz kernel-7bddfcc2716bbdfe5ec367221a0adfe1274fec0b.tar.xz kernel-7bddfcc2716bbdfe5ec367221a0adfe1274fec0b.zip |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc4.git4.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc4.git4.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc4.git4.1.vanilla.knurd.1.fc25
-rw-r--r-- | baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE | 2 | ||||
-rw-r--r-- | baseconfig/powerpc/CONFIG_SWIOTLB | 2 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-ppc64-debug.config | 4 | ||||
-rw-r--r-- | kernel-ppc64.config | 4 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 4 | ||||
-rw-r--r-- | kernel-ppc64le.config | 4 | ||||
-rw-r--r-- | kernel-ppc64p7-debug.config | 4 | ||||
-rw-r--r-- | kernel-ppc64p7.config | 4 | ||||
-rw-r--r-- | kernel.spec | 11 | ||||
-rw-r--r-- | sources | 2 |
11 files changed, 26 insertions, 17 deletions
diff --git a/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE b/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE index bbbf7d364..e7fe50c39 100644 --- a/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE +++ b/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE @@ -1 +1 @@ -CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set diff --git a/baseconfig/powerpc/CONFIG_SWIOTLB b/baseconfig/powerpc/CONFIG_SWIOTLB index 5405b65b4..ac62bf35e 100644 --- a/baseconfig/powerpc/CONFIG_SWIOTLB +++ b/baseconfig/powerpc/CONFIG_SWIOTLB @@ -1 +1 @@ -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set @@ -1 +1 @@ -8d31f80eb38819e4f2905ad21c0e8998382a08f7 +b2dbdf2ca1d2803e9cdc46a94554c4a39ffb235a diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 0efb78243..c17813d6b 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -2685,7 +2685,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG=y CONFIG_MEMORY_FAILURE=y -CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y # CONFIG_MEMORY is not set @@ -4966,7 +4966,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 429d4bd18..d368edd1f 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -2664,7 +2664,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG=y CONFIG_MEMORY_FAILURE=y -CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y # CONFIG_MEMORY is not set @@ -4942,7 +4942,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 44f1fee89..c76b90fb2 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2631,7 +2631,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG=y CONFIG_MEMORY_FAILURE=y -CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y # CONFIG_MEMORY is not set @@ -4895,7 +4895,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 37b50330e..de68e7c9d 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2610,7 +2610,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG=y CONFIG_MEMORY_FAILURE=y -CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y # CONFIG_MEMORY is not set @@ -4871,7 +4871,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 8e2362aa5..0ae90d5fe 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -2630,7 +2630,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG=y CONFIG_MEMORY_FAILURE=y -CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y # CONFIG_MEMORY is not set @@ -4894,7 +4894,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 4bd445dce..0c2a27ff0 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -2609,7 +2609,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG=y CONFIG_MEMORY_FAILURE=y -CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y # CONFIG_MEMORY is not set @@ -4870,7 +4870,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel.spec b/kernel.spec index 020bf0e05..d45dc5f50 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 4 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2216,6 +2216,15 @@ fi # # %changelog +* Fri Aug 11 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc4.git4.1 +- Linux v4.13-rc4-220-gb2dbdf2ca1d2 + +* Fri Aug 11 2017 Dan Horak <dan@danny.cz> +- disable SWIOTLB on Power (#1480380) + +* Fri Aug 11 2017 Josh Boyer <jwboyer@fedoraproject.org> +- Disable MEMORY_HOTPLUG_DEFAULT_ONLINE on ppc64 (rhbz 1476380) + * Thu Aug 10 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc4.git3.1 - Linux v4.13-rc4-139-g8d31f80eb388 @@ -1,4 +1,4 @@ SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 SHA512 (patch-4.13-rc4.xz) = 0f03c25f705892ffcff410b3d3068fe25a876c91ec251497ceda37bfdef1c88bf0ed5486c5e68f399db1f5a11e9a08c48d894cc80cb8e9b3a56ce02f203cc1bc -SHA512 (patch-4.13-rc4-git3.xz) = 31cfcc546eaf9a50bff6ab7d0f031a7dd95fc7e00e558efa00a8d68c96703f0216a1e03a03feda7abe666baa6bb2b2be61517a0830587eae3d98eafddd0b7355 +SHA512 (patch-4.13-rc4-git4.xz) = e6ff994f9a9d197ddfb027a720651919dc96703db29060ee66189177dc0a99cc09a5b403250115f3f60dc70406fb53aafe6f0d2f3f5ff015b0bce84d92f70267 |