diff --git a/Makefile.rhelver b/Makefile.rhelver index 04638816d..8cc80c475 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 = 50 +RHEL_RELEASE = 51 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 94c251fdb..02d2ac26e 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/26f5cb3bcc7121f2f2457b56cc7ace484edba6ac - 26f5cb3bcc7121f2f2457b56cc7ace484edba6ac arm64: dts: qcom: x1e80100-lenovo-yoga-slim7x: add Bluetooth support +https://gitlab.com/cki-project/kernel-ark/-/commit/eb0f4bc63e3ba2e2b8f65caaf6f1371bb0271e04 + eb0f4bc63e3ba2e2b8f65caaf6f1371bb0271e04 wifi: iwlwifi: pcie: fix byte count table for some devices + +https://gitlab.com/cki-project/kernel-ark/-/commit/6cf6b9bdaa5fe5cdd3c133fe5c149c6ebb362591 + 6cf6b9bdaa5fe5cdd3c133fe5c149c6ebb362591 arm64: dts: qcom: x1e80100-lenovo-yoga-slim7x: add Bluetooth support https://gitlab.com/cki-project/kernel-ark/-/commit/572b35f16e61868ff02271ab7257d574e0a161d5 572b35f16e61868ff02271ab7257d574e0a161d5 Revert "aacraid: Remove depreciated device and vendor PCI id's" diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index c1fd2b965..d0d9cbcdf 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -6424,7 +6424,7 @@ CONFIG_PINCTRL_SM8350_LPASS_LPI=m CONFIG_PINCTRL_SM8450_LPASS_LPI=m CONFIG_PINCTRL_SM8450=m # CONFIG_PINCTRL_SM8550 is not set -# CONFIG_PINCTRL_SM8550_LPASS_LPI is not set +CONFIG_PINCTRL_SM8550_LPASS_LPI=m # CONFIG_PINCTRL_SM8650 is not set # CONFIG_PINCTRL_SM8650_LPASS_LPI is not set # CONFIG_PINCTRL_SM8750 is not set diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 52802d6c0..9e1cbf17c 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -6396,7 +6396,7 @@ CONFIG_PINCTRL_SM8350_LPASS_LPI=m CONFIG_PINCTRL_SM8450_LPASS_LPI=m CONFIG_PINCTRL_SM8450=m # CONFIG_PINCTRL_SM8550 is not set -# CONFIG_PINCTRL_SM8550_LPASS_LPI is not set +CONFIG_PINCTRL_SM8550_LPASS_LPI=m # CONFIG_PINCTRL_SM8650 is not set # CONFIG_PINCTRL_SM8650_LPASS_LPI is not set # CONFIG_PINCTRL_SM8750 is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 3addd8bf3..1f1154d02 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6423,7 +6423,7 @@ CONFIG_PINCTRL_SM8350_LPASS_LPI=m CONFIG_PINCTRL_SM8450_LPASS_LPI=m CONFIG_PINCTRL_SM8450=m # CONFIG_PINCTRL_SM8550 is not set -# CONFIG_PINCTRL_SM8550_LPASS_LPI is not set +CONFIG_PINCTRL_SM8550_LPASS_LPI=m # CONFIG_PINCTRL_SM8650 is not set # CONFIG_PINCTRL_SM8650_LPASS_LPI is not set # CONFIG_PINCTRL_SM8750 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 71debe6ef..af99cadc4 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6395,7 +6395,7 @@ CONFIG_PINCTRL_SM8350_LPASS_LPI=m CONFIG_PINCTRL_SM8450_LPASS_LPI=m CONFIG_PINCTRL_SM8450=m # CONFIG_PINCTRL_SM8550 is not set -# CONFIG_PINCTRL_SM8550_LPASS_LPI is not set +CONFIG_PINCTRL_SM8550_LPASS_LPI=m # CONFIG_PINCTRL_SM8650 is not set # CONFIG_PINCTRL_SM8650_LPASS_LPI is not set # CONFIG_PINCTRL_SM8750 is not set diff --git a/kernel-aarch64-rt-64k-debug-fedora.config b/kernel-aarch64-rt-64k-debug-fedora.config index 1d912f023..5377e379e 100644 --- a/kernel-aarch64-rt-64k-debug-fedora.config +++ b/kernel-aarch64-rt-64k-debug-fedora.config @@ -6432,7 +6432,7 @@ CONFIG_PINCTRL_SM8350_LPASS_LPI=m CONFIG_PINCTRL_SM8450_LPASS_LPI=m CONFIG_PINCTRL_SM8450=m # CONFIG_PINCTRL_SM8550 is not set -# CONFIG_PINCTRL_SM8550_LPASS_LPI is not set +CONFIG_PINCTRL_SM8550_LPASS_LPI=m # CONFIG_PINCTRL_SM8650 is not set # CONFIG_PINCTRL_SM8650_LPASS_LPI is not set # CONFIG_PINCTRL_SM8750 is not set diff --git a/kernel-aarch64-rt-64k-fedora.config b/kernel-aarch64-rt-64k-fedora.config index 128a8ca48..2a38a4341 100644 --- a/kernel-aarch64-rt-64k-fedora.config +++ b/kernel-aarch64-rt-64k-fedora.config @@ -6404,7 +6404,7 @@ CONFIG_PINCTRL_SM8350_LPASS_LPI=m CONFIG_PINCTRL_SM8450_LPASS_LPI=m CONFIG_PINCTRL_SM8450=m # CONFIG_PINCTRL_SM8550 is not set -# CONFIG_PINCTRL_SM8550_LPASS_LPI is not set +CONFIG_PINCTRL_SM8550_LPASS_LPI=m # CONFIG_PINCTRL_SM8650 is not set # CONFIG_PINCTRL_SM8650_LPASS_LPI is not set # CONFIG_PINCTRL_SM8750 is not set diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index 35ee7c1cd..23787d80c 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -6428,7 +6428,7 @@ CONFIG_PINCTRL_SM8350_LPASS_LPI=m CONFIG_PINCTRL_SM8450_LPASS_LPI=m CONFIG_PINCTRL_SM8450=m # CONFIG_PINCTRL_SM8550 is not set -# CONFIG_PINCTRL_SM8550_LPASS_LPI is not set +CONFIG_PINCTRL_SM8550_LPASS_LPI=m # CONFIG_PINCTRL_SM8650 is not set # CONFIG_PINCTRL_SM8650_LPASS_LPI is not set # CONFIG_PINCTRL_SM8750 is not set diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index c7b9ec375..8881ba842 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -6400,7 +6400,7 @@ CONFIG_PINCTRL_SM8350_LPASS_LPI=m CONFIG_PINCTRL_SM8450_LPASS_LPI=m CONFIG_PINCTRL_SM8450=m # CONFIG_PINCTRL_SM8550 is not set -# CONFIG_PINCTRL_SM8550_LPASS_LPI is not set +CONFIG_PINCTRL_SM8550_LPASS_LPI=m # CONFIG_PINCTRL_SM8650 is not set # CONFIG_PINCTRL_SM8650_LPASS_LPI is not set # CONFIG_PINCTRL_SM8750 is not set diff --git a/kernel.changelog b/kernel.changelog index acdb5fcbf..54c3c3c8a 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,9 +1,18 @@ -* Tue Sep 16 2025 Fedora Kernel Team [6.17.0-0.rc6.46a51f4f5eda.50] +* Wed Sep 17 2025 Fedora Kernel Team [6.17.0-0.rc6.5aca7966d2a7.51] +- wifi: iwlwifi: pcie: fix byte count table for some devices (Johannes Berg) - arm64: dts: qcom: x1e80100-lenovo-yoga-slim7x: add Bluetooth support (Jens Glathe) -- ALSA HDA driver configuration split for 6.17 upstream (Jaroslav Kysela) - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) Resolves: +* Wed Sep 17 2025 Fedora Kernel Team [6.17.0-0.rc6.5aca7966d2a7.50] +- redhat: ark-linux-next.sh: initial commit (Scott Weaver) +- redhat: prepare-commit-msg: initial commit (Scott Weaver) +- redhat: ark-merge-driver: initial commit (Scott Weaver) +- redhat/Makefile: add dist-configs-commit-mismatches (Scott Weaver) +- Turn on PINCTRL_SM8550_LPASS_LPI for Fedora (Justin M. Forbes) +- Linux v6.17.0-0.rc6.5aca7966d2a7 +Resolves: + * Tue Sep 16 2025 Fedora Kernel Team [6.17.0-0.rc6.46a51f4f5eda.49] - redhat: configs: drop TI_K3_UDMA & TI_K3_UDMA_GLUE_LAYER from RHEL (Eric Chanudet) - redhat: configs: move TI_SCI_PROTOCOL and TI_MESSAGE_MANAGER to common (Eric Chanudet) diff --git a/kernel.spec b/kernel.spec index 78d056e5f..08e135a81 100644 --- a/kernel.spec +++ b/kernel.spec @@ -176,13 +176,13 @@ Summary: The Linux kernel %define specrpmversion 6.17.0 %define specversion 6.17.0 %define patchversion 6.17 -%define pkgrelease 0.rc6.250916g46a51f4f5edad.50 +%define pkgrelease 0.rc6.250917g5aca7966d2a72.51 %define kversion 6 -%define tarfile_release 6.17-rc6-3-g46a51f4f5edad +%define tarfile_release 6.17-rc6-7-g5aca7966d2a72 # This is needed to do merge window version magic %define patchlevel 17 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.250916g46a51f4f5edad.50%{?buildid}%{?dist} +%define specrelease 0.rc6.250917g5aca7966d2a72.51%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.17.0 @@ -4395,14 +4395,22 @@ fi\ # # %changelog -* Tue Sep 16 2025 Justin M. Forbes [6.17.0-0.rc6.250916g46a51f4f5edad.50] -- Linux v6.17.0-0.rc6.250916g46a51f4f5edad +* Wed Sep 17 2025 Justin M. Forbes [6.17.0-0.rc6.250917g5aca7966d2a72.51] +- Linux v6.17.0-0.rc6.250917g5aca7966d2a72 -* Tue Sep 16 2025 Fedora Kernel Team [6.17.0-0.rc6.46a51f4f5eda.50] +* Wed Sep 17 2025 Fedora Kernel Team [6.17.0-0.rc6.5aca7966d2a7.51] +- wifi: iwlwifi: pcie: fix byte count table for some devices (Johannes Berg) - arm64: dts: qcom: x1e80100-lenovo-yoga-slim7x: add Bluetooth support (Jens Glathe) -- ALSA HDA driver configuration split for 6.17 upstream (Jaroslav Kysela) - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) +* Wed Sep 17 2025 Fedora Kernel Team [6.17.0-0.rc6.5aca7966d2a7.50] +- redhat: ark-linux-next.sh: initial commit (Scott Weaver) +- redhat: prepare-commit-msg: initial commit (Scott Weaver) +- redhat: ark-merge-driver: initial commit (Scott Weaver) +- redhat/Makefile: add dist-configs-commit-mismatches (Scott Weaver) +- Turn on PINCTRL_SM8550_LPASS_LPI for Fedora (Justin M. Forbes) +- Linux v6.17.0-0.rc6.5aca7966d2a7 + * Tue Sep 16 2025 Fedora Kernel Team [6.17.0-0.rc6.46a51f4f5eda.49] - redhat: configs: drop TI_K3_UDMA & TI_K3_UDMA_GLUE_LAYER from RHEL (Eric Chanudet) - redhat: configs: move TI_SCI_PROTOCOL and TI_MESSAGE_MANAGER to common (Eric Chanudet) diff --git a/patch-6.17-redhat.patch b/patch-6.17-redhat.patch index 2f9ddd134..68cad520e 100644 --- a/patch-6.17-redhat.patch +++ b/patch-6.17-redhat.patch @@ -38,6 +38,7 @@ drivers/message/fusion/mptsas.c | 5 + drivers/message/fusion/mptspi.c | 5 + drivers/net/wireguard/main.c | 6 + + .../net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c | 2 +- drivers/pci/pci-driver.c | 9 + drivers/pci/quirks.c | 24 + drivers/scsi/hpsa.c | 4 + @@ -80,7 +81,7 @@ security/lockdown/lockdown.c | 11 + tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 -- - 82 files changed, 2911 insertions(+), 243 deletions(-) + 83 files changed, 2912 insertions(+), 244 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 5a7a83c411e9c..bf40371c718ff 100644 @@ -2234,6 +2235,19 @@ index a00671b58701f..eeef2766b8b3d 100644 ret = wg_allowedips_slab_init(); if (ret < 0) goto err_allowedips; +diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c +index d912e709a92cb..bb03dad4a3006 100644 +--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c ++++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c +@@ -2092,7 +2092,7 @@ static void iwl_txq_gen1_update_byte_cnt_tbl(struct iwl_trans *trans, + break; + } + +- if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_9000 && ++ if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_7000 && + trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210) + len = DIV_ROUND_UP(len, 4); + diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 63665240ae87f..f3c6a2c74ad03 100644 --- a/drivers/pci/pci-driver.c diff --git a/process_configs.sh b/process_configs.sh index 8526fc759..af8fb9520 100755 --- a/process_configs.sh +++ b/process_configs.sh @@ -1,13 +1,15 @@ #!/bin/bash # -# This script takes the merged config files and processes them through oldconfig -# and listnewconfig +# This script takes the merged config files and processes them through olddefconfig +# and listnewconfig to ensure kernel configurations are valid and complete. # # Globally disable suggestion of appending '|| exit' or '|| return' to cd/pushd/popd commands # shellcheck disable=SC2164 +# Exit if this is a test environment test -n "$RHTEST" && exit 0 +# Display usage information and available command line options usage() { # alphabetical order please @@ -15,6 +17,8 @@ usage() echo " -a: report all errors, equivalent to [-c -n -w -i]" echo " -c: error on mismatched config options" echo " -i: ignore any errors, but print them" + echo " -m: specify make options (e.g., -m CC=clang, -m LLVM=1)" + echo " -M: commit mismatched configs to pending directory" echo " -n: error on unset config options" echo " -t: test run, do not overwrite original config" echo " -w: error on misconfigured config options" @@ -33,6 +37,9 @@ die() exit 1 } +# Determine the correct cross-compiler prefix based on compiler type +# For clang builds, return the architecture directly +# For GCC builds, use the dummy-tools directory get_cross_compile() { arch=$1 @@ -43,7 +50,8 @@ get_cross_compile() fi } -# stupid function to find top of tree to do kernel make configs +# Find the top-level kernel source directory +# (identified by MAINTAINERS file and drivers directory) switch_to_toplevel() { path="$(pwd)" @@ -60,11 +68,124 @@ switch_to_toplevel() echo "$path" } +# Determine the correct config path based on architecture and variant +# This function maps arch/variant combinations to the proper pending directory +determine_config_path() +{ + local arch="$1" + local variant="$2" + local config_path="" + + # Identify the variant - they have their own top-level directories + if [[ "$variant" == *"rt"* ]]; then + # RT variant - goes under rt/ + if [[ "$variant" == *"debug"* ]]; then + config_path="rt/debug" + else + config_path="rt/generic" + fi + elif [[ "$variant" == *"automotive"* ]]; then + # Automotive variant - goes under automotive/ + if [[ "$variant" == *"debug"* ]]; then + config_path="automotive/debug" + else + config_path="automotive/generic" + fi + else + # Stock kernel - goes under top-level debug or generic + if [[ "$variant" == *"debug"* ]]; then + config_path="debug" + else + config_path="generic" + fi + fi + + # Add architecture-specific subdirectories + case "$arch" in + arm64) + config_path="$config_path/arm/aarch64" + ;; + powerpc) + config_path="$config_path/powerpc" + ;; + riscv) + config_path="$config_path/riscv/riscv64" + ;; + s390) + if [[ "$variant" == *"zfcpdump"* ]]; then + config_path="$config_path/s390x/zfcpdump" + else + config_path="$config_path/s390x" + fi + ;; + x86_64) + config_path="$config_path/x86" + ;; + *) + # For unknown architectures, don't add arch subdirectory + ;; + esac + + echo "$config_path" +} + +# Parse mismatched configs found during processing and create +# individual CONFIG files in the pending directory for each +parse_mismatched_configs() +{ + local tmpdir + local count=$1 # Counter for unique filenames + local arch=$2 + local variant=$3 + + tmpdir=$(mktemp -d) + + # Parse the mismatches file and create individual CONFIG files + tail -n +2 .mismatches"${count}" | while read -r LINE + do + if echo "$LINE" | grep -q "Found # .* is not set, after generation"; then + # Handle case where we found "# CONFIG_FOO is not set" after generation + config_name="${LINE#*Found # }" + config_name="${config_name% is not set, after generation*}" + if [ -n "$config_name" ]; then + echo "# Mismatch found in $arch $variant config" > "$tmpdir/$config_name" + echo "# $config_name is not set" >> "$tmpdir/$config_name" + fi + elif echo "$LINE" | grep -q "Found .* after generation"; then + # Handle case where we found "CONFIG_FOO=value" after generation + config_name="${LINE#*Found }" + config_name="${config_name% after generation*}" + config_name="${config_name%=*}" + config_value="${LINE#*Found }" + config_value="${config_value#*=}" + config_value="${config_value% after generation*}" + if [ -n "$config_name" ] && [ -n "$config_value" ]; then + echo "# Mismatch found in $arch $variant config" > "$tmpdir/$config_name" + echo "$config_name=$config_value" >> "$tmpdir/$config_name" + fi + fi + done + + # Copy the CONFIG files to the pending directory + config_path=$(determine_config_path "$arch" "$variant") + mkdir -p "$SCRIPT_DIR/pending-$FLAVOR/$config_path/" + for f in "$tmpdir"/*; do + [[ -e "$f" ]] || break + cp "$f" "$SCRIPT_DIR/pending-$FLAVOR/$config_path/" + done + + rm -rf "$tmpdir" +} + +# Check for configuration mismatches between the original and generated configs checkoptions() { - count=$3 - variant=$4 + cfg=$1 # Original config file + cfgtmp=$2 # Generated config file + count=$3 # Counter for unique filenames + variant=$4 # Config variant (e.g., debug, rt) + # This awk script compares configuration files for mismatches /usr/bin/awk ' /is not set/ { @@ -87,7 +208,7 @@ checkoptions() print "Found "a[1]"="a[2]" after generation, had " a[1]"="configs[a[1]]" in Source tree"; } } - ' "$1" "$2" > .mismatches"${count}" + ' "$cfg" "$cfgtmp" > .mismatches"${count}" checkoptions_error=false if test -s .mismatches"${count}" @@ -107,11 +228,18 @@ checkoptions() ! $checkoptions_error && return sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches"${count}" + + # Add mismatched configs to the pending directory + if test -n "$COMMITMISMATCHES"; then + parse_mismatched_configs "$count" "$arch" "$variant" + fi else rm -f .mismatches"${count}" fi } +# Parse the output of 'make listnewconfig' and 'make helpnewconfig' +# to create properly formatted configuration files for new configs parsenewconfigs() { tmpdir=$(mktemp -d) @@ -196,12 +324,32 @@ parsenewconfigs() popd &> /dev/null for f in "$tmpdir"/*; do [[ -e "$f" ]] || break - cp "$f" "$SCRIPT_DIR/pending$FLAVOR/generic/" + cp "$f" "$SCRIPT_DIR/pending-$FLAVOR/generic/" done rm -rf "$tmpdir" } +# Commit any mismatched configs that were saved to the pending directory +commit_mismatched_configs() +{ + # assume we are in $source_tree/configs, need to get to top level + pushd "$(switch_to_toplevel)" &>/dev/null + + # Check if there are any modified or untracked mismatched configs to commit + if git status --porcelain "$SCRIPT_DIR/pending-$FLAVOR/" | grep -q .; then + echo "Committing mismatched configuration files..." + git add "$SCRIPT_DIR/pending-$FLAVOR" + git commit -m "[redhat] AUTOMATIC: Mismatched $FLAVOR configs" + echo "Mismatched configs committed to pending-$FLAVOR directory" + else + echo "No mismatched configs found to commit" + fi + + popd &>/dev/null +} + +# Processes all config files, finds new/unset configs, and commits them function commit_new_configs() { # assume we are in $source_tree/configs, need to get to top level @@ -234,10 +382,12 @@ function commit_new_configs() echo "done" done - git add "$SCRIPT_DIR/pending$FLAVOR" - git commit -m "[redhat] AUTOMATIC: New configs" + # Commit the new configuration files to git + git add "$SCRIPT_DIR/pending-$FLAVOR" + git commit -m "[redhat] AUTOMATIC: New $FLAVOR configs" } +# Process a single configuration file function process_config() { local cfg @@ -307,16 +457,13 @@ function process_config() echo "Processing $cfg complete" } +# Process all configuration files +# Handles parallel processing and error reporting function process_configs() { # assume we are in $source_tree/configs, need to get to top level pushd "$(switch_to_toplevel)" &>/dev/null - # The next line is throwaway code for transition to parallel - # processing. Leaving this line in place is harmless, but it can be - # removed the next time anyone updates this function. - [ -f .mismatches ] && rm -f .mismatches - count=0 for cfg in "$SCRIPT_DIR/${SPECPACKAGE_NAME}${KVERREL}"*.config do @@ -342,7 +489,13 @@ function process_configs() cat .errors* rm .errors* -f fi - if ls .mismatches* 1> /dev/null 2>&1; then + + # Commit any mismatched configs found during processing + if [ $RETURNCODE -eq 0 ] && test -n "$COMMITMISMATCHES"; then + rm .mismatches* -f + commit_mismatched_configs + # Otherwise, display any mismatched configs + elif ls .mismatches* 1> /dev/null 2>&1; then RETURNCODE=1 cat .mismatches* rm .mismatches* -f @@ -360,6 +513,7 @@ TESTRUN="" CHECKWARNINGS="" MAKEOPTS="" CC_IS_CLANG=0 +COMMITMISMATCHES="" RETURNCODE=0 @@ -368,6 +522,7 @@ do key="$1" case $key in -a) + # Enable all error checking options CHECKOPTIONS="x" IGNOREERRORS="x" NEWOPTIONS="x" @@ -396,11 +551,16 @@ do ;; -m) shift + # Handle clang compiler options if [ "$1" = "CC=clang" ] || [ "$1" = "LLVM=1" ]; then CC_IS_CLANG=1 fi MAKEOPTS="$MAKEOPTS $1" ;; + -M) + COMMITMISMATCHES="x" + CHECKOPTIONS="x" + ;; *) break;; esac @@ -408,17 +568,11 @@ do done KVERREL="$(test -n "$1" && echo "-$1" || echo "")" -FLAVOR="$(test -n "$2" && echo "-$2" || echo "-rhel")" +FLAVOR="$(test -n "$2" && echo "$2" || echo "rhel")" # shellcheck disable=SC2015 SCRIPT=$(readlink -f "$0") SCRIPT_DIR=$(dirname "$SCRIPT") -# Config options for RHEL should target the pending-rhel directory, not pending-common. -if [ "$FLAVOR" = "-rhel" ] -then - FLAVOR="-rhel" -fi - # to handle this script being a symlink cd "$SCRIPT_DIR" diff --git a/sources b/sources index 8451306bd..011e36eea 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.17-rc6-3-g46a51f4f5edad.tar.xz) = 3dd02e51bda77d7daea12d5b082e57ee189af01474d868fec8bd207adaae0de5830b027c0f46ed92216ca1ecd0e0128a32d9cd2d56f55993e6d1f5399c469376 -SHA512 (kernel-abi-stablelists-6.17.0.tar.xz) = a6b2765ba335dae26984e3949cf78676a3262da5539e832444bda7b32cb5075808a2c76221da94af11ad510b80541c26a5b7d68860cc9185566a2272006c5415 -SHA512 (kernel-kabi-dw-6.17.0.tar.xz) = dc600912e88b52015a7fb5a6be21a180a13ebcf0daa0196ef3ee7d2fdd59cb46a18d25650320a8a6891482bf8e013014ec61cc3e8b47cace88a70122158daae4 +SHA512 (linux-6.17-rc6-7-g5aca7966d2a72.tar.xz) = a1dd1b06c24aaa885dd8a0ba6c9699fa46db53727f21cf143fa7424e7092eeff92a1ede646b1a9bbdb06e09bb614b1fd15a93141a531795c3b3e8473e09cc771 +SHA512 (kernel-abi-stablelists-6.17.0.tar.xz) = 14a8b70e11612d43eafc6dc938e1b446f92653ce459a845e6574061a6851ee332378114e2ab1915ebf04a0068e96ab33812599753b701453005ea0f8d684ffa9 +SHA512 (kernel-kabi-dw-6.17.0.tar.xz) = 9ae0e631371f71093a4e5b7e5256ddf108298e39e7efb3275a49c1a8d26ecfb3d1f50fb491a7938907a2a1d575b506fa567d4dbb257b6504d126111dcc605200