Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion Makefile.rhelver
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RHEL_MINOR = 1
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 124.35.1
RHEL_RELEASE = 124.38.1

#
# RHEL_REBASE_NUM
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/net/bpf_jit_comp.c
Original file line number Diff line number Diff line change
Expand Up @@ -2515,7 +2515,7 @@ st: if (is_imm8(insn->off))
/* Update cleanup_addr */
ctx->cleanup_addr = proglen;
if (bpf_prog_was_classic(bpf_prog) &&
!capable(CAP_SYS_ADMIN)) {
!ns_capable_noaudit(&init_user_ns, CAP_SYS_ADMIN)) {
u8 *ip = image + addrs[i - 1];

if (emit_spectre_bhb_barrier(&prog, ip, bpf_prog))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v6.12~1..kernel-mainline: 93416
Number of commits in rpm: 13
Number of commits matched with upstream: 8 (61.54%)
Number of commits in upstream but not in rpm: 93408
Number of commits NOT found in upstream: 5 (38.46%)

Rebuilding Kernel on Branch rocky10_1_rebuild_kernel-6.12.0-124.38.1.el10_1 for kernel-6.12.0-124.38.1.el10_1
Clean Cherry Picks: 8 (100.00%)
Empty Cherry Picks: 0 (0.00%)
_______________________________

__EMPTY COMMITS__________________________

__CHANGES NOT IN UPSTREAM________________
Add partial riscv64 support for build root'
Provide basic VisionFive 2 support'
Patch MMU for riscv64'
scsi: storvsc: Process unsupported MODE_SENSE_10
nvme-tcp: fix NULL pointer dereferences in nvmet_tcp_build_pdu_iovec
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-aarch64-64k-debug.config
Original file line number Diff line number Diff line change
Expand Up @@ -8343,7 +8343,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-aarch64-64k.config
Original file line number Diff line number Diff line change
Expand Up @@ -8320,7 +8320,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-aarch64-debug.config
Original file line number Diff line number Diff line change
Expand Up @@ -8350,7 +8350,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-aarch64-rt-64k-debug.config
Original file line number Diff line number Diff line change
Expand Up @@ -8325,7 +8325,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-aarch64-rt-64k.config
Original file line number Diff line number Diff line change
Expand Up @@ -8302,7 +8302,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-aarch64-rt-debug.config
Original file line number Diff line number Diff line change
Expand Up @@ -8331,7 +8331,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-aarch64-rt.config
Original file line number Diff line number Diff line change
Expand Up @@ -8308,7 +8308,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-aarch64.config
Original file line number Diff line number Diff line change
Expand Up @@ -8327,7 +8327,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-ppc64le-debug.config
Original file line number Diff line number Diff line change
Expand Up @@ -6604,7 +6604,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-ppc64le.config
Original file line number Diff line number Diff line change
Expand Up @@ -6600,7 +6600,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-s390x-debug.config
Original file line number Diff line number Diff line change
Expand Up @@ -3758,7 +3758,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-s390x-zfcpdump.config
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# end of Random number generation

Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-s390x.config
Original file line number Diff line number Diff line change
Expand Up @@ -3783,7 +3783,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-x86_64-debug.config
Original file line number Diff line number Diff line change
Expand Up @@ -9108,7 +9108,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-x86_64-rt-debug.config
Original file line number Diff line number Diff line change
Expand Up @@ -9089,7 +9089,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-x86_64-rt.config
Original file line number Diff line number Diff line change
Expand Up @@ -9060,7 +9060,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-6.12.0-x86_64.config
Original file line number Diff line number Diff line change
Expand Up @@ -9079,7 +9079,7 @@ CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
CONFIG_CRYPTO_KDF800108_CTR=y
# end of Random number generation
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-aarch64-64k-debug-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-aarch64-64k-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-aarch64-debug-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-aarch64-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-aarch64-rt-64k-debug-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-aarch64-rt-64k-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-aarch64-rt-debug-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-aarch64-rt-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-ppc64le-debug-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-ppc64le-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-s390x-debug-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-s390x-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-s390x-zfcpdump-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-x86_64-debug-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1098,7 +1098,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-x86_64-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1098,7 +1098,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-x86_64-rt-debug-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
2 changes: 1 addition & 1 deletion configs/kernel-x86_64-rt-rhel.config
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,7 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# CONFIG_CRYPTO_KEYWRAP is not set
CONFIG_CRYPTO_LIB_AESCFB=y
Expand Down
12 changes: 12 additions & 0 deletions drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
Original file line number Diff line number Diff line change
Expand Up @@ -4803,6 +4803,7 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link)
unsigned long q_map;
struct i40e_vf *vf;
int abs_vf_id;
int old_link;
int ret = 0;
int tmp;

Expand All @@ -4821,6 +4822,17 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link)
vf = &pf->vf[vf_id];
abs_vf_id = vf->vf_id + hw->func_caps.vf_base_id;

/* skip VF link state change if requested state is already set */
if (!vf->link_forced)
old_link = IFLA_VF_LINK_STATE_AUTO;
else if (vf->link_up)
old_link = IFLA_VF_LINK_STATE_ENABLE;
else
old_link = IFLA_VF_LINK_STATE_DISABLE;

if (link == old_link)
goto error_out;

pfe.event = VIRTCHNL_EVENT_LINK_CHANGE;
pfe.severity = PF_EVENT_SEVERITY_INFO;

Expand Down
2 changes: 1 addition & 1 deletion drivers/ntb/hw/mscc/ntb_hw_switchtec.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ static int switchtec_ntb_mw_set_trans(struct ntb_dev *ntb, int pidx, int widx,
if (size != 0 && xlate_pos < 12)
return -EINVAL;

if (!IS_ALIGNED(addr, BIT_ULL(xlate_pos))) {
if (xlate_pos >= 0 && !IS_ALIGNED(addr, BIT_ULL(xlate_pos))) {
/*
* In certain circumstances we can get a buffer that is
* not aligned to its size. (Most of the time
Expand Down
12 changes: 12 additions & 0 deletions drivers/nvme/target/tcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1021,6 +1021,18 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)
pr_err("H2CData PDU len %u is invalid\n", cmd->pdu_len);
goto err_proto;
}
/*
* Ensure command data structures are initialized. We must check both
* cmd->req.sg and cmd->iov because they can have different NULL states:
* - Uninitialized commands: both NULL
* - READ commands: cmd->req.sg allocated, cmd->iov NULL
* - WRITE commands: both allocated
*/
if (unlikely(!cmd->req.sg || !cmd->iov)) {
pr_err("queue %d: H2CData PDU received for invalid command state (ttag %u)\n",
queue->idx, data->ttag);
goto err_proto;
}
cmd->pdu_recv = 0;
nvmet_tcp_build_pdu_iovec(cmd);
queue->cmd = cmd;
Expand Down
Loading