From 952ed53b8dc02307ae140982548522d049e0bca5 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 14 Dec 2020 09:02:23 -0600 Subject: [PATCH] kernel-5.10.0-98 * Mon Dec 14 2020 Justin M. Forbes [5.10.0-98] - Add missing '$' sign to (GIT) in redhat/Makefile (Augusto Caringi) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- generate_bls_conf.sh | 6 +- kernel.spec | 94 ++++--------------- mod-blacklist.sh | 76 +++++++-------- parallel_xz.sh | 2 +- patch-5.10.0-redhat.patch | 6 +- ...-function-__add_to_page_cache_locked.patch | 90 ------------------ sources | 6 +- update_scripts.sh | 8 +- 9 files changed, 67 insertions(+), 223 deletions(-) mode change 100755 => 100644 kernel.spec delete mode 100644 revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch diff --git a/Makefile.rhelver b/Makefile.rhelver index e5179f2d3..166f00540 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 = 97 +RHEL_RELEASE = 98 # # Early y+1 numbering diff --git a/generate_bls_conf.sh b/generate_bls_conf.sh index 03b21821f..f8415db24 100755 --- a/generate_bls_conf.sh +++ b/generate_bls_conf.sh @@ -1,7 +1,6 @@ #!/bin/bash set -e -# shellcheck disable=SC1091 . /etc/os-release kernelver=$1 && shift @@ -19,10 +18,7 @@ else debugid="" fi -# shellcheck will complain about bootprefix being referenced but not assigned, -# but that is perfectly OK here. -# shellcheck disable=SC2154 -cat > "$output" <${output} < [5.10.0-0.rc7.20201211git33dc9614dc20.97] -- Remove cp instruction already handled in instruction below. ("Paulo E. Castro") -- Add all the dependencies gleaned from running `make prepare` on a bloated devel kernel. ("Paulo E. Castro") -- Add tools to path mangling script. ("Paulo E. Castro") -- Remove duplicate cp statement which is also not specific to x86. ("Paulo E. Castro") -- Correct orc_types failure whilst running `make prepare` https://bugzilla.redhat.com/show_bug.cgi?id=1882854 ("Paulo E. Castro") -- build_configs.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- genspec.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- ark-rebase-patches.sh: Fix for shellcheck (Ben Crocker) -- ark-create-release.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- merge-subtrees.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- rh-dist-git.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- update_scripts.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- x86_rngd.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- parallel_xz.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- expand_srpm.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- create-tarball.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- generate_bls_conf.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- clone_tree.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- new_release.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- download_cross.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- create_distgit_changelog.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- generate_cross_report.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- run_kabi-dw.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- mod-blacklist.sh: Fix syntax flagged by shellcheck (Ben Crocker) -- scripts/configdiff.sh: Fix syntax flagged by shellcheck (Ben Crocker) +* Mon Dec 14 2020 Justin M. Forbes [5.10.0-98] +- Add missing '$' sign to (GIT) in redhat/Makefile (Augusto Caringi) + +* Sat Dec 12 2020 Fedora Kernel Team [5.10.0-0.rc7.20201212git7f376f1917d7.97] +- Remove filterdiff and use native git instead (Don Zickus) +- New configs in net/sched ("Justin M. Forbes") * Fri Dec 11 2020 Fedora Kernel Team [5.10.0-0.rc7.20201211git33dc9614dc20.96] - redhat: explicitly disable CONFIG_IMA_APPRAISE_SIGNED_INIT (Bruno Meneguele) diff --git a/mod-blacklist.sh b/mod-blacklist.sh index e8797659e..f2f801b5e 100755 --- a/mod-blacklist.sh +++ b/mod-blacklist.sh @@ -1,5 +1,4 @@ #! /bin/bash -# shellcheck disable=SC2164 RpmDir=$1 ModDir=$2 @@ -25,9 +24,9 @@ __EOF__ check_blacklist() { - mod=$(find "$RpmDir/$ModDir" -name "$1") + mod=$(find $RpmDir/$ModDir -name "$1") [ ! "$mod" ] && return 0 - if modinfo "$mod" | grep -q '^alias:\s\+net-'; then + if modinfo $mod | grep -q '^alias:\s\+net-'; then mod="${1##*/}" mod="${mod%.ko*}" echo "$mod has an alias that allows auto-loading. Blacklisting." @@ -38,7 +37,7 @@ check_blacklist() find_depends() { dep=$1 - depends=$(modinfo "$dep" | sed -n -e "/^depends/ s/^depends:[ \t]*//p") + depends=`modinfo $dep | sed -n -e "/^depends/ s/^depends:[ \t]*//p"` [ -z "$depends" ] && exit for mod in ${depends//,/ } do @@ -46,14 +45,14 @@ find_depends() [ -z "$match" ] && continue # check if the module we are looking at is in mod-* too. # if so we do not need to mark the dep as required. - mod2=${dep##*/} # same as $(basename $dep), but faster + mod2=${dep##*/} # same as `basename $dep`, but faster match2=$(grep "^$mod2" "$ListName") if [ -n "$match2" ] then #echo $mod2 >> notreq.list continue fi - echo "$mod".ko >> req.list + echo $mod.ko >> req.list done } @@ -61,11 +60,11 @@ foreachp() { P=$(nproc) bgcount=0 - while read -r mod; do + while read mod; do $1 "$mod" & bgcount=$((bgcount + 1)) - if [ $bgcount -eq "$P" ]; then + if [ $bgcount -eq $P ]; then wait -n bgcount=$((bgcount - 1)) fi @@ -77,12 +76,12 @@ foreachp() # Destination was specified on the command line test -n "$4" && echo "$0: Override Destination $Dest has been specified." -pushd "$Dir" +pushd $Dir -OverrideDir=$(basename "$List") +OverrideDir=$(basename $List) OverrideDir=${OverrideDir%.*} OverrideDir=${OverrideDir#*-} -mkdir -p "$OverrideDir" +mkdir -p $OverrideDir rm -rf modnames find . -name "*.ko" -type f > modnames @@ -95,8 +94,7 @@ cp "$List" . # This variable needs to be exported because it is used in sub-script # executed by xargs -ListName=$(basename "$List") -export ListName +export ListName=$(basename "$List") foreachp find_depends < modnames @@ -104,25 +102,25 @@ sort -u req.list > req2.list sort -u "$ListName" > modules2.list join -v 1 modules2.list req2.list > modules3.list -while IFS= read -r mod +for mod in $(cat modules3.list) do - # get the path for the module - modpath=$(grep /"$mod" modnames) - [ -z "$modpath" ] && continue - echo "$modpath" >> dep.list -done < modules3.list + # get the path for the module + modpath=`grep /$mod modnames` + [ -z "$modpath" ] && continue + echo $modpath >> dep.list +done sort -u dep.list > dep2.list if [ -n "$Dest" ]; then - # now move the modules into the $Dest directory - while IFS= read -r mod - do - newpath=$(dirname "$mod" | sed -e "s/kernel\\//$Dest\//") - mkdir -p "$newpath" - mv "$mod" "$newpath" - echo "$mod" | sed -e "s/kernel\\//$Dest\//" | sed -e "s|^.|${ModDir}|g" >> "$RpmDir"/"$ListName" - done < dep2.list + # now move the modules into the $Dest directory + for mod in `cat dep2.list` + do + newpath=`dirname $mod | sed -e "s/kernel\\//$Dest\//"` + mkdir -p $newpath + mv $mod $newpath + echo $mod | sed -e "s/kernel\\//$Dest\//" | sed -e "s|^.|${ModDir}|g" >> $RpmDir/$ListName + done fi popd @@ -132,33 +130,31 @@ popd # target doesn't try to sign a non-existent file. This is kinda ugly, but # so are the modules-* packages. -while IFS= read -r mod +for mod in `cat ${Dir}/dep2.list` do - modfile=$(basename "$mod" | sed -e 's/.ko/.mod/') - rm .tmp_versions/"$modfile" -done < "$Dir"/dep2.list + modfile=`basename $mod | sed -e 's/.ko/.mod/'` + rm .tmp_versions/$modfile +done -if [ -z "$Dest" ]; then - sed -e "s|^.|${ModDir}|g" "$Dir"/dep2.list > "$RpmDir/$ListName" +if [ ! -n "$Dest" ]; then + sed -e "s|^.|${ModDir}|g" ${Dir}/dep2.list > $RpmDir/$ListName echo "./$RpmDir/$ListName created." [ -d "$RpmDir/etc/modprobe.d/" ] || mkdir -p "$RpmDir/etc/modprobe.d/" - foreachp check_blacklist < "$List" + foreachp check_blacklist < $List fi # Many BIOS-es export a PNP-id which causes the floppy driver to autoload # even though most modern systems don't have a 3.5" floppy driver anymore # this replaces the old die_floppy_die.patch which removed the PNP-id from # the module - -floppylist=("$RpmDir"/"$ModDir"/extra/drivers/block/floppy.ko*) -if [[ -n ${floppylist[0]} && -f ${floppylist[0]} ]]; then - blacklist "floppy" +if [ -f $RpmDir/$ModDir/extra/drivers/block/floppy.ko* ]; then + blacklist "floppy" fi # avoid an empty kernel-extra package -echo "$ModDir/$OverrideDir" >> "$RpmDir/$ListName" +echo "$ModDir/$OverrideDir" >> $RpmDir/$ListName -pushd "$Dir" +pushd $Dir rm modnames dep.list dep2.list req.list req2.list rm "$ListName" modules2.list modules3.list popd 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 diff --git a/patch-5.10.0-redhat.patch b/patch-5.10.0-redhat.patch index 35420ab6f..4c286290f 100644 --- a/patch-5.10.0-redhat.patch +++ b/patch-5.10.0-redhat.patch @@ -202,7 +202,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 9ec53d947628..43dc30764eda 100644 +index e30cf02da8b8..91c8dfc1f8a7 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1859,7 +1859,7 @@ index 8f3772480582..b2ced7ed9d8e 100644 { 0x9005, 0x028c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 63 }, /* Adaptec PMC Series 7 (Denali) */ { 0x9005, 0x028d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 64 }, /* Adaptec PMC Series 8 */ diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c -index 202ba925c494..094a9b551247 100644 +index 5c3513a4b450..0d59aca2cf58 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -370,11 +370,13 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc) @@ -2651,7 +2651,7 @@ index 39642626a707..17d55164b892 100644 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) diff --git a/kernel/Makefile b/kernel/Makefile -index af601b9bda0e..eb29602a431b 100644 +index 6c9f19911be0..81a49119f668 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -12,6 +12,8 @@ obj-y = fork.o exec_domain.o panic.o \ diff --git a/revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch b/revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch deleted file mode 100644 index bde2539a8..000000000 --- a/revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch +++ /dev/null @@ -1,90 +0,0 @@ -From: akpm@linux-foundation.org -To: mm-commits@vger.kernel.org, mkubecek@suse.cz, jrdr.linux@gmail.com, - josef@toxicpanda.com, jmforbes@linuxtx.org, daniel@iogearbox.net, - ast@kernel.org, alex.shi@linux.alibaba.com, akpm@linux-foundation.org -Subject: + - revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch - added to -mm tree -Message-ID: <20201208034157.9KFja%akpm@linux-foundation.org> -User-Agent: s-nail v14.9.10 - - -The patch titled - Subject: revert "mm/filemap: add static for function __add_to_page_cache_locked" -has been added to the -mm tree. Its filename is - revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch - -This patch should soon appear at - https://ozlabs.org/~akpm/mmots/broken-out/revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch -and later at - https://ozlabs.org/~akpm/mmotm/broken-out/revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch - -Before you just go and hit "reply", please: - a) Consider who else should be cc'ed - b) Prefer to cc a suitable mailing list as well - c) Ideally: find the original patch on the mailing list and do a - reply-to-all to that, adding suitable additional cc's - -*** Remember to use Documentation/process/submit-checklist.rst when testing your code *** - -The -mm tree is included into linux-next and is updated -there every 3-4 working days - ------------------------------------------------------- -From: Andrew Morton -Subject: revert "mm/filemap: add static for function __add_to_page_cache_locked" - -Revert 3351b16af494 ("mm/filemap: add static for function -__add_to_page_cache_locked") due to build issues with -CONFIG_DEBUG_INFO_BTF=y. - -Link: https://lkml.kernel.org/r/CAADnVQJ6tmzBXvtroBuEH6QA0H+q7yaSKxrVvVxhqr3KBZdEXg@mail.gmail.com -Cc: Michal Kubecek -Cc: Justin Forbes -Cc: Alex Shi -Cc: Souptick Joarder -Cc: Alexei Starovoitov -Cc: Daniel Borkmann -Cc: Josef Bacik -Signed-off-by: Andrew Morton ---- - - mm/filemap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/mm/filemap.c~revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked -+++ a/mm/filemap.c -@@ -827,7 +827,7 @@ int replace_page_cache_page(struct page - } - EXPORT_SYMBOL_GPL(replace_page_cache_page); - --static noinline int __add_to_page_cache_locked(struct page *page, -+noinline int __add_to_page_cache_locked(struct page *page, - struct address_space *mapping, - pgoff_t offset, gfp_t gfp, - void **shadowp) -_ - -Patches currently in -mm which might be from akpm@linux-foundation.org are - -revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch -kthread_worker-document-cpu-hotplug-handling-fix.patch -mm.patch -mm-remove-the-unuseful-else-after-a-return-checkpatch-fixes.patch -mm-prevent-gup_fast-from-racing-with-cow-during-fork-checkpatch-fixes.patch -mm-swap_state-skip-meaningless-swap-cache-readahead-when-ra_infowin-==-0-fix.patch -mm-vmallocc-__vmalloc_area_node-avoid-32-bit-overflow.patch -mm-cma-improve-pr_debug-log-in-cma_release-fix.patch -mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch -lib-cmdline_kunit-add-a-new-test-suite-for-cmdline-api-fix.patch -ilog2-improve-ilog2-for-constant-arguments-checkpatch-fixes.patch -lib-test_bitmapc-add-for_each_set_clump-test-cases-checkpatch-fixes.patch -checkpatch-fix-typo_spelling-check-for-words-with-apostrophe-fix.patch -resource-fix-kernel-doc-markups-checkpatch-fixes.patch -linux-next-rejects.patch -kmap-stupid-hacks-to-make-it-compile.patch -init-kconfig-dont-assume-scripts-lld-versionsh-is-executable.patch -set_memory-allow-set_direct_map__noflush-for-multiple-pages-fix.patch -arch-mm-wire-up-memfd_secret-system-call-were-relevant-fix.patch -kernel-forkc-export-kernel_thread-to-modules.patch - diff --git a/sources b/sources index 79e4f835a..a1259c417 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-20201211git33dc9614dc20.tar.xz) = 8ba0768cb918ff27ae82ee4c9631e23cc21c23815d2c9d9c7e162cb0970842efb40c5692b4c2da4ac0c7784143a970201c3e7298fbf1dd688b50b2e6f7ef2387 -SHA512 (kernel-abi-whitelists-5.10.0-0.rc7.20201211git33dc9614dc20.97.tar.bz2) = 81318457d22867a416cfa744f5a04c859af0a79c7046f66dcc7a1f4b74deb5a64e1e7b2ef1b80ecd72f8377123ba57d9878228efa5caf8b191d98b1d4bb8d11b -SHA512 (kernel-kabi-dw-5.10.0-0.rc7.20201211git33dc9614dc20.97.tar.bz2) = 03f00c562085c0e6d6b3d8cd350e45bcb3301215572029520136af00a2c776dc8fe5354a6af9243cc4dbd414c39dd8ee93855dade3878eb49e8fa2fef57f310e +SHA512 (linux-5.10.tar.xz) = c28d52bc0c1e2c99017ceeca0bf2e622427f3416e0692090b01f65e3b3a5bce0e3e52ce3cee15d71e84fcb965bd48bdfcccb818c0105035d712ebd07afde9452 +SHA512 (kernel-abi-whitelists-5.10.0-98.tar.bz2) = e3c85bb9cf256d1695035c1fc6197e85b9c74c021a67fd9c79e3422af6d0334e81aaf6b6c6857245bf4081f37a30638abe222c7ae9a94ec92eda02192a83aa90 +SHA512 (kernel-kabi-dw-5.10.0-98.tar.bz2) = 6e284faa972833261e5c9090f62efb1d3ed250d994e3e3e630e7d78b65a563799634738986f7640809557470c8edfc6250fc036b59763619f4e06a0767f7a772 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