diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-24 07:13:37 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-24 07:13:37 +0200 |
commit | a2a48a41f2bb00c38f1cac28429a7d8601b371f4 (patch) | |
tree | 2df333e5f679bf36acffc21479af5016bb06984e | |
parent | 6cd693eb065d7229d5f2ff9986803224c7e52e1e (diff) | |
parent | b163f54271e4bc51a105bc62df337e702a40fec0 (diff) | |
download | kernel-a2a48a41f2bb00c38f1cac28429a7d8601b371f4.tar.gz kernel-a2a48a41f2bb00c38f1cac28429a7d8601b371f4.tar.xz kernel-a2a48a41f2bb00c38f1cac28429a7d8601b371f4.zip |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc6.git2.1.vanilla.knurd.1.fc28kernel-4.13.0-0.rc6.git2.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc6.git2.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc6.git2.1.vanilla.knurd.1.fc25
-rw-r--r-- | baseconfig/CONFIG_GPIO_IT87 | 2 | ||||
-rw-r--r-- | baseconfig/x86/CONFIG_GPIO_IT87 | 1 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
-rw-r--r-- | kernel-aarch64.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl.config | 2 | ||||
-rw-r--r-- | kernel-ppc64-debug.config | 2 | ||||
-rw-r--r-- | kernel-ppc64.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le.config | 2 | ||||
-rw-r--r-- | kernel-ppc64p7-debug.config | 2 | ||||
-rw-r--r-- | kernel-ppc64p7.config | 2 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
-rw-r--r-- | kernel-s390x.config | 2 | ||||
-rw-r--r-- | kernel.spec | 14 | ||||
-rw-r--r-- | sources | 1 |
19 files changed, 30 insertions, 18 deletions
diff --git a/baseconfig/CONFIG_GPIO_IT87 b/baseconfig/CONFIG_GPIO_IT87 index 00746d711..aaeb504ac 100644 --- a/baseconfig/CONFIG_GPIO_IT87 +++ b/baseconfig/CONFIG_GPIO_IT87 @@ -1 +1 @@ -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set diff --git a/baseconfig/x86/CONFIG_GPIO_IT87 b/baseconfig/x86/CONFIG_GPIO_IT87 new file mode 100644 index 000000000..00746d711 --- /dev/null +++ b/baseconfig/x86/CONFIG_GPIO_IT87 @@ -0,0 +1 @@ +CONFIG_GPIO_IT87=m @@ -1 +1 @@ -14ccee78fc82f5512908f4424f541549a5705b89 +98b9f8a4549909c6ba2117dfc09404989e6d8710 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index cb02b0050..525cce29d 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1732,7 +1732,7 @@ CONFIG_GPIO_EXAR=m CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 3f229fdc4..eaf600cf9 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1715,7 +1715,7 @@ CONFIG_GPIO_EXAR=m CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 30c2c8bd3..4bfa3935a 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1859,7 +1859,7 @@ CONFIG_GPIO_EXAR=m CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set CONFIG_GPIO_MAX7301=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 354c72115..da3311cdb 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1764,7 +1764,7 @@ CONFIG_GPIO_EXAR=m CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set CONFIG_GPIO_MAX7301=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 1b7010fab..80d177db7 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1747,7 +1747,7 @@ CONFIG_GPIO_EXAR=m CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set CONFIG_GPIO_MAX7301=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index cdd2037c3..08a183a5f 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1842,7 +1842,7 @@ CONFIG_GPIO_EXAR=m CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_GENERIC=y # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set CONFIG_GPIO_MAX7301=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 5fa9f4f28..c17813d6b 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -1533,7 +1533,7 @@ CONFIG_GPIO_EXAR=m # CONFIG_GPIO_FTGPIO010 is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 2041e0d48..d368edd1f 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -1515,7 +1515,7 @@ CONFIG_GPIO_EXAR=m # CONFIG_GPIO_FTGPIO010 is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index de961892a..c76b90fb2 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1487,7 +1487,7 @@ CONFIG_GPIO_EXAR=m # CONFIG_GPIO_FTGPIO010 is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 9afd9305d..de68e7c9d 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1469,7 +1469,7 @@ CONFIG_GPIO_EXAR=m # CONFIG_GPIO_FTGPIO010 is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 743ed6247..0ae90d5fe 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -1486,7 +1486,7 @@ CONFIG_GPIO_EXAR=m # CONFIG_GPIO_FTGPIO010 is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 5b41e7d85..0c2a27ff0 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -1468,7 +1468,7 @@ CONFIG_GPIO_EXAR=m # CONFIG_GPIO_FTGPIO010 is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 76d606eb0..25977b5f7 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1457,7 +1457,7 @@ CONFIG_GPIO_EXAR=m # CONFIG_GPIO_FTGPIO010 is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set # CONFIG_GPIOLIB is not set # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index d70d86ffd..7f0886fc8 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1439,7 +1439,7 @@ CONFIG_GPIO_EXAR=m # CONFIG_GPIO_FTGPIO010 is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_IT87=m +# CONFIG_GPIO_IT87 is not set # CONFIG_GPIOLIB is not set # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set diff --git a/kernel.spec b/kernel.spec index 5c8347bed..363811616 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 6 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -2222,6 +2222,16 @@ fi # # %changelog +* Wed Aug 23 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc6.git2.1 +- Linux v4.13-rc6-50-g98b9f8a45499 + +* Tue Aug 22 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.13.0-0.rc6.git1.1 +- Linux v4.13-rc6-45-g6470812e2226 +- Reenable debugging options. + +* Tue Aug 22 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Force python3 for kvm_stat because we can't dep (rhbz 1456722) + * Mon Aug 21 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.13.0-0.rc6.git0.1 - Disable debugging options. - Linux v4.13-rc6 @@ -1,3 +1,4 @@ SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 SHA512 (patch-4.13-rc6.xz) = bc3dbb6c69a663614132c85cf51b0c390d6c8f6f5be4f950ee5425a16c3b929e59e98fd6bc7ea601f7b369af0e9cad4f21276a12707c6c001f500daaafb07860 +SHA512 (patch-4.13-rc6-git2.xz) = f2b77de4c9132e5d8b705892ccf0760db26c8875383fe65ccbc80bfaabc007fe91635c5208e79279160fd5b025ccfa95665a33cee3c6b97663ea1e4c3be286c3 |