diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-23 09:33:20 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-23 09:33:20 +0100 |
commit | 9890d35bb2f6b99962a09079b1acfae5a8a254ff (patch) | |
tree | 8c1705cc233ef33d0df8370f5f020257b9484b66 | |
parent | d64f84f69b468699e055f26c076b2438f611d876 (diff) | |
parent | e5a4f7f1873785994ab52e26ccefd7a0e5c355f4 (diff) | |
download | kernel-5.0.0-0.rc3.git1.1.vanilla.knurd.1.fc29.tar.gz kernel-5.0.0-0.rc3.git1.1.vanilla.knurd.1.fc29.tar.xz kernel-5.0.0-0.rc3.git1.1.vanilla.knurd.1.fc29.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.0.0-0.rc3.git1.1.vanilla.knurd.1.fc29
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_R8188EU (renamed from configs/fedora/generic/arm/armv7/CONFIG_R8188EU) | 0 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 3 | ||||
-rw-r--r-- | kernel-aarch64.config | 3 | ||||
-rw-r--r-- | kernel.spec | 10 | ||||
-rw-r--r-- | sources | 1 |
6 files changed, 14 insertions, 5 deletions
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_R8188EU b/configs/fedora/generic/arm/CONFIG_R8188EU index ed7c3546e..ed7c3546e 100644 --- a/configs/fedora/generic/arm/armv7/CONFIG_R8188EU +++ b/configs/fedora/generic/arm/CONFIG_R8188EU @@ -1 +1 @@ -d7393226d15add056285c8fc86723d54d7e0c77d +333478a7eb21245880c89aad166ad08478cc577d diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 80c467461..dcc11d857 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -24,6 +24,7 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_88EU_AP_MODE=y CONFIG_9P_FSCACHE=y CONFIG_9P_FS=m CONFIG_9P_FS_POSIX_ACL=y @@ -4545,7 +4546,7 @@ CONFIG_QUOTA=y CONFIG_R3964=m CONFIG_R6040=m CONFIG_R8169=m -# CONFIG_R8188EU is not set +CONFIG_R8188EU=m CONFIG_R8712U=m CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 203f1c4db..ce63c7085 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -24,6 +24,7 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_88EU_AP_MODE=y CONFIG_9P_FSCACHE=y CONFIG_9P_FS=m CONFIG_9P_FS_POSIX_ACL=y @@ -4524,7 +4525,7 @@ CONFIG_QUOTA=y CONFIG_R3964=m CONFIG_R6040=m CONFIG_R8169=m -# CONFIG_R8188EU is not set +CONFIG_R8188EU=m CONFIG_R8712U=m CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y diff --git a/kernel.spec b/kernel.spec index 5c80c0cc4..afcdfc7d6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 3 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -132,7 +132,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 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -1894,6 +1894,12 @@ fi # # %changelog +* Wed Jan 23 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc3.git1.1 +- Linux v5.0-rc3-53-g333478a7eb21 + +* Wed Jan 23 2019 Laura Abbott <labbott@redhat.com> +- Reenable debugging options. + * Mon Jan 21 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc3.git0.1 - Linux v5.0-rc3 - Disable debugging options. @@ -1 +1,2 @@ SHA512 (linux-5.0-rc3.tar.gz) = 4af12c1918c35635ce35e0fd51af36d9c9aa24a79eeab0c5889b7abb12b8feedcdcaa1969f45ab421a371046898e1676d266f38e7dacffb7240d501566e03ce2 +SHA512 (patch-5.0-rc3-git1.xz) = caf337615fd24a1b2cfe106cca310c08d86ced32f01da3274625e68e43df00392eda0829037736c17b0dab3c47cb3649be73599cdd655ea05af0c8aa5edfb410 |