diff options
| -rw-r--r-- | Makefile.rhelver | 2 | ||||
| -rw-r--r-- | kernel.spec | 51 | ||||
| -rwxr-xr-x | parallel_xz.sh | 2 | ||||
| -rw-r--r-- | sources | 6 | ||||
| -rwxr-xr-x | update_scripts.sh | 8 |
5 files changed, 53 insertions, 16 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index c11ed05e1..350b1c0db 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 15 +RHEL_RELEASE = 17 # # Early y+1 numbering diff --git a/kernel.spec b/kernel.spec index bb7fb8594..37caf60e6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -30,7 +30,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc6.20200923git805c6d3c1921.15 +%global distro_build 0.rc6.20200925git171d4ff79f96.17 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -69,13 +69,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.9.0 -%define pkgrelease 0.rc6.20200923git805c6d3c1921.15 +%define pkgrelease 0.rc6.20200925git171d4ff79f96.17 # This is needed to do merge window version magic %define patchlevel 9 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20200923git805c6d3c1921.15%{?buildid}%{?dist} +%define specrelease 0.rc6.20200925git171d4ff79f96.17%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -566,7 +566,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200923git805c6d3c1921.tar.xz +Source0: linux-20200925git171d4ff79f96.tar.xz Source1: Makefile.rhelver @@ -1284,8 +1284,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200923git805c6d3c1921 -c -mv linux-20200923git805c6d3c1921 linux-%{KVERREL} +%setup -q -n kernel-20200925git171d4ff79f96 -c +mv linux-20200925git171d4ff79f96 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2071,7 +2071,7 @@ BuildKernel %make_target %kernel_image %{_use_vdso} %global perf_make \ %{__make} -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} -%global _lto_cflags %{nil} ++%global _lto_cflags %{nil} # perf # make sure check-headers.sh is executable chmod +x tools/perf/check-headers.sh @@ -2795,6 +2795,43 @@ fi # # %changelog +* Fri Sep 25 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc6.20200925git171d4ff79f96.16] +- Merge ark-patches + +* Fri Sep 25 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc6.20200925git171d4ff79f96.15.test] +- 171d4ff79f96 rebase +- mm: fix misplaced unlock_page in do_wp_page() (Linus Torvalds) +- Updated changelog for the release based on c9c9e6a49f89 (Fedora Kernel Team) +- Revert "ALSA: usb-audio: Disable Lenovo P620 Rear line-in volume control" (Kai-Heng Feng) +- media: dt-bindings: media: imx274: Convert to json-schema (Jacopo Mondi) +- Revert "ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO" (Takashi Iwai) +- ALSA: usb-audio: Add delay quirk for H570e USB headsets (Joakim Tjernlund) +- ALSA: hda/realtek: Enable front panel headset LED on Lenovo ThinkStation P520 (Kai-Heng Feng) +- ALSA: hda/realtek - Couldn't detect Mic if booting with headset plugged (Hui Wang) +- ALSA: asihpi: fix iounmap in error handler (Tom Rix) +- media: media/v4l2: remove V4L2_FLAG_MEMORY_NON_CONSISTENT flag (Sergey Senozhatsky) +- mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA (Geert Uytterhoeven) +- media: cec-adap.c: don't use flush_scheduled_work() (Hans Verkuil) + +* Thu Sep 24 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc6.20200924gitc9c9e6a49f89.15] +- Merge ark-patches + +* Thu Sep 24 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc6.20200924gitc9c9e6a49f89.14.test] +- c9c9e6a49f89 rebase +- mm: move the copy_one_pte() pte_present check into the caller (Linus Torvalds) +- mm: split out the non-present case from copy_one_pte() (Linus Torvalds) +- Updated changelog for the release based on 805c6d3c1921 (Fedora Kernel Team) +- dm crypt: document encrypted keyring key option (Milan Broz) +- dm crypt: document new no_workqueue flags (Milan Broz) +- btrfs: fix put of uninitialized kobject after seed device delete (Anand Jain) +- tools/bootconfig: Add testcase for tailing space (Masami Hiramatsu) +- tools/bootconfig: Add testcases for repeated key with brace (Masami Hiramatsu) +- lib/bootconfig: Fix to remove tailing spaces after value (Masami Hiramatsu) +- lib/bootconfig: Fix a bug of breaking existing tree nodes (Masami Hiramatsu) +- dm: fix comment in dm_process_bio() (Mike Snitzer) +- dm: fix bio splitting and its bio completion order for regular IO (Mike Snitzer) +- btrfs: fix overflow when copying corrupt csums for a message (Johannes Thumshirn) + * Wed Sep 23 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc6.20200923git805c6d3c1921.14] - Merge ark-patches diff --git a/parallel_xz.sh b/parallel_xz.sh index f1b6cdd15..bc08a548d 100755 --- a/parallel_xz.sh +++ b/parallel_xz.sh @@ -23,4 +23,4 @@ test "$procgroup" = 1 && exec xargs -r xz # xz has some startup cost. If files are really small, # this cost might be significant. To combat this, # process several files (in sequence) by each xz process via -n 16: -exec xargs -r -n 16 -P "$procgroup" xz +exec xargs -r -n 16 -P $procgroup xz @@ -1,3 +1,3 @@ -SHA512 (linux-20200923git805c6d3c1921.tar.xz) = 1438a3024d7d20d93665ca8b8b3f0372543a11e6d57e62a5e33d92e21b402ca68e65349c4a293f36c805deaacbb43ac9dfe9bfb734b09c25635d3791fe83a0dd -SHA512 (kernel-abi-whitelists-5.9.0-0.rc6.20200923git805c6d3c1921.15.tar.bz2) = d54d531e08c7fcef3333fc63d7a7d61b79563c7fc9ec8fec0e3655e6a430b31a50e2c45394804013e8a080e4abb0fefba4355baf49c0cdefa257d9fd9c690f0e -SHA512 (kernel-kabi-dw-5.9.0-0.rc6.20200923git805c6d3c1921.15.tar.bz2) = 7d237f626096c01c73461c29883acff2cfa7f78061034d3ff0e420727c12ae5157097d636c9ba15b9b921143851dae4908df8c155582086c6996c1157ff252fc +SHA512 (linux-20200925git171d4ff79f96.tar.xz) = 792f914800e47952740816fe90b222ab9aececc14ba16a427772d3a47760cb5db5c508efcfce17919315b6f1ae1d91a14c286115dd39b0e8540fc7b13442155c +SHA512 (kernel-abi-whitelists-5.9.0-0.rc6.20200925git171d4ff79f96.17.tar.bz2) = a5faa521dc1025b4d1809ab718d8766c48d30098166c8f2c6cd3551dbb11b57062f0c407b2a99090dca967cdb15489061b9b2373d3654d4d5cdc44aa1a567161 +SHA512 (kernel-kabi-dw-5.9.0-0.rc6.20200925git171d4ff79f96.17.tar.bz2) = 7ede200b1a0432d29e2ad074ea1b04122cf76d2a69e8f5aa58273d610795834e4db29d48d71b22f210686461a17a7ae074487d571a2ce65d8b0ede468985d619 diff --git a/update_scripts.sh b/update_scripts.sh index 9196e795a..5c3dbaeb9 100755 --- a/update_scripts.sh +++ b/update_scripts.sh @@ -1,12 +1,12 @@ #!/bin/sh -if [ -z "$1" ]; then +if [ -z $1 ]; then exit 1 fi -TARGET="$1" +TARGET=$1 -for i in "$RPM_SOURCE_DIR"/*."$TARGET"; do +for i in $RPM_SOURCE_DIR/*.$TARGET; do NEW=${i%.$TARGET} - cp "$i" "$NEW" + cp $i $NEW done |