diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-30 18:19:14 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-30 18:19:14 +0100 |
commit | 89fb41d614bff1ce370a38043d2bd924655a92b1 (patch) | |
tree | 05271057fdb948fa9ec2e957b9681e7991de9c4b | |
parent | 4a446cdd8ce07b5d9db6c845180acc3547275489 (diff) | |
parent | 0ccd979b76fd871c4dfd4a50d84e44fd5a3daa75 (diff) | |
download | kernel-89fb41d614bff1ce370a38043d2bd924655a92b1.tar.gz kernel-89fb41d614bff1ce370a38043d2bd924655a92b1.tar.xz kernel-89fb41d614bff1ce370a38043d2bd924655a92b1.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.0.0-0.rc4.git2.1.vanilla.knurd.1.fc30kernel-5.0.0-0.rc4.git2.1.vanilla.knurd.1.fc29kernel-5.0.0-0.rc4.git2.1.vanilla.knurd.1.fc28
-rw-r--r-- | configs/fedora/generic/s390x/CONFIG_JUMP_LABEL | 1 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
-rw-r--r-- | kernel-s390x.config | 2 | ||||
-rw-r--r-- | kernel.spec | 7 | ||||
-rw-r--r-- | sources | 2 |
6 files changed, 10 insertions, 6 deletions
diff --git a/configs/fedora/generic/s390x/CONFIG_JUMP_LABEL b/configs/fedora/generic/s390x/CONFIG_JUMP_LABEL new file mode 100644 index 000000000..3ef6722b0 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_JUMP_LABEL @@ -0,0 +1 @@ +# CONFIG_JUMP_LABEL is not set @@ -1 +1 @@ -4aa9fc2a435abe95a1e8d7f8c7b3d6356514b37a +62967898789dc1f09a06e59fa85ae2c5ca4dc2da diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 36bcd8012..6487de662 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2340,7 +2340,7 @@ CONFIG_JOYSTICK_XPAD_LEDS=y CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_ZHENHUA=m # CONFIG_JSA1212 is not set -CONFIG_JUMP_LABEL=y +# CONFIG_JUMP_LABEL is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y CONFIG_KARMA_PARTITION=y diff --git a/kernel-s390x.config b/kernel-s390x.config index e5415f0f1..13857bbe4 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2323,7 +2323,7 @@ CONFIG_JOYSTICK_XPAD_LEDS=y CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_ZHENHUA=m # CONFIG_JSA1212 is not set -CONFIG_JUMP_LABEL=y +# CONFIG_JUMP_LABEL is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y CONFIG_KARMA_PARTITION=y diff --git a/kernel.spec b/kernel.spec index ec0c7c23e..896e1138a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 4 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -342,7 +342,7 @@ Summary: The Linux kernel # Which is a BadThing(tm). # We only build kernel-headers on the following... -%define nobuildarches i386 s390x +%define nobuildarches i386 %ifarch %nobuildarches %define with_up 0 @@ -1896,6 +1896,9 @@ fi # # %changelog +* Wed Jan 30 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc4.git2.1 +- Linux v5.0-rc4-59-g62967898789d + * Tue Jan 29 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc4.git1.1 - Linux v5.0-rc4-1-g4aa9fc2a435a @@ -1,2 +1,2 @@ SHA512 (linux-5.0-rc4.tar.gz) = bc7431fd672e4a96c466ec108a17a692b617f60914924ba7fa635d901f632a0b25d067d427eaff4195e3e7c6c5d6269aff3c896854cd5a42a31f6b830c693f0f -SHA512 (patch-5.0-rc4-git1.xz) = 90c0bbc8c2ac23397e98ec44ef919da5284cdf4c99be67b020136717052c8cbc3054cfacfed4a6e13f054dd915e5a4a4740ce7cd053d3afce96b8813978c8cbe +SHA512 (patch-5.0-rc4-git2.xz) = cd9e12bfcee898f907b1d9eeb85f34d527aa4eb38bebd42c5d903f9a391e785222d676248231fefa9c29015d2bc9ba1933bd2396aa50b0c6e97621caa8a779bb |