Merge remote-tracking branch 'up/master' into master-riscv64
This commit is contained in:
commit
7bcc7a5f3a
|
@ -0,0 +1 @@
|
|||
# CONFIG_VBOXSF_FS is not set
|
|
@ -0,0 +1 @@
|
|||
CONFIG_VBOXSF_FS=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_KEYBOARD_APPLESPI=m
|
2
gitrev
2
gitrev
|
@ -1 +1 @@
|
|||
26bc672134241a080a83b2ab9aa8abede8d30e1c
|
||||
847120f859cc45e074204f4cf33c8df069306eb2
|
||||
|
|
|
@ -7014,6 +7014,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
CONFIG_V4L_PLATFORM_DRIVERS=y
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
# CONFIG_VBOXSF_FS is not set
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
CONFIG_VDSO=y
|
||||
|
|
|
@ -6992,6 +6992,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
CONFIG_V4L_PLATFORM_DRIVERS=y
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
# CONFIG_VBOXSF_FS is not set
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
CONFIG_VDSO=y
|
||||
|
|
|
@ -7288,6 +7288,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
CONFIG_V4L_PLATFORM_DRIVERS=y
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
# CONFIG_VBOXSF_FS is not set
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
# CONFIG_VDSO is not set
|
||||
|
|
|
@ -6934,6 +6934,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
CONFIG_V4L_PLATFORM_DRIVERS=y
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
# CONFIG_VBOXSF_FS is not set
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
CONFIG_VDSO=y
|
||||
|
|
|
@ -6913,6 +6913,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
CONFIG_V4L_PLATFORM_DRIVERS=y
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
# CONFIG_VBOXSF_FS is not set
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
CONFIG_VDSO=y
|
||||
|
|
|
@ -7267,6 +7267,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
CONFIG_V4L_PLATFORM_DRIVERS=y
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
# CONFIG_VBOXSF_FS is not set
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
# CONFIG_VDSO is not set
|
||||
|
|
|
@ -6331,6 +6331,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
CONFIG_VBOXGUEST=m
|
||||
CONFIG_VBOXSF_FS=m
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
# CONFIG_VEML6070 is not set
|
||||
|
|
|
@ -6310,6 +6310,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
CONFIG_VBOXGUEST=m
|
||||
CONFIG_VBOXSF_FS=m
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
# CONFIG_VEML6070 is not set
|
||||
|
|
|
@ -5961,6 +5961,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
# CONFIG_V4L_PLATFORM_DRIVERS is not set
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
# CONFIG_VBOXSF_FS is not set
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
# CONFIG_VEML6070 is not set
|
||||
|
|
|
@ -5938,6 +5938,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
# CONFIG_V4L_PLATFORM_DRIVERS is not set
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
# CONFIG_VBOXSF_FS is not set
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
# CONFIG_VEML6070 is not set
|
||||
|
|
|
@ -5898,6 +5898,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
# CONFIG_V4L_PLATFORM_DRIVERS is not set
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
# CONFIG_VBOXSF_FS is not set
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
# CONFIG_VEML6070 is not set
|
||||
|
|
|
@ -5875,6 +5875,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
# CONFIG_V4L_PLATFORM_DRIVERS is not set
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
# CONFIG_VBOXSF_FS is not set
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
# CONFIG_VEML6070 is not set
|
||||
|
|
|
@ -2723,7 +2723,7 @@ CONFIG_KEXEC=y
|
|||
# CONFIG_KEYBOARD_ADC is not set
|
||||
# CONFIG_KEYBOARD_ADP5588 is not set
|
||||
# CONFIG_KEYBOARD_ADP5589 is not set
|
||||
# CONFIG_KEYBOARD_APPLESPI is not set
|
||||
CONFIG_KEYBOARD_APPLESPI=m
|
||||
CONFIG_KEYBOARD_ATKBD=y
|
||||
# CONFIG_KEYBOARD_CAP11XX is not set
|
||||
CONFIG_KEYBOARD_CROS_EC=m
|
||||
|
@ -6387,6 +6387,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
CONFIG_VBOXGUEST=m
|
||||
CONFIG_VBOXSF_FS=m
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
# CONFIG_VEML6070 is not set
|
||||
|
|
|
@ -2704,7 +2704,7 @@ CONFIG_KEXEC=y
|
|||
# CONFIG_KEYBOARD_ADC is not set
|
||||
# CONFIG_KEYBOARD_ADP5588 is not set
|
||||
# CONFIG_KEYBOARD_ADP5589 is not set
|
||||
# CONFIG_KEYBOARD_APPLESPI is not set
|
||||
CONFIG_KEYBOARD_APPLESPI=m
|
||||
CONFIG_KEYBOARD_ATKBD=y
|
||||
# CONFIG_KEYBOARD_CAP11XX is not set
|
||||
CONFIG_KEYBOARD_CROS_EC=m
|
||||
|
@ -6366,6 +6366,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
|
|||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
CONFIG_VALIDATE_FS_PARSER=y
|
||||
CONFIG_VBOXGUEST=m
|
||||
CONFIG_VBOXSF_FS=m
|
||||
# CONFIG_VCNL4000 is not set
|
||||
CONFIG_VCNL4035=m
|
||||
# CONFIG_VEML6070 is not set
|
||||
|
|
18
kernel.spec
18
kernel.spec
|
@ -98,9 +98,9 @@ Summary: The Linux kernel
|
|||
# The next upstream release sublevel (base_sublevel+1)
|
||||
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
||||
# The rc snapshot level
|
||||
%global rcrev 6
|
||||
%global rcrev 7
|
||||
# The git snapshot level
|
||||
%define gitrev 1
|
||||
%define gitrev 0
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 5.%{upstream_sublevel}.0
|
||||
%endif
|
||||
|
@ -187,7 +187,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 0
|
||||
%define debugbuildsenabled 1
|
||||
|
||||
%if 0%{?fedora}
|
||||
# Kernel headers are being split out into a separate package
|
||||
|
@ -2434,6 +2434,18 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Mon Nov 11 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc7.git0.1
|
||||
- Linux v5.4-rc7
|
||||
|
||||
* Mon Nov 11 2019 Jeremy Cline <jcline@redhat.com>
|
||||
- Disable debugging options.
|
||||
|
||||
* Fri Nov 08 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc6.git3.1
|
||||
- Linux v5.4-rc6-29-g847120f859cc
|
||||
|
||||
* Thu Nov 07 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc6.git2.1
|
||||
- Linux v5.4-rc6-26-g4dd58158254c
|
||||
|
||||
* Tue Nov 05 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc6.git1.1
|
||||
- Linux v5.4-rc6-8-g26bc67213424
|
||||
|
||||
|
|
3
sources
3
sources
|
@ -1,3 +1,2 @@
|
|||
SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
|
||||
SHA512 (patch-5.4-rc6.xz) = 6322ec5b2e5de13fe05abf031dea7274230c3ce77cf93f631dc504eb779f10c6658e8df083a9e96f6eca6f0bf4974bc9b4103d1399eee32c7dedadbab0692d7b
|
||||
SHA512 (patch-5.4-rc6-git1.xz) = aedc50747a852f7aaf5260254c7ced2575fe5eb4368bc981f0f490fcb9d34f7f081f794ce50c630eb055a08a65300cfdd3fa548aefa114c739813a97027e8ced
|
||||
SHA512 (patch-5.4-rc7.xz) = 0bd727332fc13d43f48497c7587ede034a1ca7df67bae3f6a7dab6001f0b75c858b15d4fa6c0ca5bf71bd467c330f14a92918e8bbc542c7c40f59d2a8f71eeb1
|
||||
|
|
Loading…
Reference in New Issue