* [linus:master] [keys] 9578e327b2: stress-ng.key.ops_per_sec -98.9% regression
@ 2024-05-21 7:44 2% kernel test robot
0 siblings, 0 replies; 200+ results
From: kernel test robot @ 2024-05-21 7:44 UTC (permalink / raw)
To: Luis Henriques
Cc: oe-lkp, lkp, linux-kernel, Jarkko Sakkinen, David Howells,
Jarkko Sakkinen, keyrings, ying.huang, feng.tang, fengwei.yin,
oliver.sang
Hello,
kernel test robot noticed a -98.9% regression of stress-ng.key.ops_per_sec on:
commit: 9578e327b2b4935a25d49e3891b8fcca9b6c10c6 ("keys: update key quotas in key_put()")
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git master
testcase: stress-ng
test machine: 64 threads 2 sockets Intel(R) Xeon(R) Gold 6346 CPU @ 3.10GHz (Ice Lake) with 256G memory
parameters:
nr_threads: 100%
testtime: 60s
test: key
cpufreq_governor: performance
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <oliver.sang@intel.com>
| Closes: https://lore.kernel.org/oe-lkp/202405211428.a5fd016-oliver.sang@intel.com
Details are as below:
-------------------------------------------------------------------------------------------------->
The kernel config and materials to reproduce are available at:
https://download.01.org/0day-ci/archive/20240521/202405211428.a5fd016-oliver.sang@intel.com
=========================================================================================
compiler/cpufreq_governor/kconfig/nr_threads/rootfs/tbox_group/test/testcase/testtime:
gcc-13/performance/x86_64-rhel-8.3/100%/debian-12-x86_64-20240206.cgz/lkp-icl-2sp7/key/stress-ng/60s
commit:
45db3ab700 ("Merge tag '6.9-rc7-ksmbd-fixes' of git://git.samba.org/ksmbd")
9578e327b2 ("keys: update key quotas in key_put()")
45db3ab700926379 9578e327b2b4935a25d49e3891b
---------------- ---------------------------
%stddev %change %stddev
\ | \
0.02 ± 5% +0.4 0.40 ± 5% mpstat.cpu.all.soft%
3327 ± 4% +26.3% 4203 vmstat.system.cs
132586 +12.5% 149116 vmstat.system.in
242317 ± 21% +81.7% 440232 ± 7% numa-numastat.node0.local_node
265814 ± 20% +77.8% 472661 ± 6% numa-numastat.node0.numa_hit
336040 ± 21% +44.6% 485763 ± 12% numa-numastat.node1.local_node
1420300 -98.9% 16000 stress-ng.key.ops
23671 -98.9% 266.57 stress-ng.key.ops_per_sec
86664 ± 9% +39.7% 121097 ± 3% stress-ng.time.involuntary_context_switches
147766 ± 2% +13.5% 167740 meminfo.Active
147701 ± 2% +13.5% 167676 meminfo.Active(anon)
383066 +113.9% 819244 meminfo.SUnreclaim
474630 +91.8% 910260 meminfo.Slab
197208 ± 4% +117.4% 428732 numa-meminfo.node0.SUnreclaim
243602 ± 10% +97.4% 480764 ± 4% numa-meminfo.node0.Slab
185960 ± 4% +108.0% 386790 numa-meminfo.node1.SUnreclaim
231124 ± 10% +84.2% 425753 ± 5% numa-meminfo.node1.Slab
49305 ± 4% +117.5% 107260 numa-vmstat.node0.nr_slab_unreclaimable
265330 ± 20% +78.1% 472675 ± 6% numa-vmstat.node0.numa_hit
241833 ± 21% +82.0% 440246 ± 7% numa-vmstat.node0.numa_local
46500 ± 4% +108.2% 96809 numa-vmstat.node1.nr_slab_unreclaimable
335385 ± 21% +44.8% 485563 ± 12% numa-vmstat.node1.numa_local
1343 ± 60% +284.2% 5162 ± 14% perf-c2c.DRAM.local
1029 ± 50% +942.9% 10731 ± 9% perf-c2c.DRAM.remote
722.67 ± 2% +1259.5% 9825 perf-c2c.HITM.local
565.50 ± 4% +1169.2% 7177 perf-c2c.HITM.remote
1288 ± 2% +1219.9% 17002 perf-c2c.HITM.total
246.44 ± 7% +13.0% 278.58 ± 5% sched_debug.cfs_rq:/.runnable_avg.stddev
218.77 ± 5% +77.4% 388.20 ± 9% sched_debug.cfs_rq:/.util_est.avg
987.92 ± 9% +36.9% 1352 ± 10% sched_debug.cfs_rq:/.util_est.max
177.06 ± 7% +44.6% 256.06 ± 6% sched_debug.cfs_rq:/.util_est.stddev
3311 ± 2% +12.2% 3716 ± 2% sched_debug.cpu.nr_switches.avg
37118 ± 2% +10.5% 41032 ± 2% proc-vmstat.nr_active_anon
71004 +4.1% 73890 proc-vmstat.nr_shmem
95794 +112.8% 203871 proc-vmstat.nr_slab_unreclaimable
37118 ± 2% +10.5% 41032 ± 2% proc-vmstat.nr_zone_active_anon
3916 ± 4% +106.1% 8072 ± 56% proc-vmstat.numa_hint_faults_local
645123 ± 3% +54.1% 993900 ± 3% proc-vmstat.numa_hit
578841 ± 4% +60.3% 927625 ± 3% proc-vmstat.numa_local
902523 ± 2% +108.0% 1876904 ± 4% proc-vmstat.pgalloc_normal
663704 ± 4% +103.7% 1351779 ± 7% proc-vmstat.pgfree
0.49 ± 20% +70.9% 0.84 ± 4% perf-stat.i.MPKI
5.892e+09 -9.9% 5.309e+09 perf-stat.i.branch-instructions
0.60 ± 7% +0.1 0.69 ± 5% perf-stat.i.branch-miss-rate%
43.36 ± 12% +9.2 52.51 ± 3% perf-stat.i.cache-miss-rate%
11245283 ± 21% +66.7% 18744064 ± 4% perf-stat.i.cache-misses
22283372 ± 13% +57.0% 34986667 ± 2% perf-stat.i.cache-references
3339 ± 4% +25.9% 4204 ± 2% perf-stat.i.context-switches
7.89 +8.4% 8.55 perf-stat.i.cpi
136.30 +9.5% 149.28 ± 2% perf-stat.i.cpu-migrations
51088 ± 27% -75.8% 12346 ± 4% perf-stat.i.cycles-between-cache-misses
2.461e+10 -7.7% 2.271e+10 perf-stat.i.instructions
0.13 -8.6% 0.12 perf-stat.i.ipc
0.04 ± 66% +142.6% 0.10 ± 40% perf-stat.i.major-faults
0.43 ± 21% +89.3% 0.82 ± 4% perf-stat.overall.MPKI
0.62 ± 6% +0.1 0.71 ± 5% perf-stat.overall.branch-miss-rate%
7.92 +8.4% 8.58 perf-stat.overall.cpi
19604 ± 31% -46.5% 10494 ± 4% perf-stat.overall.cycles-between-cache-misses
0.13 -7.7% 0.12 perf-stat.overall.ipc
5.796e+09 -10.0% 5.219e+09 perf-stat.ps.branch-instructions
10473414 ± 21% +74.6% 18283383 ± 4% perf-stat.ps.cache-misses
21668097 ± 13% +58.6% 34375038 ± 2% perf-stat.ps.cache-references
3202 ± 4% +28.6% 4117 ± 2% perf-stat.ps.context-switches
133.71 +9.5% 146.46 ± 2% perf-stat.ps.cpu-migrations
2.417e+10 -7.7% 2.231e+10 perf-stat.ps.instructions
0.04 ± 66% +162.8% 0.09 ± 41% perf-stat.ps.major-faults
1.473e+12 -8.1% 1.354e+12 perf-stat.total.instructions
97.62 -97.6 0.00 perf-profile.calltrace.cycles-pp.read.stress_run
97.60 -97.6 0.00 perf-profile.calltrace.cycles-pp.do_syscall_64.entry_SYSCALL_64_after_hwframe.read.stress_run
97.60 -97.6 0.00 perf-profile.calltrace.cycles-pp.entry_SYSCALL_64_after_hwframe.read.stress_run
97.59 -97.6 0.00 perf-profile.calltrace.cycles-pp.ksys_read.do_syscall_64.entry_SYSCALL_64_after_hwframe.read.stress_run
97.59 -97.6 0.00 perf-profile.calltrace.cycles-pp.vfs_read.ksys_read.do_syscall_64.entry_SYSCALL_64_after_hwframe.read
97.58 -97.6 0.00 perf-profile.calltrace.cycles-pp.proc_reg_read_iter.vfs_read.ksys_read.do_syscall_64.entry_SYSCALL_64_after_hwframe
97.58 -97.6 0.00 perf-profile.calltrace.cycles-pp.seq_read_iter.proc_reg_read_iter.vfs_read.ksys_read.do_syscall_64
95.99 -96.0 0.00 perf-profile.calltrace.cycles-pp.proc_keys_start.seq_read_iter.proc_reg_read_iter.vfs_read.ksys_read
95.97 -96.0 0.00 perf-profile.calltrace.cycles-pp._raw_spin_lock.proc_keys_start.seq_read_iter.proc_reg_read_iter.vfs_read
95.94 -95.9 0.00 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.proc_keys_start.seq_read_iter.proc_reg_read_iter
98.04 -0.4 97.64 perf-profile.calltrace.cycles-pp.stress_run
1.60 -0.0 1.58 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_garbage_collector.process_one_work.worker_thread
1.66 ± 3% +0.5 2.20 perf-profile.calltrace.cycles-pp.kthread.ret_from_fork.ret_from_fork_asm
1.66 ± 3% +0.5 2.20 perf-profile.calltrace.cycles-pp.ret_from_fork.ret_from_fork_asm
1.66 ± 3% +0.5 2.20 perf-profile.calltrace.cycles-pp.ret_from_fork_asm
0.00 +0.6 0.58 ± 6% perf-profile.calltrace.cycles-pp.rcu_do_batch.rcu_core.handle_softirqs.run_ksoftirqd.smpboot_thread_fn
0.00 +0.6 0.58 ± 6% perf-profile.calltrace.cycles-pp.rcu_core.handle_softirqs.run_ksoftirqd.smpboot_thread_fn.kthread
0.00 +0.6 0.58 ± 5% perf-profile.calltrace.cycles-pp.handle_softirqs.run_ksoftirqd.smpboot_thread_fn.kthread.ret_from_fork
0.00 +0.6 0.58 ± 5% perf-profile.calltrace.cycles-pp.run_ksoftirqd.smpboot_thread_fn.kthread.ret_from_fork.ret_from_fork_asm
0.00 +0.6 0.58 ± 5% perf-profile.calltrace.cycles-pp.smpboot_thread_fn.kthread.ret_from_fork.ret_from_fork_asm
0.00 +3.1 3.13 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_lookup.lookup_user_key.keyctl_revoke_key
0.00 +3.2 3.15 perf-profile.calltrace.cycles-pp._raw_spin_lock.key_lookup.lookup_user_key.keyctl_revoke_key.do_syscall_64
0.00 +3.2 3.16 perf-profile.calltrace.cycles-pp.key_lookup.lookup_user_key.keyctl_revoke_key.do_syscall_64.entry_SYSCALL_64_after_hwframe
0.00 +3.2 3.20 perf-profile.calltrace.cycles-pp.lookup_user_key.keyctl_revoke_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall
0.00 +3.2 3.25 perf-profile.calltrace.cycles-pp.keyctl_revoke_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +6.2 6.18 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_lookup.lookup_user_key.keyctl_read_key
0.00 +6.2 6.19 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_lookup.lookup_user_key.keyctl_keyring_unlink
0.00 +6.2 6.20 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_lookup.lookup_user_key.keyctl_get_security
0.00 +6.2 6.20 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_lookup.lookup_user_key.keyctl_setperm_key
0.00 +6.2 6.21 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_lookup.lookup_user_key.keyctl_describe_key
0.00 +6.2 6.22 perf-profile.calltrace.cycles-pp._raw_spin_lock.key_lookup.lookup_user_key.keyctl_read_key.do_syscall_64
0.00 +6.2 6.23 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_lookup.lookup_user_key.keyctl_keyring_link
0.00 +6.2 6.23 perf-profile.calltrace.cycles-pp._raw_spin_lock.key_lookup.lookup_user_key.keyctl_keyring_unlink.do_syscall_64
0.00 +6.2 6.24 perf-profile.calltrace.cycles-pp._raw_spin_lock.key_lookup.lookup_user_key.keyctl_describe_key.do_syscall_64
0.00 +6.2 6.24 perf-profile.calltrace.cycles-pp._raw_spin_lock.key_lookup.lookup_user_key.keyctl_get_security.do_syscall_64
0.00 +6.2 6.24 perf-profile.calltrace.cycles-pp._raw_spin_lock.key_lookup.lookup_user_key.keyctl_setperm_key.do_syscall_64
0.00 +6.2 6.24 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_lookup.lookup_user_key.keyctl_update_key
0.00 +6.2 6.25 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_alloc.__key_create_or_update.key_create_or_update
0.00 +6.3 6.25 perf-profile.calltrace.cycles-pp.key_lookup.lookup_user_key.keyctl_keyring_unlink.do_syscall_64.entry_SYSCALL_64_after_hwframe
0.00 +6.3 6.25 perf-profile.calltrace.cycles-pp.key_lookup.lookup_user_key.keyctl_read_key.do_syscall_64.entry_SYSCALL_64_after_hwframe
0.00 +6.3 6.26 perf-profile.calltrace.cycles-pp._raw_spin_lock.key_lookup.lookup_user_key.keyctl_keyring_link.do_syscall_64
0.00 +6.3 6.27 perf-profile.calltrace.cycles-pp.key_lookup.lookup_user_key.keyctl_setperm_key.do_syscall_64.entry_SYSCALL_64_after_hwframe
0.00 +6.3 6.27 perf-profile.calltrace.cycles-pp.key_lookup.lookup_user_key.keyctl_get_security.do_syscall_64.entry_SYSCALL_64_after_hwframe
0.00 +6.3 6.27 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_lookup.lookup_user_key.keyctl_set_timeout
0.00 +6.3 6.28 perf-profile.calltrace.cycles-pp._raw_spin_lock.key_lookup.lookup_user_key.keyctl_update_key.do_syscall_64
0.00 +6.3 6.28 perf-profile.calltrace.cycles-pp._raw_spin_lock.key_alloc.__key_create_or_update.key_create_or_update.__do_sys_add_key
0.00 +6.3 6.29 perf-profile.calltrace.cycles-pp.key_lookup.lookup_user_key.keyctl_keyring_link.do_syscall_64.entry_SYSCALL_64_after_hwframe
0.00 +6.3 6.30 perf-profile.calltrace.cycles-pp.lookup_user_key.keyctl_read_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall
0.00 +6.3 6.30 perf-profile.calltrace.cycles-pp.lookup_user_key.keyctl_keyring_unlink.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall
0.00 +6.3 6.30 perf-profile.calltrace.cycles-pp._raw_spin_lock.key_lookup.lookup_user_key.keyctl_set_timeout.do_syscall_64
0.00 +6.3 6.31 perf-profile.calltrace.cycles-pp.key_lookup.lookup_user_key.keyctl_update_key.do_syscall_64.entry_SYSCALL_64_after_hwframe
0.00 +6.3 6.31 perf-profile.calltrace.cycles-pp.keyctl_setperm_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +6.3 6.31 perf-profile.calltrace.cycles-pp.lookup_user_key.keyctl_setperm_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall
0.00 +6.3 6.32 perf-profile.calltrace.cycles-pp.lookup_user_key.keyctl_get_security.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall
0.00 +6.3 6.32 perf-profile.calltrace.cycles-pp.keyctl_get_security.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +6.3 6.33 perf-profile.calltrace.cycles-pp.keyctl_read_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +6.3 6.34 perf-profile.calltrace.cycles-pp.key_lookup.lookup_user_key.keyctl_set_timeout.do_syscall_64.entry_SYSCALL_64_after_hwframe
0.00 +6.3 6.35 perf-profile.calltrace.cycles-pp.lookup_user_key.keyctl_keyring_link.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall
0.00 +6.4 6.36 perf-profile.calltrace.cycles-pp.lookup_user_key.keyctl_update_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall
0.00 +6.4 6.38 perf-profile.calltrace.cycles-pp.lookup_user_key.keyctl_set_timeout.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall
0.00 +6.4 6.40 perf-profile.calltrace.cycles-pp.keyctl_keyring_link.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +6.4 6.41 perf-profile.calltrace.cycles-pp.keyctl_update_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +6.4 6.41 perf-profile.calltrace.cycles-pp.keyctl_set_timeout.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +6.4 6.42 perf-profile.calltrace.cycles-pp.keyctl_keyring_unlink.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +6.4 6.42 perf-profile.calltrace.cycles-pp.key_lookup.lookup_user_key.keyctl_describe_key.do_syscall_64.entry_SYSCALL_64_after_hwframe
0.00 +6.5 6.49 perf-profile.calltrace.cycles-pp.lookup_user_key.keyctl_describe_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall
0.00 +6.6 6.55 perf-profile.calltrace.cycles-pp.keyctl_describe_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +6.7 6.73 perf-profile.calltrace.cycles-pp.key_alloc.__key_create_or_update.key_create_or_update.__do_sys_add_key.do_syscall_64
0.00 +7.0 7.04 perf-profile.calltrace.cycles-pp.__key_create_or_update.key_create_or_update.__do_sys_add_key.do_syscall_64.entry_SYSCALL_64_after_hwframe
0.00 +7.0 7.05 perf-profile.calltrace.cycles-pp.key_create_or_update.__do_sys_add_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall
0.00 +7.2 7.22 perf-profile.calltrace.cycles-pp.__do_sys_add_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +12.4 12.44 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_lookup.lookup_user_key.keyctl_chown_key
0.00 +12.5 12.51 perf-profile.calltrace.cycles-pp._raw_spin_lock.key_lookup.lookup_user_key.keyctl_chown_key.do_syscall_64
0.00 +12.6 12.56 perf-profile.calltrace.cycles-pp.key_lookup.lookup_user_key.keyctl_chown_key.do_syscall_64.entry_SYSCALL_64_after_hwframe
0.00 +12.7 12.65 perf-profile.calltrace.cycles-pp.lookup_user_key.keyctl_chown_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall
0.00 +12.7 12.66 perf-profile.calltrace.cycles-pp.keyctl_chown_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +21.8 21.80 perf-profile.calltrace.cycles-pp.native_queued_spin_lock_slowpath._raw_spin_lock.key_lookup.lookup_user_key.keyctl_invalidate_key
0.00 +21.9 21.92 perf-profile.calltrace.cycles-pp._raw_spin_lock.key_lookup.lookup_user_key.keyctl_invalidate_key.do_syscall_64
0.00 +22.1 22.13 perf-profile.calltrace.cycles-pp.key_lookup.lookup_user_key.keyctl_invalidate_key.do_syscall_64.entry_SYSCALL_64_after_hwframe
0.00 +22.4 22.38 perf-profile.calltrace.cycles-pp.lookup_user_key.keyctl_invalidate_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall
0.00 +22.4 22.44 perf-profile.calltrace.cycles-pp.keyctl_invalidate_key.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +97.3 97.28 perf-profile.calltrace.cycles-pp.do_syscall_64.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +97.3 97.29 perf-profile.calltrace.cycles-pp.entry_SYSCALL_64_after_hwframe.syscall.stress_run
0.00 +97.5 97.50 perf-profile.calltrace.cycles-pp.syscall.stress_run
97.62 -97.6 0.05 perf-profile.children.cycles-pp.read
97.59 -97.6 0.02 ±141% perf-profile.children.cycles-pp.proc_reg_read_iter
97.60 -97.6 0.05 perf-profile.children.cycles-pp.ksys_read
97.60 -97.5 0.05 perf-profile.children.cycles-pp.vfs_read
97.58 -97.5 0.05 perf-profile.children.cycles-pp.seq_read_iter
95.99 -96.0 0.00 perf-profile.children.cycles-pp.proc_keys_start
97.56 -2.1 95.48 perf-profile.children.cycles-pp.native_queued_spin_lock_slowpath
97.61 -2.1 95.54 perf-profile.children.cycles-pp._raw_spin_lock
1.24 ± 3% -1.2 0.06 perf-profile.children.cycles-pp.vsnprintf
98.23 -0.8 97.42 perf-profile.children.cycles-pp.do_syscall_64
98.24 -0.8 97.44 perf-profile.children.cycles-pp.entry_SYSCALL_64_after_hwframe
98.04 -0.4 97.64 perf-profile.children.cycles-pp.stress_run
0.00 +0.1 0.05 perf-profile.children.cycles-pp.__check_object_size
0.00 +0.1 0.05 perf-profile.children.cycles-pp.assoc_array_insert_into_terminal_node
0.00 +0.1 0.05 perf-profile.children.cycles-pp.queue_work_on
0.00 +0.1 0.05 ± 7% perf-profile.children.cycles-pp.__cond_resched
0.00 +0.1 0.05 ± 7% perf-profile.children.cycles-pp.key_user_lookup
0.00 +0.1 0.05 ± 8% perf-profile.children.cycles-pp.kvasprintf
0.00 +0.1 0.06 ± 9% perf-profile.children.cycles-pp.kasprintf
0.00 +0.1 0.06 ± 8% perf-profile.children.cycles-pp._get_random_bytes
0.00 +0.1 0.06 perf-profile.children.cycles-pp.__kmalloc_node_track_caller
0.00 +0.1 0.06 perf-profile.children.cycles-pp.entry_SYSCALL_64
0.00 +0.1 0.08 ± 6% perf-profile.children.cycles-pp.__key_instantiate_and_link
0.00 +0.1 0.08 ± 4% perf-profile.children.cycles-pp.key_type_lookup
0.00 +0.1 0.08 perf-profile.children.cycles-pp.memdup_user
0.00 +0.1 0.08 ± 5% perf-profile.children.cycles-pp.down_read
0.00 +0.1 0.08 ± 5% perf-profile.children.cycles-pp.memcmp
0.43 ± 3% +0.1 0.52 ± 7% perf-profile.children.cycles-pp.asm_sysvec_apic_timer_interrupt
0.41 ± 3% +0.1 0.50 ± 7% perf-profile.children.cycles-pp.sysvec_apic_timer_interrupt
0.00 +0.1 0.09 perf-profile.children.cycles-pp.request_key_and_link
0.00 +0.1 0.09 ± 7% perf-profile.children.cycles-pp.irq_exit_rcu
0.00 +0.1 0.10 perf-profile.children.cycles-pp.__slab_free
0.00 +0.1 0.10 perf-profile.children.cycles-pp.keyctl_keyring_search
0.00 +0.1 0.11 ± 4% perf-profile.children.cycles-pp.key_link
0.00 +0.1 0.11 perf-profile.children.cycles-pp.key_unlink
0.00 +0.1 0.13 ± 2% perf-profile.children.cycles-pp.clear_bhb_loop
0.00 +0.1 0.13 ± 2% perf-profile.children.cycles-pp.keyring_compare_object
0.00 +0.1 0.14 ± 3% perf-profile.children.cycles-pp.kfree
0.00 +0.1 0.14 ± 4% perf-profile.children.cycles-pp.assoc_array_insert
0.00 +0.2 0.17 ± 4% perf-profile.children.cycles-pp.key_payload_reserve
0.00 +0.2 0.18 perf-profile.children.cycles-pp.strnlen_user
0.00 +0.2 0.19 perf-profile.children.cycles-pp.assoc_array_find
0.00 +0.2 0.19 ± 3% perf-profile.children.cycles-pp.__key_link_begin
0.00 +0.2 0.23 perf-profile.children.cycles-pp.hash_key_type_and_desc
0.02 ± 99% +0.2 0.26 perf-profile.children.cycles-pp.strndup_user
0.00 +0.4 0.35 perf-profile.children.cycles-pp.__do_sys_request_key
0.00 +0.5 0.50 ± 8% perf-profile.children.cycles-pp.key_put
0.00 +0.5 0.52 ± 8% perf-profile.children.cycles-pp.assoc_array_rcu_cleanup
1.66 ± 3% +0.5 2.20 perf-profile.children.cycles-pp.kthread
1.66 ± 3% +0.5 2.20 perf-profile.children.cycles-pp.ret_from_fork
1.66 ± 3% +0.5 2.20 perf-profile.children.cycles-pp.ret_from_fork_asm
0.00 +0.6 0.56 ± 8% perf-profile.children.cycles-pp._raw_spin_lock_irqsave
0.00 +0.6 0.58 ± 5% perf-profile.children.cycles-pp.run_ksoftirqd
0.00 +0.6 0.58 ± 5% perf-profile.children.cycles-pp.smpboot_thread_fn
0.00 +0.7 0.66 ± 6% perf-profile.children.cycles-pp.rcu_do_batch
0.00 +0.7 0.66 ± 6% perf-profile.children.cycles-pp.rcu_core
0.00 +0.7 0.67 ± 6% perf-profile.children.cycles-pp.handle_softirqs
0.00 +0.7 0.69 perf-profile.children.cycles-pp.search_nested_keyrings
0.00 +0.7 0.70 perf-profile.children.cycles-pp.search_cred_keyrings_rcu
0.00 +0.7 0.71 perf-profile.children.cycles-pp.search_process_keyrings_rcu
0.00 +0.7 0.72 perf-profile.children.cycles-pp.keyring_search_rcu
0.00 +3.2 3.25 perf-profile.children.cycles-pp.keyctl_revoke_key
0.00 +6.3 6.31 perf-profile.children.cycles-pp.keyctl_setperm_key
0.00 +6.3 6.32 perf-profile.children.cycles-pp.keyctl_get_security
0.00 +6.3 6.33 perf-profile.children.cycles-pp.keyctl_read_key
0.00 +6.4 6.40 perf-profile.children.cycles-pp.keyctl_keyring_link
0.00 +6.4 6.41 perf-profile.children.cycles-pp.keyctl_update_key
0.00 +6.4 6.41 perf-profile.children.cycles-pp.keyctl_set_timeout
0.00 +6.4 6.42 perf-profile.children.cycles-pp.keyctl_keyring_unlink
0.00 +6.6 6.55 perf-profile.children.cycles-pp.keyctl_describe_key
0.00 +6.7 6.73 perf-profile.children.cycles-pp.key_alloc
0.07 ± 6% +7.0 7.05 perf-profile.children.cycles-pp.__key_create_or_update
0.07 ± 6% +7.0 7.05 perf-profile.children.cycles-pp.key_create_or_update
0.15 ± 2% +7.1 7.22 perf-profile.children.cycles-pp.__do_sys_add_key
0.00 +12.7 12.66 perf-profile.children.cycles-pp.keyctl_chown_key
0.00 +22.4 22.45 perf-profile.children.cycles-pp.keyctl_invalidate_key
0.00 +88.3 88.26 perf-profile.children.cycles-pp.key_lookup
0.00 +89.1 89.10 perf-profile.children.cycles-pp.lookup_user_key
0.20 ± 2% +97.3 97.55 perf-profile.children.cycles-pp.syscall
97.16 -2.1 95.03 perf-profile.self.cycles-pp.native_queued_spin_lock_slowpath
0.00 +0.1 0.05 perf-profile.self.cycles-pp.queue_work_on
0.00 +0.1 0.05 ± 8% perf-profile.self.cycles-pp.key_put
0.00 +0.1 0.06 perf-profile.self.cycles-pp.syscall
0.00 +0.1 0.06 ± 6% perf-profile.self.cycles-pp.assoc_array_insert
0.00 +0.1 0.07 perf-profile.self.cycles-pp.key_payload_reserve
0.00 +0.1 0.07 ± 5% perf-profile.self.cycles-pp._raw_spin_lock_irqsave
0.00 +0.1 0.08 perf-profile.self.cycles-pp.assoc_array_find
0.00 +0.1 0.08 perf-profile.self.cycles-pp.memcmp
0.00 +0.1 0.08 ± 4% perf-profile.self.cycles-pp.down_read
0.00 +0.1 0.10 ± 3% perf-profile.self.cycles-pp.__slab_free
0.00 +0.1 0.11 ± 5% perf-profile.self.cycles-pp.lookup_user_key
0.00 +0.1 0.12 ± 3% perf-profile.self.cycles-pp.clear_bhb_loop
0.00 +0.2 0.18 ± 2% perf-profile.self.cycles-pp.strnlen_user
0.00 +0.2 0.22 ± 2% perf-profile.self.cycles-pp.hash_key_type_and_desc
0.00 +0.2 0.24 ± 3% perf-profile.self.cycles-pp.key_alloc
0.00 +0.3 0.25 perf-profile.self.cycles-pp.search_nested_keyrings
0.05 +0.5 0.53 perf-profile.self.cycles-pp._raw_spin_lock
0.00 +0.6 0.64 perf-profile.self.cycles-pp.key_lookup
Disclaimer:
Results have been estimated based on internal Intel analysis and are provided
for informational purposes only. Any difference in system hardware or software
design or configuration may affect actual performance.
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [relevance 2%]
* linux-next: Tree for May 21
@ 2024-05-21 2:54 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-21 2:54 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 39087 bytes --]
Hi all,
Do not add any work intended for v6.11 to your linux-next included
branches until after v6.10-rc1 has been released.
Changes since 20240520:
The refactor-heap tree still had its conflicts against the block tree
for which I dropped the refactor-heap tree.
Non-merge commits (relative to Linus' tree): 2731
2938 files changed, 400487 insertions(+), 52014 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (3eb3c33c1d87 Merge tag 'asm-generic-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (20141ebd2d7d lib-add-version-into-proc-allocinfo-output-fix)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (5549d1e39989 Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (d65e1a0f305b Merge tag 's390-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (e4a87abf5885 nfc: nci: Fix uninit-value in nci_rx_work)
Merging bpf/master (4b377b4868ef kprobe/ftrace: fix build error due to bad function definition)
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (4b377b4868ef kprobe/ftrace: fix build error due to bad function definition)
Merging ipvs/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging wireless/for-next (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing)
Merging wpan/master (07aa33988ad9 mac802154: fix time calculation in ieee802154_configure_durations())
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (5005ccd91b9e ALSA: usb-audio: Fix for sampling rates support for Mbox3)
Merging sound-asoc-fixes/for-linus (810296e34a29 Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus)
Merging regmap-fixes/for-linus (7ba822189e60 regmap: kunit: Fix array overflow in stride() test)
Merging regulator-fixes/for-linus (5b6f7c40958b Merge remote-tracking branch 'regulator/for-6.9' into regulator-linus)
Merging spi-fixes/for-linus (ef13561d2b16 spi: microchip-core-qspi: fix setting spi bus clock rate)
Merging pci-current/for-linus (f3d049b35b01 PCI/ASPM: Restore parent state to parent, child state to child)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler)
Merging usb.current/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging usb-serial-fixes/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (bb198e29fe75 iio: dac: ad5592r: fix temperature channel scaling value)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (008ab3c53bc4 speakup: Fix sizeof() vs ARRAY_SIZE() bug)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (a38297e3fb01 Linux 6.9)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (c6ab5c915da4 crypto: ecc - Prevent ecc_digits_from_bytes from reading too many bytes)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (0a9c28bec202 Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (26e8383b116d hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (039b2b6e9d07 Merge branch 'misc-6.10' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (a38297e3fb01 Linux 6.9)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so)
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (a38297e3fb01 Linux 6.9)
Merging drm-intel-fixes/for-linux-next-fixes (43b26bdd2ee5 drm/i915/bios: Fix parsing backlight BDB data)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (a38297e3fb01 Linux 6.9)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (a38297e3fb01 Linux 6.9)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (55750148e559 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe())
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (520fb7f183e9 drm/tests/buddy: stop using PAGE_SIZE)
Merging mm-stable/mm-stable (99b80ac45f7e mm/page-owner: use gfp_nested_mask() instead of open coded masking)
Merging mm-nonmm-stable/mm-nonmm-stable (db3e24a02e29 nilfs2: make block erasure safe in nilfs_finish_roll_forward())
Merging mm/mm-everything (f24042adabb5 foo)
Merging kbuild/for-next (eb6a9339efeb Merge tag 'mm-nonmm-stable-2024-05-19-11-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (ea558c86248b tools lib subcmd: Show parent options in help)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a6016aac5252 dma: fix DMA sync for drivers not calling dma_set_mask*())
Merging asm-generic/master (02af68767d27 Merge branch 'alpha-cleanup-6.9' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (64ae2326dd77 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (a4c5a457c610 perf/arm-dmc620: Fix lockdep assert in ->event_init())
Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support)
Merging arm-soc/for-next (1e3dd71e2587 Merge branch 'soc/defconfig' into for-next)
Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (06902980d07a Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (4cece7649650 Linux 6.9-rc1)
Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (7468eb6710ce Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-clk/next' into for-next)
Merging samsung-krzk/for-next (a9c32618cd2a Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (02ba7b5a731a Merge branch 'for-next/vexpress/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (3bdc4c661d47 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (03be434863b9 Merge branches 'clk-microchip', 'clk-samsung' and 'clk-qcom' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (9cc1df421f00 LoongArch: Update Loongson-3 default config file)
CONFLICT (content): Merge conflict in arch/loongarch/kernel/irq.c
Merging m68k/for-next (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging m68knommu/for-next (a5044ce7d1d9 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (bbf5c979011a Linux 5.9)
Merging powerpc/next (61700f816e6f powerpc/fadump: Fix section mismatch warning)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree())
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (92cce91949a4 riscv: defconfig: Enable CONFIG_CLK_SOPHGO_CV1800)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
CONFLICT (content): Merge conflict in arch/riscv/Makefile
CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
CONFLICT (content): Merge conflict in kernel/sys.c
Merging riscv-dt/riscv-dt-for-next (1c80d50bb697 riscv: dts: microchip: add pac1934 power-monitor to icicle)
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (c1248638f8c3 s390/zcrypt: Use kvcalloc() instead of kvmalloc_array())
CONFLICT (content): Merge conflict in scripts/Makefile.vdsoinst
Merging sh/for-next (efe976b7eecf sh: setup: Add missing forward declaration for sh_fdt_init())
Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask var)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (dcb8f1e8fc29 bcachefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (7b79c81bbd20 Merge branch 'for-next-next-v6.10-20240515' into for-next-20240515)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (0450d2083be6 Merge tag '6.10-rc-smb-fix' of git://git.samba.org/sfrench/cifs-2.6)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (80eb4f62056d erofs: avoid allocating DEFLATE streams before mounting)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (82172cca18b2 Merge isofs Makefile cleanup.)
Merging ext4/dev (c6a6c9694aad ext4: fix error pointer dereference in ext4_mb_load_buddy_gfp())
Merging f2fs/dev (72ece20127a3 Merge tag 'f2fs-for-6.10.rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)
Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning)
Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support)
Merging gfs2/for-next (c1c53c26e338 gfs2: make timeout values more explicit)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (c91ecba9e421 ksmbd: avoid to send duplicate oplock break notifications)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (8d915bbf3926 NFSD: Force all NFSv4.2 COPY requests to be synchronous)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access)
Merging overlayfs/overlayfs-next (e9229c18dae3 ovl: remove duplicate included header)
Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address access in jffs2_free_inode)
Merging v9fs/9p-next (25ef7dc83ebe net/9p: fix uninit-value in p9_client_rpc())
Merging v9fs-ericvh/ericvh/for-next (a38297e3fb01 Linux 6.9)
Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (584bbf439d0f Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in include/linux/fs.h
Merging vfs/for-next (39d57a87e672 Merge branch 'work.bdev' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
CONFLICT (content): Merge conflict in block/ioctl.c
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flags"
Merging printk/for-next (596ffa476e20 Merge branch 'for-6.10' into for-next)
Merging pci/next (7ecf13fd35fe Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (14ee3d12f37b Merge branch 'for-6.10/hid-bpf' into for-next)
Merging i2c/i2c/for-next (24a9d78e808c Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE())
Merging i3c/i3c/next (acec16dbb338 i3c: dw: Add hot-join support.)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (5fbf8734fb36 hwmon: (nzxt-kraken3) Bail out for unsupported device variants)
Merging jc_docs/docs-next (955e15969c1d Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK)
Merging v4l-dvb-next/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK)
Merging pm/linux-next (bbfa78f51501 Merge branch 'thermal-core' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (ccad360a2d41 PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions)
Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (69b08420b697 thermal: renesas: rcar: Add dependency on OF)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (9c0731832d3b RDMA/cma: Fix kmemleak in rdma_core observed during blktests nvme/rdma use siw)
Merging net-next/main (4b377b4868ef kprobe/ftrace: fix build error due to bad function definition)
Merging bpf-next/for-next (5c1672705a1a net: revert partially applied PHY topology series)
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (5c1672705a1a net: revert partially applied PHY topology series)
Merging ipvs-next/main (5c1672705a1a net: revert partially applied PHY topology series)
Merging bluetooth/master (7b13a745870c tty: rfcomm: prefer array indexing over pointer arithmetic)
Merging wireless-next/for-next (1d60eabb8269 wifi: mwl8k: initialize cmd->addr[] properly)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content)
Merging drm/drm-next (5a5a10d9db77 drm/buddy: Fix the warn on's during force merge)
Merging drm-exynos/for-linux-next (7a5bdb7ca1b4 drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found)
Merging drm-misc/for-linux-next (20da948e3a80 drm/bridge: adv7511: Attach next bridge without creating connector)
959314c438ca ("drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations")
Merging amdgpu/drm-next (9c1a429217d2 drm/amdgpu: Fix amdgpu_vm_is_bo_always_valid kerneldoc)
Merging drm-intel/for-linux-next (d370a9dba5c4 drm/i915/psr: PSR2_CTL[Block Count Number] not needed for LunarLake)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vbt_defs.h
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (b587f413ca47 drm/msm/gen_header: allow skipping the validation)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (844f3228d225 drm/xe: Replace RING_START_UDW by u64 RING_START)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (e843e87abb90 drm/etnaviv: Disable SH_EU clock gating on VIPNano-Si+)
Merging fbdev/for-next (a38297e3fb01 Linux 6.9)
Merging regmap/for-next (7ba822189e60 regmap: kunit: Fix array overflow in stride() test)
Merging sound/for-next (5005ccd91b9e ALSA: usb-audio: Fix for sampling rates support for Mbox3)
Merging ieee1394/for-next (21151fd8f0ea firewire: obsolete usage of *-objs in Makefile for KUnit test)
Merging sound-asoc/for-next (810296e34a29 Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus)
Merging modules/modules-next (2c9e5d4a0082 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
Merging input/next (e7647cbaba0e Input: xpad - add support for Machenike G5 Pro Controller)
Merging block/for-next (7f431a6b115c Merge branch 'block-6.10' into for-next)
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging device-mapper/for-next (825d8bbd2f32 dm: always manage discard support in terms of max_hw_discard_sectors)
Merging libata/for-next (d4a89339f17c ata: pata_legacy: make legacy_exit() work again)
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs)
Merging mfd/for-mfd-next (1482489b5196 dt-bindings: mfd: Use full path to other schemas)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (1fd949f653ee backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (55f7073f6f59 dt-bindings: power: supply: max8903: specify flt-gpios as input)
Merging regulator/for-next (5b6f7c40958b Merge remote-tracking branch 'regulator/for-6.9' into regulator-linus)
Merging security/next (dd80c7465029 MAINTAINERS: repair file entry in SECURITY SUBSYSTEM)
Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL pointer dereference)
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (6bd944d25368 KEYS: trusted: Do not use WARN when encode fails)
Merging watchdog/master (c45b8cfc6d5c watchdog: LENOVO_SE10_WDT should depend on X86 && DMI)
Merging iommu/next (2bd5059c6cc0 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next)
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (d976c6f4b32c of: property: Add fw_devlink support for interrupt-map property)
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (10b98582bc76 dt-bindings: mailbox: qcom-ipcc: Document the SDX75 IPCC)
Merging spi/for-next (e958cffa42df Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (73e1bdc9383b Merge branch into tip/master: 'x86/percpu')
Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/arm_arch_timer: Mark hisi_161010101_oem_info const)
Merging edac/edac-for-next (ab80b31cd7b2 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (fde0aeca5926 Merge user-events/for-next)
Merging rcu/rcu/next (0e9b1d2b0560 Merge branches 'cmpxchg.2024.05.11a', 'kcsan.2024.05.07a', 'lkmm.2024.05.06a', 'rcu-merge.2024.05.01a' and 'tsc.2024.04.09c' into HEAD)
Merging kvm/next (6f627b425378 KVM: SVM: Add module parameter to enable SEV-SNP)
Merging kvm-arm/next (eaa46a28d596 Merge branch kvm-arm64/mpidr-reset into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (b52e8cd3f835 KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info())
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
Merging xen-tip/linux-next (89af61fb8f0f xen/xenbus: Use *-y instead of *-objs in Makefile)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (2a1b02bcba78 workqueue: Refactor worker ID formatting and make wq_worker_comm() use full ID string)
Merging drivers-x86/for-next (2513563edc98 platform/x86: Add new MeeGoPad ANX7428 Type-C Cross Switch driver)
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (880a746fa3ea device property: Fix a typo in the description of device_get_child_node_count())
Merging usb/usb-next (51474ab44abf drm/bridge: aux-hpd-bridge: correct devm_drm_dp_hpd_bridge_add() stub)
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (e21de1455a72 serial: Clear UPF_DEAD before calling tty_port_register_device_attr_serdev())
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (f5b335dc025c misc: ntsync: mark driver as "broken" to prevent from building)
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x)
Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property)
Merging extcon/extcon-next (3e8e45b65d9f extcon: adc-jack: Document missing struct members)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (cbb325e77fbe vfio/pci: Restore zero affected bus reset devices warning)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (4cece7649650 Linux 6.9-rc1)
Merging staging/staging-next (eb563dc752d3 staging: pi433: Remove unused driver)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (28059ddbee0e MAINTAINERS: Update role for IDXD driver)
Merging cgroup/for-next (21c38a3bd4ee cgroup/rstat: add cgroup_rstat_cpu_lock helpers and tracepoints)
Merging scsi/for-next (9ba1fbe2ed0c Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (e4f5f8298cf6 scsi: mpt3sas: Add missing kerneldoc parameter descriptions)
Merging vhost/linux-next (c9d853a05402 virtio: vdpa: vDPA driver for Marvell OCTEON DPU devices)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_ring.c
Merging rpmsg/for-next (c8d8f841e95b Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (7f45fe2ea3b8 gpio: nuvoton: Fix sgpio irq handle error)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (9429f847dd72 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (4817118f257e pwm: pca9685: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (a97853f25b06 Revert "selftests/cgroup: Drop define _GNU_SOURCE")
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (5496b9b77d74 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (73a98bc5a947 Merge branch 'for-6.10' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (e406737b1110 seccomp: Constify sysctl subhelpers)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (4cece7649650 Linux 6.9-rc1)
Merging nvmem/for-next (4cece7649650 Linux 6.9-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (15aa8fb852f9 x86/efistub: Omit physical KASLR when memory reservations exist)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (f5730cffbbaa virt: vmgenid: add support for devicetree bindings)
Merging landlock/next (38a04f741569 selftests/landlock: Add layout1.refer_mount_root)
Merging rust/rust-next (97ab3e8eec0c rust: alloc: fix dangling pointer in VecExt<T>::reserve())
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (4bbf9c3b53e6 fs/coredump: Enable dynamic configuration of max file note size)
Merging bitmap/bitmap-for-next (5671dca241b9 usercopy: Don't use "proxy" headers)
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (ae1a863bcdbd kunit/fortify: Fix memcmp() test to be amplitude agnostic)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (256d218ec6ae tools/power turbostat: version 2024.05.10)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.c
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.h
CONFLICT (content): Merge conflict in drivers/md/bcache/btree.c
CONFLICT (content): Merge conflict in drivers/md/bcache/writeback.c
$ git merge --abort
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* linux-next: Tree for May 20
@ 2024-05-20 3:48 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-20 3:48 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 39039 bytes --]
Hi all,
Do not add any work intended for v6.11 to your linux-next included
branches until after v6.10-rc1 has been released.
Changes since 20240517:
The tip tree gained a conflict against the kbuild tree.
The refactor-heap tree still had its conflicts against the block tree
for which I dropped the refactor-heap tree.
Non-merge commits (relative to Linus' tree): 3211
3362 files changed, 433429 insertions(+), 58866 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (eb6a9339efeb Merge tag 'mm-nonmm-stable-2024-05-19-11-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (9ff3ffc369ed mm/vmalloc: fix vmalloc which may return null if called with __GFP_NOFAIL)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (5549d1e39989 Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (d65e1a0f305b Merge tag 's390-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (4b377b4868ef kprobe/ftrace: fix build error due to bad function definition)
Merging bpf/master (4b377b4868ef kprobe/ftrace: fix build error due to bad function definition)
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (621cde16e49b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging ipvs/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging wireless/for-next (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing)
Merging wpan/master (07aa33988ad9 mac802154: fix time calculation in ieee802154_configure_durations())
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (5005ccd91b9e ALSA: usb-audio: Fix for sampling rates support for Mbox3)
Merging sound-asoc-fixes/for-linus (225468b9f96f Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus)
Merging regmap-fixes/for-linus (7ba822189e60 regmap: kunit: Fix array overflow in stride() test)
Merging regulator-fixes/for-linus (9bc443ee2d2d Merge remote-tracking branch 'regulator/for-6.9' into regulator-linus)
Merging spi-fixes/for-linus (ef13561d2b16 spi: microchip-core-qspi: fix setting spi bus clock rate)
Merging pci-current/for-linus (f3d049b35b01 PCI/ASPM: Restore parent state to parent, child state to child)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler)
Merging usb.current/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging usb-serial-fixes/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (bb198e29fe75 iio: dac: ad5592r: fix temperature channel scaling value)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (008ab3c53bc4 speakup: Fix sizeof() vs ARRAY_SIZE() bug)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (a38297e3fb01 Linux 6.9)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (c6ab5c915da4 crypto: ecc - Prevent ecc_digits_from_bytes from reading too many bytes)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (0a9c28bec202 Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (26e8383b116d hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (039b2b6e9d07 Merge branch 'misc-6.10' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (a38297e3fb01 Linux 6.9)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so)
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (a38297e3fb01 Linux 6.9)
Merging drm-intel-fixes/for-linux-next-fixes (43b26bdd2ee5 drm/i915/bios: Fix parsing backlight BDB data)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (a38297e3fb01 Linux 6.9)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (a38297e3fb01 Linux 6.9)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (55750148e559 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe())
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (520fb7f183e9 drm/tests/buddy: stop using PAGE_SIZE)
Merging mm-stable/mm-stable (76edc534cc28 memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order)
Merging mm-nonmm-stable/mm-nonmm-stable (5cbcb62dddf5 fs/proc: fix softlockup in __read_vmcore)
Merging mm/mm-everything (529891be5997 foo)
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h
Merging kbuild/for-next (0450d2083be6 Merge tag '6.10-rc-smb-fix' of git://git.samba.org/sfrench/cifs-2.6)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (ea558c86248b tools lib subcmd: Show parent options in help)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a6016aac5252 dma: fix DMA sync for drivers not calling dma_set_mask*())
CONFLICT (content): Merge conflict in net/core/page_pool.c
Merging asm-generic/master (02af68767d27 Merge branch 'alpha-cleanup-6.9' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (64ae2326dd77 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (a4c5a457c610 perf/arm-dmc620: Fix lockdep assert in ->event_init())
Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support)
Merging arm-soc/for-next (1e3dd71e2587 Merge branch 'soc/defconfig' into for-next)
Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (06902980d07a Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (4cece7649650 Linux 6.9-rc1)
Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (7468eb6710ce Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-clk/next' into for-next)
Merging samsung-krzk/for-next (a9c32618cd2a Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (02ba7b5a731a Merge branch 'for-next/vexpress/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (3bdc4c661d47 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (03be434863b9 Merge branches 'clk-microchip', 'clk-samsung' and 'clk-qcom' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (9cc1df421f00 LoongArch: Update Loongson-3 default config file)
CONFLICT (content): Merge conflict in arch/loongarch/kernel/irq.c
Merging m68k/for-next (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging m68knommu/for-next (a5044ce7d1d9 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (bbf5c979011a Linux 5.9)
Merging powerpc/next (61700f816e6f powerpc/fadump: Fix section mismatch warning)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree())
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (92cce91949a4 riscv: defconfig: Enable CONFIG_CLK_SOPHGO_CV1800)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
CONFLICT (content): Merge conflict in arch/riscv/Makefile
CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
CONFLICT (content): Merge conflict in kernel/sys.c
Merging riscv-dt/riscv-dt-for-next (1c80d50bb697 riscv: dts: microchip: add pac1934 power-monitor to icicle)
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (c1248638f8c3 s390/zcrypt: Use kvcalloc() instead of kvmalloc_array())
CONFLICT (content): Merge conflict in scripts/Makefile.vdsoinst
Merging sh/for-next (efe976b7eecf sh: setup: Add missing forward declaration for sh_fdt_init())
Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask var)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (dcb8f1e8fc29 bcachefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (7b79c81bbd20 Merge branch 'for-next-next-v6.10-20240515' into for-next-20240515)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (0450d2083be6 Merge tag '6.10-rc-smb-fix' of git://git.samba.org/sfrench/cifs-2.6)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (5587a8172eb6 z_erofs_pcluster_begin(): don't bother with rounding position down)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (82172cca18b2 Merge isofs Makefile cleanup.)
Merging ext4/dev (c6a6c9694aad ext4: fix error pointer dereference in ext4_mb_load_buddy_gfp())
Merging f2fs/dev (16409fdbb882 f2fs: initialize last_block_in_bio variable)
Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning)
Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support)
Merging gfs2/for-next (c1c53c26e338 gfs2: make timeout values more explicit)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (c91ecba9e421 ksmbd: avoid to send duplicate oplock break notifications)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (8d915bbf3926 NFSD: Force all NFSv4.2 COPY requests to be synchronous)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access)
Merging overlayfs/overlayfs-next (e9229c18dae3 ovl: remove duplicate included header)
Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address access in jffs2_free_inode)
Merging v9fs/9p-next (25ef7dc83ebe net/9p: fix uninit-value in p9_client_rpc())
Merging v9fs-ericvh/ericvh/for-next (a38297e3fb01 Linux 6.9)
Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (584bbf439d0f Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in include/linux/fs.h
Merging vfs/for-next (39d57a87e672 Merge branch 'work.bdev' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
CONFLICT (content): Merge conflict in block/ioctl.c
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flags"
Merging printk/for-next (596ffa476e20 Merge branch 'for-6.10' into for-next)
Merging pci/next (7ecf13fd35fe Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (14ee3d12f37b Merge branch 'for-6.10/hid-bpf' into for-next)
Merging i2c/i2c/for-next (24a9d78e808c Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE())
Merging i3c/i3c/next (acec16dbb338 i3c: dw: Add hot-join support.)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (5fbf8734fb36 hwmon: (nzxt-kraken3) Bail out for unsupported device variants)
Merging jc_docs/docs-next (955e15969c1d Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK)
Merging v4l-dvb-next/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK)
Merging pm/linux-next (bbfa78f51501 Merge branch 'thermal-core' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (ccad360a2d41 PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions)
Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (69b08420b697 thermal: renesas: rcar: Add dependency on OF)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (9c0731832d3b RDMA/cma: Fix kmemleak in rdma_core observed during blktests nvme/rdma use siw)
Merging net-next/main (4b377b4868ef kprobe/ftrace: fix build error due to bad function definition)
Merging bpf-next/for-next (5c1672705a1a net: revert partially applied PHY topology series)
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (5c1672705a1a net: revert partially applied PHY topology series)
Merging ipvs-next/main (5c1672705a1a net: revert partially applied PHY topology series)
Merging bluetooth/master (287da9035b2e Bluetooth: btintel: Refactor btintel_set_ppag())
Merging wireless-next/for-next (1d60eabb8269 wifi: mwl8k: initialize cmd->addr[] properly)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content)
Merging drm/drm-next (5a5a10d9db77 drm/buddy: Fix the warn on's during force merge)
Merging drm-exynos/for-linux-next (7a5bdb7ca1b4 drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found)
Merging drm-misc/for-linux-next (20da948e3a80 drm/bridge: adv7511: Attach next bridge without creating connector)
Merging amdgpu/drm-next (062a7ce676e0 drm/amdgpu: fix ACA no query result after gpu reset)
Merging drm-intel/for-linux-next (11abdbc22b1a drm/i915: pass dev_priv explicitly to CURSURFLIVE)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vbt_defs.h
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (b587f413ca47 drm/msm/gen_header: allow skipping the validation)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (844f3228d225 drm/xe: Replace RING_START_UDW by u64 RING_START)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (e843e87abb90 drm/etnaviv: Disable SH_EU clock gating on VIPNano-Si+)
Merging fbdev/for-next (a38297e3fb01 Linux 6.9)
Merging regmap/for-next (7ba822189e60 regmap: kunit: Fix array overflow in stride() test)
Merging sound/for-next (5005ccd91b9e ALSA: usb-audio: Fix for sampling rates support for Mbox3)
Merging ieee1394/for-next (21151fd8f0ea firewire: obsolete usage of *-objs in Makefile for KUnit test)
Merging sound-asoc/for-next (225468b9f96f Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus)
Merging modules/modules-next (2c9e5d4a0082 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
Merging input/next (c1307f8a152a Input: try trimming too long modalias strings)
Merging block/for-next (04d3822ddfd1 Merge branch 'block-6.10' into for-next)
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging device-mapper/for-next (8b21ac87d550 dm-delay: remove timer_lock)
Merging libata/for-next (d4a89339f17c ata: pata_legacy: make legacy_exit() work again)
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs)
Merging mfd/for-mfd-next (1482489b5196 dt-bindings: mfd: Use full path to other schemas)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (1fd949f653ee backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (55f7073f6f59 dt-bindings: power: supply: max8903: specify flt-gpios as input)
Merging regulator/for-next (9bc443ee2d2d Merge remote-tracking branch 'regulator/for-6.9' into regulator-linus)
Merging security/next (dd80c7465029 MAINTAINERS: repair file entry in SECURITY SUBSYSTEM)
Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL pointer dereference)
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (b16a6ccf7cca tpm: Disable TCG_TPM2_HMAC by default)
Merging watchdog/master (c45b8cfc6d5c watchdog: LENOVO_SE10_WDT should depend on X86 && DMI)
Merging iommu/next (2bd5059c6cc0 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next)
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (d976c6f4b32c of: property: Add fw_devlink support for interrupt-map property)
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (e958cffa42df Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (6a1102a72a29 Merge branch into tip/master: 'x86/percpu')
Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/arm_arch_timer: Mark hisi_161010101_oem_info const)
Merging edac/edac-for-next (ab80b31cd7b2 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (fde0aeca5926 Merge user-events/for-next)
Merging rcu/rcu/next (0e9b1d2b0560 Merge branches 'cmpxchg.2024.05.11a', 'kcsan.2024.05.07a', 'lkmm.2024.05.06a', 'rcu-merge.2024.05.01a' and 'tsc.2024.04.09c' into HEAD)
Merging kvm/next (6f627b425378 KVM: SVM: Add module parameter to enable SEV-SNP)
Merging kvm-arm/next (eaa46a28d596 Merge branch kvm-arm64/mpidr-reset into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (b52e8cd3f835 KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info())
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
Merging xen-tip/linux-next (89af61fb8f0f xen/xenbus: Use *-y instead of *-objs in Makefile)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (2513563edc98 platform/x86: Add new MeeGoPad ANX7428 Type-C Cross Switch driver)
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (880a746fa3ea device property: Fix a typo in the description of device_get_child_node_count())
Merging usb/usb-next (51474ab44abf drm/bridge: aux-hpd-bridge: correct devm_drm_dp_hpd_bridge_add() stub)
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (e21de1455a72 serial: Clear UPF_DEAD before calling tty_port_register_device_attr_serdev())
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (f5b335dc025c misc: ntsync: mark driver as "broken" to prevent from building)
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x)
Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property)
Merging extcon/extcon-next (3e8e45b65d9f extcon: adc-jack: Document missing struct members)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (cbb325e77fbe vfio/pci: Restore zero affected bus reset devices warning)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (4cece7649650 Linux 6.9-rc1)
Merging staging/staging-next (eb563dc752d3 staging: pi433: Remove unused driver)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (28059ddbee0e MAINTAINERS: Update role for IDXD driver)
Merging cgroup/for-next (21c38a3bd4ee cgroup/rstat: add cgroup_rstat_cpu_lock helpers and tracepoints)
Merging scsi/for-next (9ba1fbe2ed0c Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (e4f5f8298cf6 scsi: mpt3sas: Add missing kerneldoc parameter descriptions)
Merging vhost/linux-next (c9d853a05402 virtio: vdpa: vDPA driver for Marvell OCTEON DPU devices)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_ring.c
Merging rpmsg/for-next (c8d8f841e95b Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (7f45fe2ea3b8 gpio: nuvoton: Fix sgpio irq handle error)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (9429f847dd72 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (4817118f257e pwm: pca9685: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (31a59b76b978 Revert "selftests/cgroup: Drop define _GNU_SOURCE")
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (5496b9b77d74 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (73a98bc5a947 Merge branch 'for-6.10' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (e406737b1110 seccomp: Constify sysctl subhelpers)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (4cece7649650 Linux 6.9-rc1)
Merging nvmem/for-next (4cece7649650 Linux 6.9-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (15aa8fb852f9 x86/efistub: Omit physical KASLR when memory reservations exist)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (f5730cffbbaa virt: vmgenid: add support for devicetree bindings)
Merging landlock/next (38a04f741569 selftests/landlock: Add layout1.refer_mount_root)
Merging rust/rust-next (97ab3e8eec0c rust: alloc: fix dangling pointer in VecExt<T>::reserve())
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (4bbf9c3b53e6 fs/coredump: Enable dynamic configuration of max file note size)
Merging bitmap/bitmap-for-next (5671dca241b9 usercopy: Don't use "proxy" headers)
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (ae1a863bcdbd kunit/fortify: Fix memcmp() test to be amplitude agnostic)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (256d218ec6ae tools/power turbostat: version 2024.05.10)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.c
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.h
CONFLICT (content): Merge conflict in drivers/md/bcache/btree.c
CONFLICT (content): Merge conflict in drivers/md/bcache/writeback.c
$ git merge --abort
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Re: [syzbot] [overlayfs?] WARNING in ovl_workdir_create (3)
2024-05-17 15:40 0% ` Miklos Szeredi
@ 2024-05-17 15:43 0% ` Aleksandr Nogikh
0 siblings, 0 replies; 200+ results
From: Aleksandr Nogikh @ 2024-05-17 15:43 UTC (permalink / raw)
To: Miklos Szeredi; +Cc: syzbot, linux-kernel, syzkaller-bugs
On Fri, May 17, 2024 at 5:41 PM 'Miklos Szeredi' via syzkaller-bugs
<syzkaller-bugs@googlegroups.com> wrote:
>
> On Mon, 13 May 2024 at 20:28, syzbot
> <syzbot+8aa3f99a6acb9f8fd429@syzkaller.appspotmail.com> wrote:
> >
> > Hello,
> >
> > syzbot found the following issue on:
> >
> > HEAD commit: 45db3ab70092 Merge tag '6.9-rc7-ksmbd-fixes' of git://git...
> > git tree: upstream
> > console output: https://syzkaller.appspot.com/x/log.txt?x=169b934c980000
> > kernel config: https://syzkaller.appspot.com/x/.config?x=2f7a2b43b9e58995
> > dashboard link: https://syzkaller.appspot.com/bug?extid=8aa3f99a6acb9f8fd429
> > compiler: gcc (Debian 12.2.0-14) 12.2.0, GNU ld (GNU Binutils for Debian) 2.40
> >
> > Unfortunately, I don't have any reproducer for this issue yet.
> >
> > Downloadable assets:
> > disk image: https://storage.googleapis.com/syzbot-assets/0c2a8034002c/disk-45db3ab7.raw.xz
> > vmlinux: https://storage.googleapis.com/syzbot-assets/807e35e2b3a9/vmlinux-45db3ab7.xz
> > kernel image: https://storage.googleapis.com/syzbot-assets/4868b2eab91a/bzImage-45db3ab7.xz
> >
> > IMPORTANT: if you fix the issue, please add the following tag to the commit:
> > Reported-by: syzbot+8aa3f99a6acb9f8fd429@syzkaller.appspotmail.com
> >
> > ------------[ cut here ]------------
> > DEBUG_RWSEMS_WARN_ON((rwsem_owner(sem) != current) && !rwsem_test_oflags(sem, RWSEM_NONSPINNABLE)): count = 0x0, magic = 0xffff888077f311f0, owner = 0x0, curr 0xffff8880787ebc00, list empty
>
> This is lock corruption on the upper filesystem, definitely not an
> overlayfs issue.
>
> #syz unset subsystems
>
> Thanks,
> Miklos
>
> --
Let's set ext4 then:
#syz set subsystems: ext4
^ permalink raw reply [relevance 0%]
* Re: [syzbot] [overlayfs?] WARNING in ovl_workdir_create (3)
2024-05-13 18:28 3% [syzbot] [overlayfs?] WARNING in ovl_workdir_create (3) syzbot
@ 2024-05-17 15:40 0% ` Miklos Szeredi
2024-05-17 15:43 0% ` Aleksandr Nogikh
0 siblings, 1 reply; 200+ results
From: Miklos Szeredi @ 2024-05-17 15:40 UTC (permalink / raw)
To: syzbot; +Cc: amir73il, linux-kernel, linux-unionfs, syzkaller-bugs
On Mon, 13 May 2024 at 20:28, syzbot
<syzbot+8aa3f99a6acb9f8fd429@syzkaller.appspotmail.com> wrote:
>
> Hello,
>
> syzbot found the following issue on:
>
> HEAD commit: 45db3ab70092 Merge tag '6.9-rc7-ksmbd-fixes' of git://git...
> git tree: upstream
> console output: https://syzkaller.appspot.com/x/log.txt?x=169b934c980000
> kernel config: https://syzkaller.appspot.com/x/.config?x=2f7a2b43b9e58995
> dashboard link: https://syzkaller.appspot.com/bug?extid=8aa3f99a6acb9f8fd429
> compiler: gcc (Debian 12.2.0-14) 12.2.0, GNU ld (GNU Binutils for Debian) 2.40
>
> Unfortunately, I don't have any reproducer for this issue yet.
>
> Downloadable assets:
> disk image: https://storage.googleapis.com/syzbot-assets/0c2a8034002c/disk-45db3ab7.raw.xz
> vmlinux: https://storage.googleapis.com/syzbot-assets/807e35e2b3a9/vmlinux-45db3ab7.xz
> kernel image: https://storage.googleapis.com/syzbot-assets/4868b2eab91a/bzImage-45db3ab7.xz
>
> IMPORTANT: if you fix the issue, please add the following tag to the commit:
> Reported-by: syzbot+8aa3f99a6acb9f8fd429@syzkaller.appspotmail.com
>
> ------------[ cut here ]------------
> DEBUG_RWSEMS_WARN_ON((rwsem_owner(sem) != current) && !rwsem_test_oflags(sem, RWSEM_NONSPINNABLE)): count = 0x0, magic = 0xffff888077f311f0, owner = 0x0, curr 0xffff8880787ebc00, list empty
This is lock corruption on the upper filesystem, definitely not an
overlayfs issue.
#syz unset subsystems
Thanks,
Miklos
^ permalink raw reply [relevance 0%]
* CVE-2023-52666: ksmbd: fix potential circular locking issue in smb2_set_ea()
@ 2024-05-17 14:01 8% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-17 14:01 UTC (permalink / raw)
To: linux-cve-announce; +Cc: Greg Kroah-Hartman
Description
===========
In the Linux kernel, the following vulnerability has been resolved:
ksmbd: fix potential circular locking issue in smb2_set_ea()
smb2_set_ea() can be called in parent inode lock range.
So add get_write argument to smb2_set_ea() not to call nested
mnt_want_write().
The Linux kernel CVE team has assigned CVE-2023-52666 to this issue.
Affected and fixed versions
===========================
Fixed in 5.15.149 with commit 5349fd419e4f
Fixed in 6.1.76 with commit e61fc656ceea
Fixed in 6.6.15 with commit e9ec6665de8f
Fixed in 6.7.3 with commit ecfd93955994
Fixed in 6.8 with commit 6fc0a265e1b9
Please see https://www.kernel.org for a full list of currently supported
kernel versions by the kernel community.
Unaffected versions might change over time as fixes are backported to
older supported kernel versions. The official CVE entry at
https://cve.org/CVERecord/?id=CVE-2023-52666
will be updated if fixes are backported, please check that for the most
up to date information about this issue.
Affected files
==============
The file(s) affected by this issue are:
fs/smb/server/smb2pdu.c
Mitigation
==========
The Linux kernel CVE team recommends that you update to the latest
stable kernel version for this, and many other bugfixes. Individual
changes are never tested alone, but rather are part of a larger kernel
release. Cherry-picking individual commits is not recommended or
supported by the Linux kernel community at all. If however, updating to
the latest release is impossible, the individual changes to resolve this
issue can be found at these commits:
https://git.kernel.org/stable/c/5349fd419e4f685d609c85b781f2b70f0fb14848
https://git.kernel.org/stable/c/e61fc656ceeaec65f19a92f0ffbeb562b7941e8d
https://git.kernel.org/stable/c/e9ec6665de8f706b4f4133b87b2bd02a159ec57b
https://git.kernel.org/stable/c/ecfd93955994ecc2a1308f5ee4bd90c7fca9a8c6
https://git.kernel.org/stable/c/6fc0a265e1b932e5e97a038f99e29400a93baad0
^ permalink raw reply [relevance 8%]
* Linux 6.8.10
@ 2024-05-17 11:58 2% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-17 11:58 UTC (permalink / raw)
To: linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby, Greg Kroah-Hartman
I'm announcing the release of the 6.8.10 kernel.
All users of the 6.8 kernel series must upgrade.
The updated 6.8.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.8.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml | 2
Documentation/devicetree/bindings/net/mediatek,net.yaml | 22 -
Documentation/netlink/specs/rt_link.yaml | 6
Makefile | 2
arch/arm/kernel/sleep.S | 4
arch/arm/net/bpf_jit_32.c | 56 ++-
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 3
arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 30 -
arch/arm64/kvm/vgic/vgic-kvm-device.c | 8
arch/arm64/net/bpf_jit_comp.c | 6
arch/mips/include/asm/ptrace.h | 2
arch/mips/kernel/asm-offsets.c | 1
arch/mips/kernel/ptrace.c | 15
arch/mips/kernel/scall32-o32.S | 23 -
arch/mips/kernel/scall64-n32.S | 3
arch/mips/kernel/scall64-n64.S | 3
arch/mips/kernel/scall64-o32.S | 33 -
arch/powerpc/crypto/chacha-p10-glue.c | 8
arch/powerpc/include/asm/plpks.h | 5
arch/powerpc/platforms/pseries/iommu.c | 8
arch/powerpc/platforms/pseries/plpks.c | 10
arch/riscv/net/bpf_jit_comp64.c | 6
arch/s390/include/asm/dwarf.h | 1
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2
arch/s390/mm/gmap.c | 2
arch/s390/mm/hugetlbpage.c | 2
arch/x86/kernel/apic/apic.c | 16
arch/xtensa/include/asm/processor.h | 8
arch/xtensa/include/asm/ptrace.h | 2
arch/xtensa/kernel/process.c | 5
arch/xtensa/kernel/stacktrace.c | 3
block/blk-iocost.c | 14
block/ioctl.c | 5
drivers/accel/ivpu/ivpu_drv.c | 20 -
drivers/accel/ivpu/ivpu_drv.h | 3
drivers/accel/ivpu/ivpu_hw_37xx.c | 4
drivers/accel/ivpu/ivpu_mmu.c | 8
drivers/accel/ivpu/ivpu_pm.c | 9
drivers/ata/sata_gemini.c | 5
drivers/base/regmap/regmap.c | 37 ++
drivers/bluetooth/btqca.c | 138 ++++++-
drivers/bluetooth/btqca.h | 3
drivers/bluetooth/hci_qca.c | 2
drivers/clk/clk.c | 12
drivers/clk/qcom/clk-smd-rpm.c | 1
drivers/clk/samsung/clk-exynos-clkout.c | 13
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 2
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 -
drivers/clk/sunxi-ng/ccu_common.c | 19 +
drivers/clk/sunxi-ng/ccu_common.h | 3
drivers/dma/idxd/cdev.c | 77 ++++
drivers/dma/idxd/idxd.h | 3
drivers/dma/idxd/init.c | 4
drivers/dma/idxd/registers.h | 3
drivers/dma/idxd/sysfs.c | 27 +
drivers/edac/versal_edac.c | 4
drivers/firewire/nosy.c | 6
drivers/firewire/ohci.c | 14
drivers/firmware/efi/unaccepted_memory.c | 4
drivers/firmware/microchip/mpfs-auto-update.c | 2
drivers/gpio/gpio-crystalcove.c | 2
drivers/gpio/gpio-lpc32xx.c | 1
drivers/gpio/gpio-wcove.c | 2
drivers/gpio/gpiolib-cdev.c | 16
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 -
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 52 +-
drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 15
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 16
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 11
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 3
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 3
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 48 +-
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 33 +
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 27 +
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2
drivers/gpu/drm/drm_connector.c | 2
drivers/gpu/drm/i915/display/intel_audio.c | 113 ------
drivers/gpu/drm/i915/display/intel_bios.c | 19 -
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c | 6
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.h | 2
drivers/gpu/drm/i915/gt/intel_workarounds.c | 4
drivers/gpu/drm/imagination/pvr_fw_mips.h | 5
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 +--
drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 4
drivers/gpu/drm/nouveau/nouveau_dp.c | 13
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 79 ++--
drivers/gpu/drm/panel/Kconfig | 2
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 13
drivers/gpu/drm/qxl/qxl_release.c | 50 --
drivers/gpu/drm/radeon/pptable.h | 10
drivers/gpu/drm/ttm/ttm_tt.c | 2
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 1
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 3
drivers/gpu/drm/xe/regs/xe_engine_regs.h | 2
drivers/gpu/drm/xe/xe_lrc.c | 25 -
drivers/gpu/drm/xe/xe_migrate.c | 8
drivers/gpu/host1x/bus.c | 8
drivers/hv/channel.c | 29 +
drivers/hv/connection.c | 29 +
drivers/hwmon/corsair-cpro.c | 45 +-
drivers/hwmon/pmbus/ucd9000.c | 6
drivers/iio/accel/mxc4005.c | 92 ++++
drivers/iio/imu/adis16475.c | 4
drivers/iio/pressure/bmp280-core.c | 1
drivers/iio/pressure/bmp280-spi.c | 13
drivers/iio/pressure/bmp280.h | 1
drivers/infiniband/hw/qib/qib_fs.c | 1
drivers/iommu/amd/iommu.c | 4
drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 4
drivers/iommu/mtk_iommu.c | 1
drivers/iommu/mtk_iommu_v1.c | 1
drivers/misc/mei/hw-me-regs.h | 2
drivers/misc/mei/pci-me.c | 2
drivers/misc/pvpanic/pvpanic-pci.c | 4
drivers/net/dsa/mv88e6xxx/chip.c | 20 -
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 32 +
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8
drivers/net/ethernet/broadcom/genet/bcmmii.c | 6
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 52 +-
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 20 -
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2
drivers/net/ethernet/intel/e1000e/phy.c | 8
drivers/net/ethernet/intel/ice/ice_debugfs.c | 8
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4
drivers/net/ethernet/micrel/ks8851_common.c | 16
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14
drivers/net/hyperv/netvsc.c | 7
drivers/net/usb/qmi_wwan.c | 1
drivers/net/vxlan/vxlan_core.c | 49 +-
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 7
drivers/net/wireless/intel/iwlwifi/queue/tx.c | 2
drivers/nvme/host/core.c | 2
drivers/nvme/host/nvme.h | 5
drivers/nvme/host/pci.c | 14
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 -
drivers/pinctrl/core.c | 8
drivers/pinctrl/devicetree.c | 10
drivers/pinctrl/intel/pinctrl-baytrail.c | 74 ++--
drivers/pinctrl/intel/pinctrl-intel.h | 4
drivers/pinctrl/mediatek/pinctrl-paris.c | 40 --
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6
drivers/platform/x86/acer-wmi.c | 9
drivers/platform/x86/amd/pmf/acpi.c | 2
drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 1
drivers/power/supply/mt6360_charger.c | 2
drivers/power/supply/rt9455_charger.c | 2
drivers/regulator/core.c | 27 -
drivers/regulator/mt6360-regulator.c | 32 +
drivers/regulator/tps65132-regulator.c | 7
drivers/s390/cio/cio_inject.c | 2
drivers/s390/net/qeth_core_main.c | 61 +--
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10
drivers/scsi/libsas/sas_expander.c | 2
drivers/scsi/lpfc/lpfc.h | 2
drivers/scsi/lpfc/lpfc_attr.c | 4
drivers/scsi/lpfc/lpfc_bsg.c | 20 -
drivers/scsi/lpfc/lpfc_debugfs.c | 12
drivers/scsi/lpfc/lpfc_els.c | 20 -
drivers/scsi/lpfc/lpfc_hbadisc.c | 5
drivers/scsi/lpfc/lpfc_init.c | 5
drivers/scsi/lpfc/lpfc_nvme.c | 4
drivers/scsi/lpfc/lpfc_scsi.c | 13
drivers/scsi/lpfc/lpfc_sli.c | 34 -
drivers/scsi/lpfc/lpfc_vport.c | 8
drivers/scsi/mpi3mr/mpi3mr_app.c | 2
drivers/slimbus/qcom-ngd-ctrl.c | 6
drivers/spi/spi-axi-spi-engine.c | 19 -
drivers/spi/spi-hisi-kunpeng.c | 2
drivers/spi/spi-microchip-core-qspi.c | 1
drivers/spi/spi.c | 1
drivers/target/target_core_configfs.c | 12
drivers/thermal/thermal_debugfs.c | 59 ++-
drivers/ufs/core/ufs-mcq.c | 2
drivers/ufs/core/ufshcd.c | 9
drivers/uio/uio_hv_generic.c | 12
drivers/usb/core/hub.c | 5
drivers/usb/core/port.c | 8
drivers/usb/dwc3/core.c | 90 ++--
drivers/usb/dwc3/core.h | 1
drivers/usb/dwc3/gadget.c | 2
drivers/usb/dwc3/host.c | 27 +
drivers/usb/gadget/composite.c | 6
drivers/usb/gadget/function/f_fs.c | 9
drivers/usb/gadget/function/uvc_configfs.c | 4
drivers/usb/host/ohci-hcd.c | 8
drivers/usb/host/xhci-plat.h | 4
drivers/usb/host/xhci-rzv2m.c | 1
drivers/usb/typec/tcpm/tcpm.c | 36 +
drivers/usb/typec/ucsi/ucsi.c | 12
drivers/vfio/pci/vfio_pci.c | 2
fs/9p/fid.h | 3
fs/9p/vfs_file.c | 2
fs/9p/vfs_inode.c | 23 -
fs/9p/vfs_super.c | 1
fs/btrfs/inode.c | 2
fs/btrfs/ordered-data.c | 1
fs/btrfs/qgroup.c | 2
fs/btrfs/transaction.c | 2
fs/btrfs/tree-checker.c | 30 -
fs/btrfs/tree-checker.h | 1
fs/btrfs/volumes.c | 18
fs/exfat/file.c | 7
fs/gfs2/bmap.c | 5
fs/nfs/client.c | 5
fs/nfs/inode.c | 13
fs/nfs/internal.h | 2
fs/nfs/netns.h | 2
fs/nfsd/cache.h | 2
fs/nfsd/netns.h | 21 -
fs/nfsd/nfs4callback.c | 97 +++++
fs/nfsd/nfs4proc.c | 6
fs/nfsd/nfs4state.c | 3
fs/nfsd/nfs4xdr.c | 2
fs/nfsd/nfscache.c | 40 --
fs/nfsd/nfsctl.c | 14
fs/nfsd/nfsfh.c | 3
fs/nfsd/state.h | 14
fs/nfsd/stats.c | 43 --
fs/nfsd/stats.h | 62 +--
fs/nfsd/vfs.c | 6
fs/nfsd/xdr4cb.h | 18
fs/proc/task_mmu.c | 24 -
fs/smb/client/cifsglob.h | 1
fs/smb/client/connect.c | 8
fs/smb/client/fs_context.c | 21 +
fs/smb/client/fs_context.h | 2
fs/smb/client/misc.c | 1
fs/smb/client/smb2pdu.c | 11
fs/smb/server/oplock.c | 35 +
fs/smb/server/transport_tcp.c | 4
fs/tracefs/event_inode.c | 45 +-
fs/tracefs/inode.c | 92 ++++
fs/tracefs/internal.h | 7
fs/userfaultfd.c | 4
fs/vboxsf/file.c | 1
include/linux/compiler_types.h | 11
include/linux/dma-fence.h | 7
include/linux/gfp_types.h | 2
include/linux/hyperv.h | 1
include/linux/pci_ids.h | 2
include/linux/regmap.h | 8
include/linux/regulator/consumer.h | 4
include/linux/skbuff.h | 15
include/linux/skmsg.h | 2
include/linux/slab.h | 4
include/linux/sockptr.h | 25 +
include/linux/sunrpc/clnt.h | 1
include/net/gro.h | 9
include/net/xfrm.h | 3
include/sound/emu10k1.h | 3
include/trace/events/rxrpc.h | 2
include/uapi/linux/kfd_ioctl.h | 17
include/uapi/scsi/scsi_bsg_mpi3mr.h | 2
kernel/bpf/bloom_filter.c | 13
kernel/bpf/verifier.c | 3
kernel/dma/swiotlb.c | 1
kernel/workqueue.c | 8
lib/Kconfig.debug | 5
lib/dynamic_debug.c | 6
lib/maple_tree.c | 16
lib/scatterlist.c | 2
mm/readahead.c | 4
mm/slub.c | 52 +-
net/8021q/vlan_core.c | 2
net/bluetooth/hci_core.c | 3
net/bluetooth/hci_event.c | 2
net/bluetooth/l2cap_core.c | 3
net/bluetooth/msft.c | 2
net/bluetooth/msft.h | 4
net/bluetooth/sco.c | 4
net/bridge/br_forward.c | 9
net/bridge/br_netlink.c | 3
net/core/filter.c | 42 +-
net/core/gro.c | 1
net/core/link_watch.c | 4
net/core/net-sysfs.c | 4
net/core/net_namespace.c | 13
net/core/rtnetlink.c | 6
net/core/skbuff.c | 27 +
net/core/skmsg.c | 5
net/core/sock.c | 4
net/hsr/hsr_device.c | 31 -
net/ipv4/af_inet.c | 1
net/ipv4/ip_output.c | 2
net/ipv4/raw.c | 3
net/ipv4/tcp.c | 4
net/ipv4/tcp_input.c | 2
net/ipv4/tcp_ipv4.c | 8
net/ipv4/tcp_output.c | 4
net/ipv4/udp.c | 3
net/ipv4/udp_offload.c | 15
net/ipv4/xfrm4_input.c | 6
net/ipv6/addrconf.c | 11
net/ipv6/fib6_rules.c | 6
net/ipv6/ip6_input.c | 4
net/ipv6/ip6_offload.c | 1
net/ipv6/ip6_output.c | 4
net/ipv6/udp.c | 3
net/ipv6/udp_offload.c | 3
net/ipv6/xfrm6_input.c | 6
net/l2tp/l2tp_eth.c | 3
net/mac80211/ieee80211_i.h | 4
net/mac80211/mlme.c | 5
net/mptcp/ctrl.c | 39 ++
net/mptcp/protocol.c | 3
net/nfc/llcp_sock.c | 12
net/nfc/nci/core.c | 1
net/nsh/nsh.c | 14
net/phonet/pn_netlink.c | 2
net/rxrpc/ar-internal.h | 2
net/rxrpc/call_object.c | 7
net/rxrpc/conn_event.c | 16
net/rxrpc/conn_object.c | 9
net/rxrpc/input.c | 71 ++-
net/rxrpc/output.c | 14
net/rxrpc/protocol.h | 6
net/smc/smc_ib.c | 19 -
net/sunrpc/clnt.c | 5
net/sunrpc/xprtsock.c | 1
net/tipc/msg.c | 8
net/wireless/nl80211.c | 2
net/wireless/trace.h | 2
net/xfrm/xfrm_input.c | 8
rust/macros/module.rs | 185 ++++++----
scripts/Makefile.modfinal | 2
security/keys/key.c | 3
sound/hda/intel-sdw-acpi.c | 2
sound/oss/dmasound/dmasound_paula.c | 8
sound/pci/emu10k1/emu10k1.c | 3
sound/pci/emu10k1/emu10k1_main.c | 139 ++++---
sound/pci/hda/patch_realtek.c | 25 +
sound/soc/codecs/es8326.c | 30 -
sound/soc/codecs/es8326.h | 2
sound/soc/codecs/wsa881x.c | 1
sound/soc/intel/avs/topology.c | 2
sound/soc/meson/Kconfig | 1
sound/soc/meson/axg-card.c | 1
sound/soc/meson/axg-fifo.c | 52 +-
sound/soc/meson/axg-fifo.h | 12
sound/soc/meson/axg-frddr.c | 5
sound/soc/meson/axg-tdm-interface.c | 34 +
sound/soc/meson/axg-toddr.c | 22 -
sound/soc/sof/intel/hda-dsp.c | 20 -
sound/soc/sof/intel/pci-lnl.c | 3
sound/soc/tegra/tegra186_dspk.c | 7
sound/soc/ti/davinci-mcasp.c | 12
sound/usb/line6/driver.c | 6
tools/include/linux/kernel.h | 1
tools/include/linux/mm.h | 5
tools/include/linux/panic.h | 19 +
tools/power/x86/turbostat/turbostat.8 | 2
tools/power/x86/turbostat/turbostat.c | 159 ++++++--
tools/testing/selftests/bpf/prog_tests/bloom_filter_map.c | 6
tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc | 2
tools/testing/selftests/mm/Makefile | 6
tools/testing/selftests/net/test_bridge_neigh_suppress.sh | 14
tools/testing/selftests/timers/valid-adjtimex.c | 73 +--
377 files changed, 3360 insertions(+), 1832 deletions(-)
Adam Goldman (1):
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Adam Skladowski (1):
clk: qcom: smd-rpm: Restore msm8976 num_clk
Al Viro (1):
qibfs: fix dentry leak
Alan Stern (2):
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
USB: core: Fix access violation during port device removal
Aleksa Savic (3):
hwmon: (corsair-cpro) Use a separate buffer for sending commands
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Alex Deucher (2):
drm/radeon: silence UBSAN warning (v3)
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Alex Hung (1):
drm/amd/display: Skip on writeback when it's not applicable
Alexander Potapenko (1):
kmsan: compiler_types: declare __no_sanitize_or_inline
Alexander Usyskin (1):
mei: me: add lunar lake point M DID
Alexandra Winter (1):
s390/qeth: Fix kernel panic after setting hsuid
Amadeusz Sławiński (1):
ASoC: Intel: avs: Set name of control as in topology
Aman Dhoot (1):
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Amit Sunil Dhamne (1):
usb: typec: tcpm: unregister existing source caps before re-registration
Anand Jain (1):
btrfs: return accurate error code on open failure in open_fs_devices()
Andi Shyti (1):
drm/i915/gt: Automate CCS Mode setting during engine resets
Andrei Matei (1):
bpf: Check bloom filter map value size
Andrew Price (1):
gfs2: Fix invalid metadata access in punch_hole
Andrii Nakryiko (1):
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
André Apitzsch (1):
regulator: tps65132: Add of_match table
Andy Shevchenko (5):
drm/panel: ili9341: Correct use of device property APIs
drm/panel: ili9341: Respect deferred probe
drm/panel: ili9341: Use predefined error codes
gpio: wcove: Use -ENOTSUPP consistently
gpio: crystalcove: Use -ENOTSUPP consistently
AngeloGioacchino Del Regno (2):
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
regulator: mt6360: De-capitalize devicetree regulator subnodes
Anton Protopopov (1):
bpf: Fix a verifier verbose message
Arjan van de Ven (2):
VFIO: Add the SPR_DSA and SPR_IAX devices to the denylist
dmaengine: idxd: add a new security check to deal with a hardware erratum
Arnd Bergmann (1):
power: rt9455: hide unused rt9455_boost_voltage_values
Asbjørn Sloth Tønnesen (4):
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
net: qede: use return from qede_parse_flow_attr() for flower
net: qede: use return from qede_parse_flow_attr() for flow_spec
net: qede: use return from qede_parse_actions()
Ashutosh Dixit (1):
drm/xe: Label RING_CONTEXT_CONTROL as masked
Badhri Jagan Sridharan (1):
usb: typec: tcpm: Check for port partner validity before consuming it
Benjamin Berg (1):
wifi: iwlwifi: mvm: guard against invalid STA ID on removal
Benno Lossin (1):
rust: macros: fix soundness issue in `module!` macro
Bernhard Rosenkränzer (1):
platform/x86: acer-wmi: Add support for Acer PH18-71
Billy Tsai (1):
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Boris Burkov (2):
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
btrfs: always clear PERTRANS metadata during commit
Borislav Petkov (AMD) (1):
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Boy.Wu (1):
ARM: 9381/1: kasan: clear stale stack poison
Bui Quang Minh (4):
ice: ensure the copied buf is NUL terminated
bna: ensure the copied buf is NUL terminated
octeontx2-af: avoid off-by-one read from userspace
s390/cio: Ensure the copied buf is NUL terminated
Chaitanya Kumar Borah (1):
drm/i915/audio: Fix audio time stamp programming for DP
Chen Ni (1):
ata: sata_gemini: Check clk_enable() result
Chen Yu (2):
efi/unaccepted: touch soft lockup during memory accept
tools/power turbostat: Do not print negative LPI residency
Chen-Yu Tsai (3):
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
arm64: dts: mediatek: mt8183-pico6: Fix bluetooth node
Chris Wulff (1):
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Christian A. Ehrhardt (2):
usb: typec: ucsi: Check for notifications after init
usb: typec: ucsi: Fix connector check on init
Christian König (1):
drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2
Chuck Lever (1):
NFSD: Fix nfsd4_encode_fattr4() crasher
Claudio Imbrenda (2):
s390/mm: Fix storage key clearing for guest huge pages
s390/mm: Fix clearing storage keys for huge pages
Conor Dooley (2):
firmware: microchip: don't unconditionally print validation success
spi: microchip-core-qspi: fix setting spi bus clock rate
Dai Ngo (1):
NFSD: add support for CB_GETATTR callback
Dan Carpenter (2):
pinctrl: core: delete incorrect free in pinctrl_enable()
mm/slab: make __free(kfree) accept error pointers
Daniel Golle (1):
dt-bindings: net: mediatek: remove wrongly added clocks and SerDes
Dave Airlie (1):
Revert "drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()"
David Bauer (1):
net l2tp: drop flow hash on forward
David Howells (4):
Fix a potential infinite loop in extract_user_to_sg()
rxrpc: Fix the names of the fields in the ACK trailer struct
rxrpc: Fix congestion control algorithm
rxrpc: Only transmit one ACK per jumbo packet received
David Lechner (2):
spi: axi-spi-engine: use common AXI macros
spi: axi-spi-engine: fix version format string
Devyn Liu (1):
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
Dominique Martinet (1):
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Donald Hunter (1):
netlink: specs: Add missing bridge linkinfo attrs
Doug Berger (3):
net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
net: bcmgenet: synchronize UMAC_CMD access
Doug Smythies (1):
tools/power turbostat: Fix added raw MSR output
Douglas Anderson (1):
drm/connector: Add \n to message about demoting connector force-probes
Duoming Zhou (2):
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Eric Dumazet (8):
net: add copy_safe_from_sockptr() helper
nfc: llcp: fix nfc_llcp_setsockopt() unsafe copies
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
phonet: fix rtm_phonet_notify() skb allocation
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
net-sysfs: convert dev->operstate reads to lockless ones
ipv6: annotate data-races around cnf.disable_ipv6
ipv6: prevent NULL dereference in ip6_output()
Eric Van Hensbergen (2):
fs/9p: fix uninitialized values during inode evict
fs/9p: remove erroneous nlink init from legacy stat2inode
Felix Fietkau (3):
net: bridge: fix multicast-to-unicast with fraglist GSO
net: core: reject skb_copy(_expand) for fraglist GSO skbs
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Frank Oltmanns (2):
clk: sunxi-ng: common: Support minimum and maximum rate
clk: sunxi-ng: a64: Set minimum and maximum rate for PLL-MIPI
Gabe Teeger (1):
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Gaurav Batra (1):
powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE
George Shen (1):
drm/amd/display: Handle Y carry-over in VCP X.Y calculation
Greg Kroah-Hartman (1):
Linux 6.8.10
Gregory Detal (1):
mptcp: only allow set existing scheduler for net.mptcp.scheduler
Guenter Roeck (1):
usb: ohci: Prevent missed ohci interrupts
Guillaume Nault (3):
vxlan: Fix racy device stats updates.
vxlan: Add missing VNI filter counter update in arp_reduce().
vxlan: Pull inner IP header in vxlan_rcv().
Hans de Goede (3):
pinctrl: baytrail: Fix selecting gpio pinctrl state
iio: accel: mxc4005: Interrupt handling fixes
iio: accel: mxc4005: Reset chip on probe() and resume()
Hersen Wu (1):
drm/amd/display: Fix incorrect DSC instance for MST
Himal Prasad Ghimiray (1):
drm/xe/xe_migrate: Cast to output precision before multiplying operands
Ian Forbes (1):
drm/vmwgfx: Fix Legacy Display Unit
Ido Schimmel (1):
selftests: test_bridge_neigh_suppress.sh: Fix failures due to duplicate MAC
Igor Artemiev (1):
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Ivan Avdeev (1):
usb: gadget: uvc: use correct buffer size when parsing configfs lists
Jacek Lawrynowicz (2):
accel/ivpu: Remove d3hot_after_power_off WA
accel/ivpu: Fix missed error message after VPU rename
Jan Dakinevich (1):
pinctrl/meson: fix typo in PDM's pin name
Jason Gunthorpe (1):
iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault()
Jason Xing (1):
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Javier Carrasco (1):
dt-bindings: iio: health: maxim,max30102: fix compatible check
Jeff Johnson (1):
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Jeff Layton (2):
vboxsf: explicitly deny setlease attempts
9p: explicitly deny setlease attempts
Jeffrey Altman (1):
rxrpc: Clients must accept conn from any address
Jens Remus (1):
s390/vdso: Add CFI for RA register to asm macro vdso_func
Jernej Skrabec (1):
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Jerome Brunet (7):
ASoC: meson: axg-fifo: use FIELD helpers
ASoC: meson: axg-fifo: use threaded irq to check periods
ASoC: meson: axg-card: make links nonatomic
ASoC: meson: axg-tdm-interface: manage formatters in trigger
ASoC: meson: cards: select SND_DYNAMIC_MINORS
drm/meson: dw-hdmi: power up phy on device init
drm/meson: dw-hdmi: add bandgap setting for g12
Jian Shen (1):
net: hns3: direct return when receive a unknown mailbox message
Jiaxun Yang (1):
MIPS: scall: Save thread_info.syscall unconditionally on entry
Jim Cromie (1):
dyndbg: fix old BUG_ON in >control parser
Joakim Sindholt (4):
fs/9p: only translate RWX permissions for plain 9P2000
fs/9p: translate O_TRUNC into OTRUNC
fs/9p: fix the cache always being enabled on files with qid flags
fs/9p: drop inodes immediately on non-.L too
Joao Paulo Goncalves (1):
ASoC: ti: davinci-mcasp: Fix race condition during probe
Johan Hovold (9):
regulator: core: fix debugfs creation regression
Bluetooth: qca: fix invalid device address check
Bluetooth: qca: fix wcn3991 device address check
Bluetooth: qca: add missing firmware sanity checks
Bluetooth: qca: fix NVM configuration parsing
Bluetooth: qca: generalise device address check
Bluetooth: qca: fix info leak when fetching board id
Bluetooth: qca: fix info leak when fetching fw build id
Bluetooth: qca: fix firmware check error path
Johannes Berg (3):
wifi: nl80211: don't free NULL coalescing rule
wifi: mac80211: fix prep_connection error path
wifi: iwlwifi: read txq->read_ptr under lock
John Stultz (1):
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Jonathan Kim (1):
drm/amdkfd: range check cp bad op exception interrupts
Josef Bacik (7):
sunrpc: add a struct rpc_stats arg to rpc_create_args
nfs: expose /proc/net/sunrpc/nfs in net namespaces
nfs: make the rpc_stat per net namespace
nfsd: rename NFSD_NET_* to NFSD_STATS_*
nfsd: expose /proc/net/sunrpc/nfsd in net namespaces
nfsd: make all of the nfsd stats per-network namespace
btrfs: make sure that WRITTEN is set on all metadata blocks
Justin Ernst (1):
tools/power/turbostat: Fix uncore frequency file string
Justin Tee (6):
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
scsi: lpfc: Remove IRQF_ONESHOT flag from threaded IRQ handling
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
scsi: lpfc: Release hbalock before calling lpfc_worker_wake_up()
scsi: lpfc: Use a dedicated lock for ras_fwlog state
Karthikeyan Ramasubramanian (1):
drm/i915/bios: Fix parsing backlight BDB data
Kees Cook (1):
nouveau/gsp: Avoid addressing beyond end of rpc->entries
Kefeng Wang (1):
mm: use memalloc_nofs_save() in page_cache_ra_order()
Kenneth Feng (1):
drm/amd/pm: fix the high voltage issue after unload
Kent Gibson (1):
gpiolib: cdev: fix uninitialised kfifo
Krzysztof Kozlowski (2):
iommu: mtk: fix module autoloading
gpio: lpc32xx: fix module autoloading
Kuniyuki Iwashima (3):
nfs: Handle error of rpc_proc_register() in nfs_net_init().
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Lakshmi Yadlapati (1):
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Len Brown (2):
tools/power turbostat: Expand probe_intel_uncore_frequency()
tools/power turbostat: Fix warning upon failed /dev/cpu_dma_latency read
Li Ma (1):
drm/amd/display: add DCN 351 version for microcode load
Li Nan (2):
block: fix overflow in blk_ioctl_discard()
blk-iocost: do not WARN if iocg was already offlined
Liam R. Howlett (1):
maple_tree: fix mas_empty_area_rev() null pointer dereference
Lijo Lazar (2):
drm/amdgpu: Refine IB schedule error logging
drm/amdgpu: Fix VCN allocation in CPX partition
Linus Torvalds (1):
Reapply "drm/qxl: simplify qxl_fence_wait"
Lucas De Marchi (2):
drm/xe/display: Fix ADL-N detection
drm/xe: Fix END redefinition
Lukasz Majewski (1):
hsr: Simplify code for announcing HSR nodes timer setup
Lyude Paul (3):
drm/nouveau/dp: Don't probe eDP ports twice harder
drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()
drm/nouveau/gsp: Use the sg allocator for level 2 of radix3
Mans Rullgard (1):
spi: fix null pointer dereference within spi_sync
Marek Behún (1):
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Marek Szyprowski (1):
clk: samsung: Revert "clk: Use device_get_match_data()"
Marek Vasut (1):
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Mario Limonciello (2):
platform/x86/amd: pmf: Decrease error message to debug
dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
Mark Rutland (1):
selftests/ftrace: Fix event filter target_func selection
Matt Coster (1):
drm/imagination: Ensure PVR_MIPS_PT_PAGE_COUNT is never zero
Matti Vaittinen (2):
regulator: change stubbed devm_regulator_get_enable to return Ok
regulator: change devm_regulator_get_enable_optional() stub to return Ok
Maurizio Lombardi (1):
scsi: target: Fix SELinux error when systemd-modules loads the target module
Max Filippov (1):
xtensa: fix MAKE_PC_FROM_RA second argument
Michael Ellerman (2):
powerpc/crypto/chacha-p10: Fix failure on non Power10
selftests/mm: fix powerpc ARCH check
Michael Kelley (1):
Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted
Michel Dänzer (1):
drm/amdgpu: Fix comparison in amdgpu_res_cpu_visible
Mukul Joshi (1):
drm/amdkfd: Check cgroup when returning DMABuf info
Namjae Jeon (3):
ksmbd: off ipv6only for both ipv4/ipv6 binding
ksmbd: avoid to send duplicate lease break notifications
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Nayna Jain (1):
powerpc/pseries: make max polling consistent for longer H_CALLs
Nicholas Kazlauskas (1):
drm/amd/display: Fix idle optimization checks for multi-display and dual eDP
Nicolas Bouchinet (1):
mm/slub: avoid zeroing outside-object freepointer for single free
Nikhil Rao (1):
dmaengine: idxd: add a write() method for applications to submit work
Olga Kornievskaia (1):
SUNRPC: add a missing rpc_stat for TCP TLS
Oliver Upton (1):
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Oswald Buddenhagen (4):
ALSA: emu10k1: fix E-MU card dock presence monitoring
ALSA: emu10k1: factor out snd_emu1010_load_dock_firmware()
ALSA: emu10k1: move the whole GPIO event handling to the workqueue
ALSA: emu10k1: fix E-MU dock initialization
Paolo Abeni (2):
mptcp: ensure snd_nxt is properly initialized on connect
tipc: fix UAF in error path
Patryk Wlazlyn (1):
tools/power turbostat: Print ucode revision only if valid
Paul Davey (1):
xfrm: Preserve vlan tags for transport mode software GRO
Peiyang Wang (4):
net: hns3: using user configure after hardware reset
net: hns3: change type of numa_node_mask as nodemask_t
net: hns3: release PTP resources if pf initialization failed
net: hns3: use appropriate barrier function after setting a bit value
Peng Liu (1):
tools/power turbostat: Fix Bzy_MHz documentation typo
Peter Korsgaard (1):
usb: gadget: composite: fix OS descriptors w_value logic
Peter Ujfalusi (1):
ASoC: SOF: Intel: hda-dsp: Skip IMR boot on ACE platforms in case of S3 suspend
Peter Wang (2):
scsi: ufs: core: WLUN suspend dev/link state error recovery
scsi: ufs: core: Fix MCQ mode dev command timeout
Peter Xu (1):
mm/userfaultfd: reset ptes when close() for wr-protected ones
Phil Elwell (1):
net: bcmgenet: Reset RBUF on first open
Pierre-Louis Bossart (2):
ASoC: SOF: Intel: add default firmware library path for LNL
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Puranjay Mohan (1):
arm32, bpf: Reimplement sign-extension mov instruction
Qu Wenruo (2):
btrfs: set correct ram_bytes when splitting ordered extent
btrfs: qgroup: do not check qgroup inherit if qgroup is disabled
RD Babiera (1):
usb: typec: tcpm: clear pd_event queue in PORT_RESET
Rafael J. Wysocki (3):
thermal/debugfs: Free all thermal zone debug memory on zone removal
thermal/debugfs: Fix two locking issues with thermal zone debug
thermal/debugfs: Prevent use-after-free from occurring after cdev removal
Ramona Gradinariu (1):
iio:imu: adis16475: Fix sync mode setting
Richard Fitzgerald (1):
regmap: Add regmap_read_bypassed()
Richard Gobert (2):
net: gro: fix udp bad offset in socket lookup by adding {inner_}network_offset to napi_gro_cb
net: gro: add flush check in udp_gro_receive_segment
Rick Edgecombe (4):
Drivers: hv: vmbus: Leak pages if set_memory_encrypted() fails
Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
hv_netvsc: Don't free decrypted memory
uio_hv_generic: Don't free decrypted memory
Rik van Riel (1):
blk-iocost: avoid out of bounds shift
Roded Zats (1):
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Rohit Ner (1):
scsi: ufs: core: Fix MCQ MAC configuration
Ryan Roberts (2):
fs/proc/task_mmu: fix loss of young/dirty bits during pagemap scan
fs/proc/task_mmu: fix uffd-wp confusion in pagemap_scan_pmd_entry()
Sameer Pujar (1):
ASoC: tegra: Fix DSPK 16-bit playback
Saurav Kashyap (1):
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Sean Anderson (1):
nvme-pci: Add quirk for broken MSIs
Sebastian Andrzej Siewior (1):
cxgb4: Properly lock TX queue for the selftest.
Shashank Sharma (1):
drm/amdgpu: fix doorbell regression
Shigeru Yoshida (2):
ipv4: Fix uninit-value access in __ip_make_skb()
ipv6: Fix potential uninit-value access in __ip6_make_skb()
Shin'ichiro Kawasaki (1):
scsi: mpi3mr: Avoid memcpy field-spanning write WARNING
Shubhrajyoti Datta (1):
EDAC/versal: Do not log total error counts
Silvio Gissi (1):
keys: Fix overwrite of key expiration on instantiation
Srinivas Kandagatla (1):
ASoC: codecs: wsa881x: set clk_stop_mode1 flag
Srinivas Pandruvada (1):
platform/x86: ISST: Add Granite Rapids-D to HPM CPU list
Steffen Bätz (1):
net: dsa: mv88e6xxx: add phylink_get_caps for the mv88e6320/21 family
Stephen Boyd (1):
clk: Don't hold prepare_lock when calling kref_put()
Steve French (1):
smb3: fix broken reconnect when password changing on the server by allowing password rotation
Steven Rostedt (Google) (3):
tracefs: Reset permissions on remount if permissions are options
tracefs: Still use mount point as default permissions for instances
eventfs: Do not treat events directory different than other directories
Sungwoo Kim (2):
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Bluetooth: HCI: Fix potential null-ptr-deref
Sven Schnelle (1):
workqueue: Fix selection of wake_cpu in kick_pool()
Takashi Iwai (2):
ALSA: line6: Zero-initialize message buffers
ALSA: hda/realtek: Fix conflicting PCI SSID 17aa:386f for Lenovo Legion models
Takashi Sakamoto (1):
firewire: ohci: fulfill timestamp for some local asynchronous transaction
Tao Zhou (1):
drm/amdgpu: implement IRQ_STATE_ENABLE for SDMA v4.4.2
Tetsuo Handa (1):
nfc: nci: Fix kcov check in nci_rx_work()
Thadeu Lima de Souza Cascardo (1):
net: fix out-of-bounds access in ops_init
Thanassis Avgerinos (1):
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Thierry Reding (1):
gpu: host1x: Do not setup DMA for virtual devices
Thinh Nguyen (2):
usb: xhci-plat: Don't include xhci.h
usb: dwc3: core: Prevent phy suspend during init
Thomas Bertschinger (1):
rust: module: place generated init_module() function in .init.text
Thomas Gleixner (1):
x86/apic: Don't access the APIC when disabling x2APIC
Thomas Weißschuh (1):
misc/pvpanic-pci: register attributes via pci_driver
Toke Høiland-Jørgensen (1):
xdp: use flags field to disambiguate broadcast redirect
Uwe Kleine-König (1):
OSS: dmasound/paula: Mark driver struct with __refdata to prevent section mismatch
Vanillan Wang (1):
net:usb:qmi_wwan: support Rolling modules
Vasant Hegde (1):
iommu/amd: Enhance def_domain_type to handle untrusted device
Vasileios Amoiridis (2):
iio: pressure: Fixes BME280 SPI driver data
iio: pressure: Fixes SPI support for BMP3xx devices
Viken Dadhaniya (1):
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Vitaly Lifshits (1):
e1000e: change usleep_range to udelay in PHY mdic access
Volodymyr Babchuk (1):
arm64: dts: qcom: sa8155p-adp: fix SDHC2 CD pin configuration
Wachowski, Karol (1):
accel/ivpu: Improve clarity of MMU error messages
Wei Yang (3):
memblock tests: fix undefined reference to `early_pfn_to_nid'
memblock tests: fix undefined reference to `panic'
memblock tests: fix undefined reference to `BIT'
Wen Gu (1):
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Wesley Cheng (1):
usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete
Will Deacon (1):
swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y
Wyes Karny (1):
tools/power turbostat: Increase the limit for fd opened
Xiang Chen (1):
scsi: hisi_sas: Handle the NCQ error returned by D2H frame
Xin Long (1):
tipc: fix a possible memleak in tipc_buf_append
Xu Kuohai (2):
bpf, arm64: Fix incorrect runtime stats
riscv, bpf: Fix incorrect runtime stats
Yi Zhang (1):
nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
Yifan Zhang (1):
drm/amdgpu: add smu 14.0.1 discovery support
Yihang Li (1):
scsi: libsas: Align SMP request allocation to ARCH_DMA_MINALIGN
Yonglong Liu (2):
net: hns3: fix port vlan filter not disabled issue
net: hns3: fix kernel crash when devlink reload during initialization
Yuezhang Mo (1):
exfat: fix timing of synchronizing bitmap and inode
Zack Rusin (2):
drm/ttm: Print the memory decryption status just once
drm/vmwgfx: Fix invalid reads in fence signaled events
Zeng Heng (1):
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
Zhang Yi (2):
ASoC: codecs: ES8326: Solve error interruption issue
ASoC: codecs: ES8326: modify clock table
Zhigang Luo (1):
amd/amdkfd: sync all devices to wait all processes being evicted
Zhongqiu Han (1):
gpiolib: cdev: Fix use after free in lineinfo_changed_notify
linke li (1):
net: mark racy access on sk->sk_rcvbuf
^ permalink raw reply [relevance 2%]
* Linux 6.6.31
@ 2024-05-17 11:58 2% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-17 11:58 UTC (permalink / raw)
To: linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby, Greg Kroah-Hartman
I'm announcing the release of the 6.6.31 kernel.
All users of the 6.6 kernel series must upgrade.
The updated 6.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.6.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml | 2
Documentation/devicetree/bindings/net/mediatek,net.yaml | 22
Makefile | 2
arch/arm/kernel/sleep.S | 4
arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 30
arch/arm64/kvm/vgic/vgic-kvm-device.c | 12
arch/arm64/net/bpf_jit_comp.c | 6
arch/mips/include/asm/ptrace.h | 2
arch/mips/kernel/asm-offsets.c | 1
arch/mips/kernel/ptrace.c | 15
arch/mips/kernel/scall32-o32.S | 23
arch/mips/kernel/scall64-n32.S | 3
arch/mips/kernel/scall64-n64.S | 3
arch/mips/kernel/scall64-o32.S | 33
arch/powerpc/crypto/chacha-p10-glue.c | 8
arch/powerpc/include/asm/plpks.h | 5
arch/powerpc/platforms/pseries/iommu.c | 8
arch/powerpc/platforms/pseries/plpks.c | 10
arch/riscv/net/bpf_jit_comp64.c | 6
arch/s390/include/asm/dwarf.h | 1
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2
arch/s390/mm/gmap.c | 2
arch/s390/mm/hugetlbpage.c | 2
arch/x86/kernel/apic/apic.c | 16
arch/xtensa/include/asm/processor.h | 8
arch/xtensa/include/asm/ptrace.h | 2
arch/xtensa/kernel/process.c | 5
arch/xtensa/kernel/stacktrace.c | 3
block/blk-iocost.c | 14
block/ioctl.c | 5
drivers/ata/sata_gemini.c | 5
drivers/base/regmap/regmap.c | 37 +
drivers/bluetooth/btqca.c | 206 +++++-
drivers/bluetooth/btqca.h | 8
drivers/bluetooth/hci_qca.c | 13
drivers/clk/clk.c | 12
drivers/clk/qcom/clk-smd-rpm.c | 1
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 2
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19
drivers/clk/sunxi-ng/ccu_common.c | 19
drivers/clk/sunxi-ng/ccu_common.h | 3
drivers/dma/idxd/cdev.c | 77 ++
drivers/dma/idxd/idxd.h | 3
drivers/dma/idxd/init.c | 4
drivers/dma/idxd/registers.h | 3
drivers/dma/idxd/sysfs.c | 27
drivers/firewire/nosy.c | 6
drivers/firewire/ohci.c | 14
drivers/gpio/gpio-crystalcove.c | 2
drivers/gpio/gpio-lpc32xx.c | 1
drivers/gpio/gpio-wcove.c | 2
drivers/gpio/gpiolib-cdev.c | 181 ++++-
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 52 -
drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 15
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 16
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 11
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 3
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 3
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 48 +
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2
drivers/gpu/drm/drm_connector.c | 2
drivers/gpu/drm/i915/display/intel_audio.c | 113 ---
drivers/gpu/drm/i915/display/intel_bios.c | 19
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c | 6
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.h | 2
drivers/gpu/drm/i915/gt/intel_workarounds.c | 4
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 --
drivers/gpu/drm/nouveau/nouveau_dp.c | 13
drivers/gpu/drm/panel/Kconfig | 2
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 13
drivers/gpu/drm/qxl/qxl_release.c | 50 -
drivers/gpu/drm/radeon/pptable.h | 10
drivers/gpu/drm/ttm/ttm_tt.c | 2
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 1
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2
drivers/gpu/host1x/bus.c | 8
drivers/hv/channel.c | 29
drivers/hv/connection.c | 29
drivers/hwmon/corsair-cpro.c | 45 -
drivers/hwmon/pmbus/ucd9000.c | 6
drivers/iio/accel/mxc4005.c | 24
drivers/iio/imu/adis16475.c | 4
drivers/iio/pressure/bmp280-spi.c | 4
drivers/infiniband/hw/qib/qib_fs.c | 1
drivers/iommu/mtk_iommu.c | 1
drivers/iommu/mtk_iommu_v1.c | 1
drivers/md/md.c | 1
drivers/misc/eeprom/at24.c | 47 +
drivers/misc/mei/hw-me-regs.h | 2
drivers/misc/mei/pci-me.c | 2
drivers/mtd/mtdcore.c | 2
drivers/net/dsa/mv88e6xxx/chip.c | 20
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 32
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8
drivers/net/ethernet/broadcom/genet/bcmmii.c | 6
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 52 -
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 20
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2
drivers/net/ethernet/intel/e1000e/phy.c | 8
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4
drivers/net/ethernet/micrel/ks8851_common.c | 16
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14
drivers/net/hyperv/netvsc.c | 7
drivers/net/usb/qmi_wwan.c | 1
drivers/net/vxlan/vxlan_core.c | 49 +
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 7
drivers/net/wireless/intel/iwlwifi/queue/tx.c | 2
drivers/nvme/host/core.c | 2
drivers/nvme/host/nvme.h | 5
drivers/nvme/host/pci.c | 14
drivers/nvmem/apple-efuses.c | 1
drivers/nvmem/core.c | 8
drivers/nvmem/imx-ocotp-scu.c | 1
drivers/nvmem/imx-ocotp.c | 1
drivers/nvmem/meson-efuse.c | 1
drivers/nvmem/meson-mx-efuse.c | 1
drivers/nvmem/microchip-otpc.c | 1
drivers/nvmem/mtk-efuse.c | 1
drivers/nvmem/qcom-spmi-sdam.c | 1
drivers/nvmem/qfprom.c | 1
drivers/nvmem/rave-sp-eeprom.c | 1
drivers/nvmem/rockchip-efuse.c | 1
drivers/nvmem/sc27xx-efuse.c | 1
drivers/nvmem/sec-qfprom.c | 1
drivers/nvmem/sprd-efuse.c | 1
drivers/nvmem/stm32-romem.c | 1
drivers/nvmem/sunplus-ocotp.c | 1
drivers/nvmem/sunxi_sid.c | 1
drivers/nvmem/uniphier-efuse.c | 1
drivers/nvmem/zynqmp_nvmem.c | 1
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 -
drivers/pinctrl/core.c | 8
drivers/pinctrl/devicetree.c | 10
drivers/pinctrl/intel/pinctrl-baytrail.c | 74 +-
drivers/pinctrl/intel/pinctrl-intel.h | 4
drivers/pinctrl/mediatek/pinctrl-paris.c | 40 -
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6
drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 1
drivers/power/supply/mt6360_charger.c | 2
drivers/power/supply/rt9455_charger.c | 2
drivers/regulator/core.c | 27
drivers/regulator/mt6360-regulator.c | 32
drivers/regulator/tps65132-regulator.c | 7
drivers/rtc/nvmem.c | 1
drivers/s390/cio/cio_inject.c | 2
drivers/s390/net/qeth_core_main.c | 61 -
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10
drivers/scsi/libsas/sas_expander.c | 2
drivers/scsi/lpfc/lpfc.h | 2
drivers/scsi/lpfc/lpfc_attr.c | 4
drivers/scsi/lpfc/lpfc_bsg.c | 20
drivers/scsi/lpfc/lpfc_debugfs.c | 12
drivers/scsi/lpfc/lpfc_els.c | 20
drivers/scsi/lpfc/lpfc_hbadisc.c | 5
drivers/scsi/lpfc/lpfc_init.c | 5
drivers/scsi/lpfc/lpfc_nvme.c | 4
drivers/scsi/lpfc/lpfc_scsi.c | 13
drivers/scsi/lpfc/lpfc_sli.c | 34 -
drivers/scsi/lpfc/lpfc_vport.c | 8
drivers/scsi/mpi3mr/mpi3mr_app.c | 2
drivers/slimbus/qcom-ngd-ctrl.c | 6
drivers/spi/spi-axi-spi-engine.c | 227 +++---
drivers/spi/spi-hisi-kunpeng.c | 2
drivers/spi/spi-microchip-core-qspi.c | 1
drivers/spi/spi.c | 1
drivers/target/target_core_configfs.c | 12
drivers/ufs/core/ufs-mcq.c | 2
drivers/ufs/core/ufshcd.c | 9
drivers/uio/uio_hv_generic.c | 12
drivers/usb/core/hub.c | 5
drivers/usb/core/port.c | 8
drivers/usb/dwc3/core.c | 90 +-
drivers/usb/dwc3/core.h | 1
drivers/usb/dwc3/gadget.c | 2
drivers/usb/dwc3/host.c | 27
drivers/usb/gadget/composite.c | 6
drivers/usb/gadget/function/f_fs.c | 9
drivers/usb/gadget/function/uvc_configfs.c | 4
drivers/usb/host/ohci-hcd.c | 8
drivers/usb/host/xhci-plat.h | 4
drivers/usb/host/xhci-rzv2m.c | 1
drivers/usb/typec/tcpm/tcpm.c | 36 -
drivers/usb/typec/ucsi/ucsi.c | 12
drivers/vfio/pci/vfio_pci.c | 2
drivers/w1/slaves/w1_ds250x.c | 1
fs/9p/fid.h | 3
fs/9p/vfs_file.c | 2
fs/9p/vfs_inode.c | 5
fs/9p/vfs_super.c | 1
fs/btrfs/extent_io.c | 14
fs/btrfs/inode.c | 2
fs/btrfs/ordered-data.c | 1
fs/btrfs/send.c | 4
fs/btrfs/transaction.c | 2
fs/btrfs/volumes.c | 18
fs/gfs2/bmap.c | 5
fs/nfs/client.c | 5
fs/nfs/inode.c | 13
fs/nfs/internal.h | 2
fs/nfs/netns.h | 2
fs/smb/client/cifsglob.h | 1
fs/smb/client/connect.c | 8
fs/smb/client/fs_context.c | 21
fs/smb/client/fs_context.h | 2
fs/smb/client/misc.c | 1
fs/smb/client/smb2pdu.c | 11
fs/smb/server/oplock.c | 35 -
fs/smb/server/transport_tcp.c | 4
fs/tracefs/event_inode.c | 45 -
fs/tracefs/inode.c | 92 ++
fs/tracefs/internal.h | 7
fs/userfaultfd.c | 4
fs/vboxsf/file.c | 1
include/linux/compiler_types.h | 11
include/linux/dma-fence.h | 7
include/linux/gfp_types.h | 2
include/linux/hyperv.h | 1
include/linux/nvmem-provider.h | 2
include/linux/pci_ids.h | 2
include/linux/regmap.h | 8
include/linux/regulator/consumer.h | 4
include/linux/skbuff.h | 15
include/linux/skmsg.h | 2
include/linux/slab.h | 2
include/linux/sunrpc/clnt.h | 1
include/net/gro.h | 9
include/net/xfrm.h | 3
include/sound/emu10k1.h | 3
include/sound/sof.h | 7
include/trace/events/rxrpc.h | 2
include/uapi/linux/kfd_ioctl.h | 17
include/uapi/scsi/scsi_bsg_mpi3mr.h | 2
kernel/bpf/bloom_filter.c | 13
kernel/bpf/verifier.c | 3
kernel/dma/swiotlb.c | 1
kernel/workqueue.c | 8
lib/Kconfig.debug | 5
lib/dynamic_debug.c | 6
lib/maple_tree.c | 16
lib/scatterlist.c | 2
mm/hugetlb.c | 4
mm/readahead.c | 4
net/8021q/vlan_core.c | 2
net/bluetooth/hci_core.c | 3
net/bluetooth/hci_event.c | 2
net/bluetooth/l2cap_core.c | 3
net/bluetooth/msft.c | 2
net/bluetooth/msft.h | 4
net/bluetooth/sco.c | 4
net/bridge/br_forward.c | 9
net/bridge/br_netlink.c | 3
net/core/filter.c | 42 -
net/core/gro.c | 1
net/core/link_watch.c | 4
net/core/net-sysfs.c | 4
net/core/net_namespace.c | 13
net/core/rtnetlink.c | 6
net/core/skbuff.c | 27
net/core/skmsg.c | 5
net/core/sock.c | 4
net/hsr/hsr_device.c | 31
net/ipv4/af_inet.c | 1
net/ipv4/ip_output.c | 2
net/ipv4/raw.c | 3
net/ipv4/tcp.c | 4
net/ipv4/tcp_input.c | 2
net/ipv4/tcp_ipv4.c | 8
net/ipv4/tcp_output.c | 4
net/ipv4/udp.c | 3
net/ipv4/udp_offload.c | 15
net/ipv4/xfrm4_input.c | 6
net/ipv6/addrconf.c | 11
net/ipv6/fib6_rules.c | 6
net/ipv6/ip6_input.c | 4
net/ipv6/ip6_offload.c | 52 +
net/ipv6/ip6_output.c | 4
net/ipv6/udp.c | 3
net/ipv6/udp_offload.c | 3
net/ipv6/xfrm6_input.c | 6
net/l2tp/l2tp_eth.c | 3
net/mac80211/ieee80211_i.h | 4
net/mac80211/mlme.c | 5
net/mptcp/ctrl.c | 39 +
net/mptcp/protocol.c | 3
net/nfc/nci/core.c | 1
net/nsh/nsh.c | 14
net/phonet/pn_netlink.c | 2
net/rxrpc/ar-internal.h | 2
net/rxrpc/call_object.c | 7
net/rxrpc/conn_event.c | 16
net/rxrpc/conn_object.c | 9
net/rxrpc/input.c | 71 +-
net/rxrpc/output.c | 14
net/rxrpc/protocol.h | 6
net/smc/smc_ib.c | 19
net/sunrpc/clnt.c | 5
net/sunrpc/xprtsock.c | 1
net/tipc/msg.c | 8
net/wireless/nl80211.c | 2
net/wireless/trace.h | 2
net/xfrm/xfrm_input.c | 8
rust/kernel/lib.rs | 2
rust/macros/module.rs | 185 +++--
scripts/Makefile.modfinal | 2
security/keys/key.c | 3
sound/hda/intel-sdw-acpi.c | 2
sound/pci/emu10k1/emu10k1.c | 3
sound/pci/emu10k1/emu10k1_main.c | 139 ++--
sound/pci/hda/patch_realtek.c | 1
sound/soc/codecs/wsa881x.c | 1
sound/soc/intel/avs/topology.c | 2
sound/soc/meson/Kconfig | 1
sound/soc/meson/axg-card.c | 1
sound/soc/meson/axg-fifo.c | 52 -
sound/soc/meson/axg-fifo.h | 12
sound/soc/meson/axg-frddr.c | 5
sound/soc/meson/axg-tdm-interface.c | 34 -
sound/soc/meson/axg-toddr.c | 22
sound/soc/sof/intel/hda-dsp.c | 20
sound/soc/sof/intel/pci-lnl.c | 3
sound/soc/tegra/tegra186_dspk.c | 7
sound/soc/ti/davinci-mcasp.c | 12
sound/usb/line6/driver.c | 6
tools/include/linux/kernel.h | 1
tools/include/linux/mm.h | 5
tools/include/linux/panic.h | 19
tools/power/x86/turbostat/turbostat.8 | 2
tools/power/x86/turbostat/turbostat.c | 45 +
tools/testing/selftests/bpf/prog_tests/bloom_filter_map.c | 6
tools/testing/selftests/bpf/prog_tests/tc_redirect.c | 52 -
tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc | 2
tools/testing/selftests/mm/Makefile | 6
tools/testing/selftests/net/test_bridge_neigh_suppress.sh | 333 ++++------
tools/testing/selftests/timers/valid-adjtimex.c | 73 +-
350 files changed, 3141 insertions(+), 1836 deletions(-)
Adam Goldman (1):
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Adam Skladowski (1):
clk: qcom: smd-rpm: Restore msm8976 num_clk
Al Viro (1):
qibfs: fix dentry leak
Alan Stern (2):
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
USB: core: Fix access violation during port device removal
Aleksa Savic (3):
hwmon: (corsair-cpro) Use a separate buffer for sending commands
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Alex Deucher (2):
drm/radeon: silence UBSAN warning (v3)
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Alex Hung (1):
drm/amd/display: Skip on writeback when it's not applicable
Alexander Potapenko (1):
kmsan: compiler_types: declare __no_sanitize_or_inline
Alexander Usyskin (1):
mei: me: add lunar lake point M DID
Alexandra Winter (1):
s390/qeth: Fix kernel panic after setting hsuid
Amadeusz Sławiński (1):
ASoC: Intel: avs: Set name of control as in topology
Aman Dhoot (1):
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Amit Sunil Dhamne (1):
usb: typec: tcpm: unregister existing source caps before re-registration
Anand Jain (1):
btrfs: return accurate error code on open failure in open_fs_devices()
Andi Shyti (1):
drm/i915/gt: Automate CCS Mode setting during engine resets
Andrei Matei (1):
bpf: Check bloom filter map value size
Andrew Price (1):
gfs2: Fix invalid metadata access in punch_hole
Andrii Nakryiko (1):
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
André Apitzsch (1):
regulator: tps65132: Add of_match table
Andy Shevchenko (5):
drm/panel: ili9341: Correct use of device property APIs
drm/panel: ili9341: Respect deferred probe
drm/panel: ili9341: Use predefined error codes
gpio: wcove: Use -ENOTSUPP consistently
gpio: crystalcove: Use -ENOTSUPP consistently
AngeloGioacchino Del Regno (2):
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
regulator: mt6360: De-capitalize devicetree regulator subnodes
Anton Protopopov (1):
bpf: Fix a verifier verbose message
Arjan van de Ven (2):
VFIO: Add the SPR_DSA and SPR_IAX devices to the denylist
dmaengine: idxd: add a new security check to deal with a hardware erratum
Arnd Bergmann (1):
power: rt9455: hide unused rt9455_boost_voltage_values
Asbjørn Sloth Tønnesen (4):
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
net: qede: use return from qede_parse_flow_attr() for flower
net: qede: use return from qede_parse_flow_attr() for flow_spec
net: qede: use return from qede_parse_actions()
Badhri Jagan Sridharan (1):
usb: typec: tcpm: Check for port partner validity before consuming it
Benjamin Berg (1):
wifi: iwlwifi: mvm: guard against invalid STA ID on removal
Benno Lossin (1):
rust: macros: fix soundness issue in `module!` macro
Billy Tsai (1):
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Boris Burkov (2):
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
btrfs: always clear PERTRANS metadata during commit
Borislav Petkov (AMD) (1):
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Boy.Wu (1):
ARM: 9381/1: kasan: clear stale stack poison
Bui Quang Minh (3):
bna: ensure the copied buf is NUL terminated
octeontx2-af: avoid off-by-one read from userspace
s390/cio: Ensure the copied buf is NUL terminated
Bumyong Lee (1):
dmaengine: pl330: issue_pending waits until WFP state
Chaitanya Kumar Borah (1):
drm/i915/audio: Fix audio time stamp programming for DP
Chen Ni (1):
ata: sata_gemini: Check clk_enable() result
Chen-Yu Tsai (2):
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chris Wulff (1):
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Christian A. Ehrhardt (2):
usb: typec: ucsi: Check for notifications after init
usb: typec: ucsi: Fix connector check on init
Christian König (1):
drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2
Christian Marangi (1):
mtd: limit OTP NVMEM cell parse to non-NAND devices
Claudio Imbrenda (2):
s390/mm: Fix storage key clearing for guest huge pages
s390/mm: Fix clearing storage keys for huge pages
Conor Dooley (1):
spi: microchip-core-qspi: fix setting spi bus clock rate
Dan Carpenter (2):
pinctrl: core: delete incorrect free in pinctrl_enable()
mm/slab: make __free(kfree) accept error pointers
Daniel Golle (1):
dt-bindings: net: mediatek: remove wrongly added clocks and SerDes
Daniel Okazaki (1):
eeprom: at24: fix memory corruption race condition
Dave Airlie (1):
Revert "drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()"
David Bauer (1):
net l2tp: drop flow hash on forward
David Howells (4):
Fix a potential infinite loop in extract_user_to_sg()
rxrpc: Fix the names of the fields in the ACK trailer struct
rxrpc: Fix congestion control algorithm
rxrpc: Only transmit one ACK per jumbo packet received
David Lechner (5):
spi: axi-spi-engine: simplify driver data allocation
spi: axi-spi-engine: use devm_spi_alloc_host()
spi: axi-spi-engine: move msg state to new struct
spi: axi-spi-engine: use common AXI macros
spi: axi-spi-engine: fix version format string
Devyn Liu (1):
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
Dmitry Antipov (1):
btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send()
Dominique Martinet (1):
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Doug Berger (3):
net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
net: bcmgenet: synchronize UMAC_CMD access
Doug Smythies (1):
tools/power turbostat: Fix added raw MSR output
Douglas Anderson (1):
drm/connector: Add \n to message about demoting connector force-probes
Duoming Zhou (2):
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Eric Dumazet (6):
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
phonet: fix rtm_phonet_notify() skb allocation
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
net-sysfs: convert dev->operstate reads to lockless ones
ipv6: annotate data-races around cnf.disable_ipv6
ipv6: prevent NULL dereference in ip6_output()
Felix Fietkau (3):
net: bridge: fix multicast-to-unicast with fraglist GSO
net: core: reject skb_copy(_expand) for fraglist GSO skbs
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Frank Oltmanns (2):
clk: sunxi-ng: common: Support minimum and maximum rate
clk: sunxi-ng: a64: Set minimum and maximum rate for PLL-MIPI
Gabe Teeger (1):
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Gaurav Batra (1):
powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE
George Shen (1):
drm/amd/display: Handle Y carry-over in VCP X.Y calculation
Greg Kroah-Hartman (1):
Linux 6.6.31
Gregory Detal (1):
mptcp: only allow set existing scheduler for net.mptcp.scheduler
Guenter Roeck (1):
usb: ohci: Prevent missed ohci interrupts
Guillaume Nault (3):
vxlan: Fix racy device stats updates.
vxlan: Add missing VNI filter counter update in arp_reduce().
vxlan: Pull inner IP header in vxlan_rcv().
Hangbin Liu (1):
selftests/net: convert test_bridge_neigh_suppress.sh to run it in unique namespace
Hans de Goede (2):
pinctrl: baytrail: Fix selecting gpio pinctrl state
iio: accel: mxc4005: Interrupt handling fixes
Heiner Kallweit (1):
eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
Hersen Wu (1):
drm/amd/display: Fix incorrect DSC instance for MST
Ian Forbes (1):
drm/vmwgfx: Fix Legacy Display Unit
Ido Schimmel (1):
selftests: test_bridge_neigh_suppress.sh: Fix failures due to duplicate MAC
Igor Artemiev (1):
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Ivan Avdeev (1):
usb: gadget: uvc: use correct buffer size when parsing configfs lists
Jan Dakinevich (1):
pinctrl/meson: fix typo in PDM's pin name
Jason Xing (1):
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Javier Carrasco (1):
dt-bindings: iio: health: maxim,max30102: fix compatible check
Jeff Johnson (1):
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Jeff Layton (2):
vboxsf: explicitly deny setlease attempts
9p: explicitly deny setlease attempts
Jeffrey Altman (1):
rxrpc: Clients must accept conn from any address
Jens Remus (1):
s390/vdso: Add CFI for RA register to asm macro vdso_func
Jernej Skrabec (1):
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Jerome Brunet (7):
ASoC: meson: axg-fifo: use FIELD helpers
ASoC: meson: axg-fifo: use threaded irq to check periods
ASoC: meson: axg-card: make links nonatomic
ASoC: meson: axg-tdm-interface: manage formatters in trigger
ASoC: meson: cards: select SND_DYNAMIC_MINORS
drm/meson: dw-hdmi: power up phy on device init
drm/meson: dw-hdmi: add bandgap setting for g12
Jian Shen (1):
net: hns3: direct return when receive a unknown mailbox message
Jiaxun Yang (1):
MIPS: scall: Save thread_info.syscall unconditionally on entry
Jim Cromie (1):
dyndbg: fix old BUG_ON in >control parser
Joakim Sindholt (4):
fs/9p: only translate RWX permissions for plain 9P2000
fs/9p: translate O_TRUNC into OTRUNC
fs/9p: fix the cache always being enabled on files with qid flags
fs/9p: drop inodes immediately on non-.L too
Joao Paulo Goncalves (1):
ASoC: ti: davinci-mcasp: Fix race condition during probe
Johan Hovold (9):
regulator: core: fix debugfs creation regression
Bluetooth: qca: fix invalid device address check
Bluetooth: qca: fix wcn3991 device address check
Bluetooth: qca: add missing firmware sanity checks
Bluetooth: qca: fix NVM configuration parsing
Bluetooth: qca: generalise device address check
Bluetooth: qca: fix info leak when fetching board id
Bluetooth: qca: fix info leak when fetching fw build id
Bluetooth: qca: fix firmware check error path
Johannes Berg (3):
wifi: nl80211: don't free NULL coalescing rule
wifi: mac80211: fix prep_connection error path
wifi: iwlwifi: read txq->read_ptr under lock
John Stultz (1):
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Jonathan Kim (1):
drm/amdkfd: range check cp bad op exception interrupts
Josef Bacik (3):
sunrpc: add a struct rpc_stats arg to rpc_create_args
nfs: expose /proc/net/sunrpc/nfs in net namespaces
nfs: make the rpc_stat per net namespace
Justin Ernst (1):
tools/power/turbostat: Fix uncore frequency file string
Justin Tee (6):
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
scsi: lpfc: Remove IRQF_ONESHOT flag from threaded IRQ handling
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
scsi: lpfc: Release hbalock before calling lpfc_worker_wake_up()
scsi: lpfc: Use a dedicated lock for ras_fwlog state
Karthikeyan Ramasubramanian (1):
drm/i915/bios: Fix parsing backlight BDB data
Kefeng Wang (1):
mm: use memalloc_nofs_save() in page_cache_ra_order()
Kent Gibson (2):
gpiolib: cdev: relocate debounce_period_us from struct gpio_desc
gpiolib: cdev: fix uninitialised kfifo
Krzysztof Kozlowski (2):
iommu: mtk: fix module autoloading
gpio: lpc32xx: fix module autoloading
Kuniyuki Iwashima (3):
nfs: Handle error of rpc_proc_register() in nfs_net_init().
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Lakshmi Yadlapati (1):
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Len Brown (1):
tools/power turbostat: Fix warning upon failed /dev/cpu_dma_latency read
Li Nan (3):
block: fix overflow in blk_ioctl_discard()
blk-iocost: do not WARN if iocg was already offlined
md: fix kmemleak of rdev->serial
Li Zetao (1):
spi: spi-axi-spi-engine: Use helper function devm_clk_get_enabled()
Liam R. Howlett (1):
maple_tree: fix mas_empty_area_rev() null pointer dereference
Lijo Lazar (2):
drm/amdgpu: Refine IB schedule error logging
drm/amdgpu: Fix VCN allocation in CPX partition
Linus Torvalds (1):
Reapply "drm/qxl: simplify qxl_fence_wait"
Lukasz Majewski (1):
hsr: Simplify code for announcing HSR nodes timer setup
Lyude Paul (2):
drm/nouveau/dp: Don't probe eDP ports twice harder
drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()
Mans Rullgard (1):
spi: fix null pointer dereference within spi_sync
Marc Zyngier (1):
KVM: arm64: vgic-v2: Use cpuid from userspace as vcpu_id
Marek Behún (1):
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Marek Vasut (1):
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Mario Limonciello (1):
dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
Mark Rutland (1):
selftests/ftrace: Fix event filter target_func selection
Matti Vaittinen (2):
regulator: change stubbed devm_regulator_get_enable to return Ok
regulator: change devm_regulator_get_enable_optional() stub to return Ok
Maurizio Lombardi (1):
scsi: target: Fix SELinux error when systemd-modules loads the target module
Max Filippov (1):
xtensa: fix MAKE_PC_FROM_RA second argument
Miaohe Lin (1):
mm/hugetlb: fix DEBUG_LOCKS_WARN_ON(1) when dissolve_free_hugetlb_folio()
Michael Ellerman (2):
powerpc/crypto/chacha-p10: Fix failure on non Power10
selftests/mm: fix powerpc ARCH check
Michael Kelley (1):
Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted
Michel Dänzer (1):
drm/amdgpu: Fix comparison in amdgpu_res_cpu_visible
Mukul Joshi (1):
drm/amdkfd: Check cgroup when returning DMABuf info
Namjae Jeon (3):
ksmbd: off ipv6only for both ipv4/ipv6 binding
ksmbd: avoid to send duplicate lease break notifications
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Nayna Jain (1):
powerpc/pseries: make max polling consistent for longer H_CALLs
Nikhil Rao (1):
dmaengine: idxd: add a write() method for applications to submit work
Olga Kornievskaia (1):
SUNRPC: add a missing rpc_stat for TCP TLS
Oliver Upton (1):
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Oswald Buddenhagen (4):
ALSA: emu10k1: fix E-MU card dock presence monitoring
ALSA: emu10k1: factor out snd_emu1010_load_dock_firmware()
ALSA: emu10k1: move the whole GPIO event handling to the workqueue
ALSA: emu10k1: fix E-MU dock initialization
Paolo Abeni (2):
mptcp: ensure snd_nxt is properly initialized on connect
tipc: fix UAF in error path
Patryk Wlazlyn (1):
tools/power turbostat: Print ucode revision only if valid
Paul Davey (1):
xfrm: Preserve vlan tags for transport mode software GRO
Pei Xiao (1):
Revert "selftests/bpf: Add netkit to tc_redirect selftest"
Peiyang Wang (4):
net: hns3: using user configure after hardware reset
net: hns3: change type of numa_node_mask as nodemask_t
net: hns3: release PTP resources if pf initialization failed
net: hns3: use appropriate barrier function after setting a bit value
Peng Liu (1):
tools/power turbostat: Fix Bzy_MHz documentation typo
Peter Korsgaard (1):
usb: gadget: composite: fix OS descriptors w_value logic
Peter Ujfalusi (2):
ASoC: SOF: Introduce generic names for IPC types
ASoC: SOF: Intel: hda-dsp: Skip IMR boot on ACE platforms in case of S3 suspend
Peter Wang (2):
scsi: ufs: core: WLUN suspend dev/link state error recovery
scsi: ufs: core: Fix MCQ mode dev command timeout
Peter Xu (1):
mm/userfaultfd: reset ptes when close() for wr-protected ones
Phil Elwell (1):
net: bcmgenet: Reset RBUF on first open
Pierre-Louis Bossart (2):
ASoC: SOF: Intel: add default firmware library path for LNL
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Qu Wenruo (2):
btrfs: set correct ram_bytes when splitting ordered extent
btrfs: do not wait for short bulk allocation
RD Babiera (1):
usb: typec: tcpm: clear pd_event queue in PORT_RESET
Rafał Miłecki (1):
nvmem: add explicit config option to read old syntax fixed OF cells
Ramona Gradinariu (1):
iio:imu: adis16475: Fix sync mode setting
Richard Fitzgerald (1):
regmap: Add regmap_read_bypassed()
Richard Gobert (3):
net: gro: parse ipv6 ext headers without frag0 invalidation
net: gro: fix udp bad offset in socket lookup by adding {inner_}network_offset to napi_gro_cb
net: gro: add flush check in udp_gro_receive_segment
Rick Edgecombe (4):
Drivers: hv: vmbus: Leak pages if set_memory_encrypted() fails
Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
hv_netvsc: Don't free decrypted memory
uio_hv_generic: Don't free decrypted memory
Rik van Riel (1):
blk-iocost: avoid out of bounds shift
Roded Zats (1):
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Rohit Ner (1):
scsi: ufs: core: Fix MCQ MAC configuration
Sameer Pujar (1):
ASoC: tegra: Fix DSPK 16-bit playback
Saurav Kashyap (1):
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Sean Anderson (1):
nvme-pci: Add quirk for broken MSIs
Sebastian Andrzej Siewior (1):
cxgb4: Properly lock TX queue for the selftest.
Shashank Sharma (1):
drm/amdgpu: fix doorbell regression
Shigeru Yoshida (2):
ipv4: Fix uninit-value access in __ip_make_skb()
ipv6: Fix potential uninit-value access in __ip6_make_skb()
Shin'ichiro Kawasaki (1):
scsi: mpi3mr: Avoid memcpy field-spanning write WARNING
Silvio Gissi (1):
keys: Fix overwrite of key expiration on instantiation
Srinivas Kandagatla (1):
ASoC: codecs: wsa881x: set clk_stop_mode1 flag
Srinivas Pandruvada (1):
platform/x86: ISST: Add Granite Rapids-D to HPM CPU list
Steffen Bätz (1):
net: dsa: mv88e6xxx: add phylink_get_caps for the mv88e6320/21 family
Stephen Boyd (1):
clk: Don't hold prepare_lock when calling kref_put()
Steve French (1):
smb3: fix broken reconnect when password changing on the server by allowing password rotation
Steven Rostedt (Google) (3):
tracefs: Reset permissions on remount if permissions are options
tracefs: Still use mount point as default permissions for instances
eventfs: Do not treat events directory different than other directories
Sungwoo Kim (2):
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Bluetooth: HCI: Fix potential null-ptr-deref
Sven Schnelle (1):
workqueue: Fix selection of wake_cpu in kick_pool()
Takashi Iwai (1):
ALSA: line6: Zero-initialize message buffers
Takashi Sakamoto (1):
firewire: ohci: fulfill timestamp for some local asynchronous transaction
Tao Zhou (1):
drm/amdgpu: implement IRQ_STATE_ENABLE for SDMA v4.4.2
Tetsuo Handa (1):
nfc: nci: Fix kcov check in nci_rx_work()
Thadeu Lima de Souza Cascardo (1):
net: fix out-of-bounds access in ops_init
Thanassis Avgerinos (1):
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Thierry Reding (1):
gpu: host1x: Do not setup DMA for virtual devices
Thinh Nguyen (2):
usb: xhci-plat: Don't include xhci.h
usb: dwc3: core: Prevent phy suspend during init
Thomas Bertschinger (1):
rust: module: place generated init_module() function in .init.text
Thomas Gleixner (1):
x86/apic: Don't access the APIC when disabling x2APIC
Tim Jiang (1):
Bluetooth: qca: add support for QCA2066
Toke Høiland-Jørgensen (1):
xdp: use flags field to disambiguate broadcast redirect
Vanillan Wang (1):
net:usb:qmi_wwan: support Rolling modules
Vasileios Amoiridis (1):
iio: pressure: Fixes BME280 SPI driver data
Viken Dadhaniya (1):
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Vinod Koul (1):
dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
Vitaly Lifshits (1):
e1000e: change usleep_range to udelay in PHY mdic access
Volodymyr Babchuk (1):
arm64: dts: qcom: sa8155p-adp: fix SDHC2 CD pin configuration
Wedson Almeida Filho (1):
rust: kernel: require `Send` for `Module` implementations
Wei Yang (3):
memblock tests: fix undefined reference to `early_pfn_to_nid'
memblock tests: fix undefined reference to `panic'
memblock tests: fix undefined reference to `BIT'
Wen Gu (1):
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Wesley Cheng (1):
usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete
Will Deacon (1):
swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y
Wyes Karny (1):
tools/power turbostat: Increase the limit for fd opened
Xiang Chen (1):
scsi: hisi_sas: Handle the NCQ error returned by D2H frame
Xin Long (1):
tipc: fix a possible memleak in tipc_buf_append
Xu Kuohai (2):
bpf, arm64: Fix incorrect runtime stats
riscv, bpf: Fix incorrect runtime stats
Yi Zhang (1):
nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
Yihang Li (1):
scsi: libsas: Align SMP request allocation to ARCH_DMA_MINALIGN
Yonglong Liu (2):
net: hns3: fix port vlan filter not disabled issue
net: hns3: fix kernel crash when devlink reload during initialization
Zack Rusin (2):
drm/ttm: Print the memory decryption status just once
drm/vmwgfx: Fix invalid reads in fence signaled events
Zeng Heng (1):
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
Zhigang Luo (1):
amd/amdkfd: sync all devices to wait all processes being evicted
Zhongqiu Han (1):
gpiolib: cdev: Fix use after free in lineinfo_changed_notify
linke li (1):
net: mark racy access on sk->sk_rcvbuf
^ permalink raw reply [relevance 2%]
* Linux 6.1.91
@ 2024-05-17 11:58 2% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-17 11:58 UTC (permalink / raw)
To: linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby, Greg Kroah-Hartman
I'm announcing the release of the 6.1.91 kernel.
All users of the 6.1 kernel series must upgrade.
The updated 6.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml | 2
MAINTAINERS | 1
Makefile | 2
arch/arm/kernel/sleep.S | 4
arch/arm64/kvm/vgic/vgic-kvm-device.c | 12
arch/arm64/net/bpf_jit_comp.c | 6
arch/mips/include/asm/ptrace.h | 2
arch/mips/kernel/asm-offsets.c | 1
arch/mips/kernel/ptrace.c | 15
arch/mips/kernel/scall32-o32.S | 23
arch/mips/kernel/scall64-n32.S | 3
arch/mips/kernel/scall64-n64.S | 3
arch/mips/kernel/scall64-o32.S | 33 -
arch/powerpc/platforms/pseries/iommu.c | 8
arch/powerpc/platforms/pseries/plpks.c | 62 --
arch/powerpc/platforms/pseries/plpks.h | 35 +
arch/s390/include/asm/dwarf.h | 1
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2
arch/s390/mm/gmap.c | 2
arch/s390/mm/hugetlbpage.c | 2
block/blk-iocost.c | 7
block/ioctl.c | 5
drivers/ata/sata_gemini.c | 5
drivers/bluetooth/btqca.c | 160 +++++
drivers/bluetooth/btqca.h | 6
drivers/bluetooth/hci_qca.c | 11
drivers/char/tpm/tpm-dev-common.c | 4
drivers/clk/clk.c | 12
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19
drivers/dma/idxd/cdev.c | 77 ++
drivers/dma/idxd/idxd.h | 3
drivers/dma/idxd/init.c | 4
drivers/dma/idxd/registers.h | 3
drivers/dma/idxd/sysfs.c | 27
drivers/firewire/nosy.c | 6
drivers/firewire/ohci.c | 6
drivers/gpio/gpio-crystalcove.c | 2
drivers/gpio/gpio-wcove.c | 2
drivers/gpio/gpiolib-cdev.c | 183 +++++-
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 48 -
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 7
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2
drivers/gpu/drm/drm_connector.c | 2
drivers/gpu/drm/i915/display/intel_bios.c | 19
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 +-
drivers/gpu/drm/nouveau/nouveau_dp.c | 13
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 8
drivers/gpu/drm/qxl/qxl_release.c | 50 -
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2
drivers/gpu/host1x/bus.c | 8
drivers/hv/channel.c | 29 -
drivers/hwmon/corsair-cpro.c | 45 +
drivers/hwmon/pmbus/ucd9000.c | 6
drivers/iio/accel/mxc4005.c | 24
drivers/iio/imu/adis16475.c | 4
drivers/infiniband/hw/qib/qib_fs.c | 1
drivers/iommu/mtk_iommu.c | 1
drivers/iommu/mtk_iommu_v1.c | 1
drivers/md/md.c | 1
drivers/misc/eeprom/at24.c | 46 +
drivers/misc/mei/hw-me-regs.h | 2
drivers/misc/mei/pci-me.c | 2
drivers/net/dsa/mv88e6xxx/chip.c | 4
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 32 -
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8
drivers/net/ethernet/broadcom/genet/bcmmii.c | 25
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 52 +
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 20
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4
drivers/net/ethernet/micrel/ks8851_common.c | 16
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14
drivers/net/usb/qmi_wwan.c | 1
drivers/net/vxlan/vxlan_core.c | 19
drivers/nvme/host/core.c | 2
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 -
drivers/pinctrl/core.c | 8
drivers/pinctrl/devicetree.c | 10
drivers/pinctrl/intel/pinctrl-baytrail.c | 74 +-
drivers/pinctrl/intel/pinctrl-intel.c | 6
drivers/pinctrl/intel/pinctrl-intel.h | 17
drivers/pinctrl/mediatek/pinctrl-paris.c | 40 -
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6
drivers/power/supply/mt6360_charger.c | 2
drivers/power/supply/rt9455_charger.c | 2
drivers/regulator/core.c | 27
drivers/regulator/mt6360-regulator.c | 32 -
drivers/s390/cio/cio_inject.c | 2
drivers/s390/net/qeth_core_main.c | 61 --
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2
drivers/scsi/lpfc/lpfc.h | 1
drivers/scsi/lpfc/lpfc_els.c | 20
drivers/scsi/lpfc/lpfc_hbadisc.c | 5
drivers/scsi/lpfc/lpfc_nvme.c | 4
drivers/scsi/lpfc/lpfc_scsi.c | 13
drivers/scsi/lpfc/lpfc_sli.c | 14
drivers/scsi/lpfc/lpfc_vport.c | 8
drivers/scsi/mpi3mr/mpi3mr_app.c | 2
drivers/slimbus/qcom-ngd-ctrl.c | 6
drivers/spi/spi-axi-spi-engine.c | 273 +++++-----
drivers/spi/spi-hisi-kunpeng.c | 2
drivers/spi/spi-microchip-core-qspi.c | 1
drivers/spi/spi.c | 12
drivers/staging/wlan-ng/hfa384x_usb.c | 4
drivers/staging/wlan-ng/prism2usb.c | 6
drivers/target/target_core_configfs.c | 12
drivers/ufs/core/ufshcd.c | 5
drivers/uio/uio_hv_generic.c | 12
drivers/usb/core/hub.c | 5
drivers/usb/core/port.c | 8
drivers/usb/dwc3/core.c | 90 +--
drivers/usb/dwc3/core.h | 1
drivers/usb/dwc3/gadget.c | 2
drivers/usb/dwc3/host.c | 27
drivers/usb/gadget/composite.c | 6
drivers/usb/gadget/function/f_fs.c | 2
drivers/usb/host/ohci-hcd.c | 8
drivers/usb/host/xhci-plat.h | 4
drivers/usb/typec/tcpm/tcpm.c | 35 -
drivers/usb/typec/ucsi/ucsi.c | 12
drivers/vfio/pci/vfio_pci.c | 2
fs/9p/vfs_file.c | 2
fs/9p/vfs_inode.c | 5
fs/9p/vfs_super.c | 1
fs/btrfs/extent_io.c | 19
fs/btrfs/inode.c | 2
fs/btrfs/send.c | 4
fs/btrfs/transaction.c | 2
fs/btrfs/volumes.c | 18
fs/gfs2/bmap.c | 5
fs/hugetlbfs/inode.c | 8
fs/nfs/client.c | 5
fs/nfs/inode.c | 13
fs/nfs/internal.h | 2
fs/nfs/netns.h | 2
fs/smb/client/transport.c | 37 +
fs/smb/server/oplock.c | 35 -
fs/smb/server/transport_tcp.c | 4
include/linux/compiler_types.h | 11
include/linux/dma-fence.h | 7
include/linux/gfp_types.h | 2
include/linux/hugetlb.h | 53 +
include/linux/hugetlb_cgroup.h | 69 +-
include/linux/hyperv.h | 1
include/linux/mm_types.h | 14
include/linux/pci_ids.h | 2
include/linux/pinctrl/pinctrl.h | 20
include/linux/regulator/consumer.h | 4
include/linux/skbuff.h | 15
include/linux/skmsg.h | 2
include/linux/slab.h | 2
include/linux/spi/spi.h | 51 +
include/linux/sunrpc/clnt.h | 1
include/linux/swapops.h | 105 +--
include/linux/timer.h | 15
include/net/xfrm.h | 3
include/uapi/scsi/scsi_bsg_mpi3mr.h | 2
kernel/bpf/bloom_filter.c | 13
kernel/bpf/verifier.c | 3
kernel/time/timer.c | 8
lib/Kconfig.debug | 5
lib/dynamic_debug.c | 6
mm/hugetlb.c | 55 +-
mm/hugetlb_cgroup.c | 34 -
mm/migrate.c | 2
mm/readahead.c | 4
net/bluetooth/hci_core.c | 3
net/bluetooth/l2cap_core.c | 3
net/bluetooth/msft.c | 2
net/bluetooth/msft.h | 4
net/bluetooth/sco.c | 4
net/bridge/br_forward.c | 9
net/bridge/br_netlink.c | 3
net/core/filter.c | 42 +
net/core/link_watch.c | 4
net/core/net-sysfs.c | 4
net/core/net_namespace.c | 13
net/core/rtnetlink.c | 6
net/core/skbuff.c | 27
net/core/skmsg.c | 5
net/core/sock.c | 4
net/hsr/hsr_device.c | 31 -
net/ipv4/tcp.c | 4
net/ipv4/tcp_input.c | 2
net/ipv4/tcp_ipv4.c | 8
net/ipv4/tcp_output.c | 4
net/ipv4/udp_offload.c | 12
net/ipv4/xfrm4_input.c | 6
net/ipv6/addrconf.c | 11
net/ipv6/fib6_rules.c | 6
net/ipv6/ip6_input.c | 4
net/ipv6/ip6_output.c | 2
net/ipv6/xfrm6_input.c | 6
net/l2tp/l2tp_eth.c | 3
net/mac80211/ieee80211_i.h | 4
net/mptcp/protocol.c | 3
net/nsh/nsh.c | 14
net/phonet/pn_netlink.c | 2
net/smc/smc_ib.c | 19
net/sunrpc/clnt.c | 5
net/sunrpc/xprt.c | 2
net/tipc/msg.c | 8
net/wireless/nl80211.c | 2
net/wireless/trace.h | 2
net/xfrm/xfrm_input.c | 8
rust/Makefile | 11
rust/kernel/error.rs | 2
rust/kernel/lib.rs | 2
rust/macros/module.rs | 185 ++++--
scripts/Makefile.build | 17
scripts/Makefile.host | 27
scripts/Makefile.modfinal | 4
scripts/is_rust_module.sh | 16
security/keys/key.c | 3
sound/hda/intel-sdw-acpi.c | 2
sound/pci/hda/patch_realtek.c | 1
sound/soc/meson/Kconfig | 1
sound/soc/meson/axg-card.c | 1
sound/soc/meson/axg-fifo.c | 52 +
sound/soc/meson/axg-fifo.h | 12
sound/soc/meson/axg-frddr.c | 5
sound/soc/meson/axg-tdm-interface.c | 34 -
sound/soc/meson/axg-toddr.c | 22
sound/soc/tegra/tegra186_dspk.c | 7
sound/soc/ti/davinci-mcasp.c | 12
sound/usb/line6/driver.c | 6
tools/include/linux/kernel.h | 1
tools/include/linux/mm.h | 5
tools/include/linux/panic.h | 19
tools/perf/util/unwind-libdw.c | 21
tools/perf/util/unwind-libunwind-local.c | 2
tools/power/x86/turbostat/turbostat.8 | 2
tools/power/x86/turbostat/turbostat.c | 30 -
tools/testing/selftests/bpf/prog_tests/bloom_filter_map.c | 6
tools/testing/selftests/timers/valid-adjtimex.c | 73 +-
247 files changed, 2505 insertions(+), 1391 deletions(-)
Adam Goldman (1):
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Al Viro (1):
qibfs: fix dentry leak
Alan Stern (2):
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
USB: core: Fix access violation during port device removal
Aleksa Savic (3):
hwmon: (corsair-cpro) Use a separate buffer for sending commands
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Alex Deucher (1):
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Alexander Potapenko (1):
kmsan: compiler_types: declare __no_sanitize_or_inline
Alexander Stein (1):
eeprom: at24: Use dev_err_probe for nvmem register failure
Alexander Usyskin (1):
mei: me: add lunar lake point M DID
Alexandra Winter (1):
s390/qeth: Fix kernel panic after setting hsuid
Aman Dhoot (1):
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Amit Sunil Dhamne (1):
usb: typec: tcpm: unregister existing source caps before re-registration
Anand Jain (1):
btrfs: return accurate error code on open failure in open_fs_devices()
Andrea Righi (2):
rust: fix regexp in scripts/is_rust_module.sh
btf, scripts: rust: drop is_rust_module.sh
Andrei Matei (1):
bpf: Check bloom filter map value size
Andrew Price (1):
gfs2: Fix invalid metadata access in punch_hole
Andrii Nakryiko (1):
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
Andy Shevchenko (7):
pinctrl: Introduce struct pinfunction and PINCTRL_PINFUNCTION() macro
pinctrl: intel: Make use of struct pinfunction and PINCTRL_PINFUNCTION()
drm/panel: ili9341: Respect deferred probe
drm/panel: ili9341: Use predefined error codes
gpio: wcove: Use -ENOTSUPP consistently
gpio: crystalcove: Use -ENOTSUPP consistently
gpiolib: cdev: Add missing header(s)
AngeloGioacchino Del Regno (2):
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
regulator: mt6360: De-capitalize devicetree regulator subnodes
Anton Protopopov (1):
bpf: Fix a verifier verbose message
Arjan van de Ven (2):
VFIO: Add the SPR_DSA and SPR_IAX devices to the denylist
dmaengine: idxd: add a new security check to deal with a hardware erratum
Arnd Bergmann (1):
power: rt9455: hide unused rt9455_boost_voltage_values
Asahi Lina (1):
rust: error: Rename to_kernel_errno() -> to_errno()
Asbjørn Sloth Tønnesen (4):
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
net: qede: use return from qede_parse_flow_attr() for flower
net: qede: use return from qede_parse_flow_attr() for flow_spec
net: qede: use return from qede_parse_actions()
Badhri Jagan Sridharan (1):
usb: typec: tcpm: Check for port partner validity before consuming it
Benno Lossin (1):
rust: macros: fix soundness issue in `module!` macro
Billy Tsai (1):
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Boris Burkov (2):
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
btrfs: always clear PERTRANS metadata during commit
Borislav Petkov (AMD) (1):
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Boy.Wu (1):
ARM: 9381/1: kasan: clear stale stack poison
Bui Quang Minh (3):
bna: ensure the copied buf is NUL terminated
octeontx2-af: avoid off-by-one read from userspace
s390/cio: Ensure the copied buf is NUL terminated
Bumyong Lee (1):
dmaengine: pl330: issue_pending waits until WFP state
Chen Ni (1):
ata: sata_gemini: Check clk_enable() result
Chen-Yu Tsai (2):
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chris Wulff (1):
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Christian A. Ehrhardt (2):
usb: typec: ucsi: Check for notifications after init
usb: typec: ucsi: Fix connector check on init
Christian König (1):
drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2
Claudio Imbrenda (2):
s390/mm: Fix storage key clearing for guest huge pages
s390/mm: Fix clearing storage keys for huge pages
Conor Dooley (1):
spi: microchip-core-qspi: fix setting spi bus clock rate
Dan Carpenter (2):
pinctrl: core: delete incorrect free in pinctrl_enable()
mm/slab: make __free(kfree) accept error pointers
Daniel Okazaki (1):
eeprom: at24: fix memory corruption race condition
David Bauer (1):
net l2tp: drop flow hash on forward
David Lechner (5):
spi: axi-spi-engine: simplify driver data allocation
spi: axi-spi-engine: use devm_spi_alloc_host()
spi: axi-spi-engine: move msg state to new struct
spi: axi-spi-engine: use common AXI macros
spi: axi-spi-engine: fix version format string
Devyn Liu (1):
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
Dmitry Antipov (1):
btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send()
Dominique Martinet (1):
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Doug Berger (3):
net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
net: bcmgenet: synchronize UMAC_CMD access
Doug Smythies (1):
tools/power turbostat: Fix added raw MSR output
Douglas Anderson (1):
drm/connector: Add \n to message about demoting connector force-probes
Duoming Zhou (2):
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Eric Dumazet (6):
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
phonet: fix rtm_phonet_notify() skb allocation
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
net-sysfs: convert dev->operstate reads to lockless ones
ipv6: annotate data-races around cnf.disable_ipv6
ipv6: prevent NULL dereference in ip6_output()
Felix Fietkau (3):
net: bridge: fix multicast-to-unicast with fraglist GSO
net: core: reject skb_copy(_expand) for fraglist GSO skbs
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Florian Fainelli (1):
net: bcmgenet: Clear RGMII_LINK upon link down
Gabe Teeger (1):
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Gaurav Batra (1):
powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE
Geert Uytterhoeven (1):
spi: Merge spi_controller.{slave,target}_abort()
George Shen (1):
drm/amd/display: Handle Y carry-over in VCP X.Y calculation
Greg Kroah-Hartman (1):
Linux 6.1.91
Guenter Roeck (1):
usb: ohci: Prevent missed ohci interrupts
Guillaume Nault (1):
vxlan: Pull inner IP header in vxlan_rcv().
Hans de Goede (2):
pinctrl: baytrail: Fix selecting gpio pinctrl state
iio: accel: mxc4005: Interrupt handling fixes
Heiner Kallweit (1):
eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
Igor Artemiev (1):
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jan Dakinevich (1):
pinctrl/meson: fix typo in PDM's pin name
Jason Xing (1):
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Javier Carrasco (1):
dt-bindings: iio: health: maxim,max30102: fix compatible check
Jeff Johnson (1):
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Jeff Layton (1):
9p: explicitly deny setlease attempts
Jens Remus (1):
s390/vdso: Add CFI for RA register to asm macro vdso_func
Jernej Skrabec (1):
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Jerome Brunet (7):
ASoC: meson: axg-fifo: use FIELD helpers
ASoC: meson: axg-fifo: use threaded irq to check periods
ASoC: meson: axg-card: make links nonatomic
ASoC: meson: axg-tdm-interface: manage formatters in trigger
ASoC: meson: cards: select SND_DYNAMIC_MINORS
drm/meson: dw-hdmi: power up phy on device init
drm/meson: dw-hdmi: add bandgap setting for g12
Jian Shen (1):
net: hns3: direct return when receive a unknown mailbox message
Jiaxun Yang (1):
MIPS: scall: Save thread_info.syscall unconditionally on entry
Jim Cromie (1):
dyndbg: fix old BUG_ON in >control parser
Joakim Sindholt (3):
fs/9p: only translate RWX permissions for plain 9P2000
fs/9p: translate O_TRUNC into OTRUNC
fs/9p: drop inodes immediately on non-.L too
Joao Paulo Goncalves (1):
ASoC: ti: davinci-mcasp: Fix race condition during probe
Johan Hovold (6):
regulator: core: fix debugfs creation regression
Bluetooth: qca: add missing firmware sanity checks
Bluetooth: qca: fix NVM configuration parsing
Bluetooth: qca: fix info leak when fetching board id
Bluetooth: qca: fix info leak when fetching fw build id
Bluetooth: qca: fix firmware check error path
Johannes Berg (1):
wifi: nl80211: don't free NULL coalescing rule
John Stultz (1):
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Josef Bacik (3):
sunrpc: add a struct rpc_stats arg to rpc_create_args
nfs: expose /proc/net/sunrpc/nfs in net namespaces
nfs: make the rpc_stat per net namespace
Justin Ernst (1):
tools/power/turbostat: Fix uncore frequency file string
Justin Tee (4):
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
scsi: lpfc: Release hbalock before calling lpfc_worker_wake_up()
Karthikeyan Ramasubramanian (1):
drm/i915/bios: Fix parsing backlight BDB data
Kefeng Wang (1):
mm: use memalloc_nofs_save() in page_cache_ra_order()
Kent Gibson (2):
gpiolib: cdev: relocate debounce_period_us from struct gpio_desc
gpiolib: cdev: fix uninitialised kfifo
Krzysztof Kozlowski (1):
iommu: mtk: fix module autoloading
Kuniyuki Iwashima (3):
nfs: Handle error of rpc_proc_register() in nfs_net_init().
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Lakshmi Yadlapati (1):
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Leah Rumancik (1):
MAINTAINERS: add leah to 6.1 MAINTAINERS file
Li Nan (2):
block: fix overflow in blk_ioctl_discard()
md: fix kmemleak of rdev->serial
Li Zetao (1):
spi: spi-axi-spi-engine: Use helper function devm_clk_get_enabled()
Lijo Lazar (1):
drm/amdgpu: Refine IB schedule error logging
Linus Torvalds (1):
Reapply "drm/qxl: simplify qxl_fence_wait"
Lukasz Majewski (1):
hsr: Simplify code for announcing HSR nodes timer setup
Lyude Paul (1):
drm/nouveau/dp: Don't probe eDP ports twice harder
Mans Rullgard (1):
spi: fix null pointer dereference within spi_sync
Marc Zyngier (1):
KVM: arm64: vgic-v2: Use cpuid from userspace as vcpu_id
Marek Behún (1):
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Marek Vasut (1):
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Mario Limonciello (1):
dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
Masahiro Yamada (2):
kbuild: refactor host*_flags
kbuild: specify output names separately for each emission type from rustc
Matti Vaittinen (2):
regulator: change stubbed devm_regulator_get_enable to return Ok
regulator: change devm_regulator_get_enable_optional() stub to return Ok
Maurizio Lombardi (1):
scsi: target: Fix SELinux error when systemd-modules loads the target module
Miaohe Lin (1):
mm/hugetlb: fix DEBUG_LOCKS_WARN_ON(1) when dissolve_free_hugetlb_folio()
Michael Kelley (1):
Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted
Miguel Ojeda (1):
kbuild: rust: avoid creating temporary files
Namhyung Kim (2):
perf unwind-libunwind: Fix base address for .eh_frame
perf unwind-libdw: Handle JIT-generated DSOs properly
Namjae Jeon (3):
ksmbd: off ipv6only for both ipv4/ipv6 binding
ksmbd: avoid to send duplicate lease break notifications
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Nayna Jain (2):
powerpc/pseries: replace kmalloc with kzalloc in PLPKS driver
powerpc/pseries: make max polling consistent for longer H_CALLs
Nikhil Rao (1):
dmaengine: idxd: add a write() method for applications to submit work
Oliver Upton (1):
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Oscar Salvador (1):
mm,swapops: update check in is_pfn_swap_entry for hwpoison entries
Paolo Abeni (2):
mptcp: ensure snd_nxt is properly initialized on connect
tipc: fix UAF in error path
Paul Davey (1):
xfrm: Preserve vlan tags for transport mode software GRO
Peiyang Wang (4):
net: hns3: using user configure after hardware reset
net: hns3: change type of numa_node_mask as nodemask_t
net: hns3: release PTP resources if pf initialization failed
net: hns3: use appropriate barrier function after setting a bit value
Peng Liu (1):
tools/power turbostat: Fix Bzy_MHz documentation typo
Peter Korsgaard (1):
usb: gadget: composite: fix OS descriptors w_value logic
Peter Wang (1):
scsi: ufs: core: WLUN suspend dev/link state error recovery
Peter Xu (1):
mm/hugetlb: fix missing hugetlb_lock for resv uncharge
Phil Elwell (1):
net: bcmgenet: Reset RBUF on first open
Pierre-Louis Bossart (1):
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Qu Wenruo (1):
btrfs: do not wait for short bulk allocation
Ramona Gradinariu (1):
iio:imu: adis16475: Fix sync mode setting
Richard Gobert (1):
net: gro: add flush check in udp_gro_receive_segment
Rick Edgecombe (2):
Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
uio_hv_generic: Don't free decrypted memory
Rik van Riel (1):
blk-iocost: avoid out of bounds shift
Roded Zats (1):
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Russell Currey (1):
powerpc/pseries: Move PLPKS constants to header file
Sameer Pujar (1):
ASoC: tegra: Fix DSPK 16-bit playback
Saurav Kashyap (1):
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Sebastian Andrzej Siewior (1):
cxgb4: Properly lock TX queue for the selftest.
Shin'ichiro Kawasaki (1):
scsi: mpi3mr: Avoid memcpy field-spanning write WARNING
Shyam Prasad N (1):
cifs: use the least loaded channel for sending requests
Sidhartha Kumar (8):
mm/hugetlb: add folio support to hugetlb specific flag macros
mm: add private field of first tail to struct page and struct folio
mm/hugetlb: add hugetlb_folio_subpool() helpers
mm/hugetlb: add folio_hstate()
mm/hugetlb_cgroup: convert __set_hugetlb_cgroup() to folios
mm/hugetlb_cgroup: convert hugetlb_cgroup_from_page() to folios
mm/hugetlb: convert free_huge_page to folios
mm/hugetlb_cgroup: convert hugetlb_cgroup_uncharge_page() to folios
Silvio Gissi (1):
keys: Fix overwrite of key expiration on instantiation
Stephen Boyd (1):
clk: Don't hold prepare_lock when calling kref_put()
Steve French (1):
smb3: missing lock when picking channel
Sungwoo Kim (1):
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Takashi Iwai (1):
ALSA: line6: Zero-initialize message buffers
Thadeu Lima de Souza Cascardo (1):
net: fix out-of-bounds access in ops_init
Thanassis Avgerinos (1):
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Thierry Reding (1):
gpu: host1x: Do not setup DMA for virtual devices
Thinh Nguyen (2):
usb: xhci-plat: Don't include xhci.h
usb: dwc3: core: Prevent phy suspend during init
Thomas Bertschinger (1):
rust: module: place generated init_module() function in .init.text
Thomas Gleixner (2):
timers: Get rid of del_singleshot_timer_sync()
timers: Rename del_timer() to timer_delete()
Tim Jiang (1):
Bluetooth: qca: add support for QCA2066
Toke Høiland-Jørgensen (1):
xdp: use flags field to disambiguate broadcast redirect
Uwe Kleine-König (1):
spi: axi-spi-engine: Convert to platform remove callback returning void
Vanillan Wang (1):
net:usb:qmi_wwan: support Rolling modules
Viken Dadhaniya (1):
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Vinod Koul (1):
dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
Wedson Almeida Filho (1):
rust: kernel: require `Send` for `Module` implementations
Wei Yang (3):
memblock tests: fix undefined reference to `early_pfn_to_nid'
memblock tests: fix undefined reference to `panic'
memblock tests: fix undefined reference to `BIT'
Wen Gu (1):
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Wyes Karny (1):
tools/power turbostat: Increase the limit for fd opened
Xin Long (1):
tipc: fix a possible memleak in tipc_buf_append
Xu Kuohai (1):
bpf, arm64: Fix incorrect runtime stats
Yang Yingliang (2):
spi: introduce new helpers with using modern naming
spi: spi-axi-spi-engine: switch to use modern name
Yi Zhang (1):
nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
Yonglong Liu (2):
net: hns3: fix port vlan filter not disabled issue
net: hns3: fix kernel crash when devlink reload during initialization
Zack Rusin (1):
drm/vmwgfx: Fix invalid reads in fence signaled events
Zeng Heng (1):
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
linke li (1):
net: mark racy access on sk->sk_rcvbuf
^ permalink raw reply [relevance 2%]
* Linux 5.15.159
@ 2024-05-17 11:58 4% Greg Kroah-Hartman
2024-05-17 11:58 2% ` Greg Kroah-Hartman
0 siblings, 1 reply; 200+ results
From: Greg Kroah-Hartman @ 2024-05-17 11:58 UTC (permalink / raw)
To: linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby, Greg Kroah-Hartman
I'm announcing the release of the 5.15.159 kernel.
All users of the 5.15 kernel series must upgrade.
The updated 5.15.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.15.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml | 2
Makefile | 2
arch/arm/kernel/sleep.S | 4
arch/arm64/boot/dts/qcom/msm8998.dtsi | 8
arch/arm64/boot/dts/qcom/sdm845.dtsi | 16
arch/arm64/kvm/vgic/vgic-kvm-device.c | 12
arch/mips/include/asm/ptrace.h | 2
arch/mips/kernel/asm-offsets.c | 1
arch/mips/kernel/ptrace.c | 15
arch/mips/kernel/scall32-o32.S | 23
arch/mips/kernel/scall64-n32.S | 3
arch/mips/kernel/scall64-n64.S | 3
arch/mips/kernel/scall64-o32.S | 33
arch/s390/include/asm/dwarf.h | 1
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2
arch/s390/mm/gmap.c | 2
arch/s390/mm/hugetlbpage.c | 2
block/blk-iocost.c | 7
drivers/acpi/cppc_acpi.c | 67 +
drivers/ata/sata_gemini.c | 5
drivers/bluetooth/btqca.c | 62 +
drivers/clk/clk.c | 12
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19
drivers/firewire/nosy.c | 6
drivers/firewire/ohci.c | 6
drivers/gpio/gpio-crystalcove.c | 2
drivers/gpio/gpio-wcove.c | 2
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1
drivers/gpu/drm/drm_connector.c | 2
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 -
drivers/gpu/drm/nouveau/nouveau_dp.c | 13
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 8
drivers/gpu/drm/qxl/qxl_release.c | 50 -
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2
drivers/gpu/host1x/bus.c | 8
drivers/hwmon/corsair-cpro.c | 45
drivers/hwmon/pmbus/ucd9000.c | 6
drivers/iio/accel/mxc4005.c | 24
drivers/iio/imu/adis16475.c | 4
drivers/infiniband/hw/qib/qib_fs.c | 1
drivers/iommu/mtk_iommu.c | 1
drivers/iommu/mtk_iommu_v1.c | 1
drivers/md/md.c | 1
drivers/misc/eeprom/at24.c | 46
drivers/misc/mei/hw-me-regs.h | 2
drivers/misc/mei/pci-me.c | 2
drivers/net/dsa/mv88e6xxx/chip.c | 4
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 20
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6
drivers/net/ethernet/hisilicon/hns3/Makefile | 18
drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 15
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 259 +++++
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 121 ++
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2
drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile | 12
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 311 ------
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 85 -
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 215 ++--
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 17
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 486 +++++++---
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 4
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 2
drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile | 10
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 10
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14
drivers/net/usb/qmi_wwan.c | 1
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34
drivers/pinctrl/core.c | 8
drivers/pinctrl/devicetree.c | 10
drivers/pinctrl/mediatek/pinctrl-paris.c | 180 +--
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6
drivers/power/supply/mt6360_charger.c | 2
drivers/power/supply/rt9455_charger.c | 2
drivers/regulator/core.c | 27
drivers/regulator/mt6360-regulator.c | 32
drivers/s390/cio/cio_inject.c | 2
drivers/s390/net/qeth_core.h | 1
drivers/s390/net/qeth_core_main.c | 78 -
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2
drivers/scsi/lpfc/lpfc.h | 1
drivers/scsi/lpfc/lpfc_nvme.c | 4
drivers/scsi/lpfc/lpfc_scsi.c | 13
drivers/scsi/lpfc/lpfc_vport.c | 8
drivers/slimbus/qcom-ngd-ctrl.c | 6
drivers/spi/spi-hisi-kunpeng.c | 2
drivers/target/target_core_configfs.c | 12
drivers/usb/core/hub.c | 5
drivers/usb/dwc3/core.c | 90 -
drivers/usb/dwc3/core.h | 1
drivers/usb/dwc3/gadget.c | 2
drivers/usb/dwc3/host.c | 27
drivers/usb/gadget/composite.c | 6
drivers/usb/gadget/function/f_fs.c | 2
drivers/usb/host/ohci-hcd.c | 8
drivers/usb/host/xhci-plat.h | 4
drivers/usb/typec/ucsi/ucsi.c | 12
fs/9p/vfs_file.c | 2
fs/9p/vfs_inode.c | 5
fs/9p/vfs_super.c | 1
fs/btrfs/inode.c | 2
fs/btrfs/send.c | 4
fs/btrfs/transaction.c | 2
fs/btrfs/volumes.c | 18
fs/gfs2/bmap.c | 5
fs/ksmbd/server.c | 13
fs/ksmbd/smb2pdu.c | 4
fs/ksmbd/vfs.c | 5
fs/nfs/client.c | 5
fs/nfs/inode.c | 13
fs/nfs/internal.h | 2
fs/nfs/netns.h | 2
include/linux/bpf.h | 20
include/linux/dma-fence.h | 7
include/linux/filter.h | 4
include/linux/skbuff.h | 15
include/linux/skmsg.h | 5
include/linux/sunrpc/clnt.h | 1
include/net/xfrm.h | 3
kernel/bpf/cpumap.c | 8
kernel/bpf/devmap.c | 32
kernel/bpf/verifier.c | 3
lib/Kconfig.debug | 5
lib/dynamic_debug.c | 6
net/bluetooth/l2cap_core.c | 3
net/bluetooth/sco.c | 4
net/bridge/br_forward.c | 9
net/core/filter.c | 115 +-
net/core/net_namespace.c | 13
net/core/rtnetlink.c | 2
net/core/skbuff.c | 27
net/core/skmsg.c | 53 -
net/core/sock.c | 4
net/core/sock_map.c | 3
net/ipv4/tcp.c | 4
net/ipv4/tcp_bpf.c | 51 +
net/ipv4/tcp_input.c | 2
net/ipv4/tcp_ipv4.c | 8
net/ipv4/tcp_output.c | 4
net/ipv4/udp_offload.c | 12
net/ipv4/xfrm4_input.c | 6
net/ipv6/fib6_rules.c | 6
net/ipv6/xfrm6_input.c | 6
net/l2tp/l2tp_eth.c | 3
net/mac80211/ieee80211_i.h | 4
net/mptcp/protocol.c | 3
net/nsh/nsh.c | 14
net/phonet/pn_netlink.c | 2
net/sunrpc/clnt.c | 5
net/tipc/msg.c | 8
net/wireless/nl80211.c | 2
net/wireless/trace.h | 2
net/xfrm/xfrm_input.c | 8
scripts/Makefile.modfinal | 2
security/keys/key.c | 3
sound/hda/intel-sdw-acpi.c | 2
sound/pci/hda/patch_realtek.c | 1
sound/soc/meson/Kconfig | 1
sound/soc/meson/axg-card.c | 1
sound/soc/meson/axg-fifo.c | 52 -
sound/soc/meson/axg-fifo.h | 12
sound/soc/meson/axg-frddr.c | 5
sound/soc/meson/axg-tdm-interface.c | 26
sound/soc/meson/axg-toddr.c | 22
sound/soc/tegra/tegra186_dspk.c | 7
sound/soc/ti/davinci-mcasp.c | 12
sound/usb/line6/driver.c | 6
tools/power/x86/turbostat/turbostat.8 | 2
tools/power/x86/turbostat/turbostat.c | 7
tools/testing/selftests/timers/valid-adjtimex.c | 73 -
173 files changed, 2214 insertions(+), 1413 deletions(-)
Adam Goldman (1):
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Al Viro (1):
qibfs: fix dentry leak
Alan Stern (1):
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
Aleksa Savic (3):
hwmon: (corsair-cpro) Use a separate buffer for sending commands
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Alexander Stein (1):
eeprom: at24: Use dev_err_probe for nvmem register failure
Alexander Usyskin (1):
mei: me: add lunar lake point M DID
Alexandra Winter (1):
s390/qeth: Fix kernel panic after setting hsuid
Aman Dhoot (1):
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Anand Jain (1):
btrfs: return accurate error code on open failure in open_fs_devices()
Andrew Price (1):
gfs2: Fix invalid metadata access in punch_hole
Andrii Nakryiko (1):
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
Andy Shevchenko (4):
drm/panel: ili9341: Respect deferred probe
drm/panel: ili9341: Use predefined error codes
gpio: wcove: Use -ENOTSUPP consistently
gpio: crystalcove: Use -ENOTSUPP consistently
AngeloGioacchino Del Regno (2):
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
regulator: mt6360: De-capitalize devicetree regulator subnodes
Anton Protopopov (1):
bpf: Fix a verifier verbose message
Arnd Bergmann (1):
power: rt9455: hide unused rt9455_boost_voltage_values
Asbjørn Sloth Tønnesen (4):
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
net: qede: use return from qede_parse_flow_attr() for flower
net: qede: use return from qede_parse_flow_attr() for flow_spec
net: qede: use return from qede_parse_actions()
Billy Tsai (1):
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Boris Burkov (2):
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
btrfs: always clear PERTRANS metadata during commit
Borislav Petkov (AMD) (1):
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Boy.Wu (1):
ARM: 9381/1: kasan: clear stale stack poison
Bui Quang Minh (3):
bna: ensure the copied buf is NUL terminated
octeontx2-af: avoid off-by-one read from userspace
s390/cio: Ensure the copied buf is NUL terminated
Bumyong Lee (1):
dmaengine: pl330: issue_pending waits until WFP state
Chen Ni (1):
ata: sata_gemini: Check clk_enable() result
Chen-Yu Tsai (3):
pinctrl: mediatek: paris: Rework mtk_pinconf_{get,set} switch/case logic
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chris Wulff (1):
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Christian A. Ehrhardt (2):
usb: typec: ucsi: Check for notifications after init
usb: typec: ucsi: Fix connector check on init
Claudio Imbrenda (2):
s390/mm: Fix storage key clearing for guest huge pages
s390/mm: Fix clearing storage keys for huge pages
Dan Carpenter (1):
pinctrl: core: delete incorrect free in pinctrl_enable()
Daniel Okazaki (1):
eeprom: at24: fix memory corruption race condition
David Bauer (1):
net l2tp: drop flow hash on forward
Devyn Liu (1):
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
Dmitry Antipov (1):
btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send()
Dominique Martinet (1):
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Doug Berger (1):
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
Doug Smythies (1):
tools/power turbostat: Fix added raw MSR output
Douglas Anderson (1):
drm/connector: Add \n to message about demoting connector force-probes
Duoming Zhou (2):
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Easwar Hariharan (1):
Revert "Revert "ACPI: CPPC: Use access_width over bit_width for system memory accesses""
Eric Dumazet (3):
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
phonet: fix rtm_phonet_notify() skb allocation
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
Felix Fietkau (3):
net: bridge: fix multicast-to-unicast with fraglist GSO
net: core: reject skb_copy(_expand) for fraglist GSO skbs
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Gabe Teeger (1):
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Greg Kroah-Hartman (1):
Linux 5.15.159
Guangbin Huang (2):
net: hns3: PF support get unicast MAC address space assigned by firmware
net: hns3: add query vf ring and vector map relation
Guenter Roeck (1):
usb: ohci: Prevent missed ohci interrupts
Hans de Goede (1):
iio: accel: mxc4005: Interrupt handling fixes
Hao Lan (1):
net: hns3: refactor function hclge_mbx_handler()
Heiner Kallweit (1):
eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
Igor Artemiev (1):
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jan Dakinevich (1):
pinctrl/meson: fix typo in PDM's pin name
Jarred White (1):
ACPI: CPPC: Fix bit_offset shift in MASK_VAL() macro
Jason Xing (1):
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Javier Carrasco (1):
dt-bindings: iio: health: maxim,max30102: fix compatible check
Jeff Johnson (1):
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Jeff Layton (1):
9p: explicitly deny setlease attempts
Jens Remus (1):
s390/vdso: Add CFI for RA register to asm macro vdso_func
Jernej Skrabec (1):
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Jerome Brunet (7):
ASoC: meson: axg-fifo: use FIELD helpers
ASoC: meson: axg-fifo: use threaded irq to check periods
ASoC: meson: axg-card: make links nonatomic
ASoC: meson: axg-tdm-interface: manage formatters in trigger
ASoC: meson: cards: select SND_DYNAMIC_MINORS
drm/meson: dw-hdmi: power up phy on device init
drm/meson: dw-hdmi: add bandgap setting for g12
Jian Shen (2):
net: hns3: direct return when receive a unknown mailbox message
net: hns3: split function hclge_init_vlan_config()
Jiaxun Yang (1):
MIPS: scall: Save thread_info.syscall unconditionally on entry
Jie Wang (4):
net: hns3: refactor hns3 makefile to support hns3_common module
net: hns3: create new cmdq hardware description structure hclge_comm_hw
net: hns3: create new set of unified hclge_comm_cmd_send APIs
net: hns3: refactor hclge_cmd_send with new hclge_comm_cmd_send API
Jim Cromie (1):
dyndbg: fix old BUG_ON in >control parser
Joakim Sindholt (3):
fs/9p: only translate RWX permissions for plain 9P2000
fs/9p: translate O_TRUNC into OTRUNC
fs/9p: drop inodes immediately on non-.L too
Joao Paulo Goncalves (1):
ASoC: ti: davinci-mcasp: Fix race condition during probe
Johan Hovold (4):
regulator: core: fix debugfs creation regression
Bluetooth: qca: add missing firmware sanity checks
Bluetooth: qca: fix NVM configuration parsing
Bluetooth: qca: fix firmware check error path
Johannes Berg (1):
wifi: nl80211: don't free NULL coalescing rule
John Fastabend (5):
bpf, sockmap: TCP data stall on recv before accept
bpf, sockmap: Handle fin correctly
bpf, sockmap: Convert schedule_work into delayed_work
bpf, sockmap: Reschedule is now done through backlog
bpf, sockmap: Improved check for empty queue
John Stultz (1):
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Josef Bacik (3):
sunrpc: add a struct rpc_stats arg to rpc_create_args
nfs: expose /proc/net/sunrpc/nfs in net namespaces
nfs: make the rpc_stat per net namespace
Julian Wiedmann (1):
s390/qeth: don't keep track of Input Queue count
Justin Tee (3):
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
Krzysztof Kozlowski (1):
iommu: mtk: fix module autoloading
Kuniyuki Iwashima (3):
nfs: Handle error of rpc_proc_register() in nfs_net_init().
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Lakshmi Yadlapati (1):
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Li Nan (1):
md: fix kmemleak of rdev->serial
Linus Torvalds (1):
Reapply "drm/qxl: simplify qxl_fence_wait"
Lyude Paul (1):
drm/nouveau/dp: Don't probe eDP ports twice harder
Marc Zyngier (1):
KVM: arm64: vgic-v2: Use cpuid from userspace as vcpu_id
Marek Behún (1):
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Marios Makassikis (1):
ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
Maurizio Lombardi (1):
scsi: target: Fix SELinux error when systemd-modules loads the target module
Namjae Jeon (2):
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
Oliver Upton (1):
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Paolo Abeni (2):
mptcp: ensure snd_nxt is properly initialized on connect
tipc: fix UAF in error path
Paul Davey (1):
xfrm: Preserve vlan tags for transport mode software GRO
Peiyang Wang (3):
net: hns3: using user configure after hardware reset
net: hns3: change type of numa_node_mask as nodemask_t
net: hns3: use appropriate barrier function after setting a bit value
Peng Liu (1):
tools/power turbostat: Fix Bzy_MHz documentation typo
Peter Korsgaard (1):
usb: gadget: composite: fix OS descriptors w_value logic
Phil Elwell (1):
net: bcmgenet: Reset RBUF on first open
Pierre-Louis Bossart (1):
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Ramona Gradinariu (1):
iio:imu: adis16475: Fix sync mode setting
Richard Gobert (1):
net: gro: add flush check in udp_gro_receive_segment
Rik van Riel (1):
blk-iocost: avoid out of bounds shift
Rob Herring (1):
arm64: dts: qcom: Fix 'interrupt-map' parent address cells
Roded Zats (1):
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Sameer Pujar (1):
ASoC: tegra: Fix DSPK 16-bit playback
Saurav Kashyap (1):
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Sebastian Andrzej Siewior (1):
cxgb4: Properly lock TX queue for the selftest.
Silvio Gissi (1):
keys: Fix overwrite of key expiration on instantiation
Stephen Boyd (1):
clk: Don't hold prepare_lock when calling kref_put()
Takashi Iwai (1):
ALSA: line6: Zero-initialize message buffers
Thadeu Lima de Souza Cascardo (1):
net: fix out-of-bounds access in ops_init
Thanassis Avgerinos (1):
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Thierry Reding (1):
gpu: host1x: Do not setup DMA for virtual devices
Thinh Nguyen (2):
usb: xhci-plat: Don't include xhci.h
usb: dwc3: core: Prevent phy suspend during init
Toke Høiland-Jørgensen (3):
xdp: Move conversion to xdp_frame out of map functions
xdp: Add xdp_do_redirect_frame() for pre-computed xdp_frames
xdp: use flags field to disambiguate broadcast redirect
Vanillan Wang (1):
net:usb:qmi_wwan: support Rolling modules
Vanshidhar Konda (1):
ACPI: CPPC: Fix access width used for PCC registers
Viken Dadhaniya (1):
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Vinod Koul (1):
dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
Xin Long (1):
tipc: fix a possible memleak in tipc_buf_append
Yonglong Liu (1):
net: hns3: fix port vlan filter not disabled issue
Yufeng Mo (1):
net: hns3: add log for workqueue scheduled late
Zack Rusin (1):
drm/vmwgfx: Fix invalid reads in fence signaled events
Zeng Heng (1):
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
linke li (1):
net: mark racy access on sk->sk_rcvbuf
^ permalink raw reply [relevance 4%]
* Re: Linux 5.15.159
2024-05-17 11:58 4% Linux 5.15.159 Greg Kroah-Hartman
@ 2024-05-17 11:58 2% ` Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-17 11:58 UTC (permalink / raw)
To: linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby, Greg Kroah-Hartman
diff --git a/Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml b/Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml
index c13c10c8d65d..eed0df9d3a23 100644
--- a/Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml
+++ b/Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml
@@ -42,7 +42,7 @@ allOf:
properties:
compatible:
contains:
- const: maxim,max30100
+ const: maxim,max30102
then:
properties:
maxim,green-led-current-microamp: false
diff --git a/Makefile b/Makefile
index 04e9de5b174d..5cbfe2be72dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 15
-SUBLEVEL = 158
+SUBLEVEL = 159
EXTRAVERSION =
NAME = Trick or Treat
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S
index 43077e11dafd..2acf880fcc34 100644
--- a/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
@@ -114,6 +114,10 @@ ENDPROC(cpu_resume_mmu)
.popsection
cpu_resume_after_mmu:
bl cpu_init @ restore the und/abt/irq banked regs
+#if defined(CONFIG_KASAN) && defined(CONFIG_KASAN_STACK)
+ mov r0, sp
+ bl kasan_unpoison_task_stack_below
+#endif
mov r0, #0 @ return zero on success
ldmfd sp!, {r4 - r11, pc}
ENDPROC(cpu_resume_after_mmu)
diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index 7eadecba0175..d636718adbde 100644
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -958,10 +958,10 @@ pcie0: pci@1c00000 {
interrupts = <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "msi";
interrupt-map-mask = <0 0 0 0x7>;
- interrupt-map = <0 0 0 1 &intc 0 135 IRQ_TYPE_LEVEL_HIGH>,
- <0 0 0 2 &intc 0 136 IRQ_TYPE_LEVEL_HIGH>,
- <0 0 0 3 &intc 0 138 IRQ_TYPE_LEVEL_HIGH>,
- <0 0 0 4 &intc 0 139 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-map = <0 0 0 1 &intc 0 0 135 IRQ_TYPE_LEVEL_HIGH>,
+ <0 0 0 2 &intc 0 0 136 IRQ_TYPE_LEVEL_HIGH>,
+ <0 0 0 3 &intc 0 0 138 IRQ_TYPE_LEVEL_HIGH>,
+ <0 0 0 4 &intc 0 0 139 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_PCIE_0_PIPE_CLK>,
<&gcc GCC_PCIE_0_MSTR_AXI_CLK>,
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 15af6c7ad06c..6f7061c878e4 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -1996,10 +1996,10 @@ pcie0: pci@1c00000 {
interrupt-names = "msi";
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 0x7>;
- interrupt-map = <0 0 0 1 &intc 0 149 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
- <0 0 0 2 &intc 0 150 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
- <0 0 0 3 &intc 0 151 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
- <0 0 0 4 &intc 0 152 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
+ interrupt-map = <0 0 0 1 &intc 0 0 0 149 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
+ <0 0 0 2 &intc 0 0 0 150 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
+ <0 0 0 3 &intc 0 0 0 151 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+ <0 0 0 4 &intc 0 0 0 152 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
clocks = <&gcc GCC_PCIE_0_PIPE_CLK>,
<&gcc GCC_PCIE_0_AUX_CLK>,
@@ -2101,10 +2101,10 @@ pcie1: pci@1c08000 {
interrupt-names = "msi";
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 0x7>;
- interrupt-map = <0 0 0 1 &intc 0 434 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
- <0 0 0 2 &intc 0 435 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
- <0 0 0 3 &intc 0 438 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
- <0 0 0 4 &intc 0 439 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
+ interrupt-map = <0 0 0 1 &intc 0 0 0 434 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
+ <0 0 0 2 &intc 0 0 0 435 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
+ <0 0 0 3 &intc 0 0 0 438 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+ <0 0 0 4 &intc 0 0 0 439 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
clocks = <&gcc GCC_PCIE_1_PIPE_CLK>,
<&gcc GCC_PCIE_1_AUX_CLK>,
diff --git a/arch/arm64/kvm/vgic/vgic-kvm-device.c b/arch/arm64/kvm/vgic/vgic-kvm-device.c
index 7740995de982..e80b638b7827 100644
--- a/arch/arm64/kvm/vgic/vgic-kvm-device.c
+++ b/arch/arm64/kvm/vgic/vgic-kvm-device.c
@@ -284,16 +284,12 @@ int kvm_register_vgic_device(unsigned long type)
int vgic_v2_parse_attr(struct kvm_device *dev, struct kvm_device_attr *attr,
struct vgic_reg_attr *reg_attr)
{
- int cpuid;
+ int cpuid = FIELD_GET(KVM_DEV_ARM_VGIC_CPUID_MASK, attr->attr);
- cpuid = (attr->attr & KVM_DEV_ARM_VGIC_CPUID_MASK) >>
- KVM_DEV_ARM_VGIC_CPUID_SHIFT;
-
- if (cpuid >= atomic_read(&dev->kvm->online_vcpus))
- return -EINVAL;
-
- reg_attr->vcpu = kvm_get_vcpu(dev->kvm, cpuid);
reg_attr->addr = attr->attr & KVM_DEV_ARM_VGIC_OFFSET_MASK;
+ reg_attr->vcpu = kvm_get_vcpu_by_id(dev->kvm, cpuid);
+ if (!reg_attr->vcpu)
+ return -EINVAL;
return 0;
}
diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h
index b3e4dd6be7e2..428b9f1cf1de 100644
--- a/arch/mips/include/asm/ptrace.h
+++ b/arch/mips/include/asm/ptrace.h
@@ -157,7 +157,7 @@ static inline long regs_return_value(struct pt_regs *regs)
#define instruction_pointer(regs) ((regs)->cp0_epc)
#define profile_pc(regs) instruction_pointer(regs)
-extern asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall);
+extern asmlinkage long syscall_trace_enter(struct pt_regs *regs);
extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);
extern void die(const char *, struct pt_regs *) __noreturn;
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 04ca75278f02..6cd0246aa2c6 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -98,6 +98,7 @@ void output_thread_info_defines(void)
OFFSET(TI_CPU, thread_info, cpu);
OFFSET(TI_PRE_COUNT, thread_info, preempt_count);
OFFSET(TI_REGS, thread_info, regs);
+ OFFSET(TI_SYSCALL, thread_info, syscall);
DEFINE(_THREAD_SIZE, THREAD_SIZE);
DEFINE(_THREAD_MASK, THREAD_MASK);
DEFINE(_IRQ_STACK_SIZE, IRQ_STACK_SIZE);
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index db7c5be1d4a3..dd454b429ff7 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -1310,16 +1310,13 @@ long arch_ptrace(struct task_struct *child, long request,
* Notification of system call entry/exit
* - triggered by current->work.syscall_trace
*/
-asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
+asmlinkage long syscall_trace_enter(struct pt_regs *regs)
{
user_exit();
- current_thread_info()->syscall = syscall;
-
if (test_thread_flag(TIF_SYSCALL_TRACE)) {
if (tracehook_report_syscall_entry(regs))
return -1;
- syscall = current_thread_info()->syscall;
}
#ifdef CONFIG_SECCOMP
@@ -1328,7 +1325,7 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
struct seccomp_data sd;
unsigned long args[6];
- sd.nr = syscall;
+ sd.nr = current_thread_info()->syscall;
sd.arch = syscall_get_arch(current);
syscall_get_arguments(current, regs, args);
for (i = 0; i < 6; i++)
@@ -1338,23 +1335,23 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
ret = __secure_computing(&sd);
if (ret == -1)
return ret;
- syscall = current_thread_info()->syscall;
}
#endif
if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
trace_sys_enter(regs, regs->regs[2]);
- audit_syscall_entry(syscall, regs->regs[4], regs->regs[5],
+ audit_syscall_entry(current_thread_info()->syscall,
+ regs->regs[4], regs->regs[5],
regs->regs[6], regs->regs[7]);
/*
* Negative syscall numbers are mistaken for rejected syscalls, but
* won't have had the return value set appropriately, so we do so now.
*/
- if (syscall < 0)
+ if (current_thread_info()->syscall < 0)
syscall_set_return_value(current, regs, -ENOSYS, 0);
- return syscall;
+ return current_thread_info()->syscall;
}
/*
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 9bfce5f75f60..6c14160cd8ba 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -78,6 +78,18 @@ loads_done:
PTR_WD load_a7, bad_stack_a7
.previous
+ /*
+ * syscall number is in v0 unless we called syscall(__NR_###)
+ * where the real syscall number is in a0
+ */
+ subu t2, v0, __NR_O32_Linux
+ bnez t2, 1f /* __NR_syscall at offset 0 */
+ LONG_S a0, TI_SYSCALL($28) # Save a0 as syscall number
+ b 2f
+1:
+ LONG_S v0, TI_SYSCALL($28) # Save v0 as syscall number
+2:
+
lw t0, TI_FLAGS($28) # syscall tracing enabled?
li t1, _TIF_WORK_SYSCALL_ENTRY
and t0, t1
@@ -115,16 +127,7 @@ syscall_trace_entry:
SAVE_STATIC
move a0, sp
- /*
- * syscall number is in v0 unless we called syscall(__NR_###)
- * where the real syscall number is in a0
- */
- move a1, v0
- subu t2, v0, __NR_O32_Linux
- bnez t2, 1f /* __NR_syscall at offset 0 */
- lw a1, PT_R4(sp)
-
-1: jal syscall_trace_enter
+ jal syscall_trace_enter
bltz v0, 1f # seccomp failed? Skip syscall
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 97456b2ca7dc..97788859238c 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -44,6 +44,8 @@ NESTED(handle_sysn32, PT_SIZE, sp)
sd a3, PT_R26(sp) # save a3 for syscall restarting
+ LONG_S v0, TI_SYSCALL($28) # Store syscall number
+
li t1, _TIF_WORK_SYSCALL_ENTRY
LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
and t0, t1, t0
@@ -72,7 +74,6 @@ syscall_common:
n32_syscall_trace_entry:
SAVE_STATIC
move a0, sp
- move a1, v0
jal syscall_trace_enter
bltz v0, 1f # seccomp failed? Skip syscall
diff --git a/arch/mips/kernel/scall64-n64.S b/arch/mips/kernel/scall64-n64.S
index 5f6ed4b4c399..db5811538563 100644
--- a/arch/mips/kernel/scall64-n64.S
+++ b/arch/mips/kernel/scall64-n64.S
@@ -47,6 +47,8 @@ NESTED(handle_sys64, PT_SIZE, sp)
sd a3, PT_R26(sp) # save a3 for syscall restarting
+ LONG_S v0, TI_SYSCALL($28) # Store syscall number
+
li t1, _TIF_WORK_SYSCALL_ENTRY
LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
and t0, t1, t0
@@ -83,7 +85,6 @@ n64_syscall_exit:
syscall_trace_entry:
SAVE_STATIC
move a0, sp
- move a1, v0
jal syscall_trace_enter
bltz v0, 1f # seccomp failed? Skip syscall
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index d3c2616cba22..7a5abb73e531 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -79,6 +79,22 @@ loads_done:
PTR_WD load_a7, bad_stack_a7
.previous
+ /*
+ * absolute syscall number is in v0 unless we called syscall(__NR_###)
+ * where the real syscall number is in a0
+ * note: NR_syscall is the first O32 syscall but the macro is
+ * only defined when compiling with -mabi=32 (CONFIG_32BIT)
+ * therefore __NR_O32_Linux is used (4000)
+ */
+
+ subu t2, v0, __NR_O32_Linux
+ bnez t2, 1f /* __NR_syscall at offset 0 */
+ LONG_S a0, TI_SYSCALL($28) # Save a0 as syscall number
+ b 2f
+1:
+ LONG_S v0, TI_SYSCALL($28) # Save v0 as syscall number
+2:
+
li t1, _TIF_WORK_SYSCALL_ENTRY
LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
and t0, t1, t0
@@ -113,22 +129,7 @@ trace_a_syscall:
sd a7, PT_R11(sp) # For indirect syscalls
move a0, sp
- /*
- * absolute syscall number is in v0 unless we called syscall(__NR_###)
- * where the real syscall number is in a0
- * note: NR_syscall is the first O32 syscall but the macro is
- * only defined when compiling with -mabi=32 (CONFIG_32BIT)
- * therefore __NR_O32_Linux is used (4000)
- */
- .set push
- .set reorder
- subu t1, v0, __NR_O32_Linux
- move a1, v0
- bnez t1, 1f /* __NR_syscall at offset 0 */
- ld a1, PT_R4(sp) /* Arg1 for __NR_syscall case */
- .set pop
-
-1: jal syscall_trace_enter
+ jal syscall_trace_enter
bltz v0, 1f # seccomp failed? Skip syscall
diff --git a/arch/s390/include/asm/dwarf.h b/arch/s390/include/asm/dwarf.h
index 4f21ae561e4d..390906b8e386 100644
--- a/arch/s390/include/asm/dwarf.h
+++ b/arch/s390/include/asm/dwarf.h
@@ -9,6 +9,7 @@
#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset
#define CFI_ADJUST_CFA_OFFSET .cfi_adjust_cfa_offset
#define CFI_RESTORE .cfi_restore
+#define CFI_REL_OFFSET .cfi_rel_offset
#ifdef CONFIG_AS_CFI_VAL_OFFSET
#define CFI_VAL_OFFSET .cfi_val_offset
diff --git a/arch/s390/kernel/vdso64/vdso_user_wrapper.S b/arch/s390/kernel/vdso64/vdso_user_wrapper.S
index 97f0c0a669a5..0625381359df 100644
--- a/arch/s390/kernel/vdso64/vdso_user_wrapper.S
+++ b/arch/s390/kernel/vdso64/vdso_user_wrapper.S
@@ -23,8 +23,10 @@ __kernel_\func:
CFI_DEF_CFA_OFFSET (STACK_FRAME_OVERHEAD + WRAPPER_FRAME_SIZE)
CFI_VAL_OFFSET 15, -STACK_FRAME_OVERHEAD
stg %r14,STACK_FRAME_OVERHEAD(%r15)
+ CFI_REL_OFFSET 14, STACK_FRAME_OVERHEAD
brasl %r14,__s390_vdso_\func
lg %r14,STACK_FRAME_OVERHEAD(%r15)
+ CFI_RESTORE 14
aghi %r15,WRAPPER_FRAME_SIZE
CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD
CFI_RESTORE 15
diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index a2c872de29a6..32d9db5e6f53 100644
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -2632,7 +2632,7 @@ static int __s390_enable_skey_hugetlb(pte_t *pte, unsigned long addr,
return 0;
start = pmd_val(*pmd) & HPAGE_MASK;
- end = start + HPAGE_SIZE - 1;
+ end = start + HPAGE_SIZE;
__storage_key_init_range(start, end);
set_bit(PG_arch_1, &page->flags);
cond_resched();
diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index da36d13ffc16..8631307d3def 100644
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -146,7 +146,7 @@ static void clear_huge_pte_skeys(struct mm_struct *mm, unsigned long rste)
}
if (!test_and_set_bit(PG_arch_1, &page->flags))
- __storage_key_init_range(paddr, paddr + size - 1);
+ __storage_key_init_range(paddr, paddr + size);
}
void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index 645a589edda8..bfdb7b0cf49d 100644
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -1336,7 +1336,7 @@ static bool iocg_kick_delay(struct ioc_gq *iocg, struct ioc_now *now)
{
struct ioc *ioc = iocg->ioc;
struct blkcg_gq *blkg = iocg_to_blkg(iocg);
- u64 tdelta, delay, new_delay;
+ u64 tdelta, delay, new_delay, shift;
s64 vover, vover_pct;
u32 hwa;
@@ -1351,8 +1351,9 @@ static bool iocg_kick_delay(struct ioc_gq *iocg, struct ioc_now *now)
/* calculate the current delay in effect - 1/2 every second */
tdelta = now->now - iocg->delay_at;
- if (iocg->delay)
- delay = iocg->delay >> div64_u64(tdelta, USEC_PER_SEC);
+ shift = div64_u64(tdelta, USEC_PER_SEC);
+ if (iocg->delay && shift < BITS_PER_LONG)
+ delay = iocg->delay >> shift;
else
delay = 0;
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
index 7cc9183c8dc8..6dcce036adb9 100644
--- a/drivers/acpi/cppc_acpi.c
+++ b/drivers/acpi/cppc_acpi.c
@@ -161,6 +161,13 @@ show_cppc_data(cppc_get_perf_caps, cppc_perf_caps, nominal_freq);
show_cppc_data(cppc_get_perf_ctrs, cppc_perf_fb_ctrs, reference_perf);
show_cppc_data(cppc_get_perf_ctrs, cppc_perf_fb_ctrs, wraparound_time);
+/* Check for valid access_width, otherwise, fallback to using bit_width */
+#define GET_BIT_WIDTH(reg) ((reg)->access_width ? (8 << ((reg)->access_width - 1)) : (reg)->bit_width)
+
+/* Shift and apply the mask for CPC reads/writes */
+#define MASK_VAL(reg, val) (((val) >> (reg)->bit_offset) & \
+ GENMASK(((reg)->bit_width) - 1, 0))
+
static ssize_t show_feedback_ctrs(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
@@ -762,8 +769,10 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
} else if (gas_t->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
if (gas_t->address) {
void __iomem *addr;
+ size_t access_width;
- addr = ioremap(gas_t->address, gas_t->bit_width/8);
+ access_width = GET_BIT_WIDTH(gas_t) / 8;
+ addr = ioremap(gas_t->address, access_width);
if (!addr)
goto out_free;
cpc_ptr->cpc_regs[i-2].sys_mem_vaddr = addr;
@@ -936,6 +945,7 @@ static int cpc_read(int cpu, struct cpc_register_resource *reg_res, u64 *val)
{
int ret_val = 0;
void __iomem *vaddr = NULL;
+ int size;
int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu);
struct cpc_reg *reg = ®_res->cpc_entry.reg;
@@ -945,17 +955,26 @@ static int cpc_read(int cpu, struct cpc_register_resource *reg_res, u64 *val)
}
*val = 0;
- if (reg->space_id == ACPI_ADR_SPACE_PLATFORM_COMM && pcc_ss_id >= 0)
+ size = GET_BIT_WIDTH(reg);
+
+ if (reg->space_id == ACPI_ADR_SPACE_PLATFORM_COMM && pcc_ss_id >= 0) {
+ /*
+ * For registers in PCC space, the register size is determined
+ * by the bit width field; the access size is used to indicate
+ * the PCC subspace id.
+ */
+ size = reg->bit_width;
vaddr = GET_PCC_VADDR(reg->address, pcc_ss_id);
+ }
else if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
vaddr = reg_res->sys_mem_vaddr;
else if (reg->space_id == ACPI_ADR_SPACE_FIXED_HARDWARE)
return cpc_read_ffh(cpu, reg, val);
else
return acpi_os_read_memory((acpi_physical_address)reg->address,
- val, reg->bit_width);
+ val, size);
- switch (reg->bit_width) {
+ switch (size) {
case 8:
*val = readb_relaxed(vaddr);
break;
@@ -969,32 +988,53 @@ static int cpc_read(int cpu, struct cpc_register_resource *reg_res, u64 *val)
*val = readq_relaxed(vaddr);
break;
default:
- pr_debug("Error: Cannot read %u bit width from PCC for ss: %d\n",
- reg->bit_width, pcc_ss_id);
+ if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
+ pr_debug("Error: Cannot read %u bit width from system memory: 0x%llx\n",
+ size, reg->address);
+ } else if (reg->space_id == ACPI_ADR_SPACE_PLATFORM_COMM) {
+ pr_debug("Error: Cannot read %u bit width from PCC for ss: %d\n",
+ size, pcc_ss_id);
+ }
ret_val = -EFAULT;
}
+ if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
+ *val = MASK_VAL(reg, *val);
+
return ret_val;
}
static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val)
{
int ret_val = 0;
+ int size;
void __iomem *vaddr = NULL;
int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu);
struct cpc_reg *reg = ®_res->cpc_entry.reg;
- if (reg->space_id == ACPI_ADR_SPACE_PLATFORM_COMM && pcc_ss_id >= 0)
+ size = GET_BIT_WIDTH(reg);
+
+ if (reg->space_id == ACPI_ADR_SPACE_PLATFORM_COMM && pcc_ss_id >= 0) {
+ /*
+ * For registers in PCC space, the register size is determined
+ * by the bit width field; the access size is used to indicate
+ * the PCC subspace id.
+ */
+ size = reg->bit_width;
vaddr = GET_PCC_VADDR(reg->address, pcc_ss_id);
+ }
else if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
vaddr = reg_res->sys_mem_vaddr;
else if (reg->space_id == ACPI_ADR_SPACE_FIXED_HARDWARE)
return cpc_write_ffh(cpu, reg, val);
else
return acpi_os_write_memory((acpi_physical_address)reg->address,
- val, reg->bit_width);
+ val, size);
+
+ if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
+ val = MASK_VAL(reg, val);
- switch (reg->bit_width) {
+ switch (size) {
case 8:
writeb_relaxed(val, vaddr);
break;
@@ -1008,8 +1048,13 @@ static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val)
writeq_relaxed(val, vaddr);
break;
default:
- pr_debug("Error: Cannot write %u bit width to PCC for ss: %d\n",
- reg->bit_width, pcc_ss_id);
+ if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
+ pr_debug("Error: Cannot write %u bit width to system memory: 0x%llx\n",
+ size, reg->address);
+ } else if (reg->space_id == ACPI_ADR_SPACE_PLATFORM_COMM) {
+ pr_debug("Error: Cannot write %u bit width to PCC for ss: %d\n",
+ size, pcc_ss_id);
+ }
ret_val = -EFAULT;
break;
}
diff --git a/drivers/ata/sata_gemini.c b/drivers/ata/sata_gemini.c
index 6fd54e968d10..1564472fd5d5 100644
--- a/drivers/ata/sata_gemini.c
+++ b/drivers/ata/sata_gemini.c
@@ -201,7 +201,10 @@ int gemini_sata_start_bridge(struct sata_gemini *sg, unsigned int bridge)
pclk = sg->sata0_pclk;
else
pclk = sg->sata1_pclk;
- clk_enable(pclk);
+ ret = clk_enable(pclk);
+ if (ret)
+ return ret;
+
msleep(10);
/* Do not keep clocking a bridge that is not online */
diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index 0f3943ac5417..d4ae33a5f805 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -182,9 +182,10 @@ int qca_send_pre_shutdown_cmd(struct hci_dev *hdev)
}
EXPORT_SYMBOL_GPL(qca_send_pre_shutdown_cmd);
-static void qca_tlv_check_data(struct hci_dev *hdev,
+static int qca_tlv_check_data(struct hci_dev *hdev,
struct qca_fw_config *config,
- u8 *fw_data, enum qca_btsoc_type soc_type)
+ u8 *fw_data, size_t fw_size,
+ enum qca_btsoc_type soc_type)
{
const u8 *data;
u32 type_len;
@@ -194,12 +195,16 @@ static void qca_tlv_check_data(struct hci_dev *hdev,
struct tlv_type_patch *tlv_patch;
struct tlv_type_nvm *tlv_nvm;
uint8_t nvm_baud_rate = config->user_baud_rate;
+ u8 type;
config->dnld_mode = QCA_SKIP_EVT_NONE;
config->dnld_type = QCA_SKIP_EVT_NONE;
switch (config->type) {
case ELF_TYPE_PATCH:
+ if (fw_size < 7)
+ return -EINVAL;
+
config->dnld_mode = QCA_SKIP_EVT_VSE_CC;
config->dnld_type = QCA_SKIP_EVT_VSE_CC;
@@ -208,6 +213,9 @@ static void qca_tlv_check_data(struct hci_dev *hdev,
bt_dev_dbg(hdev, "File version : 0x%x", fw_data[6]);
break;
case TLV_TYPE_PATCH:
+ if (fw_size < sizeof(struct tlv_type_hdr) + sizeof(struct tlv_type_patch))
+ return -EINVAL;
+
tlv = (struct tlv_type_hdr *)fw_data;
type_len = le32_to_cpu(tlv->type_len);
tlv_patch = (struct tlv_type_patch *)tlv->data;
@@ -247,25 +255,56 @@ static void qca_tlv_check_data(struct hci_dev *hdev,
break;
case TLV_TYPE_NVM:
+ if (fw_size < sizeof(struct tlv_type_hdr))
+ return -EINVAL;
+
tlv = (struct tlv_type_hdr *)fw_data;
type_len = le32_to_cpu(tlv->type_len);
- length = (type_len >> 8) & 0x00ffffff;
+ length = type_len >> 8;
+ type = type_len & 0xff;
- BT_DBG("TLV Type\t\t : 0x%x", type_len & 0x000000ff);
+ /* Some NVM files have more than one set of tags, only parse
+ * the first set when it has type 2 for now. When there is
+ * more than one set there is an enclosing header of type 4.
+ */
+ if (type == 4) {
+ if (fw_size < 2 * sizeof(struct tlv_type_hdr))
+ return -EINVAL;
+
+ tlv++;
+
+ type_len = le32_to_cpu(tlv->type_len);
+ length = type_len >> 8;
+ type = type_len & 0xff;
+ }
+
+ BT_DBG("TLV Type\t\t : 0x%x", type);
BT_DBG("Length\t\t : %d bytes", length);
+ if (type != 2)
+ break;
+
+ if (fw_size < length + (tlv->data - fw_data))
+ return -EINVAL;
+
idx = 0;
data = tlv->data;
- while (idx < length) {
+ while (idx < length - sizeof(struct tlv_type_nvm)) {
tlv_nvm = (struct tlv_type_nvm *)(data + idx);
tag_id = le16_to_cpu(tlv_nvm->tag_id);
tag_len = le16_to_cpu(tlv_nvm->tag_len);
+ if (length < idx + sizeof(struct tlv_type_nvm) + tag_len)
+ return -EINVAL;
+
/* Update NVM tags as needed */
switch (tag_id) {
case EDL_TAG_ID_HCI:
+ if (tag_len < 3)
+ return -EINVAL;
+
/* HCI transport layer parameters
* enabling software inband sleep
* onto controller side.
@@ -281,6 +320,9 @@ static void qca_tlv_check_data(struct hci_dev *hdev,
break;
case EDL_TAG_ID_DEEP_SLEEP:
+ if (tag_len < 1)
+ return -EINVAL;
+
/* Sleep enable mask
* enabling deep sleep feature on controller.
*/
@@ -289,14 +331,16 @@ static void qca_tlv_check_data(struct hci_dev *hdev,
break;
}
- idx += (sizeof(u16) + sizeof(u16) + 8 + tag_len);
+ idx += sizeof(struct tlv_type_nvm) + tag_len;
}
break;
default:
BT_ERR("Unknown TLV type %d", config->type);
- break;
+ return -EINVAL;
}
+
+ return 0;
}
static int qca_tlv_send_segment(struct hci_dev *hdev, int seg_size,
@@ -446,7 +490,9 @@ static int qca_download_firmware(struct hci_dev *hdev,
memcpy(data, fw->data, size);
release_firmware(fw);
- qca_tlv_check_data(hdev, config, data, soc_type);
+ ret = qca_tlv_check_data(hdev, config, data, size, soc_type);
+ if (ret)
+ goto out;
segment = data;
remain = size;
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index a05b5bca6425..dc2bcf58fc10 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -4227,7 +4227,8 @@ void clk_unregister(struct clk *clk)
if (ops == &clk_nodrv_ops) {
pr_err("%s: unregistered clock: %s\n", __func__,
clk->core->name);
- goto unlock;
+ clk_prepare_unlock();
+ return;
}
/*
* Assign empty clock ops for consumers that might still hold
@@ -4261,11 +4262,10 @@ void clk_unregister(struct clk *clk)
if (clk->core->protect_count)
pr_warn("%s: unregistering protected clock: %s\n",
__func__, clk->core->name);
+ clk_prepare_unlock();
kref_put(&clk->core->ref, __clk_release);
free_clk(clk);
-unlock:
- clk_prepare_unlock();
}
EXPORT_SYMBOL_GPL(clk_unregister);
@@ -4471,13 +4471,11 @@ void __clk_put(struct clk *clk)
clk->max_rate < clk->core->req_rate)
clk_core_set_rate_nolock(clk->core, clk->core->req_rate);
- owner = clk->core->owner;
- kref_put(&clk->core->ref, __clk_release);
-
clk_prepare_unlock();
+ owner = clk->core->owner;
+ kref_put(&clk->core->ref, __clk_release);
module_put(owner);
-
free_clk(clk);
}
diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-h6.c b/drivers/clk/sunxi-ng/ccu-sun50i-h6.c
index c0800da2fa3d..736a781e4007 100644
--- a/drivers/clk/sunxi-ng/ccu-sun50i-h6.c
+++ b/drivers/clk/sunxi-ng/ccu-sun50i-h6.c
@@ -1181,12 +1181,19 @@ static const u32 usb2_clk_regs[] = {
SUN50I_H6_USB3_CLK_REG,
};
+static struct ccu_mux_nb sun50i_h6_cpu_nb = {
+ .common = &cpux_clk.common,
+ .cm = &cpux_clk.mux,
+ .delay_us = 1,
+ .bypass_index = 0, /* index of 24 MHz oscillator */
+};
+
static int sun50i_h6_ccu_probe(struct platform_device *pdev)
{
struct resource *res;
void __iomem *reg;
+ int i, ret;
u32 val;
- int i;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
reg = devm_ioremap_resource(&pdev->dev, res);
@@ -1240,7 +1247,15 @@ static int sun50i_h6_ccu_probe(struct platform_device *pdev)
val |= BIT(24);
writel(val, reg + SUN50I_H6_HDMI_CEC_CLK_REG);
- return devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_h6_ccu_desc);
+ ret = devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_h6_ccu_desc);
+ if (ret)
+ return ret;
+
+ /* Reparent CPU during PLL CPUX rate changes */
+ ccu_mux_notifier_register(pll_cpux_clk.common.hw.clk,
+ &sun50i_h6_cpu_nb);
+
+ return 0;
}
static const struct of_device_id sun50i_h6_ccu_ids[] = {
diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c
index b0d671db178a..ea31ac7ac1ca 100644
--- a/drivers/firewire/nosy.c
+++ b/drivers/firewire/nosy.c
@@ -148,10 +148,12 @@ packet_buffer_get(struct client *client, char __user *data, size_t user_length)
if (atomic_read(&buffer->size) == 0)
return -ENODEV;
- /* FIXME: Check length <= user_length. */
+ length = buffer->head->length;
+
+ if (length > user_length)
+ return 0;
end = buffer->data + buffer->capacity;
- length = buffer->head->length;
if (&buffer->head->data[length] < end) {
if (copy_to_user(data, buffer->head->data, length))
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 667ff40f3935..7d94e1cbc0ed 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -2049,6 +2049,8 @@ static void bus_reset_work(struct work_struct *work)
ohci->generation = generation;
reg_write(ohci, OHCI1394_IntEventClear, OHCI1394_busReset);
+ if (param_debug & OHCI_PARAM_DEBUG_BUSRESETS)
+ reg_write(ohci, OHCI1394_IntMaskSet, OHCI1394_busReset);
if (ohci->quirks & QUIRK_RESET_PACKET)
ohci->request_generation = generation;
@@ -2115,12 +2117,14 @@ static irqreturn_t irq_handler(int irq, void *data)
return IRQ_NONE;
/*
- * busReset and postedWriteErr must not be cleared yet
+ * busReset and postedWriteErr events must not be cleared yet
* (OHCI 1.1 clauses 7.2.3.2 and 13.2.8.1)
*/
reg_write(ohci, OHCI1394_IntEventClear,
event & ~(OHCI1394_busReset | OHCI1394_postedWriteErr));
log_irqs(ohci, event);
+ if (event & OHCI1394_busReset)
+ reg_write(ohci, OHCI1394_IntMaskClear, OHCI1394_busReset);
if (event & OHCI1394_selfIDComplete)
queue_work(selfid_workqueue, &ohci->bus_reset_work);
diff --git a/drivers/gpio/gpio-crystalcove.c b/drivers/gpio/gpio-crystalcove.c
index 5a909f3c79e8..c48a82c24087 100644
--- a/drivers/gpio/gpio-crystalcove.c
+++ b/drivers/gpio/gpio-crystalcove.c
@@ -91,7 +91,7 @@ static inline int to_reg(int gpio, enum ctrl_register reg_type)
case 0x5e:
return GPIOPANELCTL;
default:
- return -EOPNOTSUPP;
+ return -ENOTSUPP;
}
}
diff --git a/drivers/gpio/gpio-wcove.c b/drivers/gpio/gpio-wcove.c
index 16a0fae1e32e..2df948e16eb7 100644
--- a/drivers/gpio/gpio-wcove.c
+++ b/drivers/gpio/gpio-wcove.c
@@ -104,7 +104,7 @@ static inline int to_reg(int gpio, enum ctrl_register type)
unsigned int reg = type == CTRL_IN ? GPIO_IN_CTRL_BASE : GPIO_OUT_CTRL_BASE;
if (gpio >= WCOVE_GPIO_NUM)
- return -EOPNOTSUPP;
+ return -ENOTSUPP;
return reg + gpio;
}
diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
index 228f098e5d88..6bc8c6bee411 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
@@ -2303,6 +2303,7 @@ static enum bp_result construct_integrated_info(
result = get_integrated_info_v2_1(bp, info);
break;
case 2:
+ case 3:
result = get_integrated_info_v2_2(bp, info);
break;
default:
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index cfe163103cfd..1140292820bb 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -2460,7 +2460,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
dev->mode_config.max_width,
dev->mode_config.max_height);
else
- drm_dbg_kms(dev, "User-space requested a forced probe on [CONNECTOR:%d:%s] but is not the DRM master, demoting to read-only probe",
+ drm_dbg_kms(dev, "User-space requested a forced probe on [CONNECTOR:%d:%s] but is not the DRM master, demoting to read-only probe\n",
connector->base.id, connector->name);
}
diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
index 5cd2b2ebbbd3..2c8e978eb9ab 100644
--- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
@@ -105,6 +105,8 @@
#define HHI_HDMI_CLK_CNTL 0x1cc /* 0x73 */
#define HHI_HDMI_PHY_CNTL0 0x3a0 /* 0xe8 */
#define HHI_HDMI_PHY_CNTL1 0x3a4 /* 0xe9 */
+#define PHY_CNTL1_INIT 0x03900000
+#define PHY_INVERT BIT(17)
#define HHI_HDMI_PHY_CNTL2 0x3a8 /* 0xea */
#define HHI_HDMI_PHY_CNTL3 0x3ac /* 0xeb */
#define HHI_HDMI_PHY_CNTL4 0x3b0 /* 0xec */
@@ -129,6 +131,8 @@ struct meson_dw_hdmi_data {
unsigned int addr);
void (*dwc_write)(struct meson_dw_hdmi *dw_hdmi,
unsigned int addr, unsigned int data);
+ u32 cntl0_init;
+ u32 cntl1_init;
};
struct meson_dw_hdmi {
@@ -384,26 +388,6 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi, void *data,
drm_mode_is_420_also(display, mode)))
mode_is_420 = true;
- /* Enable clocks */
- regmap_update_bits(priv->hhi, HHI_HDMI_CLK_CNTL, 0xffff, 0x100);
-
- /* Bring HDMITX MEM output of power down */
- regmap_update_bits(priv->hhi, HHI_MEM_PD_REG0, 0xff << 8, 0);
-
- /* Bring out of reset */
- dw_hdmi->data->top_write(dw_hdmi, HDMITX_TOP_SW_RESET, 0);
-
- /* Enable internal pixclk, tmds_clk, spdif_clk, i2s_clk, cecclk */
- dw_hdmi_top_write_bits(dw_hdmi, HDMITX_TOP_CLK_CNTL,
- 0x3, 0x3);
-
- /* Enable cec_clk and hdcp22_tmdsclk_en */
- dw_hdmi_top_write_bits(dw_hdmi, HDMITX_TOP_CLK_CNTL,
- 0x3 << 4, 0x3 << 4);
-
- /* Enable normal output to PHY */
- dw_hdmi->data->top_write(dw_hdmi, HDMITX_TOP_BIST_CNTL, BIT(12));
-
/* TMDS pattern setup */
if (mode->clock > 340000 && !mode_is_420) {
dw_hdmi->data->top_write(dw_hdmi, HDMITX_TOP_TMDS_CLK_PTTN_01,
@@ -425,20 +409,6 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi, void *data,
/* Setup PHY parameters */
meson_hdmi_phy_setup_mode(dw_hdmi, mode, mode_is_420);
- /* Setup PHY */
- regmap_update_bits(priv->hhi, HHI_HDMI_PHY_CNTL1,
- 0xffff << 16, 0x0390 << 16);
-
- /* BIT_INVERT */
- if (dw_hdmi_is_compatible(dw_hdmi, "amlogic,meson-gxl-dw-hdmi") ||
- dw_hdmi_is_compatible(dw_hdmi, "amlogic,meson-gxm-dw-hdmi") ||
- dw_hdmi_is_compatible(dw_hdmi, "amlogic,meson-g12a-dw-hdmi"))
- regmap_update_bits(priv->hhi, HHI_HDMI_PHY_CNTL1,
- BIT(17), 0);
- else
- regmap_update_bits(priv->hhi, HHI_HDMI_PHY_CNTL1,
- BIT(17), BIT(17));
-
/* Disable clock, fifo, fifo_wr */
regmap_update_bits(priv->hhi, HHI_HDMI_PHY_CNTL1, 0xf, 0);
@@ -492,7 +462,9 @@ static void dw_hdmi_phy_disable(struct dw_hdmi *hdmi,
DRM_DEBUG_DRIVER("\n");
- regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, 0);
+ /* Fallback to init mode */
+ regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL1, dw_hdmi->data->cntl1_init);
+ regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, dw_hdmi->data->cntl0_init);
}
static enum drm_connector_status dw_hdmi_read_hpd(struct dw_hdmi *hdmi,
@@ -610,11 +582,22 @@ static const struct regmap_config meson_dw_hdmi_regmap_config = {
.fast_io = true,
};
-static const struct meson_dw_hdmi_data meson_dw_hdmi_gx_data = {
+static const struct meson_dw_hdmi_data meson_dw_hdmi_gxbb_data = {
.top_read = dw_hdmi_top_read,
.top_write = dw_hdmi_top_write,
.dwc_read = dw_hdmi_dwc_read,
.dwc_write = dw_hdmi_dwc_write,
+ .cntl0_init = 0x0,
+ .cntl1_init = PHY_CNTL1_INIT | PHY_INVERT,
+};
+
+static const struct meson_dw_hdmi_data meson_dw_hdmi_gxl_data = {
+ .top_read = dw_hdmi_top_read,
+ .top_write = dw_hdmi_top_write,
+ .dwc_read = dw_hdmi_dwc_read,
+ .dwc_write = dw_hdmi_dwc_write,
+ .cntl0_init = 0x0,
+ .cntl1_init = PHY_CNTL1_INIT,
};
static const struct meson_dw_hdmi_data meson_dw_hdmi_g12a_data = {
@@ -622,6 +605,8 @@ static const struct meson_dw_hdmi_data meson_dw_hdmi_g12a_data = {
.top_write = dw_hdmi_g12a_top_write,
.dwc_read = dw_hdmi_g12a_dwc_read,
.dwc_write = dw_hdmi_g12a_dwc_write,
+ .cntl0_init = 0x000b4242, /* Bandgap */
+ .cntl1_init = PHY_CNTL1_INIT,
};
static void meson_dw_hdmi_init(struct meson_dw_hdmi *meson_dw_hdmi)
@@ -656,6 +641,13 @@ static void meson_dw_hdmi_init(struct meson_dw_hdmi *meson_dw_hdmi)
meson_dw_hdmi->data->top_write(meson_dw_hdmi,
HDMITX_TOP_CLK_CNTL, 0xff);
+ /* Enable normal output to PHY */
+ meson_dw_hdmi->data->top_write(meson_dw_hdmi, HDMITX_TOP_BIST_CNTL, BIT(12));
+
+ /* Setup PHY */
+ regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL1, meson_dw_hdmi->data->cntl1_init);
+ regmap_write(priv->hhi, HHI_HDMI_PHY_CNTL0, meson_dw_hdmi->data->cntl0_init);
+
/* Enable HDMI-TX Interrupt */
meson_dw_hdmi->data->top_write(meson_dw_hdmi, HDMITX_TOP_INTR_STAT_CLR,
HDMITX_TOP_INTR_CORE);
@@ -883,11 +875,11 @@ static const struct dev_pm_ops meson_dw_hdmi_pm_ops = {
static const struct of_device_id meson_dw_hdmi_of_table[] = {
{ .compatible = "amlogic,meson-gxbb-dw-hdmi",
- .data = &meson_dw_hdmi_gx_data },
+ .data = &meson_dw_hdmi_gxbb_data },
{ .compatible = "amlogic,meson-gxl-dw-hdmi",
- .data = &meson_dw_hdmi_gx_data },
+ .data = &meson_dw_hdmi_gxl_data },
{ .compatible = "amlogic,meson-gxm-dw-hdmi",
- .data = &meson_dw_hdmi_gx_data },
+ .data = &meson_dw_hdmi_gxl_data },
{ .compatible = "amlogic,meson-g12a-dw-hdmi",
.data = &meson_dw_hdmi_g12a_data },
{ }
diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c
index 447b7594b35a..0107a21dc9f9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -109,12 +109,15 @@ nouveau_dp_detect(struct nouveau_connector *nv_connector,
u8 *dpcd = nv_encoder->dp.dpcd;
int ret = NOUVEAU_DP_NONE;
- /* If we've already read the DPCD on an eDP device, we don't need to
- * reread it as it won't change
+ /* eDP ports don't support hotplugging - so there's no point in probing eDP ports unless we
+ * haven't probed them once before.
*/
- if (connector->connector_type == DRM_MODE_CONNECTOR_eDP &&
- dpcd[DP_DPCD_REV] != 0)
- return NOUVEAU_DP_SST;
+ if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
+ if (connector->status == connector_status_connected)
+ return NOUVEAU_DP_SST;
+ else if (connector->status == connector_status_disconnected)
+ return NOUVEAU_DP_NONE;
+ }
mutex_lock(&nv_encoder->dp.hpd_irq_lock);
if (mstm) {
diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
index e1542451ef9d..0d89779de22b 100644
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
@@ -420,7 +420,7 @@ static int ili9341_dpi_prepare(struct drm_panel *panel)
ili9341_dpi_init(ili);
- return ret;
+ return 0;
}
static int ili9341_dpi_enable(struct drm_panel *panel)
@@ -716,18 +716,18 @@ static int ili9341_probe(struct spi_device *spi)
reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
if (IS_ERR(reset))
- dev_err(dev, "Failed to get gpio 'reset'\n");
+ return dev_err_probe(dev, PTR_ERR(reset), "Failed to get gpio 'reset'\n");
dc = devm_gpiod_get_optional(dev, "dc", GPIOD_OUT_LOW);
if (IS_ERR(dc))
- dev_err(dev, "Failed to get gpio 'dc'\n");
+ return dev_err_probe(dev, PTR_ERR(dc), "Failed to get gpio 'dc'\n");
if (!strcmp(id->name, "sf-tc240t-9370-t"))
return ili9341_dpi_probe(spi, dc, reset);
else if (!strcmp(id->name, "yx240qv29"))
return ili9341_dbi_probe(spi, dc, reset);
- return -1;
+ return -ENODEV;
}
static int ili9341_remove(struct spi_device *spi)
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
index d4f26075383d..b19f2f00b215 100644
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -58,56 +58,16 @@ static long qxl_fence_wait(struct dma_fence *fence, bool intr,
signed long timeout)
{
struct qxl_device *qdev;
- struct qxl_release *release;
- int count = 0, sc = 0;
- bool have_drawable_releases;
unsigned long cur, end = jiffies + timeout;
qdev = container_of(fence->lock, struct qxl_device, release_lock);
- release = container_of(fence, struct qxl_release, base);
- have_drawable_releases = release->type == QXL_RELEASE_DRAWABLE;
-
-retry:
- sc++;
-
- if (dma_fence_is_signaled(fence))
- goto signaled;
-
- qxl_io_notify_oom(qdev);
-
- for (count = 0; count < 11; count++) {
- if (!qxl_queue_garbage_collect(qdev, true))
- break;
-
- if (dma_fence_is_signaled(fence))
- goto signaled;
- }
-
- if (dma_fence_is_signaled(fence))
- goto signaled;
- if (have_drawable_releases || sc < 4) {
- if (sc > 2)
- /* back off */
- usleep_range(500, 1000);
-
- if (time_after(jiffies, end))
- return 0;
-
- if (have_drawable_releases && sc > 300) {
- DMA_FENCE_WARN(fence,
- "failed to wait on release %llu after spincount %d\n",
- fence->context & ~0xf0000000, sc);
- goto signaled;
- }
- goto retry;
- }
- /*
- * yeah, original sync_obj_wait gave up after 3 spins when
- * have_drawable_releases is not set.
- */
+ if (!wait_event_timeout(qdev->release_event,
+ (dma_fence_is_signaled(fence) ||
+ (qxl_io_notify_oom(qdev), 0)),
+ timeout))
+ return 0;
-signaled:
cur = jiffies;
if (time_after(cur, end))
return 0;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
index b32ddbb992de..50eba25456bb 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
@@ -1068,7 +1068,7 @@ static int vmw_event_fence_action_create(struct drm_file *file_priv,
}
event->event.base.type = DRM_VMW_EVENT_FENCE_SIGNALED;
- event->event.base.length = sizeof(*event);
+ event->event.base.length = sizeof(event->event);
event->event.user_data = user_data;
ret = drm_event_reserve_init(dev, file_priv, &event->base, &event->event.base);
diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c
index 218e3718fd68..96737ddc8120 100644
--- a/drivers/gpu/host1x/bus.c
+++ b/drivers/gpu/host1x/bus.c
@@ -367,11 +367,6 @@ static int host1x_device_uevent(struct device *dev,
return 0;
}
-static int host1x_dma_configure(struct device *dev)
-{
- return of_dma_configure(dev, dev->of_node, true);
-}
-
static const struct dev_pm_ops host1x_device_pm_ops = {
.suspend = pm_generic_suspend,
.resume = pm_generic_resume,
@@ -385,7 +380,6 @@ struct bus_type host1x_bus_type = {
.name = "host1x",
.match = host1x_device_match,
.uevent = host1x_device_uevent,
- .dma_configure = host1x_dma_configure,
.pm = &host1x_device_pm_ops,
};
@@ -474,8 +468,6 @@ static int host1x_device_add(struct host1x *host1x,
device->dev.bus = &host1x_bus_type;
device->dev.parent = host1x->dev;
- of_dma_configure(&device->dev, host1x->dev->of_node, true);
-
device->dev.dma_parms = &device->dma_parms;
dma_set_max_seg_size(&device->dev, UINT_MAX);
diff --git a/drivers/hwmon/corsair-cpro.c b/drivers/hwmon/corsair-cpro.c
index fa6aa4fc8b52..486fb6a8c356 100644
--- a/drivers/hwmon/corsair-cpro.c
+++ b/drivers/hwmon/corsair-cpro.c
@@ -16,6 +16,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/slab.h>
+#include <linux/spinlock.h>
#include <linux/types.h>
#define USB_VENDOR_ID_CORSAIR 0x1b1c
@@ -77,8 +78,11 @@
struct ccp_device {
struct hid_device *hdev;
struct device *hwmon_dev;
+ /* For reinitializing the completion below */
+ spinlock_t wait_input_report_lock;
struct completion wait_input_report;
struct mutex mutex; /* whenever buffer is used, lock before send_usb_cmd */
+ u8 *cmd_buffer;
u8 *buffer;
int target[6];
DECLARE_BITMAP(temp_cnct, NUM_TEMP_SENSORS);
@@ -111,15 +115,23 @@ static int send_usb_cmd(struct ccp_device *ccp, u8 command, u8 byte1, u8 byte2,
unsigned long t;
int ret;
- memset(ccp->buffer, 0x00, OUT_BUFFER_SIZE);
- ccp->buffer[0] = command;
- ccp->buffer[1] = byte1;
- ccp->buffer[2] = byte2;
- ccp->buffer[3] = byte3;
-
+ memset(ccp->cmd_buffer, 0x00, OUT_BUFFER_SIZE);
+ ccp->cmd_buffer[0] = command;
+ ccp->cmd_buffer[1] = byte1;
+ ccp->cmd_buffer[2] = byte2;
+ ccp->cmd_buffer[3] = byte3;
+
+ /*
+ * Disable raw event parsing for a moment to safely reinitialize the
+ * completion. Reinit is done because hidraw could have triggered
+ * the raw event parsing and marked the ccp->wait_input_report
+ * completion as done.
+ */
+ spin_lock_bh(&ccp->wait_input_report_lock);
reinit_completion(&ccp->wait_input_report);
+ spin_unlock_bh(&ccp->wait_input_report_lock);
- ret = hid_hw_output_report(ccp->hdev, ccp->buffer, OUT_BUFFER_SIZE);
+ ret = hid_hw_output_report(ccp->hdev, ccp->cmd_buffer, OUT_BUFFER_SIZE);
if (ret < 0)
return ret;
@@ -135,11 +147,12 @@ static int ccp_raw_event(struct hid_device *hdev, struct hid_report *report, u8
struct ccp_device *ccp = hid_get_drvdata(hdev);
/* only copy buffer when requested */
- if (completion_done(&ccp->wait_input_report))
- return 0;
-
- memcpy(ccp->buffer, data, min(IN_BUFFER_SIZE, size));
- complete(&ccp->wait_input_report);
+ spin_lock(&ccp->wait_input_report_lock);
+ if (!completion_done(&ccp->wait_input_report)) {
+ memcpy(ccp->buffer, data, min(IN_BUFFER_SIZE, size));
+ complete_all(&ccp->wait_input_report);
+ }
+ spin_unlock(&ccp->wait_input_report_lock);
return 0;
}
@@ -492,7 +505,11 @@ static int ccp_probe(struct hid_device *hdev, const struct hid_device_id *id)
if (!ccp)
return -ENOMEM;
- ccp->buffer = devm_kmalloc(&hdev->dev, OUT_BUFFER_SIZE, GFP_KERNEL);
+ ccp->cmd_buffer = devm_kmalloc(&hdev->dev, OUT_BUFFER_SIZE, GFP_KERNEL);
+ if (!ccp->cmd_buffer)
+ return -ENOMEM;
+
+ ccp->buffer = devm_kmalloc(&hdev->dev, IN_BUFFER_SIZE, GFP_KERNEL);
if (!ccp->buffer)
return -ENOMEM;
@@ -510,7 +527,9 @@ static int ccp_probe(struct hid_device *hdev, const struct hid_device_id *id)
ccp->hdev = hdev;
hid_set_drvdata(hdev, ccp);
+
mutex_init(&ccp->mutex);
+ spin_lock_init(&ccp->wait_input_report_lock);
init_completion(&ccp->wait_input_report);
hid_device_io_start(hdev);
diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c
index 3daaf2237832..d6dfa268f31b 100644
--- a/drivers/hwmon/pmbus/ucd9000.c
+++ b/drivers/hwmon/pmbus/ucd9000.c
@@ -80,11 +80,11 @@ struct ucd9000_debugfs_entry {
* It has been observed that the UCD90320 randomly fails register access when
* doing another access right on the back of a register write. To mitigate this
* make sure that there is a minimum delay between a write access and the
- * following access. The 250us is based on experimental data. At a delay of
- * 200us the issue seems to go away. Add a bit of extra margin to allow for
+ * following access. The 500 is based on experimental data. At a delay of
+ * 350us the issue seems to go away. Add a bit of extra margin to allow for
* system to system differences.
*/
-#define UCD90320_WAIT_DELAY_US 250
+#define UCD90320_WAIT_DELAY_US 500
static inline void ucd90320_wait(const struct ucd9000_data *data)
{
diff --git a/drivers/iio/accel/mxc4005.c b/drivers/iio/accel/mxc4005.c
index df600d2917c0..ffae30e5eb5b 100644
--- a/drivers/iio/accel/mxc4005.c
+++ b/drivers/iio/accel/mxc4005.c
@@ -27,9 +27,13 @@
#define MXC4005_REG_ZOUT_UPPER 0x07
#define MXC4005_REG_ZOUT_LOWER 0x08
+#define MXC4005_REG_INT_MASK0 0x0A
+
#define MXC4005_REG_INT_MASK1 0x0B
#define MXC4005_REG_INT_MASK1_BIT_DRDYE 0x01
+#define MXC4005_REG_INT_CLR0 0x00
+
#define MXC4005_REG_INT_CLR1 0x01
#define MXC4005_REG_INT_CLR1_BIT_DRDYC 0x01
@@ -113,7 +117,9 @@ static bool mxc4005_is_readable_reg(struct device *dev, unsigned int reg)
static bool mxc4005_is_writeable_reg(struct device *dev, unsigned int reg)
{
switch (reg) {
+ case MXC4005_REG_INT_CLR0:
case MXC4005_REG_INT_CLR1:
+ case MXC4005_REG_INT_MASK0:
case MXC4005_REG_INT_MASK1:
case MXC4005_REG_CONTROL:
return true;
@@ -330,17 +336,13 @@ static int mxc4005_set_trigger_state(struct iio_trigger *trig,
{
struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
struct mxc4005_data *data = iio_priv(indio_dev);
+ unsigned int val;
int ret;
mutex_lock(&data->mutex);
- if (state) {
- ret = regmap_write(data->regmap, MXC4005_REG_INT_MASK1,
- MXC4005_REG_INT_MASK1_BIT_DRDYE);
- } else {
- ret = regmap_write(data->regmap, MXC4005_REG_INT_MASK1,
- ~MXC4005_REG_INT_MASK1_BIT_DRDYE);
- }
+ val = state ? MXC4005_REG_INT_MASK1_BIT_DRDYE : 0;
+ ret = regmap_write(data->regmap, MXC4005_REG_INT_MASK1, val);
if (ret < 0) {
mutex_unlock(&data->mutex);
dev_err(data->dev, "failed to update reg_int_mask1");
@@ -382,6 +384,14 @@ static int mxc4005_chip_init(struct mxc4005_data *data)
dev_dbg(data->dev, "MXC4005 chip id %02x\n", reg);
+ ret = regmap_write(data->regmap, MXC4005_REG_INT_MASK0, 0);
+ if (ret < 0)
+ return dev_err_probe(data->dev, ret, "writing INT_MASK0\n");
+
+ ret = regmap_write(data->regmap, MXC4005_REG_INT_MASK1, 0);
+ if (ret < 0)
+ return dev_err_probe(data->dev, ret, "writing INT_MASK1\n");
+
return 0;
}
diff --git a/drivers/iio/imu/adis16475.c b/drivers/iio/imu/adis16475.c
index a3b9745dd176..e8238459bdad 100644
--- a/drivers/iio/imu/adis16475.c
+++ b/drivers/iio/imu/adis16475.c
@@ -1145,6 +1145,7 @@ static int adis16475_config_sync_mode(struct adis16475 *st)
struct device *dev = &st->adis.spi->dev;
const struct adis16475_sync *sync;
u32 sync_mode;
+ u16 val;
/* default to internal clk */
st->clk_freq = st->info->int_clk * 1000;
@@ -1214,8 +1215,9 @@ static int adis16475_config_sync_mode(struct adis16475 *st)
* I'm keeping this for simplicity and avoiding extra variables
* in chip_info.
*/
+ val = ADIS16475_SYNC_MODE(sync->sync_mode);
ret = __adis_update_bits(&st->adis, ADIS16475_REG_MSG_CTRL,
- ADIS16475_SYNC_MODE_MASK, sync->sync_mode);
+ ADIS16475_SYNC_MODE_MASK, val);
if (ret)
return ret;
diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
index a0c5f3bdc324..8665e506404f 100644
--- a/drivers/infiniband/hw/qib/qib_fs.c
+++ b/drivers/infiniband/hw/qib/qib_fs.c
@@ -441,6 +441,7 @@ static int remove_device_files(struct super_block *sb,
return PTR_ERR(dir);
}
simple_recursive_removal(dir, NULL);
+ dput(dir);
return 0;
}
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 2ae46fa6b3de..04ac40d11fdf 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -1101,6 +1101,7 @@ static const struct of_device_id mtk_iommu_of_ids[] = {
{ .compatible = "mediatek,mt8192-m4u", .data = &mt8192_data},
{}
};
+MODULE_DEVICE_TABLE(of, mtk_iommu_of_ids);
static struct platform_driver mtk_iommu_driver = {
.probe = mtk_iommu_probe,
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index fe1c3123a7e7..02668fd3404f 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -576,6 +576,7 @@ static const struct of_device_id mtk_iommu_of_ids[] = {
{ .compatible = "mediatek,mt2701-m4u", },
{}
};
+MODULE_DEVICE_TABLE(of, mtk_iommu_of_ids);
static const struct component_master_ops mtk_iommu_com_ops = {
.bind = mtk_iommu_bind,
diff --git a/drivers/md/md.c b/drivers/md/md.c
index c937ad7f6b73..45ef1ddd2bd0 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2526,6 +2526,7 @@ static int bind_rdev_to_array(struct md_rdev *rdev, struct mddev *mddev)
fail:
pr_warn("md: failed to register dev-%s for %s\n",
b, mdname(mddev));
+ mddev_destroy_serial_pool(mddev, rdev, false);
return err;
}
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 305ffad131a2..02bea4436943 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -585,6 +585,31 @@ static unsigned int at24_get_offset_adj(u8 flags, unsigned int byte_len)
}
}
+static void at24_probe_temp_sensor(struct i2c_client *client)
+{
+ struct at24_data *at24 = i2c_get_clientdata(client);
+ struct i2c_board_info info = { .type = "jc42" };
+ int ret;
+ u8 val;
+
+ /*
+ * Byte 2 has value 11 for DDR3, earlier versions don't
+ * support the thermal sensor present flag
+ */
+ ret = at24_read(at24, 2, &val, 1);
+ if (ret || val != 11)
+ return;
+
+ /* Byte 32, bit 7 is set if temp sensor is present */
+ ret = at24_read(at24, 32, &val, 1);
+ if (ret || !(val & BIT(7)))
+ return;
+
+ info.addr = 0x18 | (client->addr & 7);
+
+ i2c_new_client_device(client->adapter, &info);
+}
+
static int at24_probe(struct i2c_client *client)
{
struct regmap_config regmap_config = { };
@@ -757,14 +782,6 @@ static int at24_probe(struct i2c_client *client)
pm_runtime_set_active(dev);
pm_runtime_enable(dev);
- at24->nvmem = devm_nvmem_register(dev, &nvmem_config);
- if (IS_ERR(at24->nvmem)) {
- pm_runtime_disable(dev);
- if (!pm_runtime_status_suspended(dev))
- regulator_disable(at24->vcc_reg);
- return PTR_ERR(at24->nvmem);
- }
-
/*
* Perform a one-byte test read to verify that the
* chip is functional.
@@ -777,6 +794,19 @@ static int at24_probe(struct i2c_client *client)
return -ENODEV;
}
+ at24->nvmem = devm_nvmem_register(dev, &nvmem_config);
+ if (IS_ERR(at24->nvmem)) {
+ pm_runtime_disable(dev);
+ if (!pm_runtime_status_suspended(dev))
+ regulator_disable(at24->vcc_reg);
+ return dev_err_probe(dev, PTR_ERR(at24->nvmem),
+ "failed to register nvmem\n");
+ }
+
+ /* If this a SPD EEPROM, probe for DDR3 thermal sensor */
+ if (cdata == &at24_data_spd)
+ at24_probe_temp_sensor(client);
+
pm_runtime_idle(dev);
if (writable)
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index 00867bcc2ef7..bbabfe49f956 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -115,6 +115,8 @@
#define MEI_DEV_ID_ARL_S 0x7F68 /* Arrow Lake Point S */
#define MEI_DEV_ID_ARL_H 0x7770 /* Arrow Lake Point H */
+#define MEI_DEV_ID_LNL_M 0xA870 /* Lunar Lake Point M */
+
/*
* MEI HW Section
*/
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 2809338a5c3a..188d847662ff 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -121,6 +121,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
{MEI_PCI_DEVICE(MEI_DEV_ID_ARL_S, MEI_ME_PCH15_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_ARL_H, MEI_ME_PCH15_CFG)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_LNL_M, MEI_ME_PCH15_CFG)},
+
/* required last entry */
{0, }
};
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 30fba1ea933e..3fc120802883 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -5116,7 +5116,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6141,
.family = MV88E6XXX_FAMILY_6341,
.name = "Marvell 88E6141",
- .num_databases = 4096,
+ .num_databases = 256,
.num_macs = 2048,
.num_ports = 6,
.num_internal_phys = 5,
@@ -5559,7 +5559,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6341,
.family = MV88E6XXX_FAMILY_6341,
.name = "Marvell 88E6341",
- .num_databases = 4096,
+ .num_databases = 256,
.num_macs = 2048,
.num_internal_phys = 5,
.num_ports = 6,
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index a2b736a9d20c..ef8646e91f5d 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2,7 +2,7 @@
/*
* Broadcom GENET (Gigabit Ethernet) controller driver
*
- * Copyright (c) 2014-2020 Broadcom
+ * Copyright (c) 2014-2024 Broadcom
*/
#define pr_fmt(fmt) "bcmgenet: " fmt
@@ -3256,7 +3256,7 @@ static void bcmgenet_get_hw_addr(struct bcmgenet_priv *priv,
}
/* Returns a reusable dma control register value */
-static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv)
+static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv, bool flush_rx)
{
unsigned int i;
u32 reg;
@@ -3281,6 +3281,14 @@ static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv)
udelay(10);
bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH);
+ if (flush_rx) {
+ reg = bcmgenet_rbuf_ctrl_get(priv);
+ bcmgenet_rbuf_ctrl_set(priv, reg | BIT(0));
+ udelay(10);
+ bcmgenet_rbuf_ctrl_set(priv, reg);
+ udelay(10);
+ }
+
return dma_ctrl;
}
@@ -3302,7 +3310,9 @@ static void bcmgenet_netif_start(struct net_device *dev)
struct bcmgenet_priv *priv = netdev_priv(dev);
/* Start the network engine */
+ netif_addr_lock_bh(dev);
bcmgenet_set_rx_mode(dev);
+ netif_addr_unlock_bh(dev);
bcmgenet_enable_rx_napi(priv);
umac_enable_set(priv, CMD_TX_EN | CMD_RX_EN, true);
@@ -3344,8 +3354,8 @@ static int bcmgenet_open(struct net_device *dev)
bcmgenet_set_hw_addr(priv, dev->dev_addr);
- /* Disable RX/TX DMA and flush TX queues */
- dma_ctrl = bcmgenet_dma_disable(priv);
+ /* Disable RX/TX DMA and flush TX and RX queues */
+ dma_ctrl = bcmgenet_dma_disable(priv, true);
/* Reinitialize TDMA and RDMA and SW housekeeping */
ret = bcmgenet_init_dma(priv);
@@ -4201,7 +4211,7 @@ static int bcmgenet_resume(struct device *d)
bcmgenet_hfb_create_rxnfc_filter(priv, rule);
/* Disable RX/TX DMA and flush TX queues */
- dma_ctrl = bcmgenet_dma_disable(priv);
+ dma_ctrl = bcmgenet_dma_disable(priv, false);
/* Reinitialize TDMA and RDMA and SW housekeeping */
ret = bcmgenet_init_dma(priv);
diff --git a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
index 04ad0f2b9677..777f0d7e4819 100644
--- a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
+++ b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
@@ -312,7 +312,7 @@ bnad_debugfs_write_regrd(struct file *file, const char __user *buf,
void *kern_buf;
/* Copy the user space buf */
- kern_buf = memdup_user(buf, nbytes);
+ kern_buf = memdup_user_nul(buf, nbytes);
if (IS_ERR(kern_buf))
return PTR_ERR(kern_buf);
@@ -372,7 +372,7 @@ bnad_debugfs_write_regwr(struct file *file, const char __user *buf,
void *kern_buf;
/* Copy the user space buf */
- kern_buf = memdup_user(buf, nbytes);
+ kern_buf = memdup_user_nul(buf, nbytes);
if (IS_ERR(kern_buf))
return PTR_ERR(kern_buf);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index fa5b596ff23a..a074e9d44277 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -2682,12 +2682,12 @@ int cxgb4_selftest_lb_pkt(struct net_device *netdev)
lb->loopback = 1;
q = &adap->sge.ethtxq[pi->first_qset];
- __netif_tx_lock(q->txq, smp_processor_id());
+ __netif_tx_lock_bh(q->txq);
reclaim_completed_tx(adap, &q->q, -1, true);
credits = txq_avail(&q->q) - ndesc;
if (unlikely(credits < 0)) {
- __netif_tx_unlock(q->txq);
+ __netif_tx_unlock_bh(q->txq);
return -ENOMEM;
}
@@ -2722,7 +2722,7 @@ int cxgb4_selftest_lb_pkt(struct net_device *netdev)
init_completion(&lb->completion);
txq_advance(&q->q, ndesc);
cxgb4_ring_tx_db(adap, &q->q, ndesc);
- __netif_tx_unlock(q->txq);
+ __netif_tx_unlock_bh(q->txq);
/* wait for the pkt to return */
ret = wait_for_completion_timeout(&lb->completion, 10 * HZ);
diff --git a/drivers/net/ethernet/hisilicon/hns3/Makefile b/drivers/net/ethernet/hisilicon/hns3/Makefile
index 7aa2fac76c5e..cb3aaf5252d0 100644
--- a/drivers/net/ethernet/hisilicon/hns3/Makefile
+++ b/drivers/net/ethernet/hisilicon/hns3/Makefile
@@ -4,9 +4,9 @@
#
ccflags-y += -I$(srctree)/$(src)
-
-obj-$(CONFIG_HNS3) += hns3pf/
-obj-$(CONFIG_HNS3) += hns3vf/
+ccflags-y += -I$(srctree)/drivers/net/ethernet/hisilicon/hns3/hns3pf
+ccflags-y += -I$(srctree)/drivers/net/ethernet/hisilicon/hns3/hns3vf
+ccflags-y += -I$(srctree)/drivers/net/ethernet/hisilicon/hns3/hns3_common
obj-$(CONFIG_HNS3) += hnae3.o
@@ -14,3 +14,15 @@ obj-$(CONFIG_HNS3_ENET) += hns3.o
hns3-objs = hns3_enet.o hns3_ethtool.o hns3_debugfs.o
hns3-$(CONFIG_HNS3_DCB) += hns3_dcbnl.o
+
+obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o
+
+hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_cmd.o hns3vf/hclgevf_mbx.o hns3vf/hclgevf_devlink.o \
+ hns3_common/hclge_comm_cmd.o
+
+obj-$(CONFIG_HNS3_HCLGE) += hclge.o
+hclge-objs = hns3pf/hclge_main.o hns3pf/hclge_cmd.o hns3pf/hclge_mdio.o hns3pf/hclge_tm.o \
+ hns3pf/hclge_mbx.o hns3pf/hclge_err.o hns3pf/hclge_debugfs.o hns3pf/hclge_ptp.o hns3pf/hclge_devlink.o \
+ hns3_common/hclge_comm_cmd.o
+
+hclge-$(CONFIG_HNS3_DCB) += hns3pf/hclge_dcb.o
diff --git a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
index 277d6d657c42..debbaa1822aa 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
@@ -46,6 +46,7 @@ enum HCLGE_MBX_OPCODE {
HCLGE_MBX_PUSH_PROMISC_INFO, /* (PF -> VF) push vf promisc info */
HCLGE_MBX_VF_UNINIT, /* (VF -> PF) vf is unintializing */
HCLGE_MBX_HANDLE_VF_TBL, /* (VF -> PF) store/clear hw table */
+ HCLGE_MBX_GET_RING_VECTOR_MAP, /* (VF -> PF) get ring-to-vector map */
HCLGE_MBX_GET_VF_FLR_STATUS = 200, /* (M7 -> PF) get vf flr status */
HCLGE_MBX_PUSH_LINK_STATUS, /* (M7 -> PF) get port link status */
@@ -80,6 +81,9 @@ enum hclge_mbx_tbl_cfg_subcode {
#define HCLGE_MBX_MAX_RESP_DATA_SIZE 8U
#define HCLGE_MBX_MAX_RING_CHAIN_PARAM_NUM 4
+#define HCLGE_RESET_SCHED_TIMEOUT (3 * HZ)
+#define HCLGE_MBX_SCHED_TIMEOUT (HZ / 2)
+
struct hclge_ring_chain_param {
u8 ring_type;
u8 tqp_index;
@@ -208,6 +212,17 @@ struct hclgevf_mbx_arq_ring {
__le16 msg_q[HCLGE_MBX_MAX_ARQ_MSG_NUM][HCLGE_MBX_MAX_ARQ_MSG_SIZE];
};
+struct hclge_dev;
+
+#define HCLGE_MBX_OPCODE_MAX 256
+struct hclge_mbx_ops_param {
+ struct hclge_vport *vport;
+ struct hclge_mbx_vf_to_pf_cmd *req;
+ struct hclge_respond_to_vf_msg *resp_msg;
+};
+
+typedef int (*hclge_mbx_ops_fn)(struct hclge_mbx_ops_param *param);
+
#define hclge_mbx_ring_ptr_move_crq(crq) \
(crq->next_to_use = (crq->next_to_use + 1) % crq->desc_num)
#define hclge_mbx_tail_ptr_move_arq(arq) \
diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index b51afb83d023..f362a2fac3c2 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -341,6 +341,7 @@ struct hnae3_dev_specs {
u8 max_non_tso_bd_num; /* max BD number of one non-TSO packet */
u16 max_frm_size;
u16 max_qset_num;
+ u16 umv_size;
};
struct hnae3_client_ops {
@@ -828,7 +829,7 @@ struct hnae3_handle {
struct hnae3_roce_private_info rinfo;
};
- u32 numa_node_mask; /* for multi-chip support */
+ nodemask_t numa_node_mask; /* for multi-chip support */
enum hnae3_port_base_vlan_state port_base_vlan_state;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c
new file mode 100644
index 000000000000..89e999248b9a
--- /dev/null
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c
@@ -0,0 +1,259 @@
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright (c) 2021-2021 Hisilicon Limited.
+
+#include "hnae3.h"
+#include "hclge_comm_cmd.h"
+
+static bool hclge_is_elem_in_array(const u16 *spec_opcode, u32 size, u16 opcode)
+{
+ u32 i;
+
+ for (i = 0; i < size; i++) {
+ if (spec_opcode[i] == opcode)
+ return true;
+ }
+
+ return false;
+}
+
+static const u16 pf_spec_opcode[] = { HCLGE_COMM_OPC_STATS_64_BIT,
+ HCLGE_COMM_OPC_STATS_32_BIT,
+ HCLGE_COMM_OPC_STATS_MAC,
+ HCLGE_COMM_OPC_STATS_MAC_ALL,
+ HCLGE_COMM_OPC_QUERY_32_BIT_REG,
+ HCLGE_COMM_OPC_QUERY_64_BIT_REG,
+ HCLGE_COMM_QUERY_CLEAR_MPF_RAS_INT,
+ HCLGE_COMM_QUERY_CLEAR_PF_RAS_INT,
+ HCLGE_COMM_QUERY_CLEAR_ALL_MPF_MSIX_INT,
+ HCLGE_COMM_QUERY_CLEAR_ALL_PF_MSIX_INT,
+ HCLGE_COMM_QUERY_ALL_ERR_INFO };
+
+static const u16 vf_spec_opcode[] = { HCLGE_COMM_OPC_STATS_64_BIT,
+ HCLGE_COMM_OPC_STATS_32_BIT,
+ HCLGE_COMM_OPC_STATS_MAC };
+
+static bool hclge_comm_is_special_opcode(u16 opcode, bool is_pf)
+{
+ /* these commands have several descriptors,
+ * and use the first one to save opcode and return value
+ */
+ const u16 *spec_opcode = is_pf ? pf_spec_opcode : vf_spec_opcode;
+ u32 size = is_pf ? ARRAY_SIZE(pf_spec_opcode) :
+ ARRAY_SIZE(vf_spec_opcode);
+
+ return hclge_is_elem_in_array(spec_opcode, size, opcode);
+}
+
+static int hclge_comm_ring_space(struct hclge_comm_cmq_ring *ring)
+{
+ int ntc = ring->next_to_clean;
+ int ntu = ring->next_to_use;
+ int used = (ntu - ntc + ring->desc_num) % ring->desc_num;
+
+ return ring->desc_num - used - 1;
+}
+
+static void hclge_comm_cmd_copy_desc(struct hclge_comm_hw *hw,
+ struct hclge_desc *desc, int num)
+{
+ struct hclge_desc *desc_to_use;
+ int handle = 0;
+
+ while (handle < num) {
+ desc_to_use = &hw->cmq.csq.desc[hw->cmq.csq.next_to_use];
+ *desc_to_use = desc[handle];
+ (hw->cmq.csq.next_to_use)++;
+ if (hw->cmq.csq.next_to_use >= hw->cmq.csq.desc_num)
+ hw->cmq.csq.next_to_use = 0;
+ handle++;
+ }
+}
+
+static int hclge_comm_is_valid_csq_clean_head(struct hclge_comm_cmq_ring *ring,
+ int head)
+{
+ int ntc = ring->next_to_clean;
+ int ntu = ring->next_to_use;
+
+ if (ntu > ntc)
+ return head >= ntc && head <= ntu;
+
+ return head >= ntc || head <= ntu;
+}
+
+static int hclge_comm_cmd_csq_clean(struct hclge_comm_hw *hw)
+{
+ struct hclge_comm_cmq_ring *csq = &hw->cmq.csq;
+ int clean;
+ u32 head;
+
+ head = hclge_comm_read_dev(hw, HCLGE_COMM_NIC_CSQ_HEAD_REG);
+ rmb(); /* Make sure head is ready before touch any data */
+
+ if (!hclge_comm_is_valid_csq_clean_head(csq, head)) {
+ dev_warn(&hw->cmq.csq.pdev->dev, "wrong cmd head (%u, %d-%d)\n",
+ head, csq->next_to_use, csq->next_to_clean);
+ dev_warn(&hw->cmq.csq.pdev->dev,
+ "Disabling any further commands to IMP firmware\n");
+ set_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hw->comm_state);
+ dev_warn(&hw->cmq.csq.pdev->dev,
+ "IMP firmware watchdog reset soon expected!\n");
+ return -EIO;
+ }
+
+ clean = (head - csq->next_to_clean + csq->desc_num) % csq->desc_num;
+ csq->next_to_clean = head;
+ return clean;
+}
+
+static int hclge_comm_cmd_csq_done(struct hclge_comm_hw *hw)
+{
+ u32 head = hclge_comm_read_dev(hw, HCLGE_COMM_NIC_CSQ_HEAD_REG);
+ return head == hw->cmq.csq.next_to_use;
+}
+
+static void hclge_comm_wait_for_resp(struct hclge_comm_hw *hw,
+ bool *is_completed)
+{
+ u32 timeout = 0;
+
+ do {
+ if (hclge_comm_cmd_csq_done(hw)) {
+ *is_completed = true;
+ break;
+ }
+ udelay(1);
+ timeout++;
+ } while (timeout < hw->cmq.tx_timeout);
+}
+
+static int hclge_comm_cmd_convert_err_code(u16 desc_ret)
+{
+ struct hclge_comm_errcode hclge_comm_cmd_errcode[] = {
+ { HCLGE_COMM_CMD_EXEC_SUCCESS, 0 },
+ { HCLGE_COMM_CMD_NO_AUTH, -EPERM },
+ { HCLGE_COMM_CMD_NOT_SUPPORTED, -EOPNOTSUPP },
+ { HCLGE_COMM_CMD_QUEUE_FULL, -EXFULL },
+ { HCLGE_COMM_CMD_NEXT_ERR, -ENOSR },
+ { HCLGE_COMM_CMD_UNEXE_ERR, -ENOTBLK },
+ { HCLGE_COMM_CMD_PARA_ERR, -EINVAL },
+ { HCLGE_COMM_CMD_RESULT_ERR, -ERANGE },
+ { HCLGE_COMM_CMD_TIMEOUT, -ETIME },
+ { HCLGE_COMM_CMD_HILINK_ERR, -ENOLINK },
+ { HCLGE_COMM_CMD_QUEUE_ILLEGAL, -ENXIO },
+ { HCLGE_COMM_CMD_INVALID, -EBADR },
+ };
+ u32 errcode_count = ARRAY_SIZE(hclge_comm_cmd_errcode);
+ u32 i;
+
+ for (i = 0; i < errcode_count; i++)
+ if (hclge_comm_cmd_errcode[i].imp_errcode == desc_ret)
+ return hclge_comm_cmd_errcode[i].common_errno;
+
+ return -EIO;
+}
+
+static int hclge_comm_cmd_check_retval(struct hclge_comm_hw *hw,
+ struct hclge_desc *desc, int num,
+ int ntc, bool is_pf)
+{
+ u16 opcode, desc_ret;
+ int handle;
+
+ opcode = le16_to_cpu(desc[0].opcode);
+ for (handle = 0; handle < num; handle++) {
+ desc[handle] = hw->cmq.csq.desc[ntc];
+ ntc++;
+ if (ntc >= hw->cmq.csq.desc_num)
+ ntc = 0;
+ }
+ if (likely(!hclge_comm_is_special_opcode(opcode, is_pf)))
+ desc_ret = le16_to_cpu(desc[num - 1].retval);
+ else
+ desc_ret = le16_to_cpu(desc[0].retval);
+
+ hw->cmq.last_status = desc_ret;
+
+ return hclge_comm_cmd_convert_err_code(desc_ret);
+}
+
+static int hclge_comm_cmd_check_result(struct hclge_comm_hw *hw,
+ struct hclge_desc *desc,
+ int num, int ntc, bool is_pf)
+{
+ bool is_completed = false;
+ int handle, ret;
+
+ /* If the command is sync, wait for the firmware to write back,
+ * if multi descriptors to be sent, use the first one to check
+ */
+ if (HCLGE_COMM_SEND_SYNC(le16_to_cpu(desc->flag)))
+ hclge_comm_wait_for_resp(hw, &is_completed);
+
+ if (!is_completed)
+ ret = -EBADE;
+ else
+ ret = hclge_comm_cmd_check_retval(hw, desc, num, ntc, is_pf);
+
+ /* Clean the command send queue */
+ handle = hclge_comm_cmd_csq_clean(hw);
+ if (handle < 0)
+ ret = handle;
+ else if (handle != num)
+ dev_warn(&hw->cmq.csq.pdev->dev,
+ "cleaned %d, need to clean %d\n", handle, num);
+ return ret;
+}
+
+/**
+ * hclge_comm_cmd_send - send command to command queue
+ * @hw: pointer to the hw struct
+ * @desc: prefilled descriptor for describing the command
+ * @num : the number of descriptors to be sent
+ * @is_pf: bool to judge pf/vf module
+ *
+ * This is the main send command for command queue, it
+ * sends the queue, cleans the queue, etc
+ **/
+int hclge_comm_cmd_send(struct hclge_comm_hw *hw, struct hclge_desc *desc,
+ int num, bool is_pf)
+{
+ struct hclge_comm_cmq_ring *csq = &hw->cmq.csq;
+ int ret;
+ int ntc;
+
+ spin_lock_bh(&hw->cmq.csq.lock);
+
+ if (test_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hw->comm_state)) {
+ spin_unlock_bh(&hw->cmq.csq.lock);
+ return -EBUSY;
+ }
+
+ if (num > hclge_comm_ring_space(&hw->cmq.csq)) {
+ /* If CMDQ ring is full, SW HEAD and HW HEAD may be different,
+ * need update the SW HEAD pointer csq->next_to_clean
+ */
+ csq->next_to_clean =
+ hclge_comm_read_dev(hw, HCLGE_COMM_NIC_CSQ_HEAD_REG);
+ spin_unlock_bh(&hw->cmq.csq.lock);
+ return -EBUSY;
+ }
+
+ /**
+ * Record the location of desc in the ring for this time
+ * which will be use for hardware to write back
+ */
+ ntc = hw->cmq.csq.next_to_use;
+
+ hclge_comm_cmd_copy_desc(hw, desc, num);
+
+ /* Write to hardware */
+ hclge_comm_write_dev(hw, HCLGE_COMM_NIC_CSQ_TAIL_REG,
+ hw->cmq.csq.next_to_use);
+
+ ret = hclge_comm_cmd_check_result(hw, desc, num, ntc, is_pf);
+
+ spin_unlock_bh(&hw->cmq.csq.lock);
+
+ return ret;
+}
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h
new file mode 100644
index 000000000000..5164c666cae7
--- /dev/null
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h
@@ -0,0 +1,121 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+// Copyright (c) 2021-2021 Hisilicon Limited.
+
+#ifndef __HCLGE_COMM_CMD_H
+#define __HCLGE_COMM_CMD_H
+#include <linux/types.h>
+
+#include "hnae3.h"
+
+#define HCLGE_COMM_CMD_FLAG_NO_INTR BIT(4)
+
+#define HCLGE_COMM_SEND_SYNC(flag) \
+ ((flag) & HCLGE_COMM_CMD_FLAG_NO_INTR)
+
+#define HCLGE_COMM_NIC_CSQ_TAIL_REG 0x27010
+#define HCLGE_COMM_NIC_CSQ_HEAD_REG 0x27014
+
+enum hclge_comm_cmd_return_status {
+ HCLGE_COMM_CMD_EXEC_SUCCESS = 0,
+ HCLGE_COMM_CMD_NO_AUTH = 1,
+ HCLGE_COMM_CMD_NOT_SUPPORTED = 2,
+ HCLGE_COMM_CMD_QUEUE_FULL = 3,
+ HCLGE_COMM_CMD_NEXT_ERR = 4,
+ HCLGE_COMM_CMD_UNEXE_ERR = 5,
+ HCLGE_COMM_CMD_PARA_ERR = 6,
+ HCLGE_COMM_CMD_RESULT_ERR = 7,
+ HCLGE_COMM_CMD_TIMEOUT = 8,
+ HCLGE_COMM_CMD_HILINK_ERR = 9,
+ HCLGE_COMM_CMD_QUEUE_ILLEGAL = 10,
+ HCLGE_COMM_CMD_INVALID = 11,
+};
+
+enum hclge_comm_special_cmd {
+ HCLGE_COMM_OPC_STATS_64_BIT = 0x0030,
+ HCLGE_COMM_OPC_STATS_32_BIT = 0x0031,
+ HCLGE_COMM_OPC_STATS_MAC = 0x0032,
+ HCLGE_COMM_OPC_STATS_MAC_ALL = 0x0034,
+ HCLGE_COMM_OPC_QUERY_32_BIT_REG = 0x0041,
+ HCLGE_COMM_OPC_QUERY_64_BIT_REG = 0x0042,
+ HCLGE_COMM_QUERY_CLEAR_MPF_RAS_INT = 0x1511,
+ HCLGE_COMM_QUERY_CLEAR_PF_RAS_INT = 0x1512,
+ HCLGE_COMM_QUERY_CLEAR_ALL_MPF_MSIX_INT = 0x1514,
+ HCLGE_COMM_QUERY_CLEAR_ALL_PF_MSIX_INT = 0x1515,
+ HCLGE_COMM_QUERY_ALL_ERR_INFO = 0x1517,
+};
+
+enum hclge_comm_cmd_state {
+ HCLGE_COMM_STATE_CMD_DISABLE,
+};
+
+struct hclge_comm_errcode {
+ u32 imp_errcode;
+ int common_errno;
+};
+
+#define HCLGE_DESC_DATA_LEN 6
+struct hclge_desc {
+ __le16 opcode;
+ __le16 flag;
+ __le16 retval;
+ __le16 rsv;
+ __le32 data[HCLGE_DESC_DATA_LEN];
+};
+
+struct hclge_comm_cmq_ring {
+ dma_addr_t desc_dma_addr;
+ struct hclge_desc *desc;
+ struct pci_dev *pdev;
+ u32 head;
+ u32 tail;
+
+ u16 buf_size;
+ u16 desc_num;
+ int next_to_use;
+ int next_to_clean;
+ u8 ring_type; /* cmq ring type */
+ spinlock_t lock; /* Command queue lock */
+};
+
+enum hclge_comm_cmd_status {
+ HCLGE_COMM_STATUS_SUCCESS = 0,
+ HCLGE_COMM_ERR_CSQ_FULL = -1,
+ HCLGE_COMM_ERR_CSQ_TIMEOUT = -2,
+ HCLGE_COMM_ERR_CSQ_ERROR = -3,
+};
+
+struct hclge_comm_cmq {
+ struct hclge_comm_cmq_ring csq;
+ struct hclge_comm_cmq_ring crq;
+ u16 tx_timeout;
+ enum hclge_comm_cmd_status last_status;
+};
+
+struct hclge_comm_hw {
+ void __iomem *io_base;
+ void __iomem *mem_base;
+ struct hclge_comm_cmq cmq;
+ unsigned long comm_state;
+};
+
+static inline void hclge_comm_write_reg(void __iomem *base, u32 reg, u32 value)
+{
+ writel(value, base + reg);
+}
+
+static inline u32 hclge_comm_read_reg(u8 __iomem *base, u32 reg)
+{
+ u8 __iomem *reg_addr = READ_ONCE(base);
+
+ return readl(reg_addr + reg);
+}
+
+#define hclge_comm_write_dev(a, reg, value) \
+ hclge_comm_write_reg((a)->io_base, reg, value)
+#define hclge_comm_read_dev(a, reg) \
+ hclge_comm_read_reg((a)->io_base, reg)
+
+int hclge_comm_cmd_send(struct hclge_comm_hw *hw, struct hclge_desc *desc,
+ int num, bool is_pf);
+
+#endif
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
index 45f245b1d331..bd801e35d51e 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
@@ -924,6 +924,8 @@ hns3_dbg_dev_specs(struct hnae3_handle *h, char *buf, int len, int *pos)
dev_specs->max_tm_rate);
*pos += scnprintf(buf + *pos, len - *pos, "MAX QSET number: %u\n",
dev_specs->max_qset_num);
+ *pos += scnprintf(buf + *pos, len - *pos, "umv size: %u\n",
+ dev_specs->umv_size);
}
static int hns3_dbg_dev_info(struct hnae3_handle *h, char *buf, int len)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile b/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile
deleted file mode 100644
index d1bf5c4c0abb..000000000000
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Makefile for the HISILICON network device drivers.
-#
-
-ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3
-ccflags-y += -I $(srctree)/$(src)
-
-obj-$(CONFIG_HNS3_HCLGE) += hclge.o
-hclge-objs = hclge_main.o hclge_cmd.o hclge_mdio.o hclge_tm.o hclge_mbx.o hclge_err.o hclge_debugfs.o hclge_ptp.o hclge_devlink.o
-
-hclge-$(CONFIG_HNS3_DCB) += hclge_dcb.o
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
index 9c2eeaa82294..59dd2283d25b 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
@@ -11,46 +11,24 @@
#include "hnae3.h"
#include "hclge_main.h"
-#define cmq_ring_to_dev(ring) (&(ring)->dev->pdev->dev)
-
-static int hclge_ring_space(struct hclge_cmq_ring *ring)
-{
- int ntu = ring->next_to_use;
- int ntc = ring->next_to_clean;
- int used = (ntu - ntc + ring->desc_num) % ring->desc_num;
-
- return ring->desc_num - used - 1;
-}
-
-static int is_valid_csq_clean_head(struct hclge_cmq_ring *ring, int head)
-{
- int ntu = ring->next_to_use;
- int ntc = ring->next_to_clean;
-
- if (ntu > ntc)
- return head >= ntc && head <= ntu;
-
- return head >= ntc || head <= ntu;
-}
-
-static int hclge_alloc_cmd_desc(struct hclge_cmq_ring *ring)
+static int hclge_alloc_cmd_desc(struct hclge_comm_cmq_ring *ring)
{
int size = ring->desc_num * sizeof(struct hclge_desc);
- ring->desc = dma_alloc_coherent(cmq_ring_to_dev(ring), size,
- &ring->desc_dma_addr, GFP_KERNEL);
+ ring->desc = dma_alloc_coherent(&ring->pdev->dev,
+ size, &ring->desc_dma_addr, GFP_KERNEL);
if (!ring->desc)
return -ENOMEM;
return 0;
}
-static void hclge_free_cmd_desc(struct hclge_cmq_ring *ring)
+static void hclge_free_cmd_desc(struct hclge_comm_cmq_ring *ring)
{
int size = ring->desc_num * sizeof(struct hclge_desc);
if (ring->desc) {
- dma_free_coherent(cmq_ring_to_dev(ring), size,
+ dma_free_coherent(&ring->pdev->dev, size,
ring->desc, ring->desc_dma_addr);
ring->desc = NULL;
}
@@ -59,12 +37,13 @@ static void hclge_free_cmd_desc(struct hclge_cmq_ring *ring)
static int hclge_alloc_cmd_queue(struct hclge_dev *hdev, int ring_type)
{
struct hclge_hw *hw = &hdev->hw;
- struct hclge_cmq_ring *ring =
- (ring_type == HCLGE_TYPE_CSQ) ? &hw->cmq.csq : &hw->cmq.crq;
+ struct hclge_comm_cmq_ring *ring =
+ (ring_type == HCLGE_TYPE_CSQ) ? &hw->hw.cmq.csq :
+ &hw->hw.cmq.crq;
int ret;
ring->ring_type = ring_type;
- ring->dev = hdev;
+ ring->pdev = hdev->pdev;
ret = hclge_alloc_cmd_desc(ring);
if (ret) {
@@ -96,11 +75,10 @@ void hclge_cmd_setup_basic_desc(struct hclge_desc *desc,
desc->flag |= cpu_to_le16(HCLGE_CMD_FLAG_WR);
}
-static void hclge_cmd_config_regs(struct hclge_cmq_ring *ring)
+static void hclge_cmd_config_regs(struct hclge_hw *hw,
+ struct hclge_comm_cmq_ring *ring)
{
dma_addr_t dma = ring->desc_dma_addr;
- struct hclge_dev *hdev = ring->dev;
- struct hclge_hw *hw = &hdev->hw;
u32 reg_val;
if (ring->ring_type == HCLGE_TYPE_CSQ) {
@@ -128,176 +106,8 @@ static void hclge_cmd_config_regs(struct hclge_cmq_ring *ring)
static void hclge_cmd_init_regs(struct hclge_hw *hw)
{
- hclge_cmd_config_regs(&hw->cmq.csq);
- hclge_cmd_config_regs(&hw->cmq.crq);
-}
-
-static int hclge_cmd_csq_clean(struct hclge_hw *hw)
-{
- struct hclge_dev *hdev = container_of(hw, struct hclge_dev, hw);
- struct hclge_cmq_ring *csq = &hw->cmq.csq;
- u32 head;
- int clean;
-
- head = hclge_read_dev(hw, HCLGE_NIC_CSQ_HEAD_REG);
- rmb(); /* Make sure head is ready before touch any data */
-
- if (!is_valid_csq_clean_head(csq, head)) {
- dev_warn(&hdev->pdev->dev, "wrong cmd head (%u, %d-%d)\n", head,
- csq->next_to_use, csq->next_to_clean);
- dev_warn(&hdev->pdev->dev,
- "Disabling any further commands to IMP firmware\n");
- set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);
- dev_warn(&hdev->pdev->dev,
- "IMP firmware watchdog reset soon expected!\n");
- return -EIO;
- }
-
- clean = (head - csq->next_to_clean + csq->desc_num) % csq->desc_num;
- csq->next_to_clean = head;
- return clean;
-}
-
-static int hclge_cmd_csq_done(struct hclge_hw *hw)
-{
- u32 head = hclge_read_dev(hw, HCLGE_NIC_CSQ_HEAD_REG);
- return head == hw->cmq.csq.next_to_use;
-}
-
-static bool hclge_is_special_opcode(u16 opcode)
-{
- /* these commands have several descriptors,
- * and use the first one to save opcode and return value
- */
- static const u16 spec_opcode[] = {
- HCLGE_OPC_STATS_64_BIT,
- HCLGE_OPC_STATS_32_BIT,
- HCLGE_OPC_STATS_MAC,
- HCLGE_OPC_STATS_MAC_ALL,
- HCLGE_OPC_QUERY_32_BIT_REG,
- HCLGE_OPC_QUERY_64_BIT_REG,
- HCLGE_QUERY_CLEAR_MPF_RAS_INT,
- HCLGE_QUERY_CLEAR_PF_RAS_INT,
- HCLGE_QUERY_CLEAR_ALL_MPF_MSIX_INT,
- HCLGE_QUERY_CLEAR_ALL_PF_MSIX_INT,
- HCLGE_QUERY_ALL_ERR_INFO
- };
- int i;
-
- for (i = 0; i < ARRAY_SIZE(spec_opcode); i++) {
- if (spec_opcode[i] == opcode)
- return true;
- }
-
- return false;
-}
-
-struct errcode {
- u32 imp_errcode;
- int common_errno;
-};
-
-static void hclge_cmd_copy_desc(struct hclge_hw *hw, struct hclge_desc *desc,
- int num)
-{
- struct hclge_desc *desc_to_use;
- int handle = 0;
-
- while (handle < num) {
- desc_to_use = &hw->cmq.csq.desc[hw->cmq.csq.next_to_use];
- *desc_to_use = desc[handle];
- (hw->cmq.csq.next_to_use)++;
- if (hw->cmq.csq.next_to_use >= hw->cmq.csq.desc_num)
- hw->cmq.csq.next_to_use = 0;
- handle++;
- }
-}
-
-static int hclge_cmd_convert_err_code(u16 desc_ret)
-{
- struct errcode hclge_cmd_errcode[] = {
- {HCLGE_CMD_EXEC_SUCCESS, 0},
- {HCLGE_CMD_NO_AUTH, -EPERM},
- {HCLGE_CMD_NOT_SUPPORTED, -EOPNOTSUPP},
- {HCLGE_CMD_QUEUE_FULL, -EXFULL},
- {HCLGE_CMD_NEXT_ERR, -ENOSR},
- {HCLGE_CMD_UNEXE_ERR, -ENOTBLK},
- {HCLGE_CMD_PARA_ERR, -EINVAL},
- {HCLGE_CMD_RESULT_ERR, -ERANGE},
- {HCLGE_CMD_TIMEOUT, -ETIME},
- {HCLGE_CMD_HILINK_ERR, -ENOLINK},
- {HCLGE_CMD_QUEUE_ILLEGAL, -ENXIO},
- {HCLGE_CMD_INVALID, -EBADR},
- };
- u32 errcode_count = ARRAY_SIZE(hclge_cmd_errcode);
- u32 i;
-
- for (i = 0; i < errcode_count; i++)
- if (hclge_cmd_errcode[i].imp_errcode == desc_ret)
- return hclge_cmd_errcode[i].common_errno;
-
- return -EIO;
-}
-
-static int hclge_cmd_check_retval(struct hclge_hw *hw, struct hclge_desc *desc,
- int num, int ntc)
-{
- u16 opcode, desc_ret;
- int handle;
-
- opcode = le16_to_cpu(desc[0].opcode);
- for (handle = 0; handle < num; handle++) {
- desc[handle] = hw->cmq.csq.desc[ntc];
- ntc++;
- if (ntc >= hw->cmq.csq.desc_num)
- ntc = 0;
- }
- if (likely(!hclge_is_special_opcode(opcode)))
- desc_ret = le16_to_cpu(desc[num - 1].retval);
- else
- desc_ret = le16_to_cpu(desc[0].retval);
-
- hw->cmq.last_status = desc_ret;
-
- return hclge_cmd_convert_err_code(desc_ret);
-}
-
-static int hclge_cmd_check_result(struct hclge_hw *hw, struct hclge_desc *desc,
- int num, int ntc)
-{
- struct hclge_dev *hdev = container_of(hw, struct hclge_dev, hw);
- bool is_completed = false;
- u32 timeout = 0;
- int handle, ret;
-
- /**
- * If the command is sync, wait for the firmware to write back,
- * if multi descriptors to be sent, use the first one to check
- */
- if (HCLGE_SEND_SYNC(le16_to_cpu(desc->flag))) {
- do {
- if (hclge_cmd_csq_done(hw)) {
- is_completed = true;
- break;
- }
- udelay(1);
- timeout++;
- } while (timeout < hw->cmq.tx_timeout);
- }
-
- if (!is_completed)
- ret = -EBADE;
- else
- ret = hclge_cmd_check_retval(hw, desc, num, ntc);
-
- /* Clean the command send queue */
- handle = hclge_cmd_csq_clean(hw);
- if (handle < 0)
- ret = handle;
- else if (handle != num)
- dev_warn(&hdev->pdev->dev,
- "cleaned %d, need to clean %d\n", handle, num);
- return ret;
+ hclge_cmd_config_regs(hw, &hw->hw.cmq.csq);
+ hclge_cmd_config_regs(hw, &hw->hw.cmq.crq);
}
/**
@@ -311,43 +121,7 @@ static int hclge_cmd_check_result(struct hclge_hw *hw, struct hclge_desc *desc,
**/
int hclge_cmd_send(struct hclge_hw *hw, struct hclge_desc *desc, int num)
{
- struct hclge_dev *hdev = container_of(hw, struct hclge_dev, hw);
- struct hclge_cmq_ring *csq = &hw->cmq.csq;
- int ret;
- int ntc;
-
- spin_lock_bh(&hw->cmq.csq.lock);
-
- if (test_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state)) {
- spin_unlock_bh(&hw->cmq.csq.lock);
- return -EBUSY;
- }
-
- if (num > hclge_ring_space(&hw->cmq.csq)) {
- /* If CMDQ ring is full, SW HEAD and HW HEAD may be different,
- * need update the SW HEAD pointer csq->next_to_clean
- */
- csq->next_to_clean = hclge_read_dev(hw, HCLGE_NIC_CSQ_HEAD_REG);
- spin_unlock_bh(&hw->cmq.csq.lock);
- return -EBUSY;
- }
-
- /**
- * Record the location of desc in the ring for this time
- * which will be use for hardware to write back
- */
- ntc = hw->cmq.csq.next_to_use;
-
- hclge_cmd_copy_desc(hw, desc, num);
-
- /* Write to hardware */
- hclge_write_dev(hw, HCLGE_NIC_CSQ_TAIL_REG, hw->cmq.csq.next_to_use);
-
- ret = hclge_cmd_check_result(hw, desc, num, ntc);
-
- spin_unlock_bh(&hw->cmq.csq.lock);
-
- return ret;
+ return hclge_comm_cmd_send(&hw->hw, desc, num, true);
}
static void hclge_set_default_capability(struct hclge_dev *hdev)
@@ -401,7 +175,7 @@ static __le32 hclge_build_api_caps(void)
return cpu_to_le32(api_caps);
}
-static enum hclge_cmd_status
+static enum hclge_comm_cmd_status
hclge_cmd_query_version_and_capability(struct hclge_dev *hdev)
{
struct hnae3_ae_dev *ae_dev = pci_get_drvdata(hdev->pdev);
@@ -433,18 +207,22 @@ hclge_cmd_query_version_and_capability(struct hclge_dev *hdev)
int hclge_cmd_queue_init(struct hclge_dev *hdev)
{
+ struct hclge_comm_cmq *cmdq = &hdev->hw.hw.cmq;
int ret;
/* Setup the lock for command queue */
- spin_lock_init(&hdev->hw.cmq.csq.lock);
- spin_lock_init(&hdev->hw.cmq.crq.lock);
+ spin_lock_init(&cmdq->csq.lock);
+ spin_lock_init(&cmdq->crq.lock);
+
+ cmdq->csq.pdev = hdev->pdev;
+ cmdq->crq.pdev = hdev->pdev;
/* Setup the queue entries for use cmd queue */
- hdev->hw.cmq.csq.desc_num = HCLGE_NIC_CMQ_DESC_NUM;
- hdev->hw.cmq.crq.desc_num = HCLGE_NIC_CMQ_DESC_NUM;
+ cmdq->csq.desc_num = HCLGE_NIC_CMQ_DESC_NUM;
+ cmdq->crq.desc_num = HCLGE_NIC_CMQ_DESC_NUM;
/* Setup Tx write back timeout */
- hdev->hw.cmq.tx_timeout = HCLGE_CMDQ_TX_TIMEOUT;
+ cmdq->tx_timeout = HCLGE_CMDQ_TX_TIMEOUT;
/* Setup queue rings */
ret = hclge_alloc_cmd_queue(hdev, HCLGE_TYPE_CSQ);
@@ -463,7 +241,7 @@ int hclge_cmd_queue_init(struct hclge_dev *hdev)
return 0;
err_csq:
- hclge_free_cmd_desc(&hdev->hw.cmq.csq);
+ hclge_free_cmd_desc(&hdev->hw.hw.cmq.csq);
return ret;
}
@@ -491,22 +269,23 @@ static int hclge_firmware_compat_config(struct hclge_dev *hdev, bool en)
int hclge_cmd_init(struct hclge_dev *hdev)
{
+ struct hclge_comm_cmq *cmdq = &hdev->hw.hw.cmq;
int ret;
- spin_lock_bh(&hdev->hw.cmq.csq.lock);
- spin_lock(&hdev->hw.cmq.crq.lock);
+ spin_lock_bh(&cmdq->csq.lock);
+ spin_lock(&cmdq->crq.lock);
- hdev->hw.cmq.csq.next_to_clean = 0;
- hdev->hw.cmq.csq.next_to_use = 0;
- hdev->hw.cmq.crq.next_to_clean = 0;
- hdev->hw.cmq.crq.next_to_use = 0;
+ cmdq->csq.next_to_clean = 0;
+ cmdq->csq.next_to_use = 0;
+ cmdq->crq.next_to_clean = 0;
+ cmdq->crq.next_to_use = 0;
hclge_cmd_init_regs(&hdev->hw);
- spin_unlock(&hdev->hw.cmq.crq.lock);
- spin_unlock_bh(&hdev->hw.cmq.csq.lock);
+ spin_unlock(&cmdq->crq.lock);
+ spin_unlock_bh(&cmdq->csq.lock);
- clear_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);
+ clear_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hdev->hw.hw.comm_state);
/* Check if there is new reset pending, because the higher level
* reset may happen when lower level reset is being processed.
@@ -550,7 +329,7 @@ int hclge_cmd_init(struct hclge_dev *hdev)
return 0;
err_cmd_init:
- set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);
+ set_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hdev->hw.hw.comm_state);
return ret;
}
@@ -571,19 +350,23 @@ static void hclge_cmd_uninit_regs(struct hclge_hw *hw)
void hclge_cmd_uninit(struct hclge_dev *hdev)
{
+ struct hclge_comm_cmq *cmdq = &hdev->hw.hw.cmq;
+
+ cmdq->csq.pdev = hdev->pdev;
+
hclge_firmware_compat_config(hdev, false);
- set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);
+ set_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hdev->hw.hw.comm_state);
/* wait to ensure that the firmware completes the possible left
* over commands.
*/
msleep(HCLGE_CMDQ_CLEAR_WAIT_TIME);
- spin_lock_bh(&hdev->hw.cmq.csq.lock);
- spin_lock(&hdev->hw.cmq.crq.lock);
+ spin_lock_bh(&cmdq->csq.lock);
+ spin_lock(&cmdq->crq.lock);
hclge_cmd_uninit_regs(&hdev->hw);
- spin_unlock(&hdev->hw.cmq.crq.lock);
- spin_unlock_bh(&hdev->hw.cmq.csq.lock);
+ spin_unlock(&cmdq->crq.lock);
+ spin_unlock_bh(&cmdq->csq.lock);
- hclge_free_cmd_desc(&hdev->hw.cmq.csq);
- hclge_free_cmd_desc(&hdev->hw.cmq.crq);
+ hclge_free_cmd_desc(&cmdq->csq);
+ hclge_free_cmd_desc(&cmdq->crq);
}
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
index 33244472e0d0..303a7592bb18 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
@@ -7,74 +7,22 @@
#include <linux/io.h>
#include <linux/etherdevice.h>
#include "hnae3.h"
+#include "hclge_comm_cmd.h"
#define HCLGE_CMDQ_TX_TIMEOUT 30000
#define HCLGE_CMDQ_CLEAR_WAIT_TIME 200
-#define HCLGE_DESC_DATA_LEN 6
struct hclge_dev;
-struct hclge_desc {
- __le16 opcode;
#define HCLGE_CMDQ_RX_INVLD_B 0
#define HCLGE_CMDQ_RX_OUTVLD_B 1
- __le16 flag;
- __le16 retval;
- __le16 rsv;
- __le32 data[HCLGE_DESC_DATA_LEN];
-};
-
-struct hclge_cmq_ring {
- dma_addr_t desc_dma_addr;
- struct hclge_desc *desc;
- struct hclge_dev *dev;
- u32 head;
- u32 tail;
-
- u16 buf_size;
- u16 desc_num;
- int next_to_use;
- int next_to_clean;
- u8 ring_type; /* cmq ring type */
- spinlock_t lock; /* Command queue lock */
-};
-
-enum hclge_cmd_return_status {
- HCLGE_CMD_EXEC_SUCCESS = 0,
- HCLGE_CMD_NO_AUTH = 1,
- HCLGE_CMD_NOT_SUPPORTED = 2,
- HCLGE_CMD_QUEUE_FULL = 3,
- HCLGE_CMD_NEXT_ERR = 4,
- HCLGE_CMD_UNEXE_ERR = 5,
- HCLGE_CMD_PARA_ERR = 6,
- HCLGE_CMD_RESULT_ERR = 7,
- HCLGE_CMD_TIMEOUT = 8,
- HCLGE_CMD_HILINK_ERR = 9,
- HCLGE_CMD_QUEUE_ILLEGAL = 10,
- HCLGE_CMD_INVALID = 11,
-};
-
-enum hclge_cmd_status {
- HCLGE_STATUS_SUCCESS = 0,
- HCLGE_ERR_CSQ_FULL = -1,
- HCLGE_ERR_CSQ_TIMEOUT = -2,
- HCLGE_ERR_CSQ_ERROR = -3,
-};
-
struct hclge_misc_vector {
u8 __iomem *addr;
int vector_irq;
char name[HNAE3_INT_NAME_LEN];
};
-struct hclge_cmq {
- struct hclge_cmq_ring csq;
- struct hclge_cmq_ring crq;
- u16 tx_timeout;
- enum hclge_cmd_status last_status;
-};
-
#define HCLGE_CMD_FLAG_IN BIT(0)
#define HCLGE_CMD_FLAG_OUT BIT(1)
#define HCLGE_CMD_FLAG_NEXT BIT(2)
@@ -1188,7 +1136,9 @@ struct hclge_dev_specs_1_cmd {
__le16 max_frm_size;
__le16 max_qset_num;
__le16 max_int_gl;
- u8 rsv1[18];
+ u8 rsv0[2];
+ __le16 umv_size;
+ u8 rsv1[14];
};
/* mac speed type defined in firmware command */
@@ -1241,25 +1191,6 @@ struct hclge_caps_bit_map {
};
int hclge_cmd_init(struct hclge_dev *hdev);
-static inline void hclge_write_reg(void __iomem *base, u32 reg, u32 value)
-{
- writel(value, base + reg);
-}
-
-#define hclge_write_dev(a, reg, value) \
- hclge_write_reg((a)->io_base, reg, value)
-#define hclge_read_dev(a, reg) \
- hclge_read_reg((a)->io_base, reg)
-
-static inline u32 hclge_read_reg(u8 __iomem *base, u32 reg)
-{
- u8 __iomem *reg_addr = READ_ONCE(base);
-
- return readl(reg_addr + reg);
-}
-
-#define HCLGE_SEND_SYNC(flag) \
- ((flag) & HCLGE_CMD_FLAG_NO_INTR)
struct hclge_hw;
int hclge_cmd_send(struct hclge_hw *hw, struct hclge_desc *desc, int num);
@@ -1267,10 +1198,10 @@ void hclge_cmd_setup_basic_desc(struct hclge_desc *desc,
enum hclge_opcode_type opcode, bool is_read);
void hclge_cmd_reuse_desc(struct hclge_desc *desc, bool is_read);
-enum hclge_cmd_status hclge_cmd_mdio_write(struct hclge_hw *hw,
- struct hclge_desc *desc);
-enum hclge_cmd_status hclge_cmd_mdio_read(struct hclge_hw *hw,
- struct hclge_desc *desc);
+enum hclge_comm_cmd_status hclge_cmd_mdio_write(struct hclge_hw *hw,
+ struct hclge_desc *desc);
+enum hclge_comm_cmd_status hclge_cmd_mdio_read(struct hclge_hw *hw,
+ struct hclge_desc *desc);
void hclge_cmd_uninit(struct hclge_dev *hdev);
int hclge_cmd_queue_init(struct hclge_dev *hdev);
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 598da1be22eb..d58048b05678 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -24,6 +24,7 @@
#include "hclge_err.h"
#include "hnae3.h"
#include "hclge_devlink.h"
+#include "hclge_comm_cmd.h"
#define HCLGE_NAME "hclge"
@@ -1343,8 +1344,6 @@ static void hclge_parse_cfg(struct hclge_cfg *cfg, struct hclge_desc *desc)
cfg->umv_space = hnae3_get_field(__le32_to_cpu(req->param[1]),
HCLGE_CFG_UMV_TBL_SPACE_M,
HCLGE_CFG_UMV_TBL_SPACE_S);
- if (!cfg->umv_space)
- cfg->umv_space = HCLGE_DEFAULT_UMV_SPACE_PER_PF;
cfg->pf_rss_size_max = hnae3_get_field(__le32_to_cpu(req->param[2]),
HCLGE_CFG_PF_RSS_SIZE_M,
@@ -1420,6 +1419,7 @@ static void hclge_set_default_dev_specs(struct hclge_dev *hdev)
ae_dev->dev_specs.max_int_gl = HCLGE_DEF_MAX_INT_GL;
ae_dev->dev_specs.max_frm_size = HCLGE_MAC_MAX_FRAME;
ae_dev->dev_specs.max_qset_num = HCLGE_MAX_QSET_NUM;
+ ae_dev->dev_specs.umv_size = HCLGE_DEFAULT_UMV_SPACE_PER_PF;
}
static void hclge_parse_dev_specs(struct hclge_dev *hdev,
@@ -1441,6 +1441,7 @@ static void hclge_parse_dev_specs(struct hclge_dev *hdev,
ae_dev->dev_specs.max_qset_num = le16_to_cpu(req1->max_qset_num);
ae_dev->dev_specs.max_int_gl = le16_to_cpu(req1->max_int_gl);
ae_dev->dev_specs.max_frm_size = le16_to_cpu(req1->max_frm_size);
+ ae_dev->dev_specs.umv_size = le16_to_cpu(req1->umv_size);
}
static void hclge_check_dev_specs(struct hclge_dev *hdev)
@@ -1461,6 +1462,8 @@ static void hclge_check_dev_specs(struct hclge_dev *hdev)
dev_specs->max_int_gl = HCLGE_DEF_MAX_INT_GL;
if (!dev_specs->max_frm_size)
dev_specs->max_frm_size = HCLGE_MAC_MAX_FRAME;
+ if (!dev_specs->umv_size)
+ dev_specs->umv_size = HCLGE_DEFAULT_UMV_SPACE_PER_PF;
}
static int hclge_query_dev_specs(struct hclge_dev *hdev)
@@ -1550,7 +1553,10 @@ static int hclge_configure(struct hclge_dev *hdev)
hdev->tm_info.num_pg = 1;
hdev->tc_max = cfg.tc_num;
hdev->tm_info.hw_pfc_map = 0;
- hdev->wanted_umv_size = cfg.umv_space;
+ if (cfg.umv_space)
+ hdev->wanted_umv_size = cfg.umv_space;
+ else
+ hdev->wanted_umv_size = hdev->ae_dev->dev_specs.umv_size;
hdev->tx_spare_buf_size = cfg.tx_spare_buf_size;
hdev->gro_en = true;
if (cfg.vlan_fliter_cap == HCLGE_VLAN_FLTR_CAN_MDF)
@@ -1567,6 +1573,9 @@ static int hclge_configure(struct hclge_dev *hdev)
cfg.default_speed, ret);
return ret;
}
+ hdev->hw.mac.req_speed = hdev->hw.mac.speed;
+ hdev->hw.mac.req_autoneg = AUTONEG_ENABLE;
+ hdev->hw.mac.req_duplex = DUPLEX_FULL;
hclge_parse_link_mode(hdev, cfg.speed_ability);
@@ -1669,11 +1678,11 @@ static int hclge_alloc_tqps(struct hclge_dev *hdev)
* HCLGE_TQP_MAX_SIZE_DEV_V2
*/
if (i < HCLGE_TQP_MAX_SIZE_DEV_V2)
- tqp->q.io_base = hdev->hw.io_base +
+ tqp->q.io_base = hdev->hw.hw.io_base +
HCLGE_TQP_REG_OFFSET +
i * HCLGE_TQP_REG_SIZE;
else
- tqp->q.io_base = hdev->hw.io_base +
+ tqp->q.io_base = hdev->hw.hw.io_base +
HCLGE_TQP_REG_OFFSET +
HCLGE_TQP_EXT_REG_OFFSET +
(i - HCLGE_TQP_MAX_SIZE_DEV_V2) *
@@ -1816,8 +1825,9 @@ static int hclge_vport_setup(struct hclge_vport *vport, u16 num_tqps)
nic->pdev = hdev->pdev;
nic->ae_algo = &ae_algo;
- nic->numa_node_mask = hdev->numa_node_mask;
- nic->kinfo.io_base = hdev->hw.io_base;
+ bitmap_copy(nic->numa_node_mask.bits, hdev->numa_node_mask.bits,
+ MAX_NUMNODES);
+ nic->kinfo.io_base = hdev->hw.hw.io_base;
ret = hclge_knic_setup(vport, num_tqps,
hdev->num_tx_desc, hdev->num_rx_desc);
@@ -2503,12 +2513,13 @@ static int hclge_init_roce_base_info(struct hclge_vport *vport)
roce->rinfo.base_vector = hdev->num_nic_msi;
roce->rinfo.netdev = nic->kinfo.netdev;
- roce->rinfo.roce_io_base = hdev->hw.io_base;
- roce->rinfo.roce_mem_base = hdev->hw.mem_base;
+ roce->rinfo.roce_io_base = hdev->hw.hw.io_base;
+ roce->rinfo.roce_mem_base = hdev->hw.hw.mem_base;
roce->pdev = nic->pdev;
roce->ae_algo = nic->ae_algo;
- roce->numa_node_mask = nic->numa_node_mask;
+ bitmap_copy(roce->numa_node_mask.bits, nic->numa_node_mask.bits,
+ MAX_NUMNODES);
return 0;
}
@@ -2847,16 +2858,20 @@ static int hclge_mac_init(struct hclge_dev *hdev)
static void hclge_mbx_task_schedule(struct hclge_dev *hdev)
{
if (!test_bit(HCLGE_STATE_REMOVING, &hdev->state) &&
- !test_and_set_bit(HCLGE_STATE_MBX_SERVICE_SCHED, &hdev->state))
+ !test_and_set_bit(HCLGE_STATE_MBX_SERVICE_SCHED, &hdev->state)) {
+ hdev->last_mbx_scheduled = jiffies;
mod_delayed_work(hclge_wq, &hdev->service_task, 0);
+ }
}
static void hclge_reset_task_schedule(struct hclge_dev *hdev)
{
if (!test_bit(HCLGE_STATE_REMOVING, &hdev->state) &&
test_bit(HCLGE_STATE_SERVICE_INITED, &hdev->state) &&
- !test_and_set_bit(HCLGE_STATE_RST_SERVICE_SCHED, &hdev->state))
+ !test_and_set_bit(HCLGE_STATE_RST_SERVICE_SCHED, &hdev->state)) {
+ hdev->last_rst_scheduled = jiffies;
mod_delayed_work(hclge_wq, &hdev->service_task, 0);
+ }
}
static void hclge_errhand_task_schedule(struct hclge_dev *hdev)
@@ -3158,9 +3173,9 @@ hclge_set_phy_link_ksettings(struct hnae3_handle *handle,
return ret;
}
- hdev->hw.mac.autoneg = cmd->base.autoneg;
- hdev->hw.mac.speed = cmd->base.speed;
- hdev->hw.mac.duplex = cmd->base.duplex;
+ hdev->hw.mac.req_autoneg = cmd->base.autoneg;
+ hdev->hw.mac.req_speed = cmd->base.speed;
+ hdev->hw.mac.req_duplex = cmd->base.duplex;
linkmode_copy(hdev->hw.mac.advertising, cmd->link_modes.advertising);
return 0;
@@ -3193,9 +3208,9 @@ static int hclge_tp_port_init(struct hclge_dev *hdev)
if (!hnae3_dev_phy_imp_supported(hdev))
return 0;
- cmd.base.autoneg = hdev->hw.mac.autoneg;
- cmd.base.speed = hdev->hw.mac.speed;
- cmd.base.duplex = hdev->hw.mac.duplex;
+ cmd.base.autoneg = hdev->hw.mac.req_autoneg;
+ cmd.base.speed = hdev->hw.mac.req_speed;
+ cmd.base.duplex = hdev->hw.mac.req_duplex;
linkmode_copy(cmd.link_modes.advertising, hdev->hw.mac.advertising);
return hclge_set_phy_link_ksettings(&hdev->vport->nic, &cmd);
@@ -3354,7 +3369,7 @@ static u32 hclge_check_event_cause(struct hclge_dev *hdev, u32 *clearval)
if (BIT(HCLGE_VECTOR0_IMPRESET_INT_B) & msix_src_reg) {
dev_info(&hdev->pdev->dev, "IMP reset interrupt\n");
set_bit(HNAE3_IMP_RESET, &hdev->reset_pending);
- set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);
+ set_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hdev->hw.hw.comm_state);
*clearval = BIT(HCLGE_VECTOR0_IMPRESET_INT_B);
hdev->rst_stats.imp_rst_cnt++;
return HCLGE_VECTOR0_EVENT_RST;
@@ -3362,7 +3377,7 @@ static u32 hclge_check_event_cause(struct hclge_dev *hdev, u32 *clearval)
if (BIT(HCLGE_VECTOR0_GLOBALRESET_INT_B) & msix_src_reg) {
dev_info(&hdev->pdev->dev, "global reset interrupt\n");
- set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);
+ set_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hdev->hw.hw.comm_state);
set_bit(HNAE3_GLOBAL_RESET, &hdev->reset_pending);
*clearval = BIT(HCLGE_VECTOR0_GLOBALRESET_INT_B);
hdev->rst_stats.global_rst_cnt++;
@@ -3501,7 +3516,7 @@ static void hclge_get_misc_vector(struct hclge_dev *hdev)
vector->vector_irq = pci_irq_vector(hdev->pdev, 0);
- vector->addr = hdev->hw.io_base + HCLGE_MISC_VECTOR_REG_BASE;
+ vector->addr = hdev->hw.hw.io_base + HCLGE_MISC_VECTOR_REG_BASE;
hdev->vector_status[0] = 0;
hdev->num_msi_left -= 1;
@@ -3685,10 +3700,17 @@ static int hclge_set_all_vf_rst(struct hclge_dev *hdev, bool reset)
static void hclge_mailbox_service_task(struct hclge_dev *hdev)
{
if (!test_and_clear_bit(HCLGE_STATE_MBX_SERVICE_SCHED, &hdev->state) ||
- test_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state) ||
+ test_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hdev->hw.hw.comm_state) ||
test_and_set_bit(HCLGE_STATE_MBX_HANDLING, &hdev->state))
return;
+ if (time_is_before_jiffies(hdev->last_mbx_scheduled +
+ HCLGE_MBX_SCHED_TIMEOUT))
+ dev_warn(&hdev->pdev->dev,
+ "mbx service task is scheduled after %ums on cpu%u!\n",
+ jiffies_to_msecs(jiffies - hdev->last_mbx_scheduled),
+ smp_processor_id());
+
hclge_mbx_handler(hdev);
clear_bit(HCLGE_STATE_MBX_HANDLING, &hdev->state);
@@ -3925,7 +3947,7 @@ static int hclge_reset_prepare_wait(struct hclge_dev *hdev)
* any mailbox handling or command to firmware is only valid
* after hclge_cmd_init is called.
*/
- set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);
+ set_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hdev->hw.hw.comm_state);
hdev->rst_stats.pf_rst_cnt++;
break;
case HNAE3_FLR_RESET:
@@ -4338,6 +4360,13 @@ static void hclge_reset_service_task(struct hclge_dev *hdev)
if (!test_and_clear_bit(HCLGE_STATE_RST_SERVICE_SCHED, &hdev->state))
return;
+ if (time_is_before_jiffies(hdev->last_rst_scheduled +
+ HCLGE_RESET_SCHED_TIMEOUT))
+ dev_warn(&hdev->pdev->dev,
+ "reset service task is scheduled after %ums on cpu%u!\n",
+ jiffies_to_msecs(jiffies - hdev->last_rst_scheduled),
+ smp_processor_id());
+
down(&hdev->reset_sem);
set_bit(HCLGE_STATE_RST_HANDLING, &hdev->state);
@@ -4472,11 +4501,11 @@ static void hclge_get_vector_info(struct hclge_dev *hdev, u16 idx,
/* need an extend offset to config vector >= 64 */
if (idx - 1 < HCLGE_PF_MAX_VECTOR_NUM_DEV_V2)
- vector_info->io_addr = hdev->hw.io_base +
+ vector_info->io_addr = hdev->hw.hw.io_base +
HCLGE_VECTOR_REG_BASE +
(idx - 1) * HCLGE_VECTOR_REG_OFFSET;
else
- vector_info->io_addr = hdev->hw.io_base +
+ vector_info->io_addr = hdev->hw.hw.io_base +
HCLGE_VECTOR_EXT_REG_BASE +
(idx - 1) / HCLGE_PF_MAX_VECTOR_NUM_DEV_V2 *
HCLGE_VECTOR_REG_OFFSET_H +
@@ -5114,7 +5143,7 @@ int hclge_bind_ring_with_vector(struct hclge_vport *vport,
struct hclge_desc desc;
struct hclge_ctrl_vector_chain_cmd *req =
(struct hclge_ctrl_vector_chain_cmd *)desc.data;
- enum hclge_cmd_status status;
+ enum hclge_comm_cmd_status status;
enum hclge_opcode_type op;
u16 tqp_type_and_id;
int i;
@@ -7640,7 +7669,7 @@ static bool hclge_get_cmdq_stat(struct hnae3_handle *handle)
struct hclge_vport *vport = hclge_get_vport(handle);
struct hclge_dev *hdev = vport->back;
- return test_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);
+ return test_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hdev->hw.hw.comm_state);
}
static bool hclge_ae_dev_resetting(struct hnae3_handle *handle)
@@ -8127,8 +8156,7 @@ static void hclge_set_timer_task(struct hnae3_handle *handle, bool enable)
/* Set the DOWN flag here to disable link updating */
set_bit(HCLGE_STATE_DOWN, &hdev->state);
- /* flush memory to make sure DOWN is seen by service task */
- smp_mb__before_atomic();
+ smp_mb__after_atomic(); /* flush memory to make sure DOWN is seen by service task */
hclge_flush_link_update(hdev);
}
}
@@ -8838,7 +8866,7 @@ int hclge_rm_mc_addr_common(struct hclge_vport *vport,
char format_mac_addr[HNAE3_FORMAT_MAC_ADDR_LEN];
struct hclge_dev *hdev = vport->back;
struct hclge_mac_vlan_tbl_entry_cmd req;
- enum hclge_cmd_status status;
+ enum hclge_comm_cmd_status status;
struct hclge_desc desc[3];
/* mac addr check */
@@ -10074,67 +10102,85 @@ static int hclge_set_vlan_protocol_type(struct hclge_dev *hdev)
return status;
}
-static int hclge_init_vlan_config(struct hclge_dev *hdev)
+static int hclge_init_vlan_filter(struct hclge_dev *hdev)
{
-#define HCLGE_DEF_VLAN_TYPE 0x8100
-
- struct hnae3_handle *handle = &hdev->vport[0].nic;
struct hclge_vport *vport;
+ bool enable = true;
int ret;
int i;
- if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) {
- /* for revision 0x21, vf vlan filter is per function */
- for (i = 0; i < hdev->num_alloc_vport; i++) {
- vport = &hdev->vport[i];
- ret = hclge_set_vlan_filter_ctrl(hdev,
- HCLGE_FILTER_TYPE_VF,
- HCLGE_FILTER_FE_EGRESS,
- true,
- vport->vport_id);
- if (ret)
- return ret;
- vport->cur_vlan_fltr_en = true;
- }
+ if (hdev->ae_dev->dev_version < HNAE3_DEVICE_VERSION_V2)
+ return hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_VF,
+ HCLGE_FILTER_FE_EGRESS_V1_B,
+ true, 0);
- ret = hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_PORT,
- HCLGE_FILTER_FE_INGRESS, true,
- 0);
- if (ret)
- return ret;
- } else {
+ /* for revision 0x21, vf vlan filter is per function */
+ for (i = 0; i < hdev->num_alloc_vport; i++) {
+ vport = &hdev->vport[i];
ret = hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_VF,
- HCLGE_FILTER_FE_EGRESS_V1_B,
- true, 0);
+ HCLGE_FILTER_FE_EGRESS, true,
+ vport->vport_id);
if (ret)
return ret;
+ vport->cur_vlan_fltr_en = true;
}
- hdev->vlan_type_cfg.rx_in_fst_vlan_type = HCLGE_DEF_VLAN_TYPE;
- hdev->vlan_type_cfg.rx_in_sec_vlan_type = HCLGE_DEF_VLAN_TYPE;
- hdev->vlan_type_cfg.rx_ot_fst_vlan_type = HCLGE_DEF_VLAN_TYPE;
- hdev->vlan_type_cfg.rx_ot_sec_vlan_type = HCLGE_DEF_VLAN_TYPE;
- hdev->vlan_type_cfg.tx_ot_vlan_type = HCLGE_DEF_VLAN_TYPE;
- hdev->vlan_type_cfg.tx_in_vlan_type = HCLGE_DEF_VLAN_TYPE;
+ if (test_bit(HNAE3_DEV_SUPPORT_VLAN_FLTR_MDF_B, hdev->ae_dev->caps) &&
+ !test_bit(HNAE3_DEV_SUPPORT_PORT_VLAN_BYPASS_B, hdev->ae_dev->caps))
+ enable = false;
- ret = hclge_set_vlan_protocol_type(hdev);
- if (ret)
- return ret;
+ return hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_PORT,
+ HCLGE_FILTER_FE_INGRESS, enable, 0);
+}
- for (i = 0; i < hdev->num_alloc_vport; i++) {
- u16 vlan_tag;
- u8 qos;
+static int hclge_init_vlan_type(struct hclge_dev *hdev)
+{
+ hdev->vlan_type_cfg.rx_in_fst_vlan_type = ETH_P_8021Q;
+ hdev->vlan_type_cfg.rx_in_sec_vlan_type = ETH_P_8021Q;
+ hdev->vlan_type_cfg.rx_ot_fst_vlan_type = ETH_P_8021Q;
+ hdev->vlan_type_cfg.rx_ot_sec_vlan_type = ETH_P_8021Q;
+ hdev->vlan_type_cfg.tx_ot_vlan_type = ETH_P_8021Q;
+ hdev->vlan_type_cfg.tx_in_vlan_type = ETH_P_8021Q;
+
+ return hclge_set_vlan_protocol_type(hdev);
+}
+static int hclge_init_vport_vlan_offload(struct hclge_dev *hdev)
+{
+ struct hclge_port_base_vlan_config *cfg;
+ struct hclge_vport *vport;
+ int ret;
+ int i;
+
+ for (i = 0; i < hdev->num_alloc_vport; i++) {
vport = &hdev->vport[i];
- vlan_tag = vport->port_base_vlan_cfg.vlan_info.vlan_tag;
- qos = vport->port_base_vlan_cfg.vlan_info.qos;
+ cfg = &vport->port_base_vlan_cfg;
- ret = hclge_vlan_offload_cfg(vport,
- vport->port_base_vlan_cfg.state,
- vlan_tag, qos);
+ ret = hclge_vlan_offload_cfg(vport, cfg->state,
+ cfg->vlan_info.vlan_tag,
+ cfg->vlan_info.qos);
if (ret)
return ret;
}
+ return 0;
+}
+
+static int hclge_init_vlan_config(struct hclge_dev *hdev)
+{
+ struct hnae3_handle *handle = &hdev->vport[0].nic;
+ int ret;
+
+ ret = hclge_init_vlan_filter(hdev);
+ if (ret)
+ return ret;
+
+ ret = hclge_init_vlan_type(hdev);
+ if (ret)
+ return ret;
+
+ ret = hclge_init_vport_vlan_offload(hdev);
+ if (ret)
+ return ret;
return hclge_set_vlan_filter(handle, htons(ETH_P_8021Q), 0, false);
}
@@ -11424,10 +11470,11 @@ static int hclge_dev_mem_map(struct hclge_dev *hdev)
if (!(pci_select_bars(pdev, IORESOURCE_MEM) & BIT(HCLGE_MEM_BAR)))
return 0;
- hw->mem_base = devm_ioremap_wc(&pdev->dev,
- pci_resource_start(pdev, HCLGE_MEM_BAR),
- pci_resource_len(pdev, HCLGE_MEM_BAR));
- if (!hw->mem_base) {
+ hw->hw.mem_base =
+ devm_ioremap_wc(&pdev->dev,
+ pci_resource_start(pdev, HCLGE_MEM_BAR),
+ pci_resource_len(pdev, HCLGE_MEM_BAR));
+ if (!hw->hw.mem_base) {
dev_err(&pdev->dev, "failed to map device memory\n");
return -EFAULT;
}
@@ -11466,8 +11513,8 @@ static int hclge_pci_init(struct hclge_dev *hdev)
pci_set_master(pdev);
hw = &hdev->hw;
- hw->io_base = pcim_iomap(pdev, 2, 0);
- if (!hw->io_base) {
+ hw->hw.io_base = pcim_iomap(pdev, 2, 0);
+ if (!hw->hw.io_base) {
dev_err(&pdev->dev, "Can't map configuration register space\n");
ret = -ENOMEM;
goto err_clr_master;
@@ -11482,7 +11529,7 @@ static int hclge_pci_init(struct hclge_dev *hdev)
return 0;
err_unmap_io_base:
- pcim_iounmap(pdev, hdev->hw.io_base);
+ pcim_iounmap(pdev, hdev->hw.hw.io_base);
err_clr_master:
pci_clear_master(pdev);
pci_release_regions(pdev);
@@ -11496,10 +11543,10 @@ static void hclge_pci_uninit(struct hclge_dev *hdev)
{
struct pci_dev *pdev = hdev->pdev;
- if (hdev->hw.mem_base)
- devm_iounmap(&pdev->dev, hdev->hw.mem_base);
+ if (hdev->hw.hw.mem_base)
+ devm_iounmap(&pdev->dev, hdev->hw.hw.mem_base);
- pcim_iounmap(pdev, hdev->hw.io_base);
+ pcim_iounmap(pdev, hdev->hw.hw.io_base);
pci_free_irq_vectors(pdev);
pci_clear_master(pdev);
pci_release_mem_regions(pdev);
@@ -11560,7 +11607,7 @@ static void hclge_reset_prepare_general(struct hnae3_ae_dev *ae_dev,
/* disable misc vector before reset done */
hclge_enable_vector(&hdev->misc_vector, false);
- set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);
+ set_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hdev->hw.hw.comm_state);
if (hdev->reset_type == HNAE3_FLR_RESET)
hdev->rst_stats.flr_rst_cnt++;
@@ -11851,7 +11898,7 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
err_devlink_uninit:
hclge_devlink_uninit(hdev);
err_pci_uninit:
- pcim_iounmap(pdev, hdev->hw.io_base);
+ pcim_iounmap(pdev, hdev->hw.hw.io_base);
pci_clear_master(pdev);
pci_release_regions(pdev);
pci_disable_device(pdev);
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index a716027df0ed..1ef5b4c8625a 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -228,7 +228,6 @@ enum HCLGE_DEV_STATE {
HCLGE_STATE_MBX_HANDLING,
HCLGE_STATE_ERR_SERVICE_SCHED,
HCLGE_STATE_STATISTICS_UPDATING,
- HCLGE_STATE_CMD_DISABLE,
HCLGE_STATE_LINK_UPDATING,
HCLGE_STATE_RST_FAIL,
HCLGE_STATE_FD_TBL_CHANGED,
@@ -275,10 +274,13 @@ struct hclge_mac {
u8 media_type; /* port media type, e.g. fibre/copper/backplane */
u8 mac_addr[ETH_ALEN];
u8 autoneg;
+ u8 req_autoneg;
u8 duplex;
+ u8 req_duplex;
u8 support_autoneg;
u8 speed_type; /* 0: sfp speed, 1: active speed */
u32 speed;
+ u32 req_speed;
u32 max_speed;
u32 speed_ability; /* speed ability supported by current media */
u32 module_type; /* sub media type, e.g. kr/cr/sr/lr */
@@ -294,11 +296,9 @@ struct hclge_mac {
};
struct hclge_hw {
- void __iomem *io_base;
- void __iomem *mem_base;
+ struct hclge_comm_hw hw;
struct hclge_mac mac;
int num_vec;
- struct hclge_cmq cmq;
};
/* TQP stats */
@@ -613,6 +613,11 @@ struct key_info {
#define MAX_FD_FILTER_NUM 4096
#define HCLGE_ARFS_EXPIRE_INTERVAL 5UL
+#define hclge_read_dev(a, reg) \
+ hclge_comm_read_reg((a)->hw.io_base, reg)
+#define hclge_write_dev(a, reg, value) \
+ hclge_comm_write_reg((a)->hw.io_base, reg, value)
+
enum HCLGE_FD_ACTIVE_RULE_TYPE {
HCLGE_FD_RULE_NONE,
HCLGE_FD_ARFS_ACTIVE,
@@ -858,7 +863,7 @@ struct hclge_dev {
u16 fdir_pf_filter_count; /* Num of guaranteed filters for this PF */
u16 num_alloc_vport; /* Num vports this driver supports */
- u32 numa_node_mask;
+ nodemask_t numa_node_mask;
u16 rx_buf_len;
u16 num_tx_desc; /* desc num of per tx queue */
u16 num_rx_desc; /* desc num of per rx queue */
@@ -925,6 +930,8 @@ struct hclge_dev {
u16 hclge_fd_rule_num;
unsigned long serv_processed_cnt;
unsigned long last_serv_processed;
+ unsigned long last_rst_scheduled;
+ unsigned long last_mbx_scheduled;
unsigned long fd_bmap[BITS_TO_LONGS(MAX_FD_FILTER_NUM)];
enum HCLGE_FD_ACTIVE_RULE_TYPE fd_active_type;
u8 fd_en;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
index 5182051e5414..77c432ab7856 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
@@ -33,7 +33,7 @@ static int hclge_gen_resp_to_vf(struct hclge_vport *vport,
{
struct hclge_mbx_pf_to_vf_cmd *resp_pf_to_vf;
struct hclge_dev *hdev = vport->back;
- enum hclge_cmd_status status;
+ enum hclge_comm_cmd_status status;
struct hclge_desc desc;
u16 resp;
@@ -92,7 +92,7 @@ static int hclge_send_mbx_msg(struct hclge_vport *vport, u8 *msg, u16 msg_len,
{
struct hclge_mbx_pf_to_vf_cmd *resp_pf_to_vf;
struct hclge_dev *hdev = vport->back;
- enum hclge_cmd_status status;
+ enum hclge_comm_cmd_status status;
struct hclge_desc desc;
if (msg_len > HCLGE_MBX_MAX_MSG_SIZE) {
@@ -250,6 +250,81 @@ static int hclge_map_unmap_ring_to_vf_vector(struct hclge_vport *vport, bool en,
return ret;
}
+static int hclge_query_ring_vector_map(struct hclge_vport *vport,
+ struct hnae3_ring_chain_node *ring_chain,
+ struct hclge_desc *desc)
+{
+ struct hclge_ctrl_vector_chain_cmd *req =
+ (struct hclge_ctrl_vector_chain_cmd *)desc->data;
+ struct hclge_dev *hdev = vport->back;
+ u16 tqp_type_and_id;
+ int status;
+
+ hclge_cmd_setup_basic_desc(desc, HCLGE_OPC_ADD_RING_TO_VECTOR, true);
+
+ tqp_type_and_id = le16_to_cpu(req->tqp_type_and_id[0]);
+ hnae3_set_field(tqp_type_and_id, HCLGE_INT_TYPE_M, HCLGE_INT_TYPE_S,
+ hnae3_get_bit(ring_chain->flag, HNAE3_RING_TYPE_B));
+ hnae3_set_field(tqp_type_and_id, HCLGE_TQP_ID_M, HCLGE_TQP_ID_S,
+ ring_chain->tqp_index);
+ req->tqp_type_and_id[0] = cpu_to_le16(tqp_type_and_id);
+ req->vfid = vport->vport_id;
+
+ status = hclge_cmd_send(&hdev->hw, desc, 1);
+ if (status)
+ dev_err(&hdev->pdev->dev,
+ "Get VF ring vector map info fail, status is %d.\n",
+ status);
+
+ return status;
+}
+
+static int hclge_get_vf_ring_vector_map(struct hclge_vport *vport,
+ struct hclge_mbx_vf_to_pf_cmd *req,
+ struct hclge_respond_to_vf_msg *resp)
+{
+#define HCLGE_LIMIT_RING_NUM 1
+#define HCLGE_RING_TYPE_OFFSET 0
+#define HCLGE_TQP_INDEX_OFFSET 1
+#define HCLGE_INT_GL_INDEX_OFFSET 2
+#define HCLGE_VECTOR_ID_OFFSET 3
+#define HCLGE_RING_VECTOR_MAP_INFO_LEN 4
+ struct hnae3_ring_chain_node ring_chain;
+ struct hclge_desc desc;
+ struct hclge_ctrl_vector_chain_cmd *data =
+ (struct hclge_ctrl_vector_chain_cmd *)desc.data;
+ u16 tqp_type_and_id;
+ u8 int_gl_index;
+ int ret;
+
+ req->msg.ring_num = HCLGE_LIMIT_RING_NUM;
+
+ memset(&ring_chain, 0, sizeof(ring_chain));
+ ret = hclge_get_ring_chain_from_mbx(req, &ring_chain, vport);
+ if (ret)
+ return ret;
+
+ ret = hclge_query_ring_vector_map(vport, &ring_chain, &desc);
+ if (ret) {
+ hclge_free_vector_ring_chain(&ring_chain);
+ return ret;
+ }
+
+ tqp_type_and_id = le16_to_cpu(data->tqp_type_and_id[0]);
+ int_gl_index = hnae3_get_field(tqp_type_and_id,
+ HCLGE_INT_GL_IDX_M, HCLGE_INT_GL_IDX_S);
+
+ resp->data[HCLGE_RING_TYPE_OFFSET] = req->msg.param[0].ring_type;
+ resp->data[HCLGE_TQP_INDEX_OFFSET] = req->msg.param[0].tqp_index;
+ resp->data[HCLGE_INT_GL_INDEX_OFFSET] = int_gl_index;
+ resp->data[HCLGE_VECTOR_ID_OFFSET] = data->int_vector_id_l;
+ resp->len = HCLGE_RING_VECTOR_MAP_INFO_LEN;
+
+ hclge_free_vector_ring_chain(&ring_chain);
+
+ return ret;
+}
+
static void hclge_set_vf_promisc_mode(struct hclge_vport *vport,
struct hclge_mbx_vf_to_pf_cmd *req)
{
@@ -670,7 +745,7 @@ static bool hclge_cmd_crq_empty(struct hclge_hw *hw)
{
u32 tail = hclge_read_dev(hw, HCLGE_NIC_CRQ_TAIL_REG);
- return tail == hw->cmq.crq.next_to_use;
+ return tail == hw->hw.cmq.crq.next_to_use;
}
static void hclge_handle_ncsi_error(struct hclge_dev *hdev)
@@ -699,20 +774,289 @@ static void hclge_handle_vf_tbl(struct hclge_vport *vport,
}
}
+static int
+hclge_mbx_map_ring_to_vector_handler(struct hclge_mbx_ops_param *param)
+{
+ return hclge_map_unmap_ring_to_vf_vector(param->vport, true,
+ param->req);
+}
+
+static int
+hclge_mbx_unmap_ring_to_vector_handler(struct hclge_mbx_ops_param *param)
+{
+ return hclge_map_unmap_ring_to_vf_vector(param->vport, false,
+ param->req);
+}
+
+static int
+hclge_mbx_get_ring_vector_map_handler(struct hclge_mbx_ops_param *param)
+{
+ int ret;
+
+ ret = hclge_get_vf_ring_vector_map(param->vport, param->req,
+ param->resp_msg);
+ if (ret)
+ dev_err(¶m->vport->back->pdev->dev,
+ "PF fail(%d) to get VF ring vector map\n",
+ ret);
+ return ret;
+}
+
+static int hclge_mbx_set_promisc_mode_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_set_vf_promisc_mode(param->vport, param->req);
+ return 0;
+}
+
+static int hclge_mbx_set_unicast_handler(struct hclge_mbx_ops_param *param)
+{
+ int ret;
+
+ ret = hclge_set_vf_uc_mac_addr(param->vport, param->req);
+ if (ret)
+ dev_err(¶m->vport->back->pdev->dev,
+ "PF fail(%d) to set VF UC MAC Addr\n",
+ ret);
+ return ret;
+}
+
+static int hclge_mbx_set_multicast_handler(struct hclge_mbx_ops_param *param)
+{
+ int ret;
+
+ ret = hclge_set_vf_mc_mac_addr(param->vport, param->req);
+ if (ret)
+ dev_err(¶m->vport->back->pdev->dev,
+ "PF fail(%d) to set VF MC MAC Addr\n",
+ ret);
+ return ret;
+}
+
+static int hclge_mbx_set_vlan_handler(struct hclge_mbx_ops_param *param)
+{
+ int ret;
+
+ ret = hclge_set_vf_vlan_cfg(param->vport, param->req, param->resp_msg);
+ if (ret)
+ dev_err(¶m->vport->back->pdev->dev,
+ "PF failed(%d) to config VF's VLAN\n",
+ ret);
+ return ret;
+}
+
+static int hclge_mbx_set_alive_handler(struct hclge_mbx_ops_param *param)
+{
+ int ret;
+
+ ret = hclge_set_vf_alive(param->vport, param->req);
+ if (ret)
+ dev_err(¶m->vport->back->pdev->dev,
+ "PF failed(%d) to set VF's ALIVE\n",
+ ret);
+ return ret;
+}
+
+static int hclge_mbx_get_qinfo_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_get_vf_queue_info(param->vport, param->resp_msg);
+ return 0;
+}
+
+static int hclge_mbx_get_qdepth_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_get_vf_queue_depth(param->vport, param->resp_msg);
+ return 0;
+}
+
+static int hclge_mbx_get_basic_info_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_get_basic_info(param->vport, param->resp_msg);
+ return 0;
+}
+
+static int hclge_mbx_get_link_status_handler(struct hclge_mbx_ops_param *param)
+{
+ int ret;
+
+ ret = hclge_push_vf_link_status(param->vport);
+ if (ret)
+ dev_err(¶m->vport->back->pdev->dev,
+ "failed to inform link stat to VF, ret = %d\n",
+ ret);
+ return ret;
+}
+
+static int hclge_mbx_queue_reset_handler(struct hclge_mbx_ops_param *param)
+{
+ return hclge_mbx_reset_vf_queue(param->vport, param->req,
+ param->resp_msg);
+}
+
+static int hclge_mbx_reset_handler(struct hclge_mbx_ops_param *param)
+{
+ return hclge_reset_vf(param->vport);
+}
+
+static int hclge_mbx_keep_alive_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_vf_keep_alive(param->vport);
+ return 0;
+}
+
+static int hclge_mbx_set_mtu_handler(struct hclge_mbx_ops_param *param)
+{
+ int ret;
+
+ ret = hclge_set_vf_mtu(param->vport, param->req);
+ if (ret)
+ dev_err(¶m->vport->back->pdev->dev,
+ "VF fail(%d) to set mtu\n", ret);
+ return ret;
+}
+
+static int hclge_mbx_get_qid_in_pf_handler(struct hclge_mbx_ops_param *param)
+{
+ return hclge_get_queue_id_in_pf(param->vport, param->req,
+ param->resp_msg);
+}
+
+static int hclge_mbx_get_rss_key_handler(struct hclge_mbx_ops_param *param)
+{
+ return hclge_get_rss_key(param->vport, param->req, param->resp_msg);
+}
+
+static int hclge_mbx_get_link_mode_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_get_link_mode(param->vport, param->req);
+ return 0;
+}
+
+static int
+hclge_mbx_get_vf_flr_status_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_rm_vport_all_mac_table(param->vport, false,
+ HCLGE_MAC_ADDR_UC);
+ hclge_rm_vport_all_mac_table(param->vport, false,
+ HCLGE_MAC_ADDR_MC);
+ hclge_rm_vport_all_vlan_table(param->vport, false);
+ return 0;
+}
+
+static int hclge_mbx_vf_uninit_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_rm_vport_all_mac_table(param->vport, true,
+ HCLGE_MAC_ADDR_UC);
+ hclge_rm_vport_all_mac_table(param->vport, true,
+ HCLGE_MAC_ADDR_MC);
+ hclge_rm_vport_all_vlan_table(param->vport, true);
+ return 0;
+}
+
+static int hclge_mbx_get_media_type_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_get_vf_media_type(param->vport, param->resp_msg);
+ return 0;
+}
+
+static int hclge_mbx_push_link_status_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_handle_link_change_event(param->vport->back, param->req);
+ return 0;
+}
+
+static int hclge_mbx_get_mac_addr_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_get_vf_mac_addr(param->vport, param->resp_msg);
+ return 0;
+}
+
+static int hclge_mbx_ncsi_error_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_handle_ncsi_error(param->vport->back);
+ return 0;
+}
+
+static int hclge_mbx_handle_vf_tbl_handler(struct hclge_mbx_ops_param *param)
+{
+ hclge_handle_vf_tbl(param->vport, param->req);
+ return 0;
+}
+
+static const hclge_mbx_ops_fn hclge_mbx_ops_list[HCLGE_MBX_OPCODE_MAX] = {
+ [HCLGE_MBX_RESET] = hclge_mbx_reset_handler,
+ [HCLGE_MBX_SET_UNICAST] = hclge_mbx_set_unicast_handler,
+ [HCLGE_MBX_SET_MULTICAST] = hclge_mbx_set_multicast_handler,
+ [HCLGE_MBX_SET_VLAN] = hclge_mbx_set_vlan_handler,
+ [HCLGE_MBX_MAP_RING_TO_VECTOR] = hclge_mbx_map_ring_to_vector_handler,
+ [HCLGE_MBX_UNMAP_RING_TO_VECTOR] = hclge_mbx_unmap_ring_to_vector_handler,
+ [HCLGE_MBX_SET_PROMISC_MODE] = hclge_mbx_set_promisc_mode_handler,
+ [HCLGE_MBX_GET_QINFO] = hclge_mbx_get_qinfo_handler,
+ [HCLGE_MBX_GET_QDEPTH] = hclge_mbx_get_qdepth_handler,
+ [HCLGE_MBX_GET_BASIC_INFO] = hclge_mbx_get_basic_info_handler,
+ [HCLGE_MBX_GET_RSS_KEY] = hclge_mbx_get_rss_key_handler,
+ [HCLGE_MBX_GET_MAC_ADDR] = hclge_mbx_get_mac_addr_handler,
+ [HCLGE_MBX_GET_LINK_STATUS] = hclge_mbx_get_link_status_handler,
+ [HCLGE_MBX_QUEUE_RESET] = hclge_mbx_queue_reset_handler,
+ [HCLGE_MBX_KEEP_ALIVE] = hclge_mbx_keep_alive_handler,
+ [HCLGE_MBX_SET_ALIVE] = hclge_mbx_set_alive_handler,
+ [HCLGE_MBX_SET_MTU] = hclge_mbx_set_mtu_handler,
+ [HCLGE_MBX_GET_QID_IN_PF] = hclge_mbx_get_qid_in_pf_handler,
+ [HCLGE_MBX_GET_LINK_MODE] = hclge_mbx_get_link_mode_handler,
+ [HCLGE_MBX_GET_MEDIA_TYPE] = hclge_mbx_get_media_type_handler,
+ [HCLGE_MBX_VF_UNINIT] = hclge_mbx_vf_uninit_handler,
+ [HCLGE_MBX_HANDLE_VF_TBL] = hclge_mbx_handle_vf_tbl_handler,
+ [HCLGE_MBX_GET_RING_VECTOR_MAP] = hclge_mbx_get_ring_vector_map_handler,
+ [HCLGE_MBX_GET_VF_FLR_STATUS] = hclge_mbx_get_vf_flr_status_handler,
+ [HCLGE_MBX_PUSH_LINK_STATUS] = hclge_mbx_push_link_status_handler,
+ [HCLGE_MBX_NCSI_ERROR] = hclge_mbx_ncsi_error_handler,
+};
+
+static void hclge_mbx_request_handling(struct hclge_mbx_ops_param *param)
+{
+ hclge_mbx_ops_fn cmd_func = NULL;
+ struct hclge_dev *hdev;
+ int ret = 0;
+
+ hdev = param->vport->back;
+ cmd_func = hclge_mbx_ops_list[param->req->msg.code];
+ if (!cmd_func) {
+ dev_err(&hdev->pdev->dev,
+ "un-supported mailbox message, code = %u\n",
+ param->req->msg.code);
+ return;
+ }
+ ret = cmd_func(param);
+
+ /* PF driver should not reply IMP */
+ if (hnae3_get_bit(param->req->mbx_need_resp, HCLGE_MBX_NEED_RESP_B) &&
+ param->req->msg.code < HCLGE_MBX_GET_VF_FLR_STATUS) {
+ param->resp_msg->status = ret;
+ if (time_is_before_jiffies(hdev->last_mbx_scheduled +
+ HCLGE_MBX_SCHED_TIMEOUT))
+ dev_warn(&hdev->pdev->dev,
+ "resp vport%u mbx(%u,%u) late\n",
+ param->req->mbx_src_vfid,
+ param->req->msg.code,
+ param->req->msg.subcode);
+
+ hclge_gen_resp_to_vf(param->vport, param->req, param->resp_msg);
+ }
+}
+
void hclge_mbx_handler(struct hclge_dev *hdev)
{
- struct hclge_cmq_ring *crq = &hdev->hw.cmq.crq;
+ struct hclge_comm_cmq_ring *crq = &hdev->hw.hw.cmq.crq;
struct hclge_respond_to_vf_msg resp_msg;
struct hclge_mbx_vf_to_pf_cmd *req;
- struct hclge_vport *vport;
+ struct hclge_mbx_ops_param param;
struct hclge_desc *desc;
- bool is_del = false;
unsigned int flag;
- int ret = 0;
+ param.resp_msg = &resp_msg;
/* handle all the mailbox requests in the queue */
while (!hclge_cmd_crq_empty(&hdev->hw)) {
- if (test_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state)) {
+ if (test_bit(HCLGE_COMM_STATE_CMD_DISABLE,
+ &hdev->hw.hw.comm_state)) {
dev_warn(&hdev->pdev->dev,
"command queue needs re-initializing\n");
return;
@@ -733,136 +1077,16 @@ void hclge_mbx_handler(struct hclge_dev *hdev)
continue;
}
- vport = &hdev->vport[req->mbx_src_vfid];
-
trace_hclge_pf_mbx_get(hdev, req);
/* clear the resp_msg before processing every mailbox message */
memset(&resp_msg, 0, sizeof(resp_msg));
-
- switch (req->msg.code) {
- case HCLGE_MBX_MAP_RING_TO_VECTOR:
- ret = hclge_map_unmap_ring_to_vf_vector(vport, true,
- req);
- break;
- case HCLGE_MBX_UNMAP_RING_TO_VECTOR:
- ret = hclge_map_unmap_ring_to_vf_vector(vport, false,
- req);
- break;
- case HCLGE_MBX_SET_PROMISC_MODE:
- hclge_set_vf_promisc_mode(vport, req);
- break;
- case HCLGE_MBX_SET_UNICAST:
- ret = hclge_set_vf_uc_mac_addr(vport, req);
- if (ret)
- dev_err(&hdev->pdev->dev,
- "PF fail(%d) to set VF UC MAC Addr\n",
- ret);
- break;
- case HCLGE_MBX_SET_MULTICAST:
- ret = hclge_set_vf_mc_mac_addr(vport, req);
- if (ret)
- dev_err(&hdev->pdev->dev,
- "PF fail(%d) to set VF MC MAC Addr\n",
- ret);
- break;
- case HCLGE_MBX_SET_VLAN:
- ret = hclge_set_vf_vlan_cfg(vport, req, &resp_msg);
- if (ret)
- dev_err(&hdev->pdev->dev,
- "PF failed(%d) to config VF's VLAN\n",
- ret);
- break;
- case HCLGE_MBX_SET_ALIVE:
- ret = hclge_set_vf_alive(vport, req);
- if (ret)
- dev_err(&hdev->pdev->dev,
- "PF failed(%d) to set VF's ALIVE\n",
- ret);
- break;
- case HCLGE_MBX_GET_QINFO:
- hclge_get_vf_queue_info(vport, &resp_msg);
- break;
- case HCLGE_MBX_GET_QDEPTH:
- hclge_get_vf_queue_depth(vport, &resp_msg);
- break;
- case HCLGE_MBX_GET_BASIC_INFO:
- hclge_get_basic_info(vport, &resp_msg);
- break;
- case HCLGE_MBX_GET_LINK_STATUS:
- ret = hclge_push_vf_link_status(vport);
- if (ret)
- dev_err(&hdev->pdev->dev,
- "failed to inform link stat to VF, ret = %d\n",
- ret);
- break;
- case HCLGE_MBX_QUEUE_RESET:
- ret = hclge_mbx_reset_vf_queue(vport, req, &resp_msg);
- break;
- case HCLGE_MBX_RESET:
- ret = hclge_reset_vf(vport);
- break;
- case HCLGE_MBX_KEEP_ALIVE:
- hclge_vf_keep_alive(vport);
- break;
- case HCLGE_MBX_SET_MTU:
- ret = hclge_set_vf_mtu(vport, req);
- if (ret)
- dev_err(&hdev->pdev->dev,
- "VF fail(%d) to set mtu\n", ret);
- break;
- case HCLGE_MBX_GET_QID_IN_PF:
- ret = hclge_get_queue_id_in_pf(vport, req, &resp_msg);
- break;
- case HCLGE_MBX_GET_RSS_KEY:
- ret = hclge_get_rss_key(vport, req, &resp_msg);
- break;
- case HCLGE_MBX_GET_LINK_MODE:
- hclge_get_link_mode(vport, req);
- break;
- case HCLGE_MBX_GET_VF_FLR_STATUS:
- case HCLGE_MBX_VF_UNINIT:
- is_del = req->msg.code == HCLGE_MBX_VF_UNINIT;
- hclge_rm_vport_all_mac_table(vport, is_del,
- HCLGE_MAC_ADDR_UC);
- hclge_rm_vport_all_mac_table(vport, is_del,
- HCLGE_MAC_ADDR_MC);
- hclge_rm_vport_all_vlan_table(vport, is_del);
- break;
- case HCLGE_MBX_GET_MEDIA_TYPE:
- hclge_get_vf_media_type(vport, &resp_msg);
- break;
- case HCLGE_MBX_PUSH_LINK_STATUS:
- hclge_handle_link_change_event(hdev, req);
- break;
- case HCLGE_MBX_GET_MAC_ADDR:
- hclge_get_vf_mac_addr(vport, &resp_msg);
- break;
- case HCLGE_MBX_NCSI_ERROR:
- hclge_handle_ncsi_error(hdev);
- break;
- case HCLGE_MBX_HANDLE_VF_TBL:
- hclge_handle_vf_tbl(vport, req);
- break;
- default:
- dev_err(&hdev->pdev->dev,
- "un-supported mailbox message, code = %u\n",
- req->msg.code);
- break;
- }
-
- /* PF driver should not reply IMP */
- if (hnae3_get_bit(req->mbx_need_resp, HCLGE_MBX_NEED_RESP_B) &&
- req->msg.code < HCLGE_MBX_GET_VF_FLR_STATUS) {
- resp_msg.status = ret;
- hclge_gen_resp_to_vf(vport, req, &resp_msg);
- }
+ param.vport = &hdev->vport[req->mbx_src_vfid];
+ param.req = req;
+ hclge_mbx_request_handling(¶m);
crq->desc[crq->next_to_use].flag = 0;
hclge_mbx_ring_ptr_move_crq(crq);
-
- /* reinitialize ret after complete the mbx message processing */
- ret = 0;
}
/* Write back CMDQ_RQ header pointer, M7 need this pointer */
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
index 1231c34f0949..63d2be4349e3 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
@@ -47,7 +47,7 @@ static int hclge_mdio_write(struct mii_bus *bus, int phyid, int regnum,
struct hclge_desc desc;
int ret;
- if (test_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state))
+ if (test_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hdev->hw.hw.comm_state))
return 0;
hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_MDIO_CONFIG, false);
@@ -85,7 +85,7 @@ static int hclge_mdio_read(struct mii_bus *bus, int phyid, int regnum)
struct hclge_desc desc;
int ret;
- if (test_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state))
+ if (test_bit(HCLGE_COMM_STATE_CMD_DISABLE, &hdev->hw.hw.comm_state))
return 0;
hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_MDIO_CONFIG, true);
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c
index dd0750f6daa6..0f06f95b09bc 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c
@@ -464,7 +464,7 @@ static int hclge_ptp_create_clock(struct hclge_dev *hdev)
}
spin_lock_init(&ptp->lock);
- ptp->io_base = hdev->hw.io_base + HCLGE_PTP_REG_OFFSET;
+ ptp->io_base = hdev->hw.hw.io_base + HCLGE_PTP_REG_OFFSET;
ptp->ts_cfg.rx_filter = HWTSTAMP_FILTER_NONE;
ptp->ts_cfg.tx_type = HWTSTAMP_TX_OFF;
hdev->ptp = ptp;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile b/drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile
deleted file mode 100644
index 51ff7d86ee90..000000000000
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Makefile for the HISILICON network device drivers.
-#
-
-ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3
-ccflags-y += -I $(srctree)/$(src)
-
-obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o
-hclgevf-objs = hclgevf_main.o hclgevf_cmd.o hclgevf_mbx.o hclgevf_devlink.o
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index bd8468c2d9a6..a41e04796b0b 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -537,7 +537,8 @@ static int hclgevf_set_handle_info(struct hclgevf_dev *hdev)
nic->ae_algo = &ae_algovf;
nic->pdev = hdev->pdev;
- nic->numa_node_mask = hdev->numa_node_mask;
+ bitmap_copy(nic->numa_node_mask.bits, hdev->numa_node_mask.bits,
+ MAX_NUMNODES);
nic->flags |= HNAE3_SUPPORT_VF;
nic->kinfo.io_base = hdev->hw.io_base;
@@ -2588,8 +2589,8 @@ static int hclgevf_init_roce_base_info(struct hclgevf_dev *hdev)
roce->pdev = nic->pdev;
roce->ae_algo = nic->ae_algo;
- roce->numa_node_mask = nic->numa_node_mask;
-
+ bitmap_copy(roce->numa_node_mask.bits, nic->numa_node_mask.bits,
+ MAX_NUMNODES);
return 0;
}
@@ -2721,8 +2722,7 @@ static void hclgevf_set_timer_task(struct hnae3_handle *handle, bool enable)
} else {
set_bit(HCLGEVF_STATE_DOWN, &hdev->state);
- /* flush memory to make sure DOWN is seen by service task */
- smp_mb__before_atomic();
+ smp_mb__after_atomic(); /* flush memory to make sure DOWN is seen by service task */
hclgevf_flush_link_update(hdev);
}
}
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
index 5c7538ca36a7..2b216ac96914 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
@@ -298,7 +298,7 @@ struct hclgevf_dev {
u16 rss_size_max; /* HW defined max RSS task queue */
u16 num_alloc_vport; /* num vports this driver supports */
- u32 numa_node_mask;
+ nodemask_t numa_node_mask;
u16 rx_buf_len;
u16 num_tx_desc; /* desc num of per tx queue */
u16 num_rx_desc; /* desc num of per rx queue */
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
index 4dddf6ec3be8..e20182752951 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
@@ -559,12 +559,10 @@ static ssize_t rvu_dbg_qsize_write(struct file *filp,
u16 pcifunc;
int ret, lf;
- cmd_buf = memdup_user(buffer, count + 1);
+ cmd_buf = memdup_user_nul(buffer, count);
if (IS_ERR(cmd_buf))
return -ENOMEM;
- cmd_buf[count] = '\0';
-
cmd_buf_tmp = strchr(cmd_buf, '\n');
if (cmd_buf_tmp) {
*cmd_buf_tmp = '\0';
diff --git a/drivers/net/ethernet/qlogic/qede/qede_filter.c b/drivers/net/ethernet/qlogic/qede/qede_filter.c
index 3010833ddde3..8871099b99d8 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_filter.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_filter.c
@@ -1868,8 +1868,8 @@ int qede_add_tc_flower_fltr(struct qede_dev *edev, __be16 proto,
struct flow_cls_offload *f)
{
struct qede_arfs_fltr_node *n;
- int min_hlen, rc = -EINVAL;
struct qede_arfs_tuple t;
+ int min_hlen, rc;
__qede_lock(edev);
@@ -1879,7 +1879,8 @@ int qede_add_tc_flower_fltr(struct qede_dev *edev, __be16 proto,
}
/* parse flower attribute and prepare filter */
- if (qede_parse_flow_attr(edev, proto, f->rule, &t))
+ rc = qede_parse_flow_attr(edev, proto, f->rule, &t);
+ if (rc)
goto unlock;
/* Validate profile mode and number of filters */
@@ -1888,11 +1889,13 @@ int qede_add_tc_flower_fltr(struct qede_dev *edev, __be16 proto,
DP_NOTICE(edev,
"Filter configuration invalidated, filter mode=0x%x, configured mode=0x%x, filter count=0x%x\n",
t.mode, edev->arfs->mode, edev->arfs->filter_count);
+ rc = -EINVAL;
goto unlock;
}
/* parse tc actions and get the vf_id */
- if (qede_parse_actions(edev, &f->rule->action, f->common.extack))
+ rc = qede_parse_actions(edev, &f->rule->action, f->common.extack);
+ if (rc)
goto unlock;
if (qede_flow_find_fltr(edev, &t)) {
@@ -1998,10 +2001,9 @@ static int qede_flow_spec_to_rule(struct qede_dev *edev,
if (IS_ERR(flow))
return PTR_ERR(flow);
- if (qede_parse_flow_attr(edev, proto, flow->rule, t)) {
- err = -EINVAL;
+ err = qede_parse_flow_attr(edev, proto, flow->rule, t);
+ if (err)
goto err_out;
- }
/* Make sure location is valid and filter isn't already set */
err = qede_flow_spec_validate(edev, &flow->rule->action, t,
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 846ace9830d3..89e1fac07a25 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1419,6 +1419,7 @@ static const struct usb_device_id products[] = {
{QMI_FIXED_INTF(0x0489, 0xe0b5, 0)}, /* Foxconn T77W968 LTE with eSIM support*/
{QMI_FIXED_INTF(0x2692, 0x9025, 4)}, /* Cellient MPL200 (rebranded Qualcomm 05c6:9025) */
{QMI_QUIRK_SET_DTR(0x1546, 0x1342, 4)}, /* u-blox LARA-L6 */
+ {QMI_QUIRK_SET_DTR(0x33f8, 0x0104, 4)}, /* Rolling RW101 RMNET */
/* 4. Gobi 1000 devices */
{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
index 54064714d73f..b223583dfb73 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
@@ -43,7 +43,7 @@
#define SCU614 0x614 /* Disable GPIO Internal Pull-Down #1 */
#define SCU618 0x618 /* Disable GPIO Internal Pull-Down #2 */
#define SCU61C 0x61c /* Disable GPIO Internal Pull-Down #3 */
-#define SCU620 0x620 /* Disable GPIO Internal Pull-Down #4 */
+#define SCU630 0x630 /* Disable GPIO Internal Pull-Down #4 */
#define SCU634 0x634 /* Disable GPIO Internal Pull-Down #5 */
#define SCU638 0x638 /* Disable GPIO Internal Pull-Down #6 */
#define SCU690 0x690 /* Multi-function Pin Control #24 */
@@ -2487,38 +2487,38 @@ static struct aspeed_pin_config aspeed_g6_configs[] = {
ASPEED_PULL_DOWN_PINCONF(D14, SCU61C, 0),
/* GPIOS7 */
- ASPEED_PULL_DOWN_PINCONF(T24, SCU620, 23),
+ ASPEED_PULL_DOWN_PINCONF(T24, SCU630, 23),
/* GPIOS6 */
- ASPEED_PULL_DOWN_PINCONF(P23, SCU620, 22),
+ ASPEED_PULL_DOWN_PINCONF(P23, SCU630, 22),
/* GPIOS5 */
- ASPEED_PULL_DOWN_PINCONF(P24, SCU620, 21),
+ ASPEED_PULL_DOWN_PINCONF(P24, SCU630, 21),
/* GPIOS4 */
- ASPEED_PULL_DOWN_PINCONF(R26, SCU620, 20),
+ ASPEED_PULL_DOWN_PINCONF(R26, SCU630, 20),
/* GPIOS3*/
- ASPEED_PULL_DOWN_PINCONF(R24, SCU620, 19),
+ ASPEED_PULL_DOWN_PINCONF(R24, SCU630, 19),
/* GPIOS2 */
- ASPEED_PULL_DOWN_PINCONF(T26, SCU620, 18),
+ ASPEED_PULL_DOWN_PINCONF(T26, SCU630, 18),
/* GPIOS1 */
- ASPEED_PULL_DOWN_PINCONF(T25, SCU620, 17),
+ ASPEED_PULL_DOWN_PINCONF(T25, SCU630, 17),
/* GPIOS0 */
- ASPEED_PULL_DOWN_PINCONF(R23, SCU620, 16),
+ ASPEED_PULL_DOWN_PINCONF(R23, SCU630, 16),
/* GPIOR7 */
- ASPEED_PULL_DOWN_PINCONF(U26, SCU620, 15),
+ ASPEED_PULL_DOWN_PINCONF(U26, SCU630, 15),
/* GPIOR6 */
- ASPEED_PULL_DOWN_PINCONF(W26, SCU620, 14),
+ ASPEED_PULL_DOWN_PINCONF(W26, SCU630, 14),
/* GPIOR5 */
- ASPEED_PULL_DOWN_PINCONF(T23, SCU620, 13),
+ ASPEED_PULL_DOWN_PINCONF(T23, SCU630, 13),
/* GPIOR4 */
- ASPEED_PULL_DOWN_PINCONF(U25, SCU620, 12),
+ ASPEED_PULL_DOWN_PINCONF(U25, SCU630, 12),
/* GPIOR3*/
- ASPEED_PULL_DOWN_PINCONF(V26, SCU620, 11),
+ ASPEED_PULL_DOWN_PINCONF(V26, SCU630, 11),
/* GPIOR2 */
- ASPEED_PULL_DOWN_PINCONF(V24, SCU620, 10),
+ ASPEED_PULL_DOWN_PINCONF(V24, SCU630, 10),
/* GPIOR1 */
- ASPEED_PULL_DOWN_PINCONF(U24, SCU620, 9),
+ ASPEED_PULL_DOWN_PINCONF(U24, SCU630, 9),
/* GPIOR0 */
- ASPEED_PULL_DOWN_PINCONF(V25, SCU620, 8),
+ ASPEED_PULL_DOWN_PINCONF(V25, SCU630, 8),
/* GPIOX7 */
ASPEED_PULL_DOWN_PINCONF(AB10, SCU634, 31),
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 456b72041c34..1c906fc68c1d 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -2098,13 +2098,7 @@ int pinctrl_enable(struct pinctrl_dev *pctldev)
error = pinctrl_claim_hogs(pctldev);
if (error) {
- dev_err(pctldev->dev, "could not claim hogs: %i\n",
- error);
- pinctrl_free_pindescs(pctldev, pctldev->desc->pins,
- pctldev->desc->npins);
- mutex_destroy(&pctldev->mutex);
- kfree(pctldev);
-
+ dev_err(pctldev->dev, "could not claim hogs: %i\n", error);
return error;
}
diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c
index eac55fee5281..0220228c5040 100644
--- a/drivers/pinctrl/devicetree.c
+++ b/drivers/pinctrl/devicetree.c
@@ -220,14 +220,16 @@ int pinctrl_dt_to_map(struct pinctrl *p, struct pinctrl_dev *pctldev)
for (state = 0; ; state++) {
/* Retrieve the pinctrl-* property */
propname = kasprintf(GFP_KERNEL, "pinctrl-%d", state);
- if (!propname)
- return -ENOMEM;
+ if (!propname) {
+ ret = -ENOMEM;
+ goto err;
+ }
prop = of_find_property(np, propname, &size);
kfree(propname);
if (!prop) {
if (state == 0) {
- of_node_put(np);
- return -ENODEV;
+ ret = -ENODEV;
+ goto err;
}
break;
}
diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
index 0fa1c36148c2..deade010270a 100644
--- a/drivers/pinctrl/mediatek/pinctrl-paris.c
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
@@ -79,78 +79,76 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev,
{
struct mtk_pinctrl *hw = pinctrl_dev_get_drvdata(pctldev);
u32 param = pinconf_to_config_param(*config);
- int pullup, err, reg, ret = 1;
+ int pullup, reg, err = -ENOTSUPP, ret = 1;
const struct mtk_pin_desc *desc;
- if (pin >= hw->soc->npins) {
- err = -EINVAL;
- goto out;
- }
+ if (pin >= hw->soc->npins)
+ return -EINVAL;
+
desc = (const struct mtk_pin_desc *)&hw->soc->pins[pin];
switch (param) {
case PIN_CONFIG_BIAS_DISABLE:
case PIN_CONFIG_BIAS_PULL_UP:
case PIN_CONFIG_BIAS_PULL_DOWN:
- if (hw->soc->bias_get_combo) {
- err = hw->soc->bias_get_combo(hw, desc, &pullup, &ret);
- if (err)
- goto out;
- if (ret == MTK_PUPD_SET_R1R0_00)
- ret = MTK_DISABLE;
- if (param == PIN_CONFIG_BIAS_DISABLE) {
- if (ret != MTK_DISABLE)
- err = -EINVAL;
- } else if (param == PIN_CONFIG_BIAS_PULL_UP) {
- if (!pullup || ret == MTK_DISABLE)
- err = -EINVAL;
- } else if (param == PIN_CONFIG_BIAS_PULL_DOWN) {
- if (pullup || ret == MTK_DISABLE)
- err = -EINVAL;
- }
- } else {
- err = -ENOTSUPP;
+ if (!hw->soc->bias_get_combo)
+ break;
+ err = hw->soc->bias_get_combo(hw, desc, &pullup, &ret);
+ if (err)
+ break;
+ if (ret == MTK_PUPD_SET_R1R0_00)
+ ret = MTK_DISABLE;
+ if (param == PIN_CONFIG_BIAS_DISABLE) {
+ if (ret != MTK_DISABLE)
+ err = -EINVAL;
+ } else if (param == PIN_CONFIG_BIAS_PULL_UP) {
+ if (!pullup || ret == MTK_DISABLE)
+ err = -EINVAL;
+ } else if (param == PIN_CONFIG_BIAS_PULL_DOWN) {
+ if (pullup || ret == MTK_DISABLE)
+ err = -EINVAL;
}
break;
case PIN_CONFIG_SLEW_RATE:
err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_SR, &ret);
break;
case PIN_CONFIG_INPUT_ENABLE:
- case PIN_CONFIG_OUTPUT_ENABLE:
+ err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_IES, &ret);
+ if (!ret)
+ err = -EINVAL;
+ break;
+ case PIN_CONFIG_OUTPUT:
err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DIR, &ret);
if (err)
- goto out;
- /* CONFIG Current direction return value
- * ------------- ----------------- ----------------------
- * OUTPUT_ENABLE output 1 (= HW value)
- * input 0 (= HW value)
- * INPUT_ENABLE output 0 (= reverse HW value)
- * input 1 (= reverse HW value)
- */
- if (param == PIN_CONFIG_INPUT_ENABLE)
- ret = !ret;
+ break;
+
+ if (!ret) {
+ err = -EINVAL;
+ break;
+ }
+ err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DO, &ret);
break;
case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DIR, &ret);
if (err)
- goto out;
+ break;
/* return error when in output mode
* because schmitt trigger only work in input mode
*/
if (ret) {
err = -EINVAL;
- goto out;
+ break;
}
err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_SMT, &ret);
-
+ if (!ret)
+ err = -EINVAL;
break;
case PIN_CONFIG_DRIVE_STRENGTH:
- if (hw->soc->drive_get)
- err = hw->soc->drive_get(hw, desc, &ret);
- else
- err = -ENOTSUPP;
+ if (!hw->soc->drive_get)
+ break;
+ err = hw->soc->drive_get(hw, desc, &ret);
break;
case MTK_PIN_CONFIG_TDSEL:
case MTK_PIN_CONFIG_RDSEL:
@@ -160,23 +158,18 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev,
break;
case MTK_PIN_CONFIG_PU_ADV:
case MTK_PIN_CONFIG_PD_ADV:
- if (hw->soc->adv_pull_get) {
- pullup = param == MTK_PIN_CONFIG_PU_ADV;
- err = hw->soc->adv_pull_get(hw, desc, pullup, &ret);
- } else
- err = -ENOTSUPP;
+ if (!hw->soc->adv_pull_get)
+ break;
+ pullup = param == MTK_PIN_CONFIG_PU_ADV;
+ err = hw->soc->adv_pull_get(hw, desc, pullup, &ret);
break;
case MTK_PIN_CONFIG_DRV_ADV:
- if (hw->soc->adv_drive_get)
- err = hw->soc->adv_drive_get(hw, desc, &ret);
- else
- err = -ENOTSUPP;
+ if (!hw->soc->adv_drive_get)
+ break;
+ err = hw->soc->adv_drive_get(hw, desc, &ret);
break;
- default:
- err = -ENOTSUPP;
}
-out:
if (!err)
*config = pinconf_to_config_packed(param, ret);
@@ -188,54 +181,33 @@ static int mtk_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
{
struct mtk_pinctrl *hw = pinctrl_dev_get_drvdata(pctldev);
const struct mtk_pin_desc *desc;
- int err = 0;
+ int err = -ENOTSUPP;
u32 reg;
- if (pin >= hw->soc->npins) {
- err = -EINVAL;
- goto err;
- }
+ if (pin >= hw->soc->npins)
+ return -EINVAL;
+
desc = (const struct mtk_pin_desc *)&hw->soc->pins[pin];
switch ((u32)param) {
case PIN_CONFIG_BIAS_DISABLE:
- if (hw->soc->bias_set_combo)
- err = hw->soc->bias_set_combo(hw, desc, 0, MTK_DISABLE);
- else
- err = -ENOTSUPP;
+ if (!hw->soc->bias_set_combo)
+ break;
+ err = hw->soc->bias_set_combo(hw, desc, 0, MTK_DISABLE);
break;
case PIN_CONFIG_BIAS_PULL_UP:
- if (hw->soc->bias_set_combo)
- err = hw->soc->bias_set_combo(hw, desc, 1, arg);
- else
- err = -ENOTSUPP;
+ if (!hw->soc->bias_set_combo)
+ break;
+ err = hw->soc->bias_set_combo(hw, desc, 1, arg);
break;
case PIN_CONFIG_BIAS_PULL_DOWN:
- if (hw->soc->bias_set_combo)
- err = hw->soc->bias_set_combo(hw, desc, 0, arg);
- else
- err = -ENOTSUPP;
- break;
- case PIN_CONFIG_OUTPUT_ENABLE:
- err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_SMT,
- MTK_DISABLE);
- /* Keep set direction to consider the case that a GPIO pin
- * does not have SMT control
- */
- if (err != -ENOTSUPP)
- goto err;
-
- err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DIR,
- MTK_OUTPUT);
+ if (!hw->soc->bias_set_combo)
+ break;
+ err = hw->soc->bias_set_combo(hw, desc, 0, arg);
break;
case PIN_CONFIG_INPUT_ENABLE:
/* regard all non-zero value as enable */
err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_IES, !!arg);
- if (err)
- goto err;
-
- err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DIR,
- MTK_INPUT);
break;
case PIN_CONFIG_SLEW_RATE:
/* regard all non-zero value as enable */
@@ -245,7 +217,7 @@ static int mtk_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DO,
arg);
if (err)
- goto err;
+ break;
err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DIR,
MTK_OUTPUT);
@@ -257,15 +229,14 @@ static int mtk_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
*/
err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DIR, !arg);
if (err)
- goto err;
+ break;
err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_SMT, !!arg);
break;
case PIN_CONFIG_DRIVE_STRENGTH:
- if (hw->soc->drive_set)
- err = hw->soc->drive_set(hw, desc, arg);
- else
- err = -ENOTSUPP;
+ if (!hw->soc->drive_set)
+ break;
+ err = hw->soc->drive_set(hw, desc, arg);
break;
case MTK_PIN_CONFIG_TDSEL:
case MTK_PIN_CONFIG_RDSEL:
@@ -275,26 +246,19 @@ static int mtk_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
break;
case MTK_PIN_CONFIG_PU_ADV:
case MTK_PIN_CONFIG_PD_ADV:
- if (hw->soc->adv_pull_set) {
- bool pullup;
-
- pullup = param == MTK_PIN_CONFIG_PU_ADV;
- err = hw->soc->adv_pull_set(hw, desc, pullup,
- arg);
- } else
- err = -ENOTSUPP;
+ if (!hw->soc->adv_pull_set)
+ break;
+ err = hw->soc->adv_pull_set(hw, desc,
+ (param == MTK_PIN_CONFIG_PU_ADV),
+ arg);
break;
case MTK_PIN_CONFIG_DRV_ADV:
- if (hw->soc->adv_drive_set)
- err = hw->soc->adv_drive_set(hw, desc, arg);
- else
- err = -ENOTSUPP;
+ if (!hw->soc->adv_drive_set)
+ break;
+ err = hw->soc->adv_drive_set(hw, desc, arg);
break;
- default:
- err = -ENOTSUPP;
}
-err:
return err;
}
diff --git a/drivers/pinctrl/meson/pinctrl-meson-a1.c b/drivers/pinctrl/meson/pinctrl-meson-a1.c
index 79f5d753d7e1..50a87d9618a8 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-a1.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-a1.c
@@ -250,7 +250,7 @@ static const unsigned int pdm_dclk_x_pins[] = { GPIOX_10 };
static const unsigned int pdm_din2_a_pins[] = { GPIOA_6 };
static const unsigned int pdm_din1_a_pins[] = { GPIOA_7 };
static const unsigned int pdm_din0_a_pins[] = { GPIOA_8 };
-static const unsigned int pdm_dclk_pins[] = { GPIOA_9 };
+static const unsigned int pdm_dclk_a_pins[] = { GPIOA_9 };
/* gen_clk */
static const unsigned int gen_clk_x_pins[] = { GPIOX_7 };
@@ -591,7 +591,7 @@ static struct meson_pmx_group meson_a1_periphs_groups[] = {
GROUP(pdm_din2_a, 3),
GROUP(pdm_din1_a, 3),
GROUP(pdm_din0_a, 3),
- GROUP(pdm_dclk, 3),
+ GROUP(pdm_dclk_a, 3),
GROUP(pwm_c_a, 3),
GROUP(pwm_b_a, 3),
@@ -755,7 +755,7 @@ static const char * const spi_a_groups[] = {
static const char * const pdm_groups[] = {
"pdm_din0_x", "pdm_din1_x", "pdm_din2_x", "pdm_dclk_x", "pdm_din2_a",
- "pdm_din1_a", "pdm_din0_a", "pdm_dclk",
+ "pdm_din1_a", "pdm_din0_a", "pdm_dclk_a",
};
static const char * const gen_clk_groups[] = {
diff --git a/drivers/power/supply/mt6360_charger.c b/drivers/power/supply/mt6360_charger.c
index f1248faf5905..383bf19819df 100644
--- a/drivers/power/supply/mt6360_charger.c
+++ b/drivers/power/supply/mt6360_charger.c
@@ -591,7 +591,7 @@ static const struct regulator_ops mt6360_chg_otg_ops = {
};
static const struct regulator_desc mt6360_otg_rdesc = {
- .of_match = "usb-otg-vbus",
+ .of_match = "usb-otg-vbus-regulator",
.name = "usb-otg-vbus",
.ops = &mt6360_chg_otg_ops,
.owner = THIS_MODULE,
diff --git a/drivers/power/supply/rt9455_charger.c b/drivers/power/supply/rt9455_charger.c
index 594bb3b8a4d1..a84afccd509f 100644
--- a/drivers/power/supply/rt9455_charger.c
+++ b/drivers/power/supply/rt9455_charger.c
@@ -193,6 +193,7 @@ static const int rt9455_voreg_values[] = {
4450000, 4450000, 4450000, 4450000, 4450000, 4450000, 4450000, 4450000
};
+#if IS_ENABLED(CONFIG_USB_PHY)
/*
* When the charger is in boost mode, REG02[7:2] represent boost output
* voltage.
@@ -208,6 +209,7 @@ static const int rt9455_boost_voltage_values[] = {
5600000, 5600000, 5600000, 5600000, 5600000, 5600000, 5600000, 5600000,
5600000, 5600000, 5600000, 5600000, 5600000, 5600000, 5600000, 5600000,
};
+#endif
/* REG07[3:0] (VMREG) in uV */
static const int rt9455_vmreg_values[] = {
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9b1f27f87c95..d6febb9ec60d 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1872,19 +1872,24 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,
}
}
- if (err != -EEXIST)
+ if (err != -EEXIST) {
regulator->debugfs = debugfs_create_dir(supply_name, rdev->debugfs);
- if (IS_ERR(regulator->debugfs))
- rdev_dbg(rdev, "Failed to create debugfs directory\n");
+ if (IS_ERR(regulator->debugfs)) {
+ rdev_dbg(rdev, "Failed to create debugfs directory\n");
+ regulator->debugfs = NULL;
+ }
+ }
- debugfs_create_u32("uA_load", 0444, regulator->debugfs,
- ®ulator->uA_load);
- debugfs_create_u32("min_uV", 0444, regulator->debugfs,
- ®ulator->voltage[PM_SUSPEND_ON].min_uV);
- debugfs_create_u32("max_uV", 0444, regulator->debugfs,
- ®ulator->voltage[PM_SUSPEND_ON].max_uV);
- debugfs_create_file("constraint_flags", 0444, regulator->debugfs,
- regulator, &constraint_flags_fops);
+ if (regulator->debugfs) {
+ debugfs_create_u32("uA_load", 0444, regulator->debugfs,
+ ®ulator->uA_load);
+ debugfs_create_u32("min_uV", 0444, regulator->debugfs,
+ ®ulator->voltage[PM_SUSPEND_ON].min_uV);
+ debugfs_create_u32("max_uV", 0444, regulator->debugfs,
+ ®ulator->voltage[PM_SUSPEND_ON].max_uV);
+ debugfs_create_file("constraint_flags", 0444, regulator->debugfs,
+ regulator, &constraint_flags_fops);
+ }
/*
* Check now if the regulator is an always on regulator - if
diff --git a/drivers/regulator/mt6360-regulator.c b/drivers/regulator/mt6360-regulator.c
index 4d34be94d166..fc464a4450dc 100644
--- a/drivers/regulator/mt6360-regulator.c
+++ b/drivers/regulator/mt6360-regulator.c
@@ -319,15 +319,15 @@ static unsigned int mt6360_regulator_of_map_mode(unsigned int hw_mode)
}
}
-#define MT6360_REGULATOR_DESC(_name, _sname, ereg, emask, vreg, vmask, \
- mreg, mmask, streg, stmask, vranges, \
- vcnts, offon_delay, irq_tbls) \
+#define MT6360_REGULATOR_DESC(match, _name, _sname, ereg, emask, vreg, \
+ vmask, mreg, mmask, streg, stmask, \
+ vranges, vcnts, offon_delay, irq_tbls) \
{ \
.desc = { \
.name = #_name, \
.supply_name = #_sname, \
.id = MT6360_REGULATOR_##_name, \
- .of_match = of_match_ptr(#_name), \
+ .of_match = of_match_ptr(match), \
.regulators_node = of_match_ptr("regulator"), \
.of_map_mode = mt6360_regulator_of_map_mode, \
.owner = THIS_MODULE, \
@@ -351,21 +351,29 @@ static unsigned int mt6360_regulator_of_map_mode(unsigned int hw_mode)
}
static const struct mt6360_regulator_desc mt6360_regulator_descs[] = {
- MT6360_REGULATOR_DESC(BUCK1, BUCK1_VIN, 0x117, 0x40, 0x110, 0xff, 0x117, 0x30, 0x117, 0x04,
+ MT6360_REGULATOR_DESC("buck1", BUCK1, BUCK1_VIN,
+ 0x117, 0x40, 0x110, 0xff, 0x117, 0x30, 0x117, 0x04,
buck_vout_ranges, 256, 0, buck1_irq_tbls),
- MT6360_REGULATOR_DESC(BUCK2, BUCK2_VIN, 0x127, 0x40, 0x120, 0xff, 0x127, 0x30, 0x127, 0x04,
+ MT6360_REGULATOR_DESC("buck2", BUCK2, BUCK2_VIN,
+ 0x127, 0x40, 0x120, 0xff, 0x127, 0x30, 0x127, 0x04,
buck_vout_ranges, 256, 0, buck2_irq_tbls),
- MT6360_REGULATOR_DESC(LDO6, LDO_VIN3, 0x137, 0x40, 0x13B, 0xff, 0x137, 0x30, 0x137, 0x04,
+ MT6360_REGULATOR_DESC("ldo6", LDO6, LDO_VIN3,
+ 0x137, 0x40, 0x13B, 0xff, 0x137, 0x30, 0x137, 0x04,
ldo_vout_ranges1, 256, 0, ldo6_irq_tbls),
- MT6360_REGULATOR_DESC(LDO7, LDO_VIN3, 0x131, 0x40, 0x135, 0xff, 0x131, 0x30, 0x131, 0x04,
+ MT6360_REGULATOR_DESC("ldo7", LDO7, LDO_VIN3,
+ 0x131, 0x40, 0x135, 0xff, 0x131, 0x30, 0x131, 0x04,
ldo_vout_ranges1, 256, 0, ldo7_irq_tbls),
- MT6360_REGULATOR_DESC(LDO1, LDO_VIN1, 0x217, 0x40, 0x21B, 0xff, 0x217, 0x30, 0x217, 0x04,
+ MT6360_REGULATOR_DESC("ldo1", LDO1, LDO_VIN1,
+ 0x217, 0x40, 0x21B, 0xff, 0x217, 0x30, 0x217, 0x04,
ldo_vout_ranges2, 256, 0, ldo1_irq_tbls),
- MT6360_REGULATOR_DESC(LDO2, LDO_VIN1, 0x211, 0x40, 0x215, 0xff, 0x211, 0x30, 0x211, 0x04,
+ MT6360_REGULATOR_DESC("ldo2", LDO2, LDO_VIN1,
+ 0x211, 0x40, 0x215, 0xff, 0x211, 0x30, 0x211, 0x04,
ldo_vout_ranges2, 256, 0, ldo2_irq_tbls),
- MT6360_REGULATOR_DESC(LDO3, LDO_VIN1, 0x205, 0x40, 0x209, 0xff, 0x205, 0x30, 0x205, 0x04,
+ MT6360_REGULATOR_DESC("ldo3", LDO3, LDO_VIN1,
+ 0x205, 0x40, 0x209, 0xff, 0x205, 0x30, 0x205, 0x04,
ldo_vout_ranges2, 256, 100, ldo3_irq_tbls),
- MT6360_REGULATOR_DESC(LDO5, LDO_VIN2, 0x20B, 0x40, 0x20F, 0x7f, 0x20B, 0x30, 0x20B, 0x04,
+ MT6360_REGULATOR_DESC("ldo5", LDO5, LDO_VIN2,
+ 0x20B, 0x40, 0x20F, 0x7f, 0x20B, 0x30, 0x20B, 0x04,
ldo_vout_ranges3, 128, 100, ldo5_irq_tbls),
};
diff --git a/drivers/s390/cio/cio_inject.c b/drivers/s390/cio/cio_inject.c
index 8613fa937237..a2e771ebae8e 100644
--- a/drivers/s390/cio/cio_inject.c
+++ b/drivers/s390/cio/cio_inject.c
@@ -95,7 +95,7 @@ static ssize_t crw_inject_write(struct file *file, const char __user *buf,
return -EINVAL;
}
- buffer = vmemdup_user(buf, lbuf);
+ buffer = memdup_user_nul(buf, lbuf);
if (IS_ERR(buffer))
return -ENOMEM;
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index e8c360879883..71464e9ad4f8 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -545,7 +545,6 @@ static inline bool qeth_out_queue_is_empty(struct qeth_qdio_out_q *queue)
struct qeth_qdio_info {
atomic_t state;
/* input */
- int no_in_queues;
struct qeth_qdio_q *in_q;
struct qeth_qdio_q *c_q;
struct qeth_qdio_buffer_pool in_buf_pool;
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index c1346c4e2242..5c69cba6459f 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -354,8 +354,8 @@ static int qeth_cq_init(struct qeth_card *card)
qdio_reset_buffers(card->qdio.c_q->qdio_bufs,
QDIO_MAX_BUFFERS_PER_Q);
card->qdio.c_q->next_buf_to_init = 127;
- rc = do_QDIO(CARD_DDEV(card), QDIO_FLAG_SYNC_INPUT,
- card->qdio.no_in_queues - 1, 0, 127, NULL);
+ rc = do_QDIO(CARD_DDEV(card), QDIO_FLAG_SYNC_INPUT, 1, 0, 127,
+ NULL);
if (rc) {
QETH_CARD_TEXT_(card, 2, "1err%d", rc);
goto out;
@@ -366,35 +366,33 @@ static int qeth_cq_init(struct qeth_card *card)
return rc;
}
+static void qeth_free_cq(struct qeth_card *card)
+{
+ if (card->qdio.c_q) {
+ qeth_free_qdio_queue(card->qdio.c_q);
+ card->qdio.c_q = NULL;
+ }
+}
+
static int qeth_alloc_cq(struct qeth_card *card)
{
if (card->options.cq == QETH_CQ_ENABLED) {
QETH_CARD_TEXT(card, 2, "cqon");
- card->qdio.c_q = qeth_alloc_qdio_queue();
if (!card->qdio.c_q) {
- dev_err(&card->gdev->dev, "Failed to create completion queue\n");
- return -ENOMEM;
+ card->qdio.c_q = qeth_alloc_qdio_queue();
+ if (!card->qdio.c_q) {
+ dev_err(&card->gdev->dev,
+ "Failed to create completion queue\n");
+ return -ENOMEM;
+ }
}
-
- card->qdio.no_in_queues = 2;
} else {
QETH_CARD_TEXT(card, 2, "nocq");
- card->qdio.c_q = NULL;
- card->qdio.no_in_queues = 1;
+ qeth_free_cq(card);
}
- QETH_CARD_TEXT_(card, 2, "iqc%d", card->qdio.no_in_queues);
return 0;
}
-static void qeth_free_cq(struct qeth_card *card)
-{
- if (card->qdio.c_q) {
- --card->qdio.no_in_queues;
- qeth_free_qdio_queue(card->qdio.c_q);
- card->qdio.c_q = NULL;
- }
-}
-
static enum iucv_tx_notify qeth_compute_cq_notification(int sbalf15,
int delayed)
{
@@ -1492,7 +1490,6 @@ static void qeth_init_qdio_info(struct qeth_card *card)
card->qdio.default_out_queue = QETH_DEFAULT_QUEUE;
/* inbound */
- card->qdio.no_in_queues = 1;
card->qdio.in_buf_size = QETH_IN_BUF_SIZE_DEFAULT;
if (IS_IQD(card))
card->qdio.init_pool.buf_count = QETH_IN_BUF_COUNT_HSDEFAULT;
@@ -2592,6 +2589,10 @@ static int qeth_alloc_qdio_queues(struct qeth_card *card)
QETH_CARD_TEXT(card, 2, "allcqdbf");
+ /* completion */
+ if (qeth_alloc_cq(card))
+ goto out_err;
+
if (atomic_cmpxchg(&card->qdio.state, QETH_QDIO_UNINITIALIZED,
QETH_QDIO_ALLOCATED) != QETH_QDIO_UNINITIALIZED)
return 0;
@@ -2632,10 +2633,6 @@ static int qeth_alloc_qdio_queues(struct qeth_card *card)
queue->priority = QETH_QIB_PQUE_PRIO_DEFAULT;
}
- /* completion */
- if (qeth_alloc_cq(card))
- goto out_freeoutq;
-
return 0;
out_freeoutq:
@@ -2649,6 +2646,8 @@ static int qeth_alloc_qdio_queues(struct qeth_card *card)
card->qdio.in_q = NULL;
out_nomem:
atomic_set(&card->qdio.state, QETH_QDIO_UNINITIALIZED);
+ qeth_free_cq(card);
+out_err:
return -ENOMEM;
}
@@ -2656,11 +2655,12 @@ static void qeth_free_qdio_queues(struct qeth_card *card)
{
int i, j;
+ qeth_free_cq(card);
+
if (atomic_xchg(&card->qdio.state, QETH_QDIO_UNINITIALIZED) ==
QETH_QDIO_UNINITIALIZED)
return;
- qeth_free_cq(card);
for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j) {
if (card->qdio.in_q->bufs[j].rx_skb)
dev_kfree_skb_any(card->qdio.in_q->bufs[j].rx_skb);
@@ -3713,24 +3713,11 @@ static void qeth_qdio_poll(struct ccw_device *cdev, unsigned long card_ptr)
int qeth_configure_cq(struct qeth_card *card, enum qeth_cq cq)
{
- int rc;
-
- if (card->options.cq == QETH_CQ_NOTAVAILABLE) {
- rc = -1;
- goto out;
- } else {
- if (card->options.cq == cq) {
- rc = 0;
- goto out;
- }
-
- qeth_free_qdio_queues(card);
- card->options.cq = cq;
- rc = 0;
- }
-out:
- return rc;
+ if (card->options.cq == QETH_CQ_NOTAVAILABLE)
+ return -1;
+ card->options.cq = cq;
+ return 0;
}
EXPORT_SYMBOL_GPL(qeth_configure_cq);
@@ -5173,6 +5160,7 @@ static int qeth_qdio_establish(struct qeth_card *card)
struct qdio_buffer **in_sbal_ptrs[QETH_MAX_IN_QUEUES];
struct qeth_qib_parms *qib_parms = NULL;
struct qdio_initialize init_data;
+ unsigned int no_input_qs = 1;
unsigned int i;
int rc = 0;
@@ -5187,8 +5175,10 @@ static int qeth_qdio_establish(struct qeth_card *card)
}
in_sbal_ptrs[0] = card->qdio.in_q->qdio_bufs;
- if (card->options.cq == QETH_CQ_ENABLED)
+ if (card->options.cq == QETH_CQ_ENABLED) {
in_sbal_ptrs[1] = card->qdio.c_q->qdio_bufs;
+ no_input_qs++;
+ }
for (i = 0; i < card->qdio.no_out_queues; i++)
out_sbal_ptrs[i] = card->qdio.out_qs[i]->qdio_bufs;
@@ -5198,7 +5188,7 @@ static int qeth_qdio_establish(struct qeth_card *card)
QDIO_QETH_QFMT;
init_data.qib_param_field_format = 0;
init_data.qib_param_field = (void *)qib_parms;
- init_data.no_input_qs = card->qdio.no_in_queues;
+ init_data.no_input_qs = no_input_qs;
init_data.no_output_qs = card->qdio.no_out_queues;
init_data.input_handler = qeth_qdio_input_handler;
init_data.output_handler = qeth_qdio_output_handler;
diff --git a/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
index 9200b718085c..5015d9b0817a 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -833,7 +833,6 @@ static void bnx2fc_free_session_resc(struct bnx2fc_hba *hba,
BNX2FC_TGT_DBG(tgt, "Freeing up session resources\n");
- spin_lock_bh(&tgt->cq_lock);
ctx_base_ptr = tgt->ctx_base;
tgt->ctx_base = NULL;
@@ -889,7 +888,6 @@ static void bnx2fc_free_session_resc(struct bnx2fc_hba *hba,
tgt->sq, tgt->sq_dma);
tgt->sq = NULL;
}
- spin_unlock_bh(&tgt->cq_lock);
if (ctx_base_ptr)
iounmap(ctx_base_ptr);
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 65ac952b767f..194825ff1ee8 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -1341,7 +1341,6 @@ struct lpfc_hba {
unsigned long bit_flags;
#define FABRIC_COMANDS_BLOCKED 0
atomic_t num_rsrc_err;
- atomic_t num_cmd_success;
unsigned long last_rsrc_error_time;
unsigned long last_ramp_down_time;
#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index 4e0c0b273e5f..2ff8ace6f78f 100644
--- a/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@ -2539,9 +2539,9 @@ lpfc_nvme_unregister_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
/* No concern about the role change on the nvme remoteport.
* The transport will update it.
*/
- spin_lock_irq(&vport->phba->hbalock);
+ spin_lock_irq(&ndlp->lock);
ndlp->fc4_xpt_flags |= NVME_XPT_UNREG_WAIT;
- spin_unlock_irq(&vport->phba->hbalock);
+ spin_unlock_irq(&ndlp->lock);
/* Don't let the host nvme transport keep sending keep-alives
* on this remoteport. Vport is unloading, no recovery. The
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 6d1a3cbd6b3c..d9fb5e09fb53 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -231,11 +231,10 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
struct Scsi_Host *shost;
struct scsi_device *sdev;
unsigned long new_queue_depth;
- unsigned long num_rsrc_err, num_cmd_success;
+ unsigned long num_rsrc_err;
int i;
num_rsrc_err = atomic_read(&phba->num_rsrc_err);
- num_cmd_success = atomic_read(&phba->num_cmd_success);
/*
* The error and success command counters are global per
@@ -250,20 +249,16 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++) {
shost = lpfc_shost_from_vport(vports[i]);
shost_for_each_device(sdev, shost) {
- new_queue_depth =
- sdev->queue_depth * num_rsrc_err /
- (num_rsrc_err + num_cmd_success);
- if (!new_queue_depth)
- new_queue_depth = sdev->queue_depth - 1;
+ if (num_rsrc_err >= sdev->queue_depth)
+ new_queue_depth = 1;
else
new_queue_depth = sdev->queue_depth -
- new_queue_depth;
+ num_rsrc_err;
scsi_change_queue_depth(sdev, new_queue_depth);
}
}
lpfc_destroy_vport_work_array(phba, vports);
atomic_set(&phba->num_rsrc_err, 0);
- atomic_set(&phba->num_cmd_success, 0);
}
/**
diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c
index da9a1f72d938..b1071226e27f 100644
--- a/drivers/scsi/lpfc/lpfc_vport.c
+++ b/drivers/scsi/lpfc/lpfc_vport.c
@@ -651,10 +651,6 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
lpfc_free_sysfs_attr(vport);
lpfc_debugfs_terminate(vport);
- /* Remove FC host to break driver binding. */
- fc_remove_host(shost);
- scsi_remove_host(shost);
-
/* Send the DA_ID and Fabric LOGO to cleanup Nameserver entries. */
ndlp = lpfc_findnode_did(vport, Fabric_DID);
if (!ndlp)
@@ -700,6 +696,10 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
skip_logo:
+ /* Remove FC host to break driver binding. */
+ fc_remove_host(shost);
+ scsi_remove_host(shost);
+
lpfc_cleanup(vport);
/* Remove scsi host now. The nodes are cleaned up. */
diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
index 21519ce05bdb..286997adb6ea 100644
--- a/drivers/slimbus/qcom-ngd-ctrl.c
+++ b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -1376,7 +1376,11 @@ static void qcom_slim_ngd_up_worker(struct work_struct *work)
ctrl = container_of(work, struct qcom_slim_ngd_ctrl, ngd_up_work);
/* Make sure qmi service is up before continuing */
- wait_for_completion_interruptible(&ctrl->qmi_up);
+ if (!wait_for_completion_interruptible_timeout(&ctrl->qmi_up,
+ msecs_to_jiffies(MSEC_PER_SEC))) {
+ dev_err(ctrl->dev, "QMI wait timeout\n");
+ return;
+ }
mutex_lock(&ctrl->ssr_lock);
qcom_slim_ngd_enable(ctrl, true);
diff --git a/drivers/spi/spi-hisi-kunpeng.c b/drivers/spi/spi-hisi-kunpeng.c
index 525cc0143a30..54730e93fba4 100644
--- a/drivers/spi/spi-hisi-kunpeng.c
+++ b/drivers/spi/spi-hisi-kunpeng.c
@@ -151,8 +151,6 @@ static const struct debugfs_reg32 hisi_spi_regs[] = {
HISI_SPI_DBGFS_REG("ENR", HISI_SPI_ENR),
HISI_SPI_DBGFS_REG("FIFOC", HISI_SPI_FIFOC),
HISI_SPI_DBGFS_REG("IMR", HISI_SPI_IMR),
- HISI_SPI_DBGFS_REG("DIN", HISI_SPI_DIN),
- HISI_SPI_DBGFS_REG("DOUT", HISI_SPI_DOUT),
HISI_SPI_DBGFS_REG("SR", HISI_SPI_SR),
HISI_SPI_DBGFS_REG("RISR", HISI_SPI_RISR),
HISI_SPI_DBGFS_REG("ISR", HISI_SPI_ISR),
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 023bd4516a68..30ce3451bc6b 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -3566,6 +3566,8 @@ static int __init target_core_init_configfs(void)
{
struct configfs_subsystem *subsys = &target_core_fabrics;
struct t10_alua_lu_gp *lu_gp;
+ struct cred *kern_cred;
+ const struct cred *old_cred;
int ret;
pr_debug("TARGET_CORE[0]: Loading Generic Kernel Storage"
@@ -3642,11 +3644,21 @@ static int __init target_core_init_configfs(void)
if (ret < 0)
goto out;
+ /* We use the kernel credentials to access the target directory */
+ kern_cred = prepare_kernel_cred(&init_task);
+ if (!kern_cred) {
+ ret = -ENOMEM;
+ goto out;
+ }
+ old_cred = override_creds(kern_cred);
target_init_dbroot();
+ revert_creds(old_cred);
+ put_cred(kern_cred);
return 0;
out:
+ target_xcopy_release_pt();
configfs_unregister_subsystem(subsys);
core_dev_release_virtual_lun0();
rd_module_exit();
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index a603e8a54196..7bb3f81ac3b3 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -5049,9 +5049,10 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1,
}
if (usb_endpoint_maxp(&udev->ep0.desc) == i) {
; /* Initial ep0 maxpacket guess is right */
- } else if ((udev->speed == USB_SPEED_FULL ||
+ } else if (((udev->speed == USB_SPEED_FULL ||
udev->speed == USB_SPEED_HIGH) &&
- (i == 8 || i == 16 || i == 32 || i == 64)) {
+ (i == 8 || i == 16 || i == 32 || i == 64)) ||
+ (udev->speed >= USB_SPEED_SUPER && i > 0)) {
/* Initial guess is wrong; use the descriptor's value */
if (udev->speed == USB_SPEED_FULL)
dev_dbg(&udev->dev, "ep0 maxpacket = %d\n", i);
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 0f0269d28c37..a469d0524789 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -102,6 +102,27 @@ static int dwc3_get_dr_mode(struct dwc3 *dwc)
return 0;
}
+void dwc3_enable_susphy(struct dwc3 *dwc, bool enable)
+{
+ u32 reg;
+
+ reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));
+ if (enable && !dwc->dis_u3_susphy_quirk)
+ reg |= DWC3_GUSB3PIPECTL_SUSPHY;
+ else
+ reg &= ~DWC3_GUSB3PIPECTL_SUSPHY;
+
+ dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg);
+
+ reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
+ if (enable && !dwc->dis_u2_susphy_quirk)
+ reg |= DWC3_GUSB2PHYCFG_SUSPHY;
+ else
+ reg &= ~DWC3_GUSB2PHYCFG_SUSPHY;
+
+ dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
+}
+
void dwc3_set_prtcap(struct dwc3 *dwc, u32 mode)
{
u32 reg;
@@ -593,11 +614,8 @@ static int dwc3_core_ulpi_init(struct dwc3 *dwc)
*/
static int dwc3_phy_setup(struct dwc3 *dwc)
{
- unsigned int hw_mode;
u32 reg;
- hw_mode = DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0);
-
reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));
/*
@@ -607,21 +625,16 @@ static int dwc3_phy_setup(struct dwc3 *dwc)
reg &= ~DWC3_GUSB3PIPECTL_UX_EXIT_PX;
/*
- * Above 1.94a, it is recommended to set DWC3_GUSB3PIPECTL_SUSPHY
- * to '0' during coreConsultant configuration. So default value
- * will be '0' when the core is reset. Application needs to set it
- * to '1' after the core initialization is completed.
+ * Above DWC_usb3.0 1.94a, it is recommended to set
+ * DWC3_GUSB3PIPECTL_SUSPHY to '0' during coreConsultant configuration.
+ * So default value will be '0' when the core is reset. Application
+ * needs to set it to '1' after the core initialization is completed.
+ *
+ * Similarly for DRD controllers, GUSB3PIPECTL.SUSPENDENABLE must be
+ * cleared after power-on reset, and it can be set after core
+ * initialization.
*/
- if (!DWC3_VER_IS_WITHIN(DWC3, ANY, 194A))
- reg |= DWC3_GUSB3PIPECTL_SUSPHY;
-
- /*
- * For DRD controllers, GUSB3PIPECTL.SUSPENDENABLE must be cleared after
- * power-on reset, and it can be set after core initialization, which is
- * after device soft-reset during initialization.
- */
- if (hw_mode == DWC3_GHWPARAMS0_MODE_DRD)
- reg &= ~DWC3_GUSB3PIPECTL_SUSPHY;
+ reg &= ~DWC3_GUSB3PIPECTL_SUSPHY;
if (dwc->u2ss_inp3_quirk)
reg |= DWC3_GUSB3PIPECTL_U2SSINP3OK;
@@ -647,9 +660,6 @@ static int dwc3_phy_setup(struct dwc3 *dwc)
if (dwc->tx_de_emphasis_quirk)
reg |= DWC3_GUSB3PIPECTL_TX_DEEPH(dwc->tx_de_emphasis);
- if (dwc->dis_u3_susphy_quirk)
- reg &= ~DWC3_GUSB3PIPECTL_SUSPHY;
-
if (dwc->dis_del_phy_power_chg_quirk)
reg &= ~DWC3_GUSB3PIPECTL_DEPOCHANGE;
@@ -697,24 +707,15 @@ static int dwc3_phy_setup(struct dwc3 *dwc)
}
/*
- * Above 1.94a, it is recommended to set DWC3_GUSB2PHYCFG_SUSPHY to
- * '0' during coreConsultant configuration. So default value will
- * be '0' when the core is reset. Application needs to set it to
- * '1' after the core initialization is completed.
+ * Above DWC_usb3.0 1.94a, it is recommended to set
+ * DWC3_GUSB2PHYCFG_SUSPHY to '0' during coreConsultant configuration.
+ * So default value will be '0' when the core is reset. Application
+ * needs to set it to '1' after the core initialization is completed.
+ *
+ * Similarly for DRD controllers, GUSB2PHYCFG.SUSPHY must be cleared
+ * after power-on reset, and it can be set after core initialization.
*/
- if (!DWC3_VER_IS_WITHIN(DWC3, ANY, 194A))
- reg |= DWC3_GUSB2PHYCFG_SUSPHY;
-
- /*
- * For DRD controllers, GUSB2PHYCFG.SUSPHY must be cleared after
- * power-on reset, and it can be set after core initialization, which is
- * after device soft-reset during initialization.
- */
- if (hw_mode == DWC3_GHWPARAMS0_MODE_DRD)
- reg &= ~DWC3_GUSB2PHYCFG_SUSPHY;
-
- if (dwc->dis_u2_susphy_quirk)
- reg &= ~DWC3_GUSB2PHYCFG_SUSPHY;
+ reg &= ~DWC3_GUSB2PHYCFG_SUSPHY;
if (dwc->dis_enblslpm_quirk)
reg &= ~DWC3_GUSB2PHYCFG_ENBLSLPM;
@@ -996,21 +997,6 @@ static int dwc3_core_init(struct dwc3 *dwc)
if (ret)
goto err1;
- if (hw_mode == DWC3_GHWPARAMS0_MODE_DRD &&
- !DWC3_VER_IS_WITHIN(DWC3, ANY, 194A)) {
- if (!dwc->dis_u3_susphy_quirk) {
- reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));
- reg |= DWC3_GUSB3PIPECTL_SUSPHY;
- dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg);
- }
-
- if (!dwc->dis_u2_susphy_quirk) {
- reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
- reg |= DWC3_GUSB2PHYCFG_SUSPHY;
- dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
- }
- }
-
dwc3_core_setup_global_control(dwc);
dwc3_core_num_eps(dwc);
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index d64f7edc70c1..8c8e17cc1344 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -1517,6 +1517,7 @@ int dwc3_event_buffers_setup(struct dwc3 *dwc);
void dwc3_event_buffers_cleanup(struct dwc3 *dwc);
int dwc3_core_soft_reset(struct dwc3 *dwc);
+void dwc3_enable_susphy(struct dwc3 *dwc, bool enable);
#if IS_ENABLED(CONFIG_USB_DWC3_HOST) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)
int dwc3_host_init(struct dwc3 *dwc);
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 86cf3b2b66e9..af35278a5e8f 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2775,6 +2775,7 @@ static int __dwc3_gadget_start(struct dwc3 *dwc)
dwc3_ep0_out_start(dwc);
dwc3_gadget_enable_irq(dwc);
+ dwc3_enable_susphy(dwc, true);
return 0;
@@ -4512,6 +4513,7 @@ void dwc3_gadget_exit(struct dwc3 *dwc)
if (!dwc->gadget)
return;
+ dwc3_enable_susphy(dwc, false);
usb_del_gadget(dwc->gadget);
dwc3_gadget_free_endpoints(dwc);
usb_put_gadget(dwc->gadget);
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index 012b54cb847f..9adcf3a7e978 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -9,9 +9,30 @@
#include <linux/acpi.h>
#include <linux/platform_device.h>
+#include <linux/usb.h>
+#include <linux/usb/hcd.h>
+#include "../host/xhci-plat.h"
#include "core.h"
+static void dwc3_xhci_plat_start(struct usb_hcd *hcd)
+{
+ struct platform_device *pdev;
+ struct dwc3 *dwc;
+
+ if (!usb_hcd_is_primary_hcd(hcd))
+ return;
+
+ pdev = to_platform_device(hcd->self.controller);
+ dwc = dev_get_drvdata(pdev->dev.parent);
+
+ dwc3_enable_susphy(dwc, true);
+}
+
+static const struct xhci_plat_priv dwc3_xhci_plat_quirk = {
+ .plat_start = dwc3_xhci_plat_start,
+};
+
static int dwc3_host_get_irq(struct dwc3 *dwc)
{
struct platform_device *dwc3_pdev = to_platform_device(dwc->dev);
@@ -117,6 +138,11 @@ int dwc3_host_init(struct dwc3 *dwc)
}
}
+ ret = platform_device_add_data(xhci, &dwc3_xhci_plat_quirk,
+ sizeof(struct xhci_plat_priv));
+ if (ret)
+ goto err;
+
ret = platform_device_add(xhci);
if (ret) {
dev_err(dwc->dev, "failed to register xHCI device\n");
@@ -131,6 +157,7 @@ int dwc3_host_init(struct dwc3 *dwc)
void dwc3_host_exit(struct dwc3 *dwc)
{
+ dwc3_enable_susphy(dwc, false);
platform_device_unregister(dwc->xhci);
dwc->xhci = NULL;
}
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index edce0a1bdddf..3f035e905b24 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1978,7 +1978,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
buf[5] = 0x01;
switch (ctrl->bRequestType & USB_RECIP_MASK) {
case USB_RECIP_DEVICE:
- if (w_index != 0x4 || (w_value >> 8))
+ if (w_index != 0x4 || (w_value & 0xff))
break;
buf[6] = w_index;
/* Number of ext compat interfaces */
@@ -1994,9 +1994,9 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
}
break;
case USB_RECIP_INTERFACE:
- if (w_index != 0x5 || (w_value >> 8))
+ if (w_index != 0x5 || (w_value & 0xff))
break;
- interface = w_value & 0xFF;
+ interface = w_value >> 8;
if (interface >= MAX_CONFIG_INTERFACES ||
!os_desc_cfg->interface[interface])
break;
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 73ad9c3acc33..a4367a43cdd8 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -3414,7 +3414,7 @@ static int ffs_func_setup(struct usb_function *f,
__ffs_event_add(ffs, FUNCTIONFS_SETUP);
spin_unlock_irqrestore(&ffs->ev.waitq.lock, flags);
- return creq->wLength == 0 ? USB_GADGET_DELAYED_STATUS : 0;
+ return ffs->ev.setup.wLength == 0 ? USB_GADGET_DELAYED_STATUS : 0;
}
static bool ffs_func_req_match(struct usb_function *f,
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 1f5e69314a17..90185d1df20c 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -890,6 +890,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
/* Check for an all 1's result which is a typical consequence
* of dead, unclocked, or unplugged (CardBus...) devices
*/
+again:
if (ints == ~(u32)0) {
ohci->rh_state = OHCI_RH_HALTED;
ohci_dbg (ohci, "device removed!\n");
@@ -984,6 +985,13 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
}
spin_unlock(&ohci->lock);
+ /* repeat until all enabled interrupts are handled */
+ if (ohci->rh_state != OHCI_RH_HALTED) {
+ ints = ohci_readl(ohci, ®s->intrstatus);
+ if (ints && (ints & ohci_readl(ohci, ®s->intrenable)))
+ goto again;
+ }
+
return IRQ_HANDLED;
}
diff --git a/drivers/usb/host/xhci-plat.h b/drivers/usb/host/xhci-plat.h
index 561d0b7bce09..29f15298e315 100644
--- a/drivers/usb/host/xhci-plat.h
+++ b/drivers/usb/host/xhci-plat.h
@@ -8,7 +8,9 @@
#ifndef _XHCI_PLAT_H
#define _XHCI_PLAT_H
-#include "xhci.h" /* for hcd_to_xhci() */
+struct device;
+struct platform_device;
+struct usb_hcd;
struct xhci_plat_priv {
const char *firmware_name;
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index 985e512c0e65..cb6458ec042c 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -854,7 +854,7 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num)
struct ucsi_connector *con = &ucsi->connector[num - 1];
if (!(ucsi->ntfy & UCSI_ENABLE_NTFY_CONNECTOR_CHANGE)) {
- dev_dbg(ucsi->dev, "Bogus connector change event\n");
+ dev_dbg(ucsi->dev, "Early connector change event\n");
return;
}
@@ -1241,6 +1241,7 @@ static int ucsi_init(struct ucsi *ucsi)
{
struct ucsi_connector *con;
u64 command, ntfy;
+ u32 cci;
int ret;
int i;
@@ -1292,6 +1293,15 @@ static int ucsi_init(struct ucsi *ucsi)
goto err_unregister;
ucsi->ntfy = ntfy;
+
+ mutex_lock(&ucsi->ppm_lock);
+ ret = ucsi->ops->read(ucsi, UCSI_CCI, &cci, sizeof(cci));
+ mutex_unlock(&ucsi->ppm_lock);
+ if (ret)
+ return ret;
+ if (UCSI_CCI_CONNECTOR(cci))
+ ucsi_connector_change(ucsi, UCSI_CCI_CONNECTOR(cci));
+
return 0;
err_unregister:
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 7437b185fa8e..0c84d414660c 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -660,6 +660,7 @@ const struct file_operations v9fs_file_operations = {
.splice_read = generic_file_splice_read,
.splice_write = iter_file_splice_write,
.fsync = v9fs_file_fsync,
+ .setlease = simple_nosetlease,
};
const struct file_operations v9fs_file_operations_dotl = {
@@ -701,4 +702,5 @@ const struct file_operations v9fs_mmap_file_operations_dotl = {
.splice_read = generic_file_splice_read,
.splice_write = iter_file_splice_write,
.fsync = v9fs_file_fsync_dotl,
+ .setlease = simple_nosetlease,
};
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 0d9b7d453a87..ef103ef392ee 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -87,7 +87,7 @@ static int p9mode2perm(struct v9fs_session_info *v9ses,
int res;
int mode = stat->mode;
- res = mode & S_IALLUGO;
+ res = mode & 0777; /* S_IRWXUGO */
if (v9fs_proto_dotu(v9ses)) {
if ((mode & P9_DMSETUID) == P9_DMSETUID)
res |= S_ISUID;
@@ -178,6 +178,9 @@ int v9fs_uflags2omode(int uflags, int extended)
break;
}
+ if (uflags & O_TRUNC)
+ ret |= P9_OTRUNC;
+
if (extended) {
if (uflags & O_EXCL)
ret |= P9_OEXCL;
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index 7449f7fd47d2..51ac2653984a 100644
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -340,6 +340,7 @@ static const struct super_operations v9fs_super_ops = {
.alloc_inode = v9fs_alloc_inode,
.free_inode = v9fs_free_inode,
.statfs = simple_statfs,
+ .drop_inode = v9fs_drop_inode,
.evict_inode = v9fs_evict_inode,
.show_options = v9fs_show_options,
.umount_begin = v9fs_umount_begin,
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index c7d8a18daaf5..07c6ab4ba0d4 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2261,7 +2261,7 @@ void btrfs_clear_delalloc_extent(struct inode *vfs_inode,
*/
if (*bits & EXTENT_CLEAR_META_RESV &&
root != fs_info->tree_root)
- btrfs_delalloc_release_metadata(inode, len, false);
+ btrfs_delalloc_release_metadata(inode, len, true);
/* For sanity tests. */
if (btrfs_is_testing(fs_info))
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index f1ef176a6424..c2842e892e4e 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -7612,8 +7612,8 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
sctx->waiting_dir_moves = RB_ROOT;
sctx->orphan_dirs = RB_ROOT;
- sctx->clone_roots = kvcalloc(sizeof(*sctx->clone_roots),
- arg->clone_sources_count + 1,
+ sctx->clone_roots = kvcalloc(arg->clone_sources_count + 1,
+ sizeof(*sctx->clone_roots),
GFP_KERNEL);
if (!sctx->clone_roots) {
ret = -ENOMEM;
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 99cdd1d6a4bf..a9b794c47159 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1424,6 +1424,7 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans)
radix_tree_tag_clear(&fs_info->fs_roots_radix,
(unsigned long)root->root_key.objectid,
BTRFS_ROOT_TRANS_TAG);
+ btrfs_qgroup_free_meta_all_pertrans(root);
spin_unlock(&fs_info->fs_roots_radix_lock);
btrfs_free_log(trans, root);
@@ -1448,7 +1449,6 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans)
if (ret2)
return ret2;
spin_lock(&fs_info->fs_roots_radix_lock);
- btrfs_qgroup_free_meta_all_pertrans(root);
}
}
spin_unlock(&fs_info->fs_roots_radix_lock);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 36e77956c63f..b5e2daf538d4 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1260,25 +1260,32 @@ static int open_fs_devices(struct btrfs_fs_devices *fs_devices,
struct btrfs_device *device;
struct btrfs_device *latest_dev = NULL;
struct btrfs_device *tmp_device;
+ int ret = 0;
flags |= FMODE_EXCL;
list_for_each_entry_safe(device, tmp_device, &fs_devices->devices,
dev_list) {
- int ret;
+ int ret2;
- ret = btrfs_open_one_device(fs_devices, device, flags, holder);
- if (ret == 0 &&
+ ret2 = btrfs_open_one_device(fs_devices, device, flags, holder);
+ if (ret2 == 0 &&
(!latest_dev || device->generation > latest_dev->generation)) {
latest_dev = device;
- } else if (ret == -ENODATA) {
+ } else if (ret2 == -ENODATA) {
fs_devices->num_devices--;
list_del(&device->dev_list);
btrfs_free_device(device);
}
+ if (ret == 0 && ret2 != 0)
+ ret = ret2;
}
- if (fs_devices->open_devices == 0)
+
+ if (fs_devices->open_devices == 0) {
+ if (ret)
+ return ret;
return -EINVAL;
+ }
fs_devices->opened = 1;
fs_devices->latest_dev = latest_dev;
@@ -3367,6 +3374,7 @@ static int btrfs_relocate_sys_chunks(struct btrfs_fs_info *fs_info)
* alignment and size).
*/
ret = -EUCLEAN;
+ mutex_unlock(&fs_info->reclaim_bgs_lock);
goto error;
}
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 0ec1eaf33833..d2011c3c33fc 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -1704,7 +1704,8 @@ static int punch_hole(struct gfs2_inode *ip, u64 offset, u64 length)
struct buffer_head *dibh, *bh;
struct gfs2_holder rd_gh;
unsigned int bsize_shift = sdp->sd_sb.sb_bsize_shift;
- u64 lblock = (offset + (1 << bsize_shift) - 1) >> bsize_shift;
+ unsigned int bsize = 1 << bsize_shift;
+ u64 lblock = (offset + bsize - 1) >> bsize_shift;
__u16 start_list[GFS2_MAX_META_HEIGHT];
__u16 __end_list[GFS2_MAX_META_HEIGHT], *end_list = NULL;
unsigned int start_aligned, end_aligned;
@@ -1715,7 +1716,7 @@ static int punch_hole(struct gfs2_inode *ip, u64 offset, u64 length)
u64 prev_bnr = 0;
__be64 *start, *end;
- if (offset >= maxsize) {
+ if (offset + bsize - 1 >= maxsize) {
/*
* The starting point lies beyond the allocated meta-data;
* there are no blocks do deallocate.
diff --git a/fs/ksmbd/server.c b/fs/ksmbd/server.c
index 11b201e6ee44..63b01f7d9703 100644
--- a/fs/ksmbd/server.c
+++ b/fs/ksmbd/server.c
@@ -167,20 +167,17 @@ static void __handle_ksmbd_work(struct ksmbd_work *work,
int rc;
bool is_chained = false;
- if (conn->ops->allocate_rsp_buf(work))
- return;
-
if (conn->ops->is_transform_hdr &&
conn->ops->is_transform_hdr(work->request_buf)) {
rc = conn->ops->decrypt_req(work);
- if (rc < 0) {
- conn->ops->set_rsp_status(work, STATUS_DATA_ERROR);
- goto send;
- }
-
+ if (rc < 0)
+ return;
work->encrypted = true;
}
+ if (conn->ops->allocate_rsp_buf(work))
+ return;
+
rc = conn->ops->init_rsp_hdr(work);
if (rc) {
/* either uid or tid is not correct */
diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index 86b1fb43104e..57f59172d821 100644
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -536,6 +536,10 @@ int smb2_allocate_rsp_buf(struct ksmbd_work *work)
if (cmd == SMB2_QUERY_INFO_HE) {
struct smb2_query_info_req *req;
+ if (get_rfc1002_len(work->request_buf) <
+ offsetof(struct smb2_query_info_req, OutputBufferLength))
+ return -EINVAL;
+
req = smb2_get_msg(work->request_buf);
if ((req->InfoType == SMB2_O_INFO_FILE &&
(req->FileInfoClass == FILE_FULL_EA_INFORMATION ||
diff --git a/fs/ksmbd/vfs.c b/fs/ksmbd/vfs.c
index 173a488bfeee..7afb2412c4d4 100644
--- a/fs/ksmbd/vfs.c
+++ b/fs/ksmbd/vfs.c
@@ -745,10 +745,15 @@ int ksmbd_vfs_rename(struct ksmbd_work *work, const struct path *old_path,
goto out4;
}
+ /*
+ * explicitly handle file overwrite case, for compatibility with
+ * filesystems that may not support rename flags (e.g: fuse)
+ */
if ((flags & RENAME_NOREPLACE) && d_is_positive(new_dentry)) {
err = -EEXIST;
goto out4;
}
+ flags &= ~(RENAME_NOREPLACE);
if (old_child == trap) {
err = -EINVAL;
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 090b16890e3d..9e3a3570efc0 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -73,7 +73,6 @@ const struct rpc_program nfs_program = {
.number = NFS_PROGRAM,
.nrvers = ARRAY_SIZE(nfs_version),
.version = nfs_version,
- .stats = &nfs_rpcstat,
.pipe_dir_name = NFS_PIPE_DIRNAME,
};
@@ -500,6 +499,7 @@ int nfs_create_rpc_client(struct nfs_client *clp,
const struct nfs_client_initdata *cl_init,
rpc_authflavor_t flavor)
{
+ struct nfs_net *nn = net_generic(clp->cl_net, nfs_net_id);
struct rpc_clnt *clnt = NULL;
struct rpc_create_args args = {
.net = clp->cl_net,
@@ -511,6 +511,7 @@ int nfs_create_rpc_client(struct nfs_client *clp,
.servername = clp->cl_hostname,
.nodename = cl_init->nodename,
.program = &nfs_program,
+ .stats = &nn->rpcstats,
.version = clp->rpc_ops->version,
.authflavor = flavor,
.cred = cl_init->cred,
@@ -1129,6 +1130,8 @@ void nfs_clients_init(struct net *net)
#endif
spin_lock_init(&nn->nfs_client_lock);
nn->boot_time = ktime_get_real();
+ memset(&nn->rpcstats, 0, sizeof(nn->rpcstats));
+ nn->rpcstats.program = &nfs_program;
nfs_netns_sysfs_setup(nn, net);
}
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index d8f01d222c49..48ade92d4ce8 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -2360,12 +2360,21 @@ EXPORT_SYMBOL_GPL(nfs_net_id);
static int nfs_net_init(struct net *net)
{
+ struct nfs_net *nn = net_generic(net, nfs_net_id);
+
nfs_clients_init(net);
+
+ if (!rpc_proc_register(net, &nn->rpcstats)) {
+ nfs_clients_exit(net);
+ return -ENOMEM;
+ }
+
return nfs_fs_proc_net_init(net);
}
static void nfs_net_exit(struct net *net)
{
+ rpc_proc_unregister(net, "nfs");
nfs_fs_proc_net_exit(net);
nfs_clients_exit(net);
}
@@ -2424,15 +2433,12 @@ static int __init init_nfs_fs(void)
if (err)
goto out1;
- rpc_proc_register(&init_net, &nfs_rpcstat);
-
err = register_nfs_fs();
if (err)
goto out0;
return 0;
out0:
- rpc_proc_unregister(&init_net, "nfs");
nfs_destroy_directcache();
out1:
nfs_destroy_writepagecache();
@@ -2465,7 +2471,6 @@ static void __exit exit_nfs_fs(void)
nfs_destroy_nfspagecache();
nfs_fscache_unregister();
unregister_pernet_subsys(&nfs_net_ops);
- rpc_proc_unregister(&init_net, "nfs");
unregister_nfs_fs();
nfs_fs_proc_exit();
nfsiod_stop();
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 2ceb4b98ec15..d0965b4676a5 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -428,8 +428,6 @@ int nfs_try_get_tree(struct fs_context *);
int nfs_get_tree_common(struct fs_context *);
void nfs_kill_super(struct super_block *);
-extern struct rpc_stat nfs_rpcstat;
-
extern int __init register_nfs_fs(void);
extern void __exit unregister_nfs_fs(void);
extern bool nfs_sb_active(struct super_block *sb);
diff --git a/fs/nfs/netns.h b/fs/nfs/netns.h
index c8374f74dce1..a68b21603ea9 100644
--- a/fs/nfs/netns.h
+++ b/fs/nfs/netns.h
@@ -9,6 +9,7 @@
#include <linux/nfs4.h>
#include <net/net_namespace.h>
#include <net/netns/generic.h>
+#include <linux/sunrpc/stats.h>
struct bl_dev_msg {
int32_t status;
@@ -34,6 +35,7 @@ struct nfs_net {
struct nfs_netns_client *nfs_client;
spinlock_t nfs_client_lock;
ktime_t boot_time;
+ struct rpc_stat rpcstats;
#ifdef CONFIG_PROC_FS
struct proc_dir_entry *proc_nfsfs;
#endif
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 74a26cabc084..4236de05a8e7 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -1651,17 +1651,17 @@ void bpf_patch_call_args(struct bpf_insn *insn, u32 stack_depth);
struct btf *bpf_get_btf_vmlinux(void);
/* Map specifics */
-struct xdp_buff;
+struct xdp_frame;
struct sk_buff;
struct bpf_dtab_netdev;
struct bpf_cpu_map_entry;
void __dev_flush(void);
-int dev_xdp_enqueue(struct net_device *dev, struct xdp_buff *xdp,
+int dev_xdp_enqueue(struct net_device *dev, struct xdp_frame *xdpf,
struct net_device *dev_rx);
-int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_buff *xdp,
+int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_frame *xdpf,
struct net_device *dev_rx);
-int dev_map_enqueue_multi(struct xdp_buff *xdp, struct net_device *dev_rx,
+int dev_map_enqueue_multi(struct xdp_frame *xdpf, struct net_device *dev_rx,
struct bpf_map *map, bool exclude_ingress);
int dev_map_generic_redirect(struct bpf_dtab_netdev *dst, struct sk_buff *skb,
struct bpf_prog *xdp_prog);
@@ -1670,7 +1670,7 @@ int dev_map_redirect_multi(struct net_device *dev, struct sk_buff *skb,
bool exclude_ingress);
void __cpu_map_flush(void);
-int cpu_map_enqueue(struct bpf_cpu_map_entry *rcpu, struct xdp_buff *xdp,
+int cpu_map_enqueue(struct bpf_cpu_map_entry *rcpu, struct xdp_frame *xdpf,
struct net_device *dev_rx);
int cpu_map_generic_redirect(struct bpf_cpu_map_entry *rcpu,
struct sk_buff *skb);
@@ -1823,26 +1823,26 @@ static inline void __dev_flush(void)
{
}
-struct xdp_buff;
+struct xdp_frame;
struct bpf_dtab_netdev;
struct bpf_cpu_map_entry;
static inline
-int dev_xdp_enqueue(struct net_device *dev, struct xdp_buff *xdp,
+int dev_xdp_enqueue(struct net_device *dev, struct xdp_frame *xdpf,
struct net_device *dev_rx)
{
return 0;
}
static inline
-int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_buff *xdp,
+int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_frame *xdpf,
struct net_device *dev_rx)
{
return 0;
}
static inline
-int dev_map_enqueue_multi(struct xdp_buff *xdp, struct net_device *dev_rx,
+int dev_map_enqueue_multi(struct xdp_frame *xdpf, struct net_device *dev_rx,
struct bpf_map *map, bool exclude_ingress)
{
return 0;
@@ -1870,7 +1870,7 @@ static inline void __cpu_map_flush(void)
}
static inline int cpu_map_enqueue(struct bpf_cpu_map_entry *rcpu,
- struct xdp_buff *xdp,
+ struct xdp_frame *xdpf,
struct net_device *dev_rx)
{
return 0;
diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h
index 6659d0369ec5..9d276655cc25 100644
--- a/include/linux/dma-fence.h
+++ b/include/linux/dma-fence.h
@@ -631,11 +631,4 @@ u64 dma_fence_context_alloc(unsigned num);
##args); \
} while (0)
-#define DMA_FENCE_WARN(f, fmt, args...) \
- do { \
- struct dma_fence *__ff = (f); \
- pr_warn("f %llu#%llu: " fmt, __ff->context, __ff->seqno,\
- ##args); \
- } while (0)
-
#endif /* __LINUX_DMA_FENCE_H */
diff --git a/include/linux/filter.h b/include/linux/filter.h
index ddaeb2afc022..af0103bebb7b 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -1020,6 +1020,10 @@ int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb,
int xdp_do_redirect(struct net_device *dev,
struct xdp_buff *xdp,
struct bpf_prog *prog);
+int xdp_do_redirect_frame(struct net_device *dev,
+ struct xdp_buff *xdp,
+ struct xdp_frame *xdpf,
+ struct bpf_prog *prog);
void xdp_do_flush(void);
/* The xdp_do_flush_map() helper has been renamed to drop the _map suffix, as
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 7ed1d4472c0c..15de91c65a09 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2735,6 +2735,21 @@ static inline void skb_mac_header_rebuild(struct sk_buff *skb)
}
}
+/* Move the full mac header up to current network_header.
+ * Leaves skb->data pointing at offset skb->mac_len into the mac_header.
+ * Must be provided the complete mac header length.
+ */
+static inline void skb_mac_header_rebuild_full(struct sk_buff *skb, u32 full_mac_len)
+{
+ if (skb_mac_header_was_set(skb)) {
+ const unsigned char *old_mac = skb_mac_header(skb);
+
+ skb_set_mac_header(skb, -full_mac_len);
+ memmove(skb_mac_header(skb), old_mac, full_mac_len);
+ __skb_push(skb, full_mac_len - skb->mac_len);
+ }
+}
+
static inline int skb_checksum_start_offset(const struct sk_buff *skb)
{
return skb->csum_start - skb_headroom(skb);
diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
index 4273505d309a..422b391d931f 100644
--- a/include/linux/skmsg.h
+++ b/include/linux/skmsg.h
@@ -73,7 +73,6 @@ struct sk_psock_link {
};
struct sk_psock_work_state {
- struct sk_buff *skb;
u32 len;
u32 off;
};
@@ -107,7 +106,7 @@ struct sk_psock {
struct proto *sk_proto;
struct mutex work_mutex;
struct sk_psock_work_state work_state;
- struct work_struct work;
+ struct delayed_work work;
struct rcu_work rwork;
};
@@ -462,10 +461,12 @@ static inline void sk_psock_put(struct sock *sk, struct sk_psock *psock)
static inline void sk_psock_data_ready(struct sock *sk, struct sk_psock *psock)
{
+ read_lock_bh(&sk->sk_callback_lock);
if (psock->saved_data_ready)
psock->saved_data_ready(sk);
else
sk->sk_data_ready(sk);
+ read_unlock_bh(&sk->sk_callback_lock);
}
static inline void psock_set_prog(struct bpf_prog **pprog,
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 71ec22b1df86..9c5197c360b9 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -130,6 +130,7 @@ struct rpc_create_args {
const char *servername;
const char *nodename;
const struct rpc_program *program;
+ struct rpc_stat *stats;
u32 prognumber; /* overrides program->number */
u32 version;
rpc_authflavor_t authflavor;
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 6156ed2950f9..2e2e30d31a76 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1019,6 +1019,9 @@ struct xfrm_offload {
#define CRYPTO_INVALID_PACKET_SYNTAX 64
#define CRYPTO_INVALID_PROTOCOL 128
+ /* Used to keep whole l2 header for transport mode GRO */
+ __u32 orig_mac_len;
+
__u8 proto;
__u8 inner_ipproto;
};
diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c
index a8429cfb4ae8..0848d5691fd1 100644
--- a/kernel/bpf/cpumap.c
+++ b/kernel/bpf/cpumap.c
@@ -764,15 +764,9 @@ static void bq_enqueue(struct bpf_cpu_map_entry *rcpu, struct xdp_frame *xdpf)
list_add(&bq->flush_node, flush_list);
}
-int cpu_map_enqueue(struct bpf_cpu_map_entry *rcpu, struct xdp_buff *xdp,
+int cpu_map_enqueue(struct bpf_cpu_map_entry *rcpu, struct xdp_frame *xdpf,
struct net_device *dev_rx)
{
- struct xdp_frame *xdpf;
-
- xdpf = xdp_convert_buff_to_frame(xdp);
- if (unlikely(!xdpf))
- return -EOVERFLOW;
-
/* Info needed when constructing SKB on remote CPU */
xdpf->dev_rx = dev_rx;
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
index b591073c5f83..bbf3ec03aa59 100644
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -468,24 +468,19 @@ static void bq_enqueue(struct net_device *dev, struct xdp_frame *xdpf,
bq->q[bq->count++] = xdpf;
}
-static inline int __xdp_enqueue(struct net_device *dev, struct xdp_buff *xdp,
+static inline int __xdp_enqueue(struct net_device *dev, struct xdp_frame *xdpf,
struct net_device *dev_rx,
struct bpf_prog *xdp_prog)
{
- struct xdp_frame *xdpf;
int err;
if (!dev->netdev_ops->ndo_xdp_xmit)
return -EOPNOTSUPP;
- err = xdp_ok_fwd_dev(dev, xdp->data_end - xdp->data);
+ err = xdp_ok_fwd_dev(dev, xdpf->len);
if (unlikely(err))
return err;
- xdpf = xdp_convert_buff_to_frame(xdp);
- if (unlikely(!xdpf))
- return -EOVERFLOW;
-
bq_enqueue(dev, xdpf, dev_rx, xdp_prog);
return 0;
}
@@ -521,27 +516,27 @@ static u32 dev_map_bpf_prog_run_skb(struct sk_buff *skb, struct bpf_dtab_netdev
return act;
}
-int dev_xdp_enqueue(struct net_device *dev, struct xdp_buff *xdp,
+int dev_xdp_enqueue(struct net_device *dev, struct xdp_frame *xdpf,
struct net_device *dev_rx)
{
- return __xdp_enqueue(dev, xdp, dev_rx, NULL);
+ return __xdp_enqueue(dev, xdpf, dev_rx, NULL);
}
-int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_buff *xdp,
+int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_frame *xdpf,
struct net_device *dev_rx)
{
struct net_device *dev = dst->dev;
- return __xdp_enqueue(dev, xdp, dev_rx, dst->xdp_prog);
+ return __xdp_enqueue(dev, xdpf, dev_rx, dst->xdp_prog);
}
-static bool is_valid_dst(struct bpf_dtab_netdev *obj, struct xdp_buff *xdp)
+static bool is_valid_dst(struct bpf_dtab_netdev *obj, struct xdp_frame *xdpf)
{
if (!obj ||
!obj->dev->netdev_ops->ndo_xdp_xmit)
return false;
- if (xdp_ok_fwd_dev(obj->dev, xdp->data_end - xdp->data))
+ if (xdp_ok_fwd_dev(obj->dev, xdpf->len))
return false;
return true;
@@ -587,14 +582,13 @@ static int get_upper_ifindexes(struct net_device *dev, int *indexes)
return n;
}
-int dev_map_enqueue_multi(struct xdp_buff *xdp, struct net_device *dev_rx,
+int dev_map_enqueue_multi(struct xdp_frame *xdpf, struct net_device *dev_rx,
struct bpf_map *map, bool exclude_ingress)
{
struct bpf_dtab *dtab = container_of(map, struct bpf_dtab, map);
struct bpf_dtab_netdev *dst, *last_dst = NULL;
int excluded_devices[1+MAX_NEST_DEV];
struct hlist_head *head;
- struct xdp_frame *xdpf;
int num_excluded = 0;
unsigned int i;
int err;
@@ -604,15 +598,11 @@ int dev_map_enqueue_multi(struct xdp_buff *xdp, struct net_device *dev_rx,
excluded_devices[num_excluded++] = dev_rx->ifindex;
}
- xdpf = xdp_convert_buff_to_frame(xdp);
- if (unlikely(!xdpf))
- return -EOVERFLOW;
-
if (map->map_type == BPF_MAP_TYPE_DEVMAP) {
for (i = 0; i < map->max_entries; i++) {
dst = rcu_dereference_check(dtab->netdev_map[i],
rcu_read_lock_bh_held());
- if (!is_valid_dst(dst, xdp))
+ if (!is_valid_dst(dst, xdpf))
continue;
if (is_ifindex_excluded(excluded_devices, num_excluded, dst->dev->ifindex))
@@ -635,7 +625,7 @@ int dev_map_enqueue_multi(struct xdp_buff *xdp, struct net_device *dev_rx,
head = dev_map_index_hash(dtab, i);
hlist_for_each_entry_rcu(dst, head, index_hlist,
lockdep_is_held(&dtab->index_lock)) {
- if (!is_valid_dst(dst, xdp))
+ if (!is_valid_dst(dst, xdpf))
continue;
if (is_ifindex_excluded(excluded_devices, num_excluded,
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 67b325427022..94d952967fbf 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -11875,8 +11875,7 @@ static int resolve_pseudo_ldimm64(struct bpf_verifier_env *env)
f = fdget(fd);
map = __bpf_map_get(f);
if (IS_ERR(map)) {
- verbose(env, "fd %d is not pointing to valid bpf_map\n",
- insn[0].imm);
+ verbose(env, "fd %d is not pointing to valid bpf_map\n", fd);
return PTR_ERR(map);
}
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 28faea9b5da6..2025b624fbb6 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -319,7 +319,7 @@ config DEBUG_INFO_DWARF5
endchoice # "DWARF version"
config DEBUG_INFO_BTF
- bool "Generate BTF typeinfo"
+ bool "Generate BTF type information"
depends on !DEBUG_INFO_SPLIT && !DEBUG_INFO_REDUCED
depends on !GCC_PLUGIN_RANDSTRUCT || COMPILE_TEST
help
@@ -331,7 +331,8 @@ config PAHOLE_HAS_SPLIT_BTF
def_bool PAHOLE_VERSION >= 119
config DEBUG_INFO_BTF_MODULES
- def_bool y
+ bool "Generate BTF type information for kernel modules"
+ default y
depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF
help
Generate compact split BTF type information for kernel modules.
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 2ca56c22a169..27a5a28c412d 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -260,7 +260,11 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords)
} else {
for (end = buf; *end && !isspace(*end); end++)
;
- BUG_ON(end == buf);
+ if (end == buf) {
+ pr_err("parse err after word:%d=%s\n", nwords,
+ nwords ? words[nwords - 1] : "<none>");
+ return -EINVAL;
+ }
}
/* `buf' is start of word, `end' is one past its end */
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 11bfc8737e6c..900b35297585 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -435,6 +435,9 @@ static void l2cap_chan_timeout(struct work_struct *work)
BT_DBG("chan %p state %s", chan, state_to_string(chan->state));
+ if (!conn)
+ return;
+
mutex_lock(&conn->chan_lock);
/* __set_chan_timer() calls l2cap_chan_hold(chan) while scheduling
* this work. No need to call l2cap_chan_hold(chan) here again.
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 57c6a4f845a3..431e09cac178 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -83,6 +83,10 @@ static void sco_sock_timeout(struct work_struct *work)
struct sock *sk;
sco_conn_lock(conn);
+ if (!conn->hcon) {
+ sco_conn_unlock(conn);
+ return;
+ }
sk = conn->sk;
if (sk)
sock_hold(sk);
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 011bd3c59da1..1b66c276118a 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -253,6 +253,7 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb,
{
struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
const unsigned char *src = eth_hdr(skb)->h_source;
+ struct sk_buff *nskb;
if (!should_deliver(p, skb))
return;
@@ -261,12 +262,16 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb,
if (skb->dev == p->dev && ether_addr_equal(src, addr))
return;
- skb = skb_copy(skb, GFP_ATOMIC);
- if (!skb) {
+ __skb_push(skb, ETH_HLEN);
+ nskb = pskb_copy(skb, GFP_ATOMIC);
+ __skb_pull(skb, ETH_HLEN);
+ if (!nskb) {
DEV_STATS_INC(dev, tx_dropped);
return;
}
+ skb = nskb;
+ __skb_pull(skb, ETH_HLEN);
if (!is_broadcast_ether_addr(addr))
memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN);
diff --git a/net/core/filter.c b/net/core/filter.c
index 457d1a164ad5..47eb1bd47aa6 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -3987,37 +3987,75 @@ u32 xdp_master_redirect(struct xdp_buff *xdp)
}
EXPORT_SYMBOL_GPL(xdp_master_redirect);
-int xdp_do_redirect(struct net_device *dev, struct xdp_buff *xdp,
- struct bpf_prog *xdp_prog)
+static inline int __xdp_do_redirect_xsk(struct bpf_redirect_info *ri,
+ struct net_device *dev,
+ struct xdp_buff *xdp,
+ struct bpf_prog *xdp_prog)
{
- struct bpf_redirect_info *ri = this_cpu_ptr(&bpf_redirect_info);
enum bpf_map_type map_type = ri->map_type;
void *fwd = ri->tgt_value;
u32 map_id = ri->map_id;
+ int err;
+
+ ri->map_id = 0; /* Valid map id idr range: [1,INT_MAX[ */
+ ri->map_type = BPF_MAP_TYPE_UNSPEC;
+
+ err = __xsk_map_redirect(fwd, xdp);
+ if (unlikely(err))
+ goto err;
+
+ _trace_xdp_redirect_map(dev, xdp_prog, fwd, map_type, map_id, ri->tgt_index);
+ return 0;
+err:
+ _trace_xdp_redirect_map_err(dev, xdp_prog, fwd, map_type, map_id, ri->tgt_index, err);
+ return err;
+}
+
+static __always_inline int __xdp_do_redirect_frame(struct bpf_redirect_info *ri,
+ struct net_device *dev,
+ struct xdp_frame *xdpf,
+ struct bpf_prog *xdp_prog)
+{
+ enum bpf_map_type map_type = ri->map_type;
+ void *fwd = ri->tgt_value;
+ u32 map_id = ri->map_id;
+ u32 flags = ri->flags;
struct bpf_map *map;
int err;
ri->map_id = 0; /* Valid map id idr range: [1,INT_MAX[ */
+ ri->flags = 0;
ri->map_type = BPF_MAP_TYPE_UNSPEC;
+ if (unlikely(!xdpf)) {
+ err = -EOVERFLOW;
+ goto err;
+ }
+
switch (map_type) {
case BPF_MAP_TYPE_DEVMAP:
fallthrough;
case BPF_MAP_TYPE_DEVMAP_HASH:
- map = READ_ONCE(ri->map);
- if (unlikely(map)) {
+ if (unlikely(flags & BPF_F_BROADCAST)) {
+ map = READ_ONCE(ri->map);
+
+ /* The map pointer is cleared when the map is being torn
+ * down by bpf_clear_redirect_map()
+ */
+ if (unlikely(!map)) {
+ err = -ENOENT;
+ break;
+ }
+
WRITE_ONCE(ri->map, NULL);
- err = dev_map_enqueue_multi(xdp, dev, map,
- ri->flags & BPF_F_EXCLUDE_INGRESS);
+ err = dev_map_enqueue_multi(xdpf, dev, map,
+ flags & BPF_F_EXCLUDE_INGRESS);
} else {
- err = dev_map_enqueue(fwd, xdp, dev);
+ err = dev_map_enqueue(fwd, xdpf, dev);
}
break;
case BPF_MAP_TYPE_CPUMAP:
- err = cpu_map_enqueue(fwd, xdp, dev);
- break;
- case BPF_MAP_TYPE_XSKMAP:
- err = __xsk_map_redirect(fwd, xdp);
+ err = cpu_map_enqueue(fwd, xdpf, dev);
break;
case BPF_MAP_TYPE_UNSPEC:
if (map_id == INT_MAX) {
@@ -4026,7 +4064,7 @@ int xdp_do_redirect(struct net_device *dev, struct xdp_buff *xdp,
err = -EINVAL;
break;
}
- err = dev_xdp_enqueue(fwd, xdp, dev);
+ err = dev_xdp_enqueue(fwd, xdpf, dev);
break;
}
fallthrough;
@@ -4043,14 +4081,40 @@ int xdp_do_redirect(struct net_device *dev, struct xdp_buff *xdp,
_trace_xdp_redirect_map_err(dev, xdp_prog, fwd, map_type, map_id, ri->tgt_index, err);
return err;
}
+
+int xdp_do_redirect(struct net_device *dev, struct xdp_buff *xdp,
+ struct bpf_prog *xdp_prog)
+{
+ struct bpf_redirect_info *ri = this_cpu_ptr(&bpf_redirect_info);
+ enum bpf_map_type map_type = ri->map_type;
+
+ if (map_type == BPF_MAP_TYPE_XSKMAP)
+ return __xdp_do_redirect_xsk(ri, dev, xdp, xdp_prog);
+
+ return __xdp_do_redirect_frame(ri, dev, xdp_convert_buff_to_frame(xdp),
+ xdp_prog);
+}
EXPORT_SYMBOL_GPL(xdp_do_redirect);
+int xdp_do_redirect_frame(struct net_device *dev, struct xdp_buff *xdp,
+ struct xdp_frame *xdpf, struct bpf_prog *xdp_prog)
+{
+ struct bpf_redirect_info *ri = this_cpu_ptr(&bpf_redirect_info);
+ enum bpf_map_type map_type = ri->map_type;
+
+ if (map_type == BPF_MAP_TYPE_XSKMAP)
+ return __xdp_do_redirect_xsk(ri, dev, xdp, xdp_prog);
+
+ return __xdp_do_redirect_frame(ri, dev, xdpf, xdp_prog);
+}
+EXPORT_SYMBOL_GPL(xdp_do_redirect_frame);
+
static int xdp_do_generic_redirect_map(struct net_device *dev,
struct sk_buff *skb,
struct xdp_buff *xdp,
- struct bpf_prog *xdp_prog,
- void *fwd,
- enum bpf_map_type map_type, u32 map_id)
+ struct bpf_prog *xdp_prog, void *fwd,
+ enum bpf_map_type map_type, u32 map_id,
+ u32 flags)
{
struct bpf_redirect_info *ri = this_cpu_ptr(&bpf_redirect_info);
struct bpf_map *map;
@@ -4060,11 +4124,20 @@ static int xdp_do_generic_redirect_map(struct net_device *dev,
case BPF_MAP_TYPE_DEVMAP:
fallthrough;
case BPF_MAP_TYPE_DEVMAP_HASH:
- map = READ_ONCE(ri->map);
- if (unlikely(map)) {
+ if (unlikely(flags & BPF_F_BROADCAST)) {
+ map = READ_ONCE(ri->map);
+
+ /* The map pointer is cleared when the map is being torn
+ * down by bpf_clear_redirect_map()
+ */
+ if (unlikely(!map)) {
+ err = -ENOENT;
+ break;
+ }
+
WRITE_ONCE(ri->map, NULL);
err = dev_map_redirect_multi(dev, skb, xdp_prog, map,
- ri->flags & BPF_F_EXCLUDE_INGRESS);
+ flags & BPF_F_EXCLUDE_INGRESS);
} else {
err = dev_map_generic_redirect(fwd, skb, xdp_prog);
}
@@ -4101,9 +4174,11 @@ int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb,
enum bpf_map_type map_type = ri->map_type;
void *fwd = ri->tgt_value;
u32 map_id = ri->map_id;
+ u32 flags = ri->flags;
int err;
ri->map_id = 0; /* Valid map id idr range: [1,INT_MAX[ */
+ ri->flags = 0;
ri->map_type = BPF_MAP_TYPE_UNSPEC;
if (map_type == BPF_MAP_TYPE_UNSPEC && map_id == INT_MAX) {
@@ -4123,7 +4198,7 @@ int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb,
return 0;
}
- return xdp_do_generic_redirect_map(dev, skb, xdp, xdp_prog, fwd, map_type, map_id);
+ return xdp_do_generic_redirect_map(dev, skb, xdp, xdp_prog, fwd, map_type, map_id, flags);
err:
_trace_xdp_redirect_err(dev, xdp_prog, ri->tgt_index, err);
return err;
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index dcddc54d0840..a209db33fa5f 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -68,12 +68,15 @@ DEFINE_COOKIE(net_cookie);
static struct net_generic *net_alloc_generic(void)
{
+ unsigned int gen_ptrs = READ_ONCE(max_gen_ptrs);
+ unsigned int generic_size;
struct net_generic *ng;
- unsigned int generic_size = offsetof(struct net_generic, ptr[max_gen_ptrs]);
+
+ generic_size = offsetof(struct net_generic, ptr[gen_ptrs]);
ng = kzalloc(generic_size, GFP_KERNEL);
if (ng)
- ng->s.len = max_gen_ptrs;
+ ng->s.len = gen_ptrs;
return ng;
}
@@ -1211,7 +1214,11 @@ static int register_pernet_operations(struct list_head *list,
if (error < 0)
return error;
*ops->id = error;
- max_gen_ptrs = max(max_gen_ptrs, *ops->id + 1);
+ /* This does not require READ_ONCE as writers already hold
+ * pernet_ops_rwsem. But WRITE_ONCE is needed to protect
+ * net_alloc_generic.
+ */
+ WRITE_ONCE(max_gen_ptrs, max(max_gen_ptrs, *ops->id + 1));
}
error = __register_pernet_operations(list, ops);
if (error) {
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index ef218e290dfb..d25632fbfa89 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2383,7 +2383,7 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr **tb)
nla_for_each_nested(attr, tb[IFLA_VF_VLAN_LIST], rem) {
if (nla_type(attr) != IFLA_VF_VLAN_INFO ||
- nla_len(attr) < NLA_HDRLEN) {
+ nla_len(attr) < sizeof(struct ifla_vf_vlan_info)) {
return -EINVAL;
}
if (len >= MAX_VLAN_LIST_LEN)
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index a42431860af9..4ec8cfd357eb 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1583,11 +1583,17 @@ static inline int skb_alloc_rx_flag(const struct sk_buff *skb)
struct sk_buff *skb_copy(const struct sk_buff *skb, gfp_t gfp_mask)
{
- int headerlen = skb_headroom(skb);
- unsigned int size = skb_end_offset(skb) + skb->data_len;
- struct sk_buff *n = __alloc_skb(size, gfp_mask,
- skb_alloc_rx_flag(skb), NUMA_NO_NODE);
+ struct sk_buff *n;
+ unsigned int size;
+ int headerlen;
+
+ if (WARN_ON_ONCE(skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST))
+ return NULL;
+ headerlen = skb_headroom(skb);
+ size = skb_end_offset(skb) + skb->data_len;
+ n = __alloc_skb(size, gfp_mask,
+ skb_alloc_rx_flag(skb), NUMA_NO_NODE);
if (!n)
return NULL;
@@ -1899,12 +1905,17 @@ struct sk_buff *skb_copy_expand(const struct sk_buff *skb,
/*
* Allocate the copy buffer
*/
- struct sk_buff *n = __alloc_skb(newheadroom + skb->len + newtailroom,
- gfp_mask, skb_alloc_rx_flag(skb),
- NUMA_NO_NODE);
- int oldheadroom = skb_headroom(skb);
int head_copy_len, head_copy_off;
+ struct sk_buff *n;
+ int oldheadroom;
+
+ if (WARN_ON_ONCE(skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST))
+ return NULL;
+ oldheadroom = skb_headroom(skb);
+ n = __alloc_skb(newheadroom + skb->len + newtailroom,
+ gfp_mask, skb_alloc_rx_flag(skb),
+ NUMA_NO_NODE);
if (!n)
return NULL;
diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index 9cd14212dcd0..ec8671eccae0 100644
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -481,8 +481,6 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
msg_rx = sk_psock_peek_msg(psock);
}
out:
- if (psock->work_state.skb && copied > 0)
- schedule_work(&psock->work);
return copied;
}
EXPORT_SYMBOL_GPL(sk_msg_recvmsg);
@@ -617,42 +615,33 @@ static int sk_psock_handle_skb(struct sk_psock *psock, struct sk_buff *skb,
static void sk_psock_skb_state(struct sk_psock *psock,
struct sk_psock_work_state *state,
- struct sk_buff *skb,
int len, int off)
{
spin_lock_bh(&psock->ingress_lock);
if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED)) {
- state->skb = skb;
state->len = len;
state->off = off;
- } else {
- sock_drop(psock->sk, skb);
}
spin_unlock_bh(&psock->ingress_lock);
}
static void sk_psock_backlog(struct work_struct *work)
{
- struct sk_psock *psock = container_of(work, struct sk_psock, work);
+ struct delayed_work *dwork = to_delayed_work(work);
+ struct sk_psock *psock = container_of(dwork, struct sk_psock, work);
struct sk_psock_work_state *state = &psock->work_state;
struct sk_buff *skb = NULL;
+ u32 len = 0, off = 0;
bool ingress;
- u32 len, off;
int ret;
mutex_lock(&psock->work_mutex);
- if (unlikely(state->skb)) {
- spin_lock_bh(&psock->ingress_lock);
- skb = state->skb;
+ if (unlikely(state->len)) {
len = state->len;
off = state->off;
- state->skb = NULL;
- spin_unlock_bh(&psock->ingress_lock);
}
- if (skb)
- goto start;
- while ((skb = skb_dequeue(&psock->ingress_skb))) {
+ while ((skb = skb_peek(&psock->ingress_skb))) {
len = skb->len;
off = 0;
if (skb_bpf_strparser(skb)) {
@@ -661,7 +650,6 @@ static void sk_psock_backlog(struct work_struct *work)
off = stm->offset;
len = stm->full_len;
}
-start:
ingress = skb_bpf_ingress(skb);
skb_bpf_redirect_clear(skb);
do {
@@ -671,22 +659,28 @@ static void sk_psock_backlog(struct work_struct *work)
len, ingress);
if (ret <= 0) {
if (ret == -EAGAIN) {
- sk_psock_skb_state(psock, state, skb,
- len, off);
+ sk_psock_skb_state(psock, state, len, off);
+
+ /* Delay slightly to prioritize any
+ * other work that might be here.
+ */
+ if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED))
+ schedule_delayed_work(&psock->work, 1);
goto end;
}
/* Hard errors break pipe and stop xmit. */
sk_psock_report_error(psock, ret ? -ret : EPIPE);
sk_psock_clear_state(psock, SK_PSOCK_TX_ENABLED);
- sock_drop(psock->sk, skb);
goto end;
}
off += ret;
len -= ret;
} while (len);
- if (!ingress)
+ skb = skb_dequeue(&psock->ingress_skb);
+ if (!ingress) {
kfree_skb(skb);
+ }
}
end:
mutex_unlock(&psock->work_mutex);
@@ -727,7 +721,7 @@ struct sk_psock *sk_psock_init(struct sock *sk, int node)
INIT_LIST_HEAD(&psock->link);
spin_lock_init(&psock->link_lock);
- INIT_WORK(&psock->work, sk_psock_backlog);
+ INIT_DELAYED_WORK(&psock->work, sk_psock_backlog);
mutex_init(&psock->work_mutex);
INIT_LIST_HEAD(&psock->ingress_msg);
spin_lock_init(&psock->ingress_lock);
@@ -779,11 +773,6 @@ static void __sk_psock_zap_ingress(struct sk_psock *psock)
skb_bpf_redirect_clear(skb);
sock_drop(psock->sk, skb);
}
- kfree_skb(psock->work_state.skb);
- /* We null the skb here to ensure that calls to sk_psock_backlog
- * do not pick up the free'd skb.
- */
- psock->work_state.skb = NULL;
__sk_psock_purge_ingress_msg(psock);
}
@@ -802,7 +791,6 @@ void sk_psock_stop(struct sk_psock *psock)
spin_lock_bh(&psock->ingress_lock);
sk_psock_clear_state(psock, SK_PSOCK_TX_ENABLED);
sk_psock_cork_free(psock);
- __sk_psock_zap_ingress(psock);
spin_unlock_bh(&psock->ingress_lock);
}
@@ -816,7 +804,8 @@ static void sk_psock_destroy(struct work_struct *work)
sk_psock_done_strp(psock);
- cancel_work_sync(&psock->work);
+ cancel_delayed_work_sync(&psock->work);
+ __sk_psock_zap_ingress(psock);
mutex_destroy(&psock->work_mutex);
psock_progs_drop(&psock->progs);
@@ -931,7 +920,7 @@ static int sk_psock_skb_redirect(struct sk_psock *from, struct sk_buff *skb)
}
skb_queue_tail(&psock_other->ingress_skb, skb);
- schedule_work(&psock_other->work);
+ schedule_delayed_work(&psock_other->work, 0);
spin_unlock_bh(&psock_other->ingress_lock);
return 0;
}
@@ -1011,7 +1000,7 @@ static int sk_psock_verdict_apply(struct sk_psock *psock, struct sk_buff *skb,
spin_lock_bh(&psock->ingress_lock);
if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED)) {
skb_queue_tail(&psock->ingress_skb, skb);
- schedule_work(&psock->work);
+ schedule_delayed_work(&psock->work, 0);
err = 0;
}
spin_unlock_bh(&psock->ingress_lock);
@@ -1042,7 +1031,7 @@ static void sk_psock_write_space(struct sock *sk)
psock = sk_psock(sk);
if (likely(psock)) {
if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED))
- schedule_work(&psock->work);
+ schedule_delayed_work(&psock->work, 0);
write_space = psock->saved_write_space;
}
rcu_read_unlock();
diff --git a/net/core/sock.c b/net/core/sock.c
index 6f761f3c272a..62e376f09f95 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -459,7 +459,7 @@ int __sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
unsigned long flags;
struct sk_buff_head *list = &sk->sk_receive_queue;
- if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
+ if (atomic_read(&sk->sk_rmem_alloc) >= READ_ONCE(sk->sk_rcvbuf)) {
atomic_inc(&sk->sk_drops);
trace_sock_rcvqueue_full(sk, skb);
return -ENOMEM;
@@ -511,7 +511,7 @@ int __sk_receive_skb(struct sock *sk, struct sk_buff *skb,
skb->dev = NULL;
- if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
+ if (sk_rcvqueues_full(sk, READ_ONCE(sk->sk_rcvbuf))) {
atomic_inc(&sk->sk_drops);
goto discard_and_relse;
}
diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index 4e42bc679bac..2ded250ac0d2 100644
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -1577,9 +1577,10 @@ void sock_map_close(struct sock *sk, long timeout)
rcu_read_unlock();
sk_psock_stop(psock);
release_sock(sk);
- cancel_work_sync(&psock->work);
+ cancel_delayed_work_sync(&psock->work);
sk_psock_put(sk, psock);
}
+
/* Make sure we do not recurse. This is a bug.
* Leak the socket instead of crashing on a stack overflow.
*/
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 16fd3da68e9f..9c7998377d6b 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2692,7 +2692,7 @@ void tcp_shutdown(struct sock *sk, int how)
/* If we've already sent a FIN, or it's a closed state, skip this. */
if ((1 << sk->sk_state) &
(TCPF_ESTABLISHED | TCPF_SYN_SENT |
- TCPF_SYN_RECV | TCPF_CLOSE_WAIT)) {
+ TCPF_CLOSE_WAIT)) {
/* Clear out any half completed packets. FIN if needed. */
if (tcp_close_state(sk))
tcp_send_fin(sk);
@@ -2803,7 +2803,7 @@ void __tcp_close(struct sock *sk, long timeout)
* machine. State transitions:
*
* TCP_ESTABLISHED -> TCP_FIN_WAIT1
- * TCP_SYN_RECV -> TCP_FIN_WAIT1 (forget it, it's impossible)
+ * TCP_SYN_RECV -> TCP_FIN_WAIT1 (it is difficult)
* TCP_CLOSE_WAIT -> TCP_LAST_ACK
*
* are legal only when FIN has been sent (i.e. in window),
diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c
index e3a9477293ce..5fdef5ddfbbe 100644
--- a/net/ipv4/tcp_bpf.c
+++ b/net/ipv4/tcp_bpf.c
@@ -174,6 +174,24 @@ static int tcp_msg_wait_data(struct sock *sk, struct sk_psock *psock,
return ret;
}
+static bool is_next_msg_fin(struct sk_psock *psock)
+{
+ struct scatterlist *sge;
+ struct sk_msg *msg_rx;
+ int i;
+
+ msg_rx = sk_psock_peek_msg(psock);
+ i = msg_rx->sg.start;
+ sge = sk_msg_elem(msg_rx, i);
+ if (!sge->length) {
+ struct sk_buff *skb = msg_rx->skb;
+
+ if (skb && TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)
+ return true;
+ }
+ return false;
+}
+
static int tcp_bpf_recvmsg_parser(struct sock *sk,
struct msghdr *msg,
size_t len,
@@ -195,8 +213,41 @@ static int tcp_bpf_recvmsg_parser(struct sock *sk,
return tcp_recvmsg(sk, msg, len, nonblock, flags, addr_len);
lock_sock(sk);
+
+ /* We may have received data on the sk_receive_queue pre-accept and
+ * then we can not use read_skb in this context because we haven't
+ * assigned a sk_socket yet so have no link to the ops. The work-around
+ * is to check the sk_receive_queue and in these cases read skbs off
+ * queue again. The read_skb hook is not running at this point because
+ * of lock_sock so we avoid having multiple runners in read_skb.
+ */
+ if (unlikely(!skb_queue_empty(&sk->sk_receive_queue))) {
+ tcp_data_ready(sk);
+ /* This handles the ENOMEM errors if we both receive data
+ * pre accept and are already under memory pressure. At least
+ * let user know to retry.
+ */
+ if (unlikely(!skb_queue_empty(&sk->sk_receive_queue))) {
+ copied = -EAGAIN;
+ goto out;
+ }
+ }
+
msg_bytes_ready:
copied = sk_msg_recvmsg(sk, psock, msg, len, flags);
+ /* The typical case for EFAULT is the socket was gracefully
+ * shutdown with a FIN pkt. So check here the other case is
+ * some error on copy_page_to_iter which would be unexpected.
+ * On fin return correct return code to zero.
+ */
+ if (copied == -EFAULT) {
+ bool is_fin = is_next_msg_fin(psock);
+
+ if (is_fin) {
+ copied = 0;
+ goto out;
+ }
+ }
if (!copied) {
long timeo;
int data;
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index e51b5d887c24..52a9d7f96da4 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -6543,6 +6543,8 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)
tcp_initialize_rcv_mss(sk);
tcp_fast_path_on(tp);
+ if (sk->sk_shutdown & SEND_SHUTDOWN)
+ tcp_shutdown(sk, SEND_SHUTDOWN);
break;
case TCP_FIN_WAIT1: {
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 0666be6b9ec9..e162bed1916a 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -153,6 +153,12 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
if (tcptw->tw_ts_recent_stamp &&
(!twp || (reuse && time_after32(ktime_get_seconds(),
tcptw->tw_ts_recent_stamp)))) {
+ /* inet_twsk_hashdance() sets sk_refcnt after putting twsk
+ * and releasing the bucket lock.
+ */
+ if (unlikely(!refcount_inc_not_zero(&sktw->sk_refcnt)))
+ return 0;
+
/* In case of repair and re-using TIME-WAIT sockets we still
* want to be sure that it is safe as above but honor the
* sequence numbers and time stamps set as part of the repair
@@ -173,7 +179,7 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
tp->rx_opt.ts_recent = tcptw->tw_ts_recent;
tp->rx_opt.ts_recent_stamp = tcptw->tw_ts_recent_stamp;
}
- sock_hold(sktw);
+
return 1;
}
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index d8817d6c7b96..0fb84e57a2d4 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -3441,7 +3441,9 @@ void tcp_send_fin(struct sock *sk)
return;
}
} else {
- skb = alloc_skb_fclone(MAX_TCP_HEADER, sk->sk_allocation);
+ skb = alloc_skb_fclone(MAX_TCP_HEADER,
+ sk_gfp_mask(sk, GFP_ATOMIC |
+ __GFP_NOWARN));
if (unlikely(!skb))
return;
diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 7c6ac47b0bb1..c61268849948 100644
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -434,6 +434,7 @@ static struct sk_buff *udp_gro_receive_segment(struct list_head *head,
struct sk_buff *p;
unsigned int ulen;
int ret = 0;
+ int flush;
/* requires non zero csum, for symmetry with GSO */
if (!uh->check) {
@@ -467,13 +468,22 @@ static struct sk_buff *udp_gro_receive_segment(struct list_head *head,
return p;
}
+ flush = NAPI_GRO_CB(p)->flush;
+
+ if (NAPI_GRO_CB(p)->flush_id != 1 ||
+ NAPI_GRO_CB(p)->count != 1 ||
+ !NAPI_GRO_CB(p)->is_atomic)
+ flush |= NAPI_GRO_CB(p)->flush_id;
+ else
+ NAPI_GRO_CB(p)->is_atomic = false;
+
/* Terminate the flow on len mismatch or if it grow "too much".
* Under small packet flood GRO count could elsewhere grow a lot
* leading to excessive truesize values.
* On len mismatch merge the first packet shorter than gso_size,
* otherwise complete the GRO packet.
*/
- if (ulen > ntohs(uh2->len)) {
+ if (ulen > ntohs(uh2->len) || flush) {
pp = p;
} else {
if (NAPI_GRO_CB(skb)->is_flist) {
diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c
index eac206a290d0..1f50517289fd 100644
--- a/net/ipv4/xfrm4_input.c
+++ b/net/ipv4/xfrm4_input.c
@@ -61,7 +61,11 @@ int xfrm4_transport_finish(struct sk_buff *skb, int async)
ip_send_check(iph);
if (xo && (xo->flags & XFRM_GRO)) {
- skb_mac_header_rebuild(skb);
+ /* The full l2 header needs to be preserved so that re-injecting the packet at l2
+ * works correctly in the presence of vlan tags.
+ */
+ skb_mac_header_rebuild_full(skb, xo->orig_mac_len);
+ skb_reset_network_header(skb);
skb_reset_transport_header(skb);
return 0;
}
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 8e9e80eb0f32..a4caaead74c1 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -232,8 +232,12 @@ static int __fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
rt = pol_lookup_func(lookup,
net, table, flp6, arg->lookup_data, flags);
if (rt != net->ipv6.ip6_null_entry) {
+ struct inet6_dev *idev = ip6_dst_idev(&rt->dst);
+
+ if (!idev)
+ goto again;
err = fib6_rule_saddr(net, rule, flags, flp6,
- ip6_dst_idev(&rt->dst)->dev);
+ idev->dev);
if (err == -EAGAIN)
goto again;
diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index 4907ab241d6b..7dbefbb338ca 100644
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -56,7 +56,11 @@ int xfrm6_transport_finish(struct sk_buff *skb, int async)
skb_postpush_rcsum(skb, skb_network_header(skb), nhlen);
if (xo && (xo->flags & XFRM_GRO)) {
- skb_mac_header_rebuild(skb);
+ /* The full l2 header needs to be preserved so that re-injecting the packet at l2
+ * works correctly in the presence of vlan tags.
+ */
+ skb_mac_header_rebuild_full(skb, xo->orig_mac_len);
+ skb_reset_network_header(skb);
skb_reset_transport_header(skb);
return 0;
}
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index 6cd97c75445c..9a36e174984c 100644
--- a/net/l2tp/l2tp_eth.c
+++ b/net/l2tp/l2tp_eth.c
@@ -136,6 +136,9 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
/* checksums verified by L2TP */
skb->ip_summed = CHECKSUM_NONE;
+ /* drop outer flow-hash */
+ skb_clear_hash(skb);
+
skb_dst_drop(skb);
nf_reset_ct(skb);
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 21549a440b38..03f8c8bdab76 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -113,7 +113,7 @@ struct ieee80211_bss {
};
/**
- * enum ieee80211_corrupt_data_flags - BSS data corruption flags
+ * enum ieee80211_bss_corrupt_data_flags - BSS data corruption flags
* @IEEE80211_BSS_CORRUPT_BEACON: last beacon frame received was corrupted
* @IEEE80211_BSS_CORRUPT_PROBE_RESP: last probe response received was corrupted
*
@@ -126,7 +126,7 @@ enum ieee80211_bss_corrupt_data_flags {
};
/**
- * enum ieee80211_valid_data_flags - BSS valid data flags
+ * enum ieee80211_bss_valid_data_flags - BSS valid data flags
* @IEEE80211_BSS_VALID_WMM: WMM/UAPSD data was gathered from non-corrupt IE
* @IEEE80211_BSS_VALID_RATES: Supported rates were gathered from non-corrupt IE
* @IEEE80211_BSS_VALID_ERP: ERP flag was gathered from non-corrupt IE
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index cde62dafda49..3c3f630f4943 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3395,6 +3395,9 @@ static int mptcp_stream_connect(struct socket *sock, struct sockaddr *uaddr,
MPTCP_INC_STATS(sock_net(ssock->sk), MPTCP_MIB_TOKENFALLBACKINIT);
mptcp_subflow_early_fallback(msk, subflow);
}
+
+ WRITE_ONCE(msk->write_seq, subflow->idsn);
+ WRITE_ONCE(msk->snd_nxt, subflow->idsn);
if (likely(!__mptcp_check_fallback(msk)))
MPTCP_INC_STATS(sock_net(sock->sk), MPTCP_MIB_MPCAPABLEACTIVE);
diff --git a/net/nsh/nsh.c b/net/nsh/nsh.c
index 0f23e5e8e03e..3e0fc71d95a1 100644
--- a/net/nsh/nsh.c
+++ b/net/nsh/nsh.c
@@ -76,13 +76,15 @@ EXPORT_SYMBOL_GPL(nsh_pop);
static struct sk_buff *nsh_gso_segment(struct sk_buff *skb,
netdev_features_t features)
{
+ unsigned int outer_hlen, mac_len, nsh_len;
struct sk_buff *segs = ERR_PTR(-EINVAL);
u16 mac_offset = skb->mac_header;
- unsigned int nsh_len, mac_len;
- __be16 proto;
+ __be16 outer_proto, proto;
skb_reset_network_header(skb);
+ outer_proto = skb->protocol;
+ outer_hlen = skb_mac_header_len(skb);
mac_len = skb->mac_len;
if (unlikely(!pskb_may_pull(skb, NSH_BASE_HDR_LEN)))
@@ -112,10 +114,10 @@ static struct sk_buff *nsh_gso_segment(struct sk_buff *skb,
}
for (skb = segs; skb; skb = skb->next) {
- skb->protocol = htons(ETH_P_NSH);
- __skb_push(skb, nsh_len);
- skb->mac_header = mac_offset;
- skb->network_header = skb->mac_header + mac_len;
+ skb->protocol = outer_proto;
+ __skb_push(skb, nsh_len + outer_hlen);
+ skb_reset_mac_header(skb);
+ skb_set_network_header(skb, outer_hlen);
skb->mac_len = mac_len;
}
diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c
index 59aebe296890..dd4c7e9a634f 100644
--- a/net/phonet/pn_netlink.c
+++ b/net/phonet/pn_netlink.c
@@ -193,7 +193,7 @@ void rtm_phonet_notify(int event, struct net_device *dev, u8 dst)
struct sk_buff *skb;
int err = -ENOBUFS;
- skb = nlmsg_new(NLMSG_ALIGN(sizeof(struct ifaddrmsg)) +
+ skb = nlmsg_new(NLMSG_ALIGN(sizeof(struct rtmsg)) +
nla_total_size(1) + nla_total_size(4), GFP_KERNEL);
if (skb == NULL)
goto errout;
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index af1ca707c3d3..59fd6dedbbed 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -398,7 +398,7 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args,
clnt->cl_maxproc = version->nrprocs;
clnt->cl_prog = args->prognumber ? : program->number;
clnt->cl_vers = version->number;
- clnt->cl_stats = program->stats;
+ clnt->cl_stats = args->stats ? : program->stats;
clnt->cl_metrics = rpc_alloc_iostats(clnt);
rpc_init_pipe_dir_head(&clnt->cl_pipedir_objects);
err = -ENOMEM;
@@ -677,6 +677,7 @@ struct rpc_clnt *rpc_clone_client(struct rpc_clnt *clnt)
.version = clnt->cl_vers,
.authflavor = clnt->cl_auth->au_flavor,
.cred = clnt->cl_cred,
+ .stats = clnt->cl_stats,
};
return __rpc_clone_client(&args, clnt);
}
@@ -699,6 +700,7 @@ rpc_clone_client_set_auth(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
.version = clnt->cl_vers,
.authflavor = flavor,
.cred = clnt->cl_cred,
+ .stats = clnt->cl_stats,
};
return __rpc_clone_client(&args, clnt);
}
@@ -979,6 +981,7 @@ struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *old,
.version = vers,
.authflavor = old->cl_auth->au_flavor,
.cred = old->cl_cred,
+ .stats = old->cl_stats,
};
struct rpc_clnt *clnt;
int err;
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 5c9fd4791c4b..76284fc538eb 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -142,9 +142,9 @@ int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf)
if (fragid == FIRST_FRAGMENT) {
if (unlikely(head))
goto err;
- *buf = NULL;
if (skb_has_frag_list(frag) && __skb_linearize(frag))
goto err;
+ *buf = NULL;
frag = skb_unshare(frag, GFP_ATOMIC);
if (unlikely(!frag))
goto err;
@@ -156,6 +156,11 @@ int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf)
if (!head)
goto err;
+ /* Either the input skb ownership is transferred to headskb
+ * or the input skb is freed, clear the reference to avoid
+ * bad access on error path.
+ */
+ *buf = NULL;
if (skb_try_coalesce(head, frag, &headstolen, &delta)) {
kfree_skb_partial(frag, headstolen);
} else {
@@ -179,7 +184,6 @@ int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf)
*headbuf = NULL;
return 1;
}
- *buf = NULL;
return 0;
err:
kfree_skb(*buf);
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 99149b10f86f..d758ec565589 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -12890,6 +12890,8 @@ static int nl80211_set_coalesce(struct sk_buff *skb, struct genl_info *info)
error:
for (i = 0; i < new_coalesce.n_rules; i++) {
tmp_rule = &new_coalesce.rules[i];
+ if (!tmp_rule)
+ continue;
for (j = 0; j < tmp_rule->n_patterns; j++)
kfree(tmp_rule->patterns[j].mask);
kfree(tmp_rule->patterns);
diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index 19b78d472283..dafea8bfcf3c 100644
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -963,7 +963,7 @@ TRACE_EVENT(rdev_get_mpp,
TRACE_EVENT(rdev_dump_mpp,
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, int _idx,
u8 *dst, u8 *mpp),
- TP_ARGS(wiphy, netdev, _idx, mpp, dst),
+ TP_ARGS(wiphy, netdev, _idx, dst, mpp),
TP_STRUCT__entry(
WIPHY_ENTRY
NETDEV_ENTRY
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index a6861832710d..7f326a01cbce 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -400,11 +400,15 @@ static int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb)
*/
static int xfrm4_transport_input(struct xfrm_state *x, struct sk_buff *skb)
{
+ struct xfrm_offload *xo = xfrm_offload(skb);
int ihl = skb->data - skb_transport_header(skb);
if (skb->transport_header != skb->network_header) {
memmove(skb_transport_header(skb),
skb_network_header(skb), ihl);
+ if (xo)
+ xo->orig_mac_len =
+ skb_mac_header_was_set(skb) ? skb_mac_header_len(skb) : 0;
skb->network_header = skb->transport_header;
}
ip_hdr(skb)->tot_len = htons(skb->len + ihl);
@@ -415,11 +419,15 @@ static int xfrm4_transport_input(struct xfrm_state *x, struct sk_buff *skb)
static int xfrm6_transport_input(struct xfrm_state *x, struct sk_buff *skb)
{
#if IS_ENABLED(CONFIG_IPV6)
+ struct xfrm_offload *xo = xfrm_offload(skb);
int ihl = skb->data - skb_transport_header(skb);
if (skb->transport_header != skb->network_header) {
memmove(skb_transport_header(skb),
skb_network_header(skb), ihl);
+ if (xo)
+ xo->orig_mac_len =
+ skb_mac_header_was_set(skb) ? skb_mac_header_len(skb) : 0;
skb->network_header = skb->transport_header;
}
ipv6_hdr(skb)->payload_len = htons(skb->len + ihl -
diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal
index 47f047458264..dce4cf55a4b6 100644
--- a/scripts/Makefile.modfinal
+++ b/scripts/Makefile.modfinal
@@ -23,7 +23,7 @@ modname = $(notdir $(@:.mod.o=))
part-of-module = y
quiet_cmd_cc_o_c = CC [M] $@
- cmd_cc_o_c = $(CC) $(filter-out $(CC_FLAGS_CFI) $(CFLAGS_GCOV), $(c_flags)) -c -o $@ $<
+ cmd_cc_o_c = $(CC) $(filter-out $(CC_FLAGS_CFI) $(CFLAGS_GCOV) $(CFLAGS_KCSAN), $(c_flags)) -c -o $@ $<
%.mod.o: %.mod.c FORCE
$(call if_changed_dep,cc_o_c)
diff --git a/security/keys/key.c b/security/keys/key.c
index e65240641ca5..f2a84d86eab4 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -464,7 +464,8 @@ static int __key_instantiate_and_link(struct key *key,
if (authkey)
key_invalidate(authkey);
- key_set_expiry(key, prep->expiry);
+ if (prep->expiry != TIME64_MAX)
+ key_set_expiry(key, prep->expiry);
}
}
diff --git a/sound/hda/intel-sdw-acpi.c b/sound/hda/intel-sdw-acpi.c
index b7758dbe2371..7c1e47aa4e7a 100644
--- a/sound/hda/intel-sdw-acpi.c
+++ b/sound/hda/intel-sdw-acpi.c
@@ -41,6 +41,8 @@ static bool is_link_enabled(struct fwnode_handle *fw_node, int i)
"intel-quirk-mask",
&quirk_mask);
+ fwnode_handle_put(link);
+
if (quirk_mask & SDW_INTEL_QUIRK_MASK_BUS_DISABLE)
return false;
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 94859fdd1da0..c7529aa13f94 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -9131,6 +9131,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
SND_PCI_QUIRK(0x103c, 0x860f, "HP ZBook 15 G6", ALC285_FIXUP_HP_GPIO_AMP_INIT),
SND_PCI_QUIRK(0x103c, 0x861f, "HP Elite Dragonfly G1", ALC285_FIXUP_HP_GPIO_AMP_INIT),
SND_PCI_QUIRK(0x103c, 0x869d, "HP", ALC236_FIXUP_HP_MUTE_LED),
+ SND_PCI_QUIRK(0x103c, 0x86c1, "HP Laptop 15-da3001TU", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
SND_PCI_QUIRK(0x103c, 0x86c7, "HP Envy AiO 32", ALC274_FIXUP_HP_ENVY_GPIO),
SND_PCI_QUIRK(0x103c, 0x86e7, "HP Spectre x360 15-eb0xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
SND_PCI_QUIRK(0x103c, 0x86e8, "HP Spectre x360 15-eb0xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
diff --git a/sound/soc/meson/Kconfig b/sound/soc/meson/Kconfig
index b93ea33739f2..6458d5dc4902 100644
--- a/sound/soc/meson/Kconfig
+++ b/sound/soc/meson/Kconfig
@@ -99,6 +99,7 @@ config SND_MESON_AXG_PDM
config SND_MESON_CARD_UTILS
tristate
+ select SND_DYNAMIC_MINORS
config SND_MESON_CODEC_GLUE
tristate
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
index 2b77010c2c5c..cbbaa55d92a6 100644
--- a/sound/soc/meson/axg-card.c
+++ b/sound/soc/meson/axg-card.c
@@ -320,6 +320,7 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np,
dai_link->cpus = cpu;
dai_link->num_cpus = 1;
+ dai_link->nonatomic = true;
ret = meson_card_parse_dai(card, np, &dai_link->cpus->of_node,
&dai_link->cpus->dai_name);
diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c
index bccfb770b339..94b169a5493b 100644
--- a/sound/soc/meson/axg-fifo.c
+++ b/sound/soc/meson/axg-fifo.c
@@ -3,6 +3,7 @@
// Copyright (c) 2018 BayLibre, SAS.
// Author: Jerome Brunet <jbrunet@baylibre.com>
+#include <linux/bitfield.h>
#include <linux/clk.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
@@ -145,8 +146,8 @@ int axg_fifo_pcm_hw_params(struct snd_soc_component *component,
/* Enable irq if necessary */
irq_en = runtime->no_period_wakeup ? 0 : FIFO_INT_COUNT_REPEAT;
regmap_update_bits(fifo->map, FIFO_CTRL0,
- CTRL0_INT_EN(FIFO_INT_COUNT_REPEAT),
- CTRL0_INT_EN(irq_en));
+ CTRL0_INT_EN,
+ FIELD_PREP(CTRL0_INT_EN, irq_en));
return 0;
}
@@ -176,9 +177,9 @@ int axg_fifo_pcm_hw_free(struct snd_soc_component *component,
{
struct axg_fifo *fifo = axg_fifo_data(ss);
- /* Disable the block count irq */
+ /* Disable irqs */
regmap_update_bits(fifo->map, FIFO_CTRL0,
- CTRL0_INT_EN(FIFO_INT_COUNT_REPEAT), 0);
+ CTRL0_INT_EN, 0);
return 0;
}
@@ -187,13 +188,13 @@ EXPORT_SYMBOL_GPL(axg_fifo_pcm_hw_free);
static void axg_fifo_ack_irq(struct axg_fifo *fifo, u8 mask)
{
regmap_update_bits(fifo->map, FIFO_CTRL1,
- CTRL1_INT_CLR(FIFO_INT_MASK),
- CTRL1_INT_CLR(mask));
+ CTRL1_INT_CLR,
+ FIELD_PREP(CTRL1_INT_CLR, mask));
/* Clear must also be cleared */
regmap_update_bits(fifo->map, FIFO_CTRL1,
- CTRL1_INT_CLR(FIFO_INT_MASK),
- 0);
+ CTRL1_INT_CLR,
+ FIELD_PREP(CTRL1_INT_CLR, 0));
}
static irqreturn_t axg_fifo_pcm_irq_block(int irq, void *dev_id)
@@ -203,18 +204,26 @@ static irqreturn_t axg_fifo_pcm_irq_block(int irq, void *dev_id)
unsigned int status;
regmap_read(fifo->map, FIFO_STATUS1, &status);
+ status = FIELD_GET(STATUS1_INT_STS, status);
+ axg_fifo_ack_irq(fifo, status);
- status = STATUS1_INT_STS(status) & FIFO_INT_MASK;
+ /* Use the thread to call period elapsed on nonatomic links */
if (status & FIFO_INT_COUNT_REPEAT)
- snd_pcm_period_elapsed(ss);
- else
- dev_dbg(axg_fifo_dev(ss), "unexpected irq - STS 0x%02x\n",
- status);
+ return IRQ_WAKE_THREAD;
- /* Ack irqs */
- axg_fifo_ack_irq(fifo, status);
+ dev_dbg(axg_fifo_dev(ss), "unexpected irq - STS 0x%02x\n",
+ status);
+
+ return IRQ_NONE;
+}
+
+static irqreturn_t axg_fifo_pcm_irq_block_thread(int irq, void *dev_id)
+{
+ struct snd_pcm_substream *ss = dev_id;
+
+ snd_pcm_period_elapsed(ss);
- return IRQ_RETVAL(status);
+ return IRQ_HANDLED;
}
int axg_fifo_pcm_open(struct snd_soc_component *component,
@@ -242,8 +251,9 @@ int axg_fifo_pcm_open(struct snd_soc_component *component,
if (ret)
return ret;
- ret = request_irq(fifo->irq, axg_fifo_pcm_irq_block, 0,
- dev_name(dev), ss);
+ ret = request_threaded_irq(fifo->irq, axg_fifo_pcm_irq_block,
+ axg_fifo_pcm_irq_block_thread,
+ IRQF_ONESHOT, dev_name(dev), ss);
if (ret)
return ret;
@@ -254,15 +264,15 @@ int axg_fifo_pcm_open(struct snd_soc_component *component,
/* Setup status2 so it reports the memory pointer */
regmap_update_bits(fifo->map, FIFO_CTRL1,
- CTRL1_STATUS2_SEL_MASK,
- CTRL1_STATUS2_SEL(STATUS2_SEL_DDR_READ));
+ CTRL1_STATUS2_SEL,
+ FIELD_PREP(CTRL1_STATUS2_SEL, STATUS2_SEL_DDR_READ));
/* Make sure the dma is initially disabled */
__dma_enable(fifo, false);
/* Disable irqs until params are ready */
regmap_update_bits(fifo->map, FIFO_CTRL0,
- CTRL0_INT_EN(FIFO_INT_MASK), 0);
+ CTRL0_INT_EN, 0);
/* Clear any pending interrupt */
axg_fifo_ack_irq(fifo, FIFO_INT_MASK);
diff --git a/sound/soc/meson/axg-fifo.h b/sound/soc/meson/axg-fifo.h
index b63acd723c87..5b7d32c37991 100644
--- a/sound/soc/meson/axg-fifo.h
+++ b/sound/soc/meson/axg-fifo.h
@@ -42,21 +42,19 @@ struct snd_soc_pcm_runtime;
#define FIFO_CTRL0 0x00
#define CTRL0_DMA_EN BIT(31)
-#define CTRL0_INT_EN(x) ((x) << 16)
+#define CTRL0_INT_EN GENMASK(23, 16)
#define CTRL0_SEL_MASK GENMASK(2, 0)
#define CTRL0_SEL_SHIFT 0
#define FIFO_CTRL1 0x04
-#define CTRL1_INT_CLR(x) ((x) << 0)
-#define CTRL1_STATUS2_SEL_MASK GENMASK(11, 8)
-#define CTRL1_STATUS2_SEL(x) ((x) << 8)
+#define CTRL1_INT_CLR GENMASK(7, 0)
+#define CTRL1_STATUS2_SEL GENMASK(11, 8)
#define STATUS2_SEL_DDR_READ 0
-#define CTRL1_FRDDR_DEPTH_MASK GENMASK(31, 24)
-#define CTRL1_FRDDR_DEPTH(x) ((x) << 24)
+#define CTRL1_FRDDR_DEPTH GENMASK(31, 24)
#define FIFO_START_ADDR 0x08
#define FIFO_FINISH_ADDR 0x0c
#define FIFO_INT_ADDR 0x10
#define FIFO_STATUS1 0x14
-#define STATUS1_INT_STS(x) ((x) << 0)
+#define STATUS1_INT_STS GENMASK(7, 0)
#define FIFO_STATUS2 0x18
#define FIFO_INIT_ADDR 0x24
#define FIFO_CTRL2 0x28
diff --git a/sound/soc/meson/axg-frddr.c b/sound/soc/meson/axg-frddr.c
index 37f4bb3469b5..38c731ad4070 100644
--- a/sound/soc/meson/axg-frddr.c
+++ b/sound/soc/meson/axg-frddr.c
@@ -7,6 +7,7 @@
* This driver implements the frontend playback DAI of AXG and G12A based SoCs
*/
+#include <linux/bitfield.h>
#include <linux/clk.h>
#include <linux/regmap.h>
#include <linux/module.h>
@@ -59,8 +60,8 @@ static int axg_frddr_dai_hw_params(struct snd_pcm_substream *substream,
/* Trim the FIFO depth if the period is small to improve latency */
depth = min(period, fifo->depth);
val = (depth / AXG_FIFO_BURST) - 1;
- regmap_update_bits(fifo->map, FIFO_CTRL1, CTRL1_FRDDR_DEPTH_MASK,
- CTRL1_FRDDR_DEPTH(val));
+ regmap_update_bits(fifo->map, FIFO_CTRL1, CTRL1_FRDDR_DEPTH,
+ FIELD_PREP(CTRL1_FRDDR_DEPTH, val));
return 0;
}
diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c
index 60d132ab1ab7..f5145902360d 100644
--- a/sound/soc/meson/axg-tdm-interface.c
+++ b/sound/soc/meson/axg-tdm-interface.c
@@ -362,13 +362,29 @@ static int axg_tdm_iface_hw_free(struct snd_pcm_substream *substream,
return 0;
}
-static int axg_tdm_iface_prepare(struct snd_pcm_substream *substream,
+static int axg_tdm_iface_trigger(struct snd_pcm_substream *substream,
+ int cmd,
struct snd_soc_dai *dai)
{
- struct axg_tdm_stream *ts = snd_soc_dai_get_dma_data(dai, substream);
+ struct axg_tdm_stream *ts =
+ snd_soc_dai_get_dma_data(dai, substream);
+
+ switch (cmd) {
+ case SNDRV_PCM_TRIGGER_START:
+ case SNDRV_PCM_TRIGGER_RESUME:
+ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+ axg_tdm_stream_start(ts);
+ break;
+ case SNDRV_PCM_TRIGGER_SUSPEND:
+ case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+ case SNDRV_PCM_TRIGGER_STOP:
+ axg_tdm_stream_stop(ts);
+ break;
+ default:
+ return -EINVAL;
+ }
- /* Force all attached formatters to update */
- return axg_tdm_stream_reset(ts);
+ return 0;
}
static int axg_tdm_iface_remove_dai(struct snd_soc_dai *dai)
@@ -408,8 +424,8 @@ static const struct snd_soc_dai_ops axg_tdm_iface_ops = {
.set_fmt = axg_tdm_iface_set_fmt,
.startup = axg_tdm_iface_startup,
.hw_params = axg_tdm_iface_hw_params,
- .prepare = axg_tdm_iface_prepare,
.hw_free = axg_tdm_iface_hw_free,
+ .trigger = axg_tdm_iface_trigger,
};
/* TDM Backend DAIs */
diff --git a/sound/soc/meson/axg-toddr.c b/sound/soc/meson/axg-toddr.c
index d6adf7edea41..85a17d8861f2 100644
--- a/sound/soc/meson/axg-toddr.c
+++ b/sound/soc/meson/axg-toddr.c
@@ -5,6 +5,7 @@
/* This driver implements the frontend capture DAI of AXG based SoCs */
+#include <linux/bitfield.h>
#include <linux/clk.h>
#include <linux/regmap.h>
#include <linux/module.h>
@@ -19,12 +20,9 @@
#define CTRL0_TODDR_EXT_SIGNED BIT(29)
#define CTRL0_TODDR_PP_MODE BIT(28)
#define CTRL0_TODDR_SYNC_CH BIT(27)
-#define CTRL0_TODDR_TYPE_MASK GENMASK(15, 13)
-#define CTRL0_TODDR_TYPE(x) ((x) << 13)
-#define CTRL0_TODDR_MSB_POS_MASK GENMASK(12, 8)
-#define CTRL0_TODDR_MSB_POS(x) ((x) << 8)
-#define CTRL0_TODDR_LSB_POS_MASK GENMASK(7, 3)
-#define CTRL0_TODDR_LSB_POS(x) ((x) << 3)
+#define CTRL0_TODDR_TYPE GENMASK(15, 13)
+#define CTRL0_TODDR_MSB_POS GENMASK(12, 8)
+#define CTRL0_TODDR_LSB_POS GENMASK(7, 3)
#define CTRL1_TODDR_FORCE_FINISH BIT(25)
#define CTRL1_SEL_SHIFT 28
@@ -76,12 +74,12 @@ static int axg_toddr_dai_hw_params(struct snd_pcm_substream *substream,
width = params_width(params);
regmap_update_bits(fifo->map, FIFO_CTRL0,
- CTRL0_TODDR_TYPE_MASK |
- CTRL0_TODDR_MSB_POS_MASK |
- CTRL0_TODDR_LSB_POS_MASK,
- CTRL0_TODDR_TYPE(type) |
- CTRL0_TODDR_MSB_POS(TODDR_MSB_POS) |
- CTRL0_TODDR_LSB_POS(TODDR_MSB_POS - (width - 1)));
+ CTRL0_TODDR_TYPE |
+ CTRL0_TODDR_MSB_POS |
+ CTRL0_TODDR_LSB_POS,
+ FIELD_PREP(CTRL0_TODDR_TYPE, type) |
+ FIELD_PREP(CTRL0_TODDR_MSB_POS, TODDR_MSB_POS) |
+ FIELD_PREP(CTRL0_TODDR_LSB_POS, TODDR_MSB_POS - (width - 1)));
return 0;
}
diff --git a/sound/soc/tegra/tegra186_dspk.c b/sound/soc/tegra/tegra186_dspk.c
index a74c980ee775..d5a74e25371d 100644
--- a/sound/soc/tegra/tegra186_dspk.c
+++ b/sound/soc/tegra/tegra186_dspk.c
@@ -1,8 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2020-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
//
// tegra186_dspk.c - Tegra186 DSPK driver
-//
-// Copyright (c) 2020 NVIDIA CORPORATION. All rights reserved.
#include <linux/clk.h>
#include <linux/device.h>
@@ -241,14 +240,14 @@ static int tegra186_dspk_hw_params(struct snd_pcm_substream *substream,
return -EINVAL;
}
- cif_conf.client_bits = TEGRA_ACIF_BITS_24;
-
switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S16_LE:
cif_conf.audio_bits = TEGRA_ACIF_BITS_16;
+ cif_conf.client_bits = TEGRA_ACIF_BITS_16;
break;
case SNDRV_PCM_FORMAT_S32_LE:
cif_conf.audio_bits = TEGRA_ACIF_BITS_32;
+ cif_conf.client_bits = TEGRA_ACIF_BITS_24;
break;
default:
dev_err(dev, "unsupported format!\n");
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
index 56a19eeec5c7..5b82329f4440 100644
--- a/sound/soc/ti/davinci-mcasp.c
+++ b/sound/soc/ti/davinci-mcasp.c
@@ -2423,12 +2423,6 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
mcasp_reparent_fck(pdev);
- ret = devm_snd_soc_register_component(&pdev->dev, &davinci_mcasp_component,
- &davinci_mcasp_dai[mcasp->op_mode], 1);
-
- if (ret != 0)
- goto err;
-
ret = davinci_mcasp_get_dma_type(mcasp);
switch (ret) {
case PCM_EDMA:
@@ -2455,6 +2449,12 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
goto err;
}
+ ret = devm_snd_soc_register_component(&pdev->dev, &davinci_mcasp_component,
+ &davinci_mcasp_dai[mcasp->op_mode], 1);
+
+ if (ret != 0)
+ goto err;
+
no_audio:
ret = davinci_mcasp_init_gpiochip(mcasp);
if (ret) {
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index b67617b68e50..f4437015d43a 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -202,7 +202,7 @@ int line6_send_raw_message_async(struct usb_line6 *line6, const char *buffer,
struct urb *urb;
/* create message: */
- msg = kmalloc(sizeof(struct message), GFP_ATOMIC);
+ msg = kzalloc(sizeof(struct message), GFP_ATOMIC);
if (msg == NULL)
return -ENOMEM;
@@ -688,7 +688,7 @@ static int line6_init_cap_control(struct usb_line6 *line6)
int ret;
/* initialize USB buffers: */
- line6->buffer_listen = kmalloc(LINE6_BUFSIZE_LISTEN, GFP_KERNEL);
+ line6->buffer_listen = kzalloc(LINE6_BUFSIZE_LISTEN, GFP_KERNEL);
if (!line6->buffer_listen)
return -ENOMEM;
@@ -697,7 +697,7 @@ static int line6_init_cap_control(struct usb_line6 *line6)
return -ENOMEM;
if (line6->properties->capabilities & LINE6_CAP_CONTROL_MIDI) {
- line6->buffer_message = kmalloc(LINE6_MIDI_MESSAGE_MAXLEN, GFP_KERNEL);
+ line6->buffer_message = kzalloc(LINE6_MIDI_MESSAGE_MAXLEN, GFP_KERNEL);
if (!line6->buffer_message)
return -ENOMEM;
diff --git a/tools/power/x86/turbostat/turbostat.8 b/tools/power/x86/turbostat/turbostat.8
index b3d4bf08e70b..f382cd53cb4e 100644
--- a/tools/power/x86/turbostat/turbostat.8
+++ b/tools/power/x86/turbostat/turbostat.8
@@ -322,7 +322,7 @@ below the processor's base frequency.
Busy% = MPERF_delta/TSC_delta
-Bzy_MHz = TSC_delta/APERF_delta/MPERF_delta/measurement_interval
+Bzy_MHz = TSC_delta*APERF_delta/MPERF_delta/measurement_interval
Note that these calculations depend on TSC_delta, so they
are not reliable during intervals when TSC_MHz is not running at the base frequency.
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 65ada8065cfc..0822e7dc0fd8 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -1761,9 +1761,10 @@ int sum_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
average.packages.rapl_dram_perf_status += p->rapl_dram_perf_status;
for (i = 0, mp = sys.pp; mp; i++, mp = mp->next) {
- if (mp->format == FORMAT_RAW)
- continue;
- average.packages.counter[i] += p->counter[i];
+ if ((mp->format == FORMAT_RAW) && (topo.num_packages == 0))
+ average.packages.counter[i] = p->counter[i];
+ else
+ average.packages.counter[i] += p->counter[i];
}
return 0;
}
diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c
index 48b9a803235a..d13ebde20322 100644
--- a/tools/testing/selftests/timers/valid-adjtimex.c
+++ b/tools/testing/selftests/timers/valid-adjtimex.c
@@ -21,9 +21,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-
-
-
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
@@ -62,45 +59,47 @@ int clear_time_state(void)
#define NUM_FREQ_OUTOFRANGE 4
#define NUM_FREQ_INVALID 2
+#define SHIFTED_PPM (1 << 16)
+
long valid_freq[NUM_FREQ_VALID] = {
- -499<<16,
- -450<<16,
- -400<<16,
- -350<<16,
- -300<<16,
- -250<<16,
- -200<<16,
- -150<<16,
- -100<<16,
- -75<<16,
- -50<<16,
- -25<<16,
- -10<<16,
- -5<<16,
- -1<<16,
+ -499 * SHIFTED_PPM,
+ -450 * SHIFTED_PPM,
+ -400 * SHIFTED_PPM,
+ -350 * SHIFTED_PPM,
+ -300 * SHIFTED_PPM,
+ -250 * SHIFTED_PPM,
+ -200 * SHIFTED_PPM,
+ -150 * SHIFTED_PPM,
+ -100 * SHIFTED_PPM,
+ -75 * SHIFTED_PPM,
+ -50 * SHIFTED_PPM,
+ -25 * SHIFTED_PPM,
+ -10 * SHIFTED_PPM,
+ -5 * SHIFTED_PPM,
+ -1 * SHIFTED_PPM,
-1000,
- 1<<16,
- 5<<16,
- 10<<16,
- 25<<16,
- 50<<16,
- 75<<16,
- 100<<16,
- 150<<16,
- 200<<16,
- 250<<16,
- 300<<16,
- 350<<16,
- 400<<16,
- 450<<16,
- 499<<16,
+ 1 * SHIFTED_PPM,
+ 5 * SHIFTED_PPM,
+ 10 * SHIFTED_PPM,
+ 25 * SHIFTED_PPM,
+ 50 * SHIFTED_PPM,
+ 75 * SHIFTED_PPM,
+ 100 * SHIFTED_PPM,
+ 150 * SHIFTED_PPM,
+ 200 * SHIFTED_PPM,
+ 250 * SHIFTED_PPM,
+ 300 * SHIFTED_PPM,
+ 350 * SHIFTED_PPM,
+ 400 * SHIFTED_PPM,
+ 450 * SHIFTED_PPM,
+ 499 * SHIFTED_PPM,
};
long outofrange_freq[NUM_FREQ_OUTOFRANGE] = {
- -1000<<16,
- -550<<16,
- 550<<16,
- 1000<<16,
+ -1000 * SHIFTED_PPM,
+ -550 * SHIFTED_PPM,
+ 550 * SHIFTED_PPM,
+ 1000 * SHIFTED_PPM,
};
#define LONG_MAX (~0UL>>1)
^ permalink raw reply related [relevance 2%]
* linux-next: Tree for May 17
@ 2024-05-17 3:39 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-17 3:39 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 40170 bytes --]
Hi all,
Do not add any work intended for v6.11 to your linux-next included
branches until after v6.10-rc1 has been released.
Changes since 20240516:
The tip tree gained a conflict against the kbuild tree.
The refactor-heap tree still had its conflicts against the block tree
for which I dropped the refactor-heap tree.
Non-merge commits (relative to Linus' tree): 4425
4851 files changed, 476221 insertions(+), 77819 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (ea5f6ad9ad96 Merge tag 'platform-drivers-x86-v6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (9ff3ffc369ed mm/vmalloc: fix vmalloc which may return null if called with __GFP_NOFAIL)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (5549d1e39989 Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (d65e1a0f305b Merge tag 's390-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (83e93942796d selftests/net/lib: no need to record ns name if it already exist)
Merging bpf/master (2322113ac9d0 selftests/bpf: add more variations of map-in-map situations)
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (621cde16e49b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging ipvs/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging wireless/for-next (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (5005ccd91b9e ALSA: usb-audio: Fix for sampling rates support for Mbox3)
Merging sound-asoc-fixes/for-linus (225468b9f96f Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (9bc443ee2d2d Merge remote-tracking branch 'regulator/for-6.9' into regulator-linus)
Merging spi-fixes/for-linus (ef13561d2b16 spi: microchip-core-qspi: fix setting spi bus clock rate)
Merging pci-current/for-linus (f3d049b35b01 PCI/ASPM: Restore parent state to parent, child state to child)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler)
Merging usb.current/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging usb-serial-fixes/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (bb198e29fe75 iio: dac: ad5592r: fix temperature channel scaling value)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (008ab3c53bc4 speakup: Fix sizeof() vs ARRAY_SIZE() bug)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (a38297e3fb01 Linux 6.9)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (0a9c28bec202 Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (26e8383b116d hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (039b2b6e9d07 Merge branch 'misc-6.10' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (a38297e3fb01 Linux 6.9)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so)
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (a38297e3fb01 Linux 6.9)
Merging drm-intel-fixes/for-linux-next-fixes (43b26bdd2ee5 drm/i915/bios: Fix parsing backlight BDB data)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (a38297e3fb01 Linux 6.9)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (a38297e3fb01 Linux 6.9)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (55750148e559 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe())
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (aed9a1a4f710 drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations)
Merging mm-stable/mm-stable (76edc534cc28 memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in kernel/module/main.c
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging mm-nonmm-stable/mm-nonmm-stable (5cbcb62dddf5 fs/proc: fix softlockup in __read_vmcore)
Merging mm/mm-everything (529891be5997 foo)
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h
Merging kbuild/for-next (6ffe4fdf8901 kconfig: use sym_get_choice_menu() in sym_check_prop())
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Makefile
CONFLICT (content): Merge conflict in drivers/misc/lkdtm/Makefile
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/Makefile
CONFLICT (content): Merge conflict in rust/Makefile
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (ea558c86248b tools lib subcmd: Show parent options in help)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a6016aac5252 dma: fix DMA sync for drivers not calling dma_set_mask*())
CONFLICT (content): Merge conflict in net/core/page_pool.c
Merging asm-generic/master (02af68767d27 Merge branch 'alpha-cleanup-6.9' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (64ae2326dd77 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (f0cc697f9f65 Merge branch 'for-next/errata' into for-next/core)
Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support)
Merging arm-soc/for-next (1e3dd71e2587 Merge branch 'soc/defconfig' into for-next)
Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (4cece7649650 Linux 6.9-rc1)
Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (7468eb6710ce Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-clk/next' into for-next)
Merging samsung-krzk/for-next (a9c32618cd2a Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (02ba7b5a731a Merge branch 'for-next/vexpress/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (3bdc4c661d47 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (e649f89a1cda Merge branch 'clk-samsung' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (9f4047a4c9ca LoongArch: Update Loongson-3 default config file)
CONFLICT (content): Merge conflict in arch/loongarch/kernel/irq.c
Merging m68k/for-next (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging m68knommu/for-next (a5044ce7d1d9 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (d4a599910193 parisc: Define HAVE_ARCH_HUGETLB_UNMAPPED_AREA)
Merging powerpc/next (61700f816e6f powerpc/fadump: Fix section mismatch warning)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree())
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (5e3964ba8400 riscv: show help string for riscv-specific targets)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
CONFLICT (content): Merge conflict in arch/riscv/Makefile
CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
CONFLICT (content): Merge conflict in kernel/sys.c
Merging riscv-dt/riscv-dt-for-next (1c80d50bb697 riscv: dts: microchip: add pac1934 power-monitor to icicle)
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (d890e6af50e4 s390/kprobes: Remove custom insn slot allocator)
CONFLICT (content): Merge conflict in scripts/Makefile.vdsoinst
Merging sh/for-next (efe976b7eecf sh: setup: Add missing forward declaration for sh_fdt_init())
Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask var)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (07f9a27f1969 bcachefs: add no_invalid_checks flag)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (7b79c81bbd20 Merge branch 'for-next-next-v6.10-20240515' into for-next-20240515)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (a395726cf823 cifs: fix data corruption in read after invalidate)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (7c35de4df105 erofs: Zstandard compression support)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (82172cca18b2 Merge isofs Makefile cleanup.)
Merging ext4/dev (26770a717cac jbd2: add prefix 'jbd2' for 'shrink_type')
CONFLICT (content): Merge conflict in fs/ext4/file.c
Merging f2fs/dev (16409fdbb882 f2fs: initialize last_block_in_bio variable)
Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning)
Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support)
Merging gfs2/for-next (c1c53c26e338 gfs2: make timeout values more explicit)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (c91ecba9e421 ksmbd: avoid to send duplicate oplock break notifications)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (8d915bbf3926 NFSD: Force all NFSv4.2 COPY requests to be synchronous)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access)
Merging overlayfs/overlayfs-next (e9229c18dae3 ovl: remove duplicate included header)
Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address access in jffs2_free_inode)
Merging v9fs/9p-next (25ef7dc83ebe net/9p: fix uninit-value in p9_client_rpc())
Merging v9fs-ericvh/ericvh/for-next (a38297e3fb01 Linux 6.9)
Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (584bbf439d0f Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in include/linux/fs.h
Merging vfs/for-next (39d57a87e672 Merge branch 'work.bdev' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
CONFLICT (content): Merge conflict in block/ioctl.c
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flags"
Merging printk/for-next (596ffa476e20 Merge branch 'for-6.10' into for-next)
Merging pci/next (7ecf13fd35fe Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (14ee3d12f37b Merge branch 'for-6.10/hid-bpf' into for-next)
Merging i2c/i2c/for-next (24a9d78e808c Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE())
Merging i3c/i3c/next (acec16dbb338 i3c: dw: Add hot-join support.)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (5fbf8734fb36 hwmon: (nzxt-kraken3) Bail out for unsupported device variants)
Merging jc_docs/docs-next (955e15969c1d Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK)
Merging v4l-dvb-next/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK)
Merging pm/linux-next (bb3ddcac03b2 Merge branch 'thermal' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (ccad360a2d41 PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions)
Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (69b08420b697 thermal: renesas: rcar: Add dependency on OF)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (49ca2b2ef3d0 RDMA/IPoIB: Fix format truncation compilation errors)
Merging net-next/main (1b294a1f3561 Merge tag 'net-next-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging bpf-next/for-next (5c1672705a1a net: revert partially applied PHY topology series)
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (5c1672705a1a net: revert partially applied PHY topology series)
Merging ipvs-next/main (5c1672705a1a net: revert partially applied PHY topology series)
Merging bluetooth/master (3b42b64036e5 Bluetooth: btnxpuart: Handle FW Download Abort scenario)
Merging wireless-next/for-next (1d60eabb8269 wifi: mwl8k: initialize cmd->addr[] properly)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content)
Merging drm/drm-next (431c590c3ab0 drm/tests: Add a unit test for range bias allocation)
Merging drm-exynos/for-linux-next (7a5bdb7ca1b4 drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found)
Merging drm-misc/for-linux-next (959314c438ca drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations)
Merging amdgpu/drm-next (a83048bfa402 drm/amd/amdgpu: Add ISP support to amdgpu_discovery)
Merging drm-intel/for-linux-next (11abdbc22b1a drm/i915: pass dev_priv explicitly to CURSURFLIVE)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vbt_defs.h
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (b587f413ca47 drm/msm/gen_header: allow skipping the validation)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (63d8cb8fe3dd drm/xe/vf: Expose SR-IOV VF attributes to GT debugfs)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (e843e87abb90 drm/etnaviv: Disable SH_EU clock gating on VIPNano-Si+)
Merging fbdev/for-next (a38297e3fb01 Linux 6.9)
Merging regmap/for-next (9b1fe0510494 regmap: Reorder fields in 'struct regmap_config' to save some memory)
Merging sound/for-next (5005ccd91b9e ALSA: usb-audio: Fix for sampling rates support for Mbox3)
Merging ieee1394/for-next (21151fd8f0ea firewire: obsolete usage of *-objs in Makefile for KUnit test)
Merging sound-asoc/for-next (225468b9f96f Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus)
Merging modules/modules-next (2c9e5d4a0082 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
Merging input/next (5852f2afcdd9 Input: drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging block/for-next (59ef81807482 Merge branch 'block-6.10' into for-next)
Merging device-mapper/for-next (8b21ac87d550 dm-delay: remove timer_lock)
Merging libata/for-next (d4a89339f17c ata: pata_legacy: make legacy_exit() work again)
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs)
Merging mfd/for-mfd-next (1482489b5196 dt-bindings: mfd: Use full path to other schemas)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (1fd949f653ee backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (9bc443ee2d2d Merge remote-tracking branch 'regulator/for-6.9' into regulator-linus)
Merging security/next (dd80c7465029 MAINTAINERS: repair file entry in SECURITY SUBSYSTEM)
Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL pointer dereference)
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (3c999d1ae3c7 Merge tag 'wq-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq)
Merging watchdog/master (c45b8cfc6d5c watchdog: LENOVO_SE10_WDT should depend on X86 && DMI)
Merging iommu/next (2bd5059c6cc0 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (d976c6f4b32c of: property: Add fw_devlink support for interrupt-map property)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (e958cffa42df Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (995ca29c7bde Merge branch into tip/master: 'x86/urgent')
CONFLICT (content): Merge conflict in arch/x86/boot/Makefile
Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/arm_arch_timer: Mark hisi_161010101_oem_info const)
Merging edac/edac-for-next (ab80b31cd7b2 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (fde0aeca5926 Merge user-events/for-next)
CONFLICT (content): Merge conflict in init/main.c
Merging rcu/rcu/next (0e9b1d2b0560 Merge branches 'cmpxchg.2024.05.11a', 'kcsan.2024.05.07a', 'lkmm.2024.05.06a', 'rcu-merge.2024.05.01a' and 'tsc.2024.04.09c' into HEAD)
Merging kvm/next (6f627b425378 KVM: SVM: Add module parameter to enable SEV-SNP)
Merging kvm-arm/next (eaa46a28d596 Merge branch kvm-arm64/mpidr-reset into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (b52e8cd3f835 KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info())
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
Merging xen-tip/linux-next (d4c16b4755de xen/xenbus: Use *-y instead of *-objs in Makefile)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (2513563edc98 platform/x86: Add new MeeGoPad ANX7428 Type-C Cross Switch driver)
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (880a746fa3ea device property: Fix a typo in the description of device_get_child_node_count())
Merging usb/usb-next (51474ab44abf drm/bridge: aux-hpd-bridge: correct devm_drm_dp_hpd_bridge_add() stub)
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (e21de1455a72 serial: Clear UPF_DEAD before calling tty_port_register_device_attr_serdev())
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (f5b335dc025c misc: ntsync: mark driver as "broken" to prevent from building)
a36b69775fca ("ndtest: Convert to platform remove callback returning void")
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x)
Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property)
Merging extcon/extcon-next (3e8e45b65d9f extcon: adc-jack: Document missing struct members)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (dda057ad8c9c vfio: remove an extra semicolon)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (4cece7649650 Linux 6.9-rc1)
Merging staging/staging-next (eb563dc752d3 staging: pi433: Remove unused driver)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (28059ddbee0e MAINTAINERS: Update role for IDXD driver)
Merging cgroup/for-next (21c38a3bd4ee cgroup/rstat: add cgroup_rstat_cpu_lock helpers and tracepoints)
Merging scsi/for-next (9ba1fbe2ed0c Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (e4f5f8298cf6 scsi: mpt3sas: Add missing kerneldoc parameter descriptions)
Merging vhost/linux-next (c9d853a05402 virtio: vdpa: vDPA driver for Marvell OCTEON DPU devices)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_ring.c
Merging rpmsg/for-next (c8d8f841e95b Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (7f45fe2ea3b8 gpio: nuvoton: Fix sgpio irq handle error)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (9429f847dd72 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (4817118f257e pwm: pca9685: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (2c3b8f8f37c6 selftests/sgx: Include KHDR_INCLUDES in Makefile)
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (5496b9b77d74 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (73a98bc5a947 Merge branch 'for-6.10' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (e406737b1110 seccomp: Constify sysctl subhelpers)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (4cece7649650 Linux 6.9-rc1)
Merging nvmem/for-next (4cece7649650 Linux 6.9-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (38a04f741569 selftests/landlock: Add layout1.refer_mount_root)
Merging rust/rust-next (97ab3e8eec0c rust: alloc: fix dangling pointer in VecExt<T>::reserve())
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (4bbf9c3b53e6 fs/coredump: Enable dynamic configuration of max file note size)
Merging bitmap/bitmap-for-next (c3052c2f53d3 usercopy: Don't use "proxy" headers)
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (5a1f2a9c4236 ubsan: Restore dependency on ARCH_HAS_UBSAN)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (256d218ec6ae tools/power turbostat: version 2024.05.10)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.c
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.h
CONFLICT (content): Merge conflict in drivers/md/bcache/btree.c
CONFLICT (content): Merge conflict in drivers/md/bcache/writeback.c
$ git merge --abort
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Re: [syzbot] [can?] KMSAN: kernel-infoleak in raw_recvmsg
[not found] <20240517.004903.736683498204817840.syoshida@redhat.com>
@ 2024-05-16 16:24 4% ` syzbot
0 siblings, 0 replies; 200+ results
From: syzbot @ 2024-05-16 16:24 UTC (permalink / raw)
To: linux-kernel, syoshida, syzkaller-bugs
Hello,
syzbot has tested the proposed patch and the reproducer did not trigger any issue:
Reported-and-tested-by: syzbot+5681e40d297b30f5b513@syzkaller.appspotmail.com
Tested on:
commit: 71b1543c Merge tag '6.9-rc5-ksmbd-fixes' of git://git...
git tree: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
console output: https://syzkaller.appspot.com/x/log.txt?x=17cf9ed0980000
kernel config: https://syzkaller.appspot.com/x/.config?x=776c05250f36d55c
dashboard link: https://syzkaller.appspot.com/bug?extid=5681e40d297b30f5b513
compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40
patch: https://syzkaller.appspot.com/x/patch.diff?x=106cbf70980000
Note: testing is done by a robot and is best-effort only.
^ permalink raw reply [relevance 4%]
* [PATCH 6.6 000/308] 6.6.31-rc3 review
@ 2024-05-16 12:15 2% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-16 12:15 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 6.6.31 release.
There are 308 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sat, 18 May 2024 12:12:33 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.31-rc3.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 6.6.31-rc3
Li Nan <linan122@huawei.com>
md: fix kmemleak of rdev->serial
Pei Xiao <xiaopei01@kylinos.cn>
Revert "selftests/bpf: Add netkit to tc_redirect selftest"
Miaohe Lin <linmiaohe@huawei.com>
mm/hugetlb: fix DEBUG_LOCKS_WARN_ON(1) when dissolve_free_hugetlb_folio()
Qu Wenruo <wqu@suse.com>
btrfs: do not wait for short bulk allocation
Silvio Gissi <sifonsec@amazon.com>
keys: Fix overwrite of key expiration on instantiation
Nikhil Rao <nikhil.rao@intel.com>
dmaengine: idxd: add a write() method for applications to submit work
Arjan van de Ven <arjan@linux.intel.com>
dmaengine: idxd: add a new security check to deal with a hardware erratum
Arjan van de Ven <arjan@linux.intel.com>
VFIO: Add the SPR_DSA and SPR_IAX devices to the denylist
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix firmware check error path
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching fw build id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching board id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: generalise device address check
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix NVM configuration parsing
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: add missing firmware sanity checks
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix wcn3991 device address check
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix invalid device address check
Steven Rostedt (Google) <rostedt@goodmis.org>
eventfs: Do not treat events directory different than other directories
Steven Rostedt (Google) <rostedt@goodmis.org>
tracefs: Still use mount point as default permissions for instances
Steven Rostedt (Google) <rostedt@goodmis.org>
tracefs: Reset permissions on remount if permissions are options
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: avoid to send duplicate lease break notifications
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: off ipv6only for both ipv4/ipv6 binding
Conor Dooley <conor.dooley@microchip.com>
spi: microchip-core-qspi: fix setting spi bus clock rate
Johan Hovold <johan+linaro@kernel.org>
regulator: core: fix debugfs creation regression
Sean Anderson <sean.anderson@linux.dev>
nvme-pci: Add quirk for broken MSIs
Peter Xu <peterx@redhat.com>
mm/userfaultfd: reset ptes when close() for wr-protected ones
Kefeng Wang <wangkefeng.wang@huawei.com>
mm: use memalloc_nofs_save() in page_cache_ra_order()
Michael Ellerman <mpe@ellerman.id.au>
selftests/mm: fix powerpc ARCH check
Thomas Gleixner <tglx@linutronix.de>
x86/apic: Don't access the APIC when disabling x2APIC
Lakshmi Yadlapati <lakshmiy@us.ibm.com>
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
net: fix out-of-bounds access in ops_init
Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
arm64: dts: qcom: sa8155p-adp: fix SDHC2 CD pin configuration
Hersen Wu <hersenxs.wu@amd.com>
drm/amd/display: Fix incorrect DSC instance for MST
George Shen <george.shen@amd.com>
drm/amd/display: Handle Y carry-over in VCP X.Y calculation
Karthikeyan Ramasubramanian <kramasub@chromium.org>
drm/i915/bios: Fix parsing backlight BDB data
Andi Shyti <andi.shyti@linux.intel.com>
drm/i915/gt: Automate CCS Mode setting during engine resets
Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
drm/i915/audio: Fix audio time stamp programming for DP
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix invalid reads in fence signaled events
Ian Forbes <ian.forbes@broadcom.com>
drm/vmwgfx: Fix Legacy Display Unit
Zack Rusin <zack.rusin@broadcom.com>
drm/ttm: Print the memory decryption status just once
Alex Deucher <alexander.deucher@amd.com>
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Dave Airlie <airlied@redhat.com>
Revert "drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()"
Lyude Paul <lyude@redhat.com>
drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: add lunar lake point M DID
Frank Oltmanns <frank@oltmanns.dev>
clk: sunxi-ng: a64: Set minimum and maximum rate for PLL-MIPI
Frank Oltmanns <frank@oltmanns.dev>
clk: sunxi-ng: common: Support minimum and maximum rate
Viken Dadhaniya <quic_vdadhani@quicinc.com>
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Jim Cromie <jim.cromie@gmail.com>
dyndbg: fix old BUG_ON in >control parser
Joao Paulo Goncalves <joao.goncalves@toradex.com>
ASoC: ti: davinci-mcasp: Fix race condition during probe
Sameer Pujar <spujar@nvidia.com>
ASoC: tegra: Fix DSPK 16-bit playback
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize UMAC_CMD access
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
Max Filippov <jcmvbkbc@gmail.com>
xtensa: fix MAKE_PC_FROM_RA second argument
Paolo Abeni <pabeni@redhat.com>
tipc: fix UAF in error path
Vitaly Lifshits <vitaly.lifshits@intel.com>
e1000e: change usleep_range to udelay in PHY mdic access
Alexander Potapenko <glider@google.com>
kmsan: compiler_types: declare __no_sanitize_or_inline
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Interrupt handling fixes
Vasileios Amoiridis <vassilisamir@gmail.com>
iio: pressure: Fixes BME280 SPI driver data
Ramona Gradinariu <ramona.bolboaca13@gmail.com>
iio:imu: adis16475: Fix sync mode setting
Javier Carrasco <javier.carrasco.cruz@gmail.com>
dt-bindings: iio: health: maxim,max30102: fix compatible check
Sven Schnelle <svens@linux.ibm.com>
workqueue: Fix selection of wake_cpu in kick_pool()
Gregory Detal <gregory.detal@gmail.com>
mptcp: only allow set existing scheduler for net.mptcp.scheduler
Paolo Abeni <pabeni@redhat.com>
mptcp: ensure snd_nxt is properly initialized on connect
Dan Carpenter <dan.carpenter@linaro.org>
mm/slab: make __free(kfree) accept error pointers
Liam R. Howlett <Liam.Howlett@oracle.com>
maple_tree: fix mas_empty_area_rev() null pointer dereference
Qu Wenruo <wqu@suse.com>
btrfs: set correct ram_bytes when splitting ordered extent
Dominique Martinet <dominique.martinet@atmark-techno.com>
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Takashi Sakamoto <o-takashi@sakamocchi.jp>
firewire: ohci: fulfill timestamp for some local asynchronous transaction
Aman Dhoot <amandhoot12@gmail.com>
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Badhri Jagan Sridharan <badhri@google.com>
usb: typec: tcpm: Check for port partner validity before consuming it
Amit Sunil Dhamne <amitsd@google.com>
usb: typec: tcpm: unregister existing source caps before re-registration
RD Babiera <rdbabiera@google.com>
usb: typec: tcpm: clear pd_event queue in PORT_RESET
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: dwc3: core: Prevent phy suspend during init
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: xhci-plat: Don't include xhci.h
Chris Wulff <Chris.Wulff@biamp.com>
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Wesley Cheng <quic_wcheng@quicinc.com>
usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete
Ivan Avdeev <me@provod.works>
usb: gadget: uvc: use correct buffer size when parsing configfs lists
Peter Korsgaard <peter@korsgaard.com>
usb: gadget: composite: fix OS descriptors w_value logic
Alan Stern <stern@rowland.harvard.edu>
USB: core: Fix access violation during port device removal
Guenter Roeck <linux@roeck-us.net>
usb: ohci: Prevent missed ohci interrupts
Alan Stern <stern@rowland.harvard.edu>
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Fix connector check on init
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Check for notifications after init
Linus Torvalds <torvalds@linux-foundation.org>
Reapply "drm/qxl: simplify qxl_fence_wait"
Thanassis Avgerinos <thanassis.avgerinos@gmail.com>
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Dmitry Antipov <dmantipov@yandex.ru>
btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send()
Christian König <christian.koenig@amd.com>
drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2
Michel Dänzer <mdaenzer@redhat.com>
drm/amdgpu: Fix comparison in amdgpu_res_cpu_visible
Gabe Teeger <gabe.teeger@amd.com>
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: fix uninitialised kfifo
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: relocate debounce_period_us from struct gpio_desc
Zhongqiu Han <quic_zhonhan@quicinc.com>
gpiolib: cdev: Fix use after free in lineinfo_changed_notify
Mario Limonciello <mario.limonciello@amd.com>
dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
Douglas Anderson <dianders@chromium.org>
drm/connector: Add \n to message about demoting connector force-probes
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: add bandgap setting for g12
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: power up phy on device init
Steffen Bätz <steffen@innosonix.de>
net: dsa: mv88e6xxx: add phylink_get_caps for the mv88e6320/21 family
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix kernel crash when devlink reload during initialization
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix port vlan filter not disabled issue
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: use appropriate barrier function after setting a bit value
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: release PTP resources if pf initialization failed
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: change type of numa_node_mask as nodemask_t
Jian Shen <shenjian15@huawei.com>
net: hns3: direct return when receive a unknown mailbox message
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: using user configure after hardware reset
Wen Gu <guwen@linux.alibaba.com>
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Eric Dumazet <edumazet@google.com>
ipv6: prevent NULL dereference in ip6_output()
Eric Dumazet <edumazet@google.com>
ipv6: annotate data-races around cnf.disable_ipv6
Lukasz Majewski <lukma@denx.de>
hsr: Simplify code for announcing HSR nodes timer setup
Eric Dumazet <edumazet@google.com>
net-sysfs: convert dev->operstate reads to lockless ones
Eric Dumazet <edumazet@google.com>
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
Daniel Golle <daniel@makrotopia.org>
dt-bindings: net: mediatek: remove wrongly added clocks and SerDes
David Howells <dhowells@redhat.com>
rxrpc: Only transmit one ACK per jumbo packet received
David Howells <dhowells@redhat.com>
rxrpc: Fix congestion control algorithm
David Howells <dhowells@redhat.com>
rxrpc: Fix the names of the fields in the ACK trailer struct
Ido Schimmel <idosch@nvidia.com>
selftests: test_bridge_neigh_suppress.sh: Fix failures due to duplicate MAC
Hangbin Liu <liuhangbin@gmail.com>
selftests/net: convert test_bridge_neigh_suppress.sh to run it in unique namespace
Shigeru Yoshida <syoshida@redhat.com>
ipv6: Fix potential uninit-value access in __ip6_make_skb()
Felix Fietkau <nbd@nbd.name>
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
nfc: nci: Fix kcov check in nci_rx_work()
Eric Dumazet <edumazet@google.com>
phonet: fix rtm_phonet_notify() skb allocation
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use a separate buffer for sending commands
Roded Zats <rzats@paloaltonetworks.com>
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Marek Vasut <marex@denx.de>
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: HCI: Fix potential null-ptr-deref
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Kuniyuki Iwashima <kuniyu@amazon.com>
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Eric Dumazet <edumazet@google.com>
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
Boy.Wu <boy.wu@mediatek.com>
ARM: 9381/1: kasan: clear stale stack poison
Paul Davey <paul.davey@alliedtelesis.co.nz>
xfrm: Preserve vlan tags for transport mode software GRO
Al Viro <viro@zeniv.linux.org.uk>
qibfs: fix dentry leak
Olga Kornievskaia <kolga@netapp.com>
SUNRPC: add a missing rpc_stat for TCP TLS
Li Nan <linan122@huawei.com>
blk-iocost: do not WARN if iocg was already offlined
Vanillan Wang <vanillanwang@163.com>
net:usb:qmi_wwan: support Rolling modules
Alex Deucher <alexander.deucher@amd.com>
drm/radeon: silence UBSAN warning (v3)
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
platform/x86: ISST: Add Granite Rapids-D to HPM CPU list
Lyude Paul <lyude@redhat.com>
drm/nouveau/dp: Don't probe eDP ports twice harder
Krzysztof Kozlowski <krzk@kernel.org>
gpio: lpc32xx: fix module autoloading
Joakim Sindholt <opensource@zhasha.com>
fs/9p: drop inodes immediately on non-.L too
Stephen Boyd <sboyd@kernel.org>
clk: Don't hold prepare_lock when calling kref_put()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: crystalcove: Use -ENOTSUPP consistently
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: wcove: Use -ENOTSUPP consistently
Michael Ellerman <mpe@ellerman.id.au>
powerpc/crypto/chacha-p10: Fix failure on non Power10
Jeff Layton <jlayton@kernel.org>
9p: explicitly deny setlease attempts
Joakim Sindholt <opensource@zhasha.com>
fs/9p: fix the cache always being enabled on files with qid flags
Joakim Sindholt <opensource@zhasha.com>
fs/9p: translate O_TRUNC into OTRUNC
Joakim Sindholt <opensource@zhasha.com>
fs/9p: only translate RWX permissions for plain 9P2000
Krzysztof Kozlowski <krzk@kernel.org>
iommu: mtk: fix module autoloading
Steve French <stfrench@microsoft.com>
smb3: fix broken reconnect when password changing on the server by allowing password rotation
Michael Kelley <mhklinux@outlook.com>
Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted
Rick Edgecombe <rick.p.edgecombe@intel.com>
uio_hv_generic: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
hv_netvsc: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Leak pages if set_memory_encrypted() fails
John Stultz <jstultz@google.com>
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Zhigang Luo <Zhigang.Luo@amd.com>
amd/amdkfd: sync all devices to wait all processes being evicted
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Fix VCN allocation in CPX partition
Alex Hung <alex.hung@amd.com>
drm/amd/display: Skip on writeback when it's not applicable
Tao Zhou <tao.zhou1@amd.com>
drm/amdgpu: implement IRQ_STATE_ENABLE for SDMA v4.4.2
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Refine IB schedule error logging
Justin Ernst <justin.ernst@hpe.com>
tools/power/turbostat: Fix uncore frequency file string
Jiaxun Yang <jiaxun.yang@flygoat.com>
MIPS: scall: Save thread_info.syscall unconditionally on entry
Thierry Reding <treding@nvidia.com>
gpu: host1x: Do not setup DMA for virtual devices
Rik van Riel <riel@surriel.com>
blk-iocost: avoid out of bounds shift
Xiang Chen <chenxiang66@hisilicon.com>
scsi: hisi_sas: Handle the NCQ error returned by D2H frame
Maurizio Lombardi <mlombard@redhat.com>
scsi: target: Fix SELinux error when systemd-modules loads the target module
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `BIT'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `panic'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `early_pfn_to_nid'
Boris Burkov <boris@bur.io>
btrfs: always clear PERTRANS metadata during commit
Boris Burkov <boris@bur.io>
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
Len Brown <len.brown@intel.com>
tools/power turbostat: Fix warning upon failed /dev/cpu_dma_latency read
Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com>
tools/power turbostat: Print ucode revision only if valid
Peng Liu <liupeng17@lenovo.com>
tools/power turbostat: Fix Bzy_MHz documentation typo
Wyes Karny <wyes.karny@amd.com>
tools/power turbostat: Increase the limit for fd opened
Doug Smythies <dsmythies@telus.net>
tools/power turbostat: Fix added raw MSR output
Adam Goldman <adamg@pobox.com>
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Chen Ni <nichen@iscas.ac.cn>
ata: sata_gemini: Check clk_enable() result
Jeff Layton <jlayton@kernel.org>
vboxsf: explicitly deny setlease attempts
Phil Elwell <phil@raspberrypi.com>
net: bcmgenet: Reset RBUF on first open
Li Nan <linan122@huawei.com>
block: fix overflow in blk_ioctl_discard()
Takashi Iwai <tiwai@suse.de>
ALSA: line6: Zero-initialize message buffers
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: Fix MCQ mode dev command timeout
Yihang Li <liyihang9@huawei.com>
scsi: libsas: Align SMP request allocation to ARCH_DMA_MINALIGN
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: WLUN suspend dev/link state error recovery
André Apitzsch <git@apitzsch.eu>
regulator: tps65132: Add of_match table
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
ASoC: SOF: Intel: hda-dsp: Skip IMR boot on ACE platforms in case of S3 suspend
Borislav Petkov (AMD) <bp@alien8.de>
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Mark Rutland <mark.rutland@arm.com>
selftests/ftrace: Fix event filter target_func selection
Andrei Matei <andreimatei1@gmail.com>
bpf: Check bloom filter map value size
Jonathan Kim <Jonathan.Kim@amd.com>
drm/amdkfd: range check cp bad op exception interrupts
Mukul Joshi <mukul.joshi@amd.com>
drm/amdkfd: Check cgroup when returning DMABuf info
Anand Jain <anand.jain@oracle.com>
btrfs: return accurate error code on open failure in open_fs_devices()
Saurav Kashyap <skashyap@marvell.com>
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
scsi: mpi3mr: Avoid memcpy field-spanning write WARNING
linke li <lilinke99@qq.com>
net: mark racy access on sk->sk_rcvbuf
Benjamin Berg <benjamin.berg@intel.com>
wifi: iwlwifi: mvm: guard against invalid STA ID on removal
Johannes Berg <johannes.berg@intel.com>
wifi: iwlwifi: read txq->read_ptr under lock
Johannes Berg <johannes.berg@intel.com>
wifi: mac80211: fix prep_connection error path
Igor Artemiev <Igor.A.Artemiev@mcst.ru>
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jeff Johnson <quic_jjohnson@quicinc.com>
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Andrew Price <anprice@redhat.com>
gfs2: Fix invalid metadata access in punch_hole
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Use a dedicated lock for ras_fwlog state
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Release hbalock before calling lpfc_worker_wake_up()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Remove IRQF_ONESHOT flag from threaded IRQ handling
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
Rohit Ner <rohitner@google.com>
scsi: ufs: core: Fix MCQ MAC configuration
Oliver Upton <oliver.upton@linux.dev>
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Marc Zyngier <maz@kernel.org>
KVM: arm64: vgic-v2: Use cpuid from userspace as vcpu_id
Will Deacon <will@kernel.org>
swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y
Gaurav Batra <gbatra@linux.ibm.com>
powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: make max polling consistent for longer H_CALLs
Jernej Skrabec <jernej.skrabec@gmail.com>
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Adam Skladowski <a39.skl@gmail.com>
clk: qcom: smd-rpm: Restore msm8976 num_clk
Richard Gobert <richardbgobert@gmail.com>
net: gro: add flush check in udp_gro_receive_segment
Richard Gobert <richardbgobert@gmail.com>
net: gro: fix udp bad offset in socket lookup by adding {inner_}network_offset to napi_gro_cb
Richard Gobert <richardbgobert@gmail.com>
net: gro: parse ipv6 ext headers without frag0 invalidation
Shigeru Yoshida <syoshida@redhat.com>
ipv4: Fix uninit-value access in __ip_make_skb()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Use predefined error codes
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Respect deferred probe
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Correct use of device property APIs
Alexandra Winter <wintera@linux.ibm.com>
s390/qeth: Fix kernel panic after setting hsuid
Guillaume Nault <gnault@redhat.com>
vxlan: Pull inner IP header in vxlan_rcv().
Xin Long <lucien.xin@gmail.com>
tipc: fix a possible memleak in tipc_buf_append
Jeffrey Altman <jaltman@auristor.com>
rxrpc: Clients must accept conn from any address
Felix Fietkau <nbd@nbd.name>
net: core: reject skb_copy(_expand) for fraglist GSO skbs
Felix Fietkau <nbd@nbd.name>
net: bridge: fix multicast-to-unicast with fraglist GSO
Mans Rullgard <mans@mansr.com>
spi: fix null pointer dereference within spi_sync
Shashank Sharma <shashank.sharma@amd.com>
drm/amdgpu: fix doorbell regression
Marek Behún <kabel@kernel.org>
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
cxgb4: Properly lock TX queue for the selftest.
Bui Quang Minh <minhquangbui99@gmail.com>
s390/cio: Ensure the copied buf is NUL terminated
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: cards: select SND_DYNAMIC_MINORS
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-tdm-interface: manage formatters in trigger
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-card: make links nonatomic
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use threaded irq to check periods
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use FIELD helpers
Guillaume Nault <gnault@redhat.com>
vxlan: Add missing VNI filter counter update in arp_reduce().
Guillaume Nault <gnault@redhat.com>
vxlan: Fix racy device stats updates.
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_actions()
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flow_spec
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flower
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: fix E-MU dock initialization
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: move the whole GPIO event handling to the workqueue
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: factor out snd_emu1010_load_dock_firmware()
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: fix E-MU card dock presence monitoring
David Howells <dhowells@redhat.com>
Fix a potential infinite loop in extract_user_to_sg()
Jens Remus <jremus@linux.ibm.com>
s390/vdso: Add CFI for RA register to asm macro vdso_func
David Bauer <mail@david-bauer.net>
net l2tp: drop flow hash on forward
Kuniyuki Iwashima <kuniyu@amazon.com>
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
Bui Quang Minh <minhquangbui99@gmail.com>
octeontx2-af: avoid off-by-one read from userspace
Bui Quang Minh <minhquangbui99@gmail.com>
bna: ensure the copied buf is NUL terminated
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: use flags field to disambiguate broadcast redirect
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix clearing storage keys for huge pages
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix storage key clearing for guest huge pages
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
ASoC: codecs: wsa881x: set clk_stop_mode1 flag
Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
ASoC: Intel: avs: Set name of control as in topology
Xu Kuohai <xukuohai@huawei.com>
riscv, bpf: Fix incorrect runtime stats
Xu Kuohai <xukuohai@huawei.com>
bpf, arm64: Fix incorrect runtime stats
Devyn Liu <liudingyuan@huawei.com>
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: fix version format string
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use common AXI macros
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: move msg state to new struct
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use devm_spi_alloc_host()
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: simplify driver data allocation
Li Zetao <lizetao1@huawei.com>
spi: spi-axi-spi-engine: Use helper function devm_clk_get_enabled()
Anton Protopopov <aspsk@isovalent.com>
bpf: Fix a verifier verbose message
Yi Zhang <yi.zhang@redhat.com>
nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ASoC: SOF: Intel: add default firmware library path for LNL
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
ASoC: SOF: Introduce generic names for IPC types
Richard Fitzgerald <rf@opensource.cirrus.com>
regmap: Add regmap_read_bypassed()
Jason Xing <kernelxing@tencent.com>
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Andrii Nakryiko <andrii@kernel.org>
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change devm_regulator_get_enable_optional() stub to return Ok
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change stubbed devm_regulator_get_enable to return Ok
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
regulator: mt6360: De-capitalize devicetree regulator subnodes
Zeng Heng <zengheng4@huawei.com>
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
Arnd Bergmann <arnd@arndb.de>
power: rt9455: hide unused rt9455_boost_voltage_values
Hans de Goede <hdegoede@redhat.com>
pinctrl: baytrail: Fix selecting gpio pinctrl state
Kuniyuki Iwashima <kuniyu@amazon.com>
nfs: Handle error of rpc_proc_register() in nfs_net_init().
Josef Bacik <josef@toxicpanda.com>
nfs: make the rpc_stat per net namespace
Josef Bacik <josef@toxicpanda.com>
nfs: expose /proc/net/sunrpc/nfs in net namespaces
Josef Bacik <josef@toxicpanda.com>
sunrpc: add a struct rpc_stats arg to rpc_create_args
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
Dan Carpenter <dan.carpenter@linaro.org>
pinctrl: core: delete incorrect free in pinctrl_enable()
Jan Dakinevich <jan.dakinevich@salutedevices.com>
pinctrl/meson: fix typo in PDM's pin name
Billy Tsai <billy_tsai@aspeedtech.com>
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Tim Jiang <quic_tjiang@quicinc.com>
Bluetooth: qca: add support for QCA2066
Daniel Okazaki <dtokazaki@google.com>
eeprom: at24: fix memory corruption race condition
Heiner Kallweit <hkallweit1@gmail.com>
eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
Wedson Almeida Filho <walmeida@microsoft.com>
rust: kernel: require `Send` for `Module` implementations
Johannes Berg <johannes.berg@intel.com>
wifi: nl80211: don't free NULL coalescing rule
Benno Lossin <benno.lossin@proton.me>
rust: macros: fix soundness issue in `module!` macro
Thomas Bertschinger <tahbertschinger@gmail.com>
rust: module: place generated init_module() function in .init.text
Christian Marangi <ansuelsmth@gmail.com>
mtd: limit OTP NVMEM cell parse to non-NAND devices
Rafał Miłecki <rafal@milecki.pl>
nvmem: add explicit config option to read old syntax fixed OF cells
Vinod Koul <vkoul@kernel.org>
dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
Bumyong Lee <bumyong.lee@samsung.com>
dmaengine: pl330: issue_pending waits until WFP state
-------------
Diffstat:
.../bindings/iio/health/maxim,max30102.yaml | 2 +-
.../devicetree/bindings/net/mediatek,net.yaml | 22 +-
Makefile | 4 +-
arch/arm/kernel/sleep.S | 4 +
arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 30 +-
arch/arm64/kvm/vgic/vgic-kvm-device.c | 12 +-
arch/arm64/net/bpf_jit_comp.c | 6 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/kernel/asm-offsets.c | 1 +
arch/mips/kernel/ptrace.c | 15 +-
arch/mips/kernel/scall32-o32.S | 23 +-
arch/mips/kernel/scall64-n32.S | 3 +-
arch/mips/kernel/scall64-n64.S | 3 +-
arch/mips/kernel/scall64-o32.S | 33 +-
arch/powerpc/crypto/chacha-p10-glue.c | 8 +-
arch/powerpc/include/asm/plpks.h | 5 +-
arch/powerpc/platforms/pseries/iommu.c | 8 +
arch/powerpc/platforms/pseries/plpks.c | 10 +-
arch/riscv/net/bpf_jit_comp64.c | 6 +-
arch/s390/include/asm/dwarf.h | 1 +
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2 +
arch/s390/mm/gmap.c | 2 +-
arch/s390/mm/hugetlbpage.c | 2 +-
arch/x86/kernel/apic/apic.c | 16 +-
arch/xtensa/include/asm/processor.h | 8 +-
arch/xtensa/include/asm/ptrace.h | 2 +-
arch/xtensa/kernel/process.c | 5 +-
arch/xtensa/kernel/stacktrace.c | 3 +-
block/blk-iocost.c | 14 +-
block/ioctl.c | 5 +-
drivers/ata/sata_gemini.c | 5 +-
drivers/base/regmap/regmap.c | 37 +++
drivers/bluetooth/btqca.c | 208 ++++++++++++-
drivers/bluetooth/btqca.h | 8 +-
drivers/bluetooth/hci_qca.c | 13 +-
drivers/clk/clk.c | 12 +-
drivers/clk/qcom/clk-smd-rpm.c | 1 +
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 2 +
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 +-
drivers/clk/sunxi-ng/ccu_common.c | 19 ++
drivers/clk/sunxi-ng/ccu_common.h | 3 +
drivers/dma/idxd/cdev.c | 77 +++++
drivers/dma/idxd/idxd.h | 3 +
drivers/dma/idxd/init.c | 4 +
drivers/dma/idxd/registers.h | 3 -
drivers/dma/idxd/sysfs.c | 27 +-
drivers/firewire/nosy.c | 6 +-
drivers/firewire/ohci.c | 14 +-
drivers/gpio/gpio-crystalcove.c | 2 +-
drivers/gpio/gpio-lpc32xx.c | 1 +
drivers/gpio/gpio-wcove.c | 2 +-
drivers/gpio/gpiolib-cdev.c | 181 +++++++++--
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 56 ++--
drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 15 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 16 +-
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 11 +-
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +
.../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 48 ++-
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 +
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6 +
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2 +-
drivers/gpu/drm/drm_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_audio.c | 113 +------
drivers/gpu/drm/i915/display/intel_bios.c | 19 +-
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5 -
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c | 6 +-
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.h | 2 +-
drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +-
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 ++---
drivers/gpu/drm/nouveau/nouveau_dp.c | 13 +-
drivers/gpu/drm/panel/Kconfig | 2 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 13 +-
drivers/gpu/drm/qxl/qxl_release.c | 50 +---
drivers/gpu/drm/radeon/pptable.h | 10 +-
drivers/gpu/drm/ttm/ttm_tt.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
drivers/gpu/host1x/bus.c | 8 -
drivers/hv/channel.c | 29 +-
drivers/hv/connection.c | 29 +-
drivers/hwmon/corsair-cpro.c | 43 ++-
drivers/hwmon/pmbus/ucd9000.c | 6 +-
drivers/iio/accel/mxc4005.c | 24 +-
drivers/iio/imu/adis16475.c | 4 +-
drivers/iio/pressure/bmp280-spi.c | 4 +-
drivers/infiniband/hw/qib/qib_fs.c | 1 +
drivers/iommu/mtk_iommu.c | 1 +
drivers/iommu/mtk_iommu_v1.c | 1 +
drivers/md/md.c | 1 +
drivers/misc/eeprom/at24.c | 47 ++-
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/mtd/mtdcore.c | 2 +
drivers/net/dsa/mv88e6xxx/chip.c | 20 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 32 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8 +-
drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +-
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 52 ++--
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 20 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +-
drivers/net/ethernet/intel/e1000e/phy.c | 8 +-
.../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +-
drivers/net/ethernet/micrel/ks8851_common.c | 16 +-
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14 +-
drivers/net/hyperv/netvsc.c | 7 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/vxlan/vxlan_core.c | 49 ++-
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 7 +-
drivers/net/wireless/intel/iwlwifi/queue/tx.c | 2 +-
drivers/nvme/host/core.c | 2 +-
drivers/nvme/host/nvme.h | 5 +
drivers/nvme/host/pci.c | 14 +-
drivers/nvmem/apple-efuses.c | 1 +
drivers/nvmem/core.c | 8 +-
drivers/nvmem/imx-ocotp-scu.c | 1 +
drivers/nvmem/imx-ocotp.c | 1 +
drivers/nvmem/meson-efuse.c | 1 +
drivers/nvmem/meson-mx-efuse.c | 1 +
drivers/nvmem/microchip-otpc.c | 1 +
drivers/nvmem/mtk-efuse.c | 1 +
drivers/nvmem/qcom-spmi-sdam.c | 1 +
drivers/nvmem/qfprom.c | 1 +
drivers/nvmem/rave-sp-eeprom.c | 1 +
drivers/nvmem/rockchip-efuse.c | 1 +
drivers/nvmem/sc27xx-efuse.c | 1 +
drivers/nvmem/sec-qfprom.c | 1 +
drivers/nvmem/sprd-efuse.c | 1 +
drivers/nvmem/stm32-romem.c | 1 +
drivers/nvmem/sunplus-ocotp.c | 1 +
drivers/nvmem/sunxi_sid.c | 1 +
drivers/nvmem/uniphier-efuse.c | 1 +
drivers/nvmem/zynqmp_nvmem.c | 1 +
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 +--
drivers/pinctrl/core.c | 8 +-
drivers/pinctrl/devicetree.c | 10 +-
drivers/pinctrl/intel/pinctrl-baytrail.c | 74 ++---
drivers/pinctrl/intel/pinctrl-intel.h | 4 +
drivers/pinctrl/mediatek/pinctrl-paris.c | 40 +--
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +-
.../x86/intel/speed_select_if/isst_if_common.c | 1 +
drivers/power/supply/mt6360_charger.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +
drivers/regulator/core.c | 27 +-
drivers/regulator/mt6360-regulator.c | 32 +-
drivers/regulator/tps65132-regulator.c | 7 +
drivers/rtc/nvmem.c | 1 +
drivers/s390/cio/cio_inject.c | 2 +-
drivers/s390/net/qeth_core_main.c | 69 ++---
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 -
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 +-
drivers/scsi/libsas/sas_expander.c | 2 +-
drivers/scsi/lpfc/lpfc.h | 2 +-
drivers/scsi/lpfc/lpfc_attr.c | 4 +-
drivers/scsi/lpfc/lpfc_bsg.c | 20 +-
drivers/scsi/lpfc/lpfc_debugfs.c | 12 +-
drivers/scsi/lpfc/lpfc_els.c | 20 +-
drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +-
drivers/scsi/lpfc/lpfc_init.c | 5 +-
drivers/scsi/lpfc/lpfc_nvme.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 13 +-
drivers/scsi/lpfc/lpfc_sli.c | 34 +--
drivers/scsi/lpfc/lpfc_vport.c | 8 +-
drivers/scsi/mpi3mr/mpi3mr_app.c | 2 +-
drivers/slimbus/qcom-ngd-ctrl.c | 6 +-
drivers/spi/spi-axi-spi-engine.c | 229 +++++++-------
drivers/spi/spi-hisi-kunpeng.c | 2 -
drivers/spi/spi-microchip-core-qspi.c | 1 +
drivers/spi/spi.c | 1 +
drivers/target/target_core_configfs.c | 12 +
drivers/ufs/core/ufs-mcq.c | 2 +-
drivers/ufs/core/ufshcd.c | 9 +-
drivers/uio/uio_hv_generic.c | 12 +-
drivers/usb/core/hub.c | 5 +-
drivers/usb/core/port.c | 8 +-
drivers/usb/dwc3/core.c | 90 +++---
drivers/usb/dwc3/core.h | 1 +
drivers/usb/dwc3/gadget.c | 2 +
drivers/usb/dwc3/host.c | 27 ++
drivers/usb/gadget/composite.c | 6 +-
drivers/usb/gadget/function/f_fs.c | 9 +-
drivers/usb/gadget/function/uvc_configfs.c | 4 +-
drivers/usb/host/ohci-hcd.c | 8 +
drivers/usb/host/xhci-plat.h | 4 +-
drivers/usb/host/xhci-rzv2m.c | 1 +
drivers/usb/typec/tcpm/tcpm.c | 36 ++-
drivers/usb/typec/ucsi/ucsi.c | 12 +-
drivers/vfio/pci/vfio_pci.c | 2 +
drivers/w1/slaves/w1_ds250x.c | 1 +
fs/9p/fid.h | 3 -
fs/9p/vfs_file.c | 2 +
fs/9p/vfs_inode.c | 5 +-
fs/9p/vfs_super.c | 1 +
fs/btrfs/extent_io.c | 14 +-
fs/btrfs/inode.c | 2 +-
fs/btrfs/ordered-data.c | 1 +
fs/btrfs/send.c | 4 +-
fs/btrfs/transaction.c | 2 +-
fs/btrfs/volumes.c | 18 +-
fs/gfs2/bmap.c | 5 +-
fs/nfs/client.c | 5 +-
fs/nfs/inode.c | 13 +-
fs/nfs/internal.h | 2 -
fs/nfs/netns.h | 2 +
fs/smb/client/cifsglob.h | 1 +
fs/smb/client/connect.c | 8 +
fs/smb/client/fs_context.c | 21 ++
fs/smb/client/fs_context.h | 2 +
fs/smb/client/misc.c | 1 +
fs/smb/client/smb2pdu.c | 11 +
fs/smb/server/oplock.c | 35 ++-
fs/smb/server/transport_tcp.c | 4 +
fs/tracefs/event_inode.c | 45 ++-
fs/tracefs/inode.c | 92 +++++-
fs/tracefs/internal.h | 7 +-
fs/userfaultfd.c | 4 +
fs/vboxsf/file.c | 1 +
include/linux/compiler_types.h | 11 +
include/linux/dma-fence.h | 7 -
include/linux/gfp_types.h | 2 +
include/linux/hyperv.h | 1 +
include/linux/nvmem-provider.h | 2 +
include/linux/pci_ids.h | 2 +
include/linux/regmap.h | 8 +
include/linux/regulator/consumer.h | 4 +-
include/linux/skbuff.h | 15 +
include/linux/skmsg.h | 2 +
include/linux/slab.h | 2 +-
include/linux/sunrpc/clnt.h | 1 +
include/net/gro.h | 9 +
include/net/xfrm.h | 3 +
include/sound/emu10k1.h | 3 +-
include/sound/sof.h | 7 +-
include/trace/events/rxrpc.h | 2 +-
include/uapi/linux/kfd_ioctl.h | 17 +-
include/uapi/scsi/scsi_bsg_mpi3mr.h | 2 +-
kernel/bpf/bloom_filter.c | 13 +
kernel/bpf/verifier.c | 3 +-
kernel/dma/swiotlb.c | 1 +
kernel/workqueue.c | 8 +-
lib/Kconfig.debug | 5 +-
lib/dynamic_debug.c | 6 +-
lib/maple_tree.c | 16 +-
lib/scatterlist.c | 2 +-
mm/hugetlb.c | 4 +-
mm/readahead.c | 4 +
net/8021q/vlan_core.c | 2 +
net/bluetooth/hci_core.c | 3 +-
net/bluetooth/hci_event.c | 2 +
net/bluetooth/l2cap_core.c | 3 +
net/bluetooth/msft.c | 2 +-
net/bluetooth/msft.h | 4 +-
net/bluetooth/sco.c | 4 +
net/bridge/br_forward.c | 9 +-
net/bridge/br_netlink.c | 3 +-
net/core/filter.c | 42 ++-
net/core/gro.c | 1 +
net/core/link_watch.c | 4 +-
net/core/net-sysfs.c | 4 +-
net/core/net_namespace.c | 13 +-
net/core/rtnetlink.c | 6 +-
net/core/skbuff.c | 27 +-
net/core/skmsg.c | 5 +-
net/core/sock.c | 4 +-
net/hsr/hsr_device.c | 31 +-
net/ipv4/af_inet.c | 1 +
net/ipv4/ip_output.c | 2 +-
net/ipv4/raw.c | 3 +
net/ipv4/tcp.c | 4 +-
net/ipv4/tcp_input.c | 2 +
net/ipv4/tcp_ipv4.c | 8 +-
net/ipv4/tcp_output.c | 4 +-
net/ipv4/udp.c | 3 +-
net/ipv4/udp_offload.c | 15 +-
net/ipv4/xfrm4_input.c | 6 +-
net/ipv6/addrconf.c | 11 +-
net/ipv6/fib6_rules.c | 6 +-
net/ipv6/ip6_input.c | 4 +-
net/ipv6/ip6_offload.c | 52 +++-
net/ipv6/ip6_output.c | 4 +-
net/ipv6/udp.c | 3 +-
net/ipv6/udp_offload.c | 3 +-
net/ipv6/xfrm6_input.c | 6 +-
net/l2tp/l2tp_eth.c | 3 +
net/mac80211/ieee80211_i.h | 4 +-
net/mac80211/mlme.c | 5 +-
net/mptcp/ctrl.c | 39 ++-
net/mptcp/protocol.c | 3 +
net/nfc/nci/core.c | 1 +
net/nsh/nsh.c | 14 +-
net/phonet/pn_netlink.c | 2 +-
net/rxrpc/ar-internal.h | 2 +-
net/rxrpc/call_object.c | 7 +-
net/rxrpc/conn_event.c | 16 +-
net/rxrpc/conn_object.c | 9 +-
net/rxrpc/input.c | 71 +++--
net/rxrpc/output.c | 14 +-
net/rxrpc/protocol.h | 6 +-
net/smc/smc_ib.c | 19 +-
net/sunrpc/clnt.c | 5 +-
net/sunrpc/xprtsock.c | 1 +
net/tipc/msg.c | 8 +-
net/wireless/nl80211.c | 2 +
net/wireless/trace.h | 2 +-
net/xfrm/xfrm_input.c | 8 +
rust/kernel/lib.rs | 2 +-
rust/macros/module.rs | 185 +++++++-----
scripts/Makefile.modfinal | 2 +-
security/keys/key.c | 3 +-
sound/hda/intel-sdw-acpi.c | 2 +
sound/pci/emu10k1/emu10k1.c | 3 +-
sound/pci/emu10k1/emu10k1_main.c | 139 +++++----
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/codecs/wsa881x.c | 1 +
sound/soc/intel/avs/topology.c | 2 +
sound/soc/meson/Kconfig | 1 +
sound/soc/meson/axg-card.c | 1 +
sound/soc/meson/axg-fifo.c | 56 ++--
sound/soc/meson/axg-fifo.h | 12 +-
sound/soc/meson/axg-frddr.c | 5 +-
sound/soc/meson/axg-tdm-interface.c | 34 ++-
sound/soc/meson/axg-toddr.c | 22 +-
sound/soc/sof/intel/hda-dsp.c | 20 +-
sound/soc/sof/intel/pci-lnl.c | 3 +
sound/soc/tegra/tegra186_dspk.c | 7 +-
sound/soc/ti/davinci-mcasp.c | 12 +-
sound/usb/line6/driver.c | 6 +-
tools/include/linux/kernel.h | 1 +
tools/include/linux/mm.h | 5 +
tools/include/linux/panic.h | 19 ++
tools/power/x86/turbostat/turbostat.8 | 2 +-
tools/power/x86/turbostat/turbostat.c | 45 ++-
.../selftests/bpf/prog_tests/bloom_filter_map.c | 6 +
.../testing/selftests/bpf/prog_tests/tc_redirect.c | 52 ----
.../ftrace/test.d/filter/event-filter-function.tc | 2 +-
tools/testing/selftests/mm/Makefile | 6 +-
.../selftests/net/test_bridge_neigh_suppress.sh | 333 ++++++++++-----------
tools/testing/selftests/timers/valid-adjtimex.c | 73 +++--
350 files changed, 3151 insertions(+), 1846 deletions(-)
^ permalink raw reply [relevance 2%]
* [PATCH 6.8 000/339] 6.8.10-rc3 review
@ 2024-05-16 12:14 1% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-16 12:14 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 6.8.10 release.
There are 339 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sat, 18 May 2024 12:12:41 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.8.10-rc3.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.8.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 6.8.10-rc3
Silvio Gissi <sifonsec@amazon.com>
keys: Fix overwrite of key expiration on instantiation
Nikhil Rao <nikhil.rao@intel.com>
dmaengine: idxd: add a write() method for applications to submit work
Arjan van de Ven <arjan@linux.intel.com>
dmaengine: idxd: add a new security check to deal with a hardware erratum
Arjan van de Ven <arjan@linux.intel.com>
VFIO: Add the SPR_DSA and SPR_IAX devices to the denylist
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix firmware check error path
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching fw build id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching board id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: generalise device address check
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix NVM configuration parsing
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: add missing firmware sanity checks
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix wcn3991 device address check
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix invalid device address check
Steven Rostedt (Google) <rostedt@goodmis.org>
eventfs: Do not treat events directory different than other directories
Steven Rostedt (Google) <rostedt@goodmis.org>
tracefs: Still use mount point as default permissions for instances
Steven Rostedt (Google) <rostedt@goodmis.org>
tracefs: Reset permissions on remount if permissions are options
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: avoid to send duplicate lease break notifications
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: off ipv6only for both ipv4/ipv6 binding
Conor Dooley <conor.dooley@microchip.com>
spi: microchip-core-qspi: fix setting spi bus clock rate
Johan Hovold <johan+linaro@kernel.org>
regulator: core: fix debugfs creation regression
Sean Anderson <sean.anderson@linux.dev>
nvme-pci: Add quirk for broken MSIs
Ryan Roberts <ryan.roberts@arm.com>
fs/proc/task_mmu: fix uffd-wp confusion in pagemap_scan_pmd_entry()
Ryan Roberts <ryan.roberts@arm.com>
fs/proc/task_mmu: fix loss of young/dirty bits during pagemap scan
Vasant Hegde <vasant.hegde@amd.com>
iommu/amd: Enhance def_domain_type to handle untrusted device
Peter Xu <peterx@redhat.com>
mm/userfaultfd: reset ptes when close() for wr-protected ones
Kefeng Wang <wangkefeng.wang@huawei.com>
mm: use memalloc_nofs_save() in page_cache_ra_order()
Michael Ellerman <mpe@ellerman.id.au>
selftests/mm: fix powerpc ARCH check
Thomas Gleixner <tglx@linutronix.de>
x86/apic: Don't access the APIC when disabling x2APIC
Thomas Weißschuh <linux@weissschuh.net>
misc/pvpanic-pci: register attributes via pci_driver
Lakshmi Yadlapati <lakshmiy@us.ibm.com>
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
net: fix out-of-bounds access in ops_init
Jason Gunthorpe <jgg@ziepe.ca>
iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault()
Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
arm64: dts: qcom: sa8155p-adp: fix SDHC2 CD pin configuration
Hersen Wu <hersenxs.wu@amd.com>
drm/amd/display: Fix incorrect DSC instance for MST
George Shen <george.shen@amd.com>
drm/amd/display: Handle Y carry-over in VCP X.Y calculation
Karthikeyan Ramasubramanian <kramasub@chromium.org>
drm/i915/bios: Fix parsing backlight BDB data
Andi Shyti <andi.shyti@linux.intel.com>
drm/i915/gt: Automate CCS Mode setting during engine resets
Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
drm/i915/audio: Fix audio time stamp programming for DP
Lyude Paul <lyude@redhat.com>
drm/nouveau/gsp: Use the sg allocator for level 2 of radix3
Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
drm/amd/display: Fix idle optimization checks for multi-display and dual eDP
Matt Coster <matt.coster@imgtec.com>
drm/imagination: Ensure PVR_MIPS_PT_PAGE_COUNT is never zero
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix invalid reads in fence signaled events
Ian Forbes <ian.forbes@broadcom.com>
drm/vmwgfx: Fix Legacy Display Unit
Zack Rusin <zack.rusin@broadcom.com>
drm/ttm: Print the memory decryption status just once
Alex Deucher <alexander.deucher@amd.com>
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Dave Airlie <airlied@redhat.com>
Revert "drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()"
Lyude Paul <lyude@redhat.com>
drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: add lunar lake point M DID
Frank Oltmanns <frank@oltmanns.dev>
clk: sunxi-ng: a64: Set minimum and maximum rate for PLL-MIPI
Frank Oltmanns <frank@oltmanns.dev>
clk: sunxi-ng: common: Support minimum and maximum rate
Marek Szyprowski <m.szyprowski@samsung.com>
clk: samsung: Revert "clk: Use device_get_match_data()"
Viken Dadhaniya <quic_vdadhani@quicinc.com>
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Jim Cromie <jim.cromie@gmail.com>
dyndbg: fix old BUG_ON in >control parser
Joao Paulo Goncalves <joao.goncalves@toradex.com>
ASoC: ti: davinci-mcasp: Fix race condition during probe
Sameer Pujar <spujar@nvidia.com>
ASoC: tegra: Fix DSPK 16-bit playback
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize UMAC_CMD access
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
Max Filippov <jcmvbkbc@gmail.com>
xtensa: fix MAKE_PC_FROM_RA second argument
Paolo Abeni <pabeni@redhat.com>
tipc: fix UAF in error path
Vitaly Lifshits <vitaly.lifshits@intel.com>
e1000e: change usleep_range to udelay in PHY mdic access
Alexander Potapenko <glider@google.com>
kmsan: compiler_types: declare __no_sanitize_or_inline
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Reset chip on probe() and resume()
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Interrupt handling fixes
Vasileios Amoiridis <vassilisamir@gmail.com>
iio: pressure: Fixes SPI support for BMP3xx devices
Vasileios Amoiridis <vassilisamir@gmail.com>
iio: pressure: Fixes BME280 SPI driver data
Ramona Gradinariu <ramona.bolboaca13@gmail.com>
iio:imu: adis16475: Fix sync mode setting
Javier Carrasco <javier.carrasco.cruz@gmail.com>
dt-bindings: iio: health: maxim,max30102: fix compatible check
Sven Schnelle <svens@linux.ibm.com>
workqueue: Fix selection of wake_cpu in kick_pool()
Gregory Detal <gregory.detal@gmail.com>
mptcp: only allow set existing scheduler for net.mptcp.scheduler
Paolo Abeni <pabeni@redhat.com>
mptcp: ensure snd_nxt is properly initialized on connect
Dan Carpenter <dan.carpenter@linaro.org>
mm/slab: make __free(kfree) accept error pointers
Liam R. Howlett <Liam.Howlett@oracle.com>
maple_tree: fix mas_empty_area_rev() null pointer dereference
Josef Bacik <josef@toxicpanda.com>
btrfs: make sure that WRITTEN is set on all metadata blocks
Qu Wenruo <wqu@suse.com>
btrfs: qgroup: do not check qgroup inherit if qgroup is disabled
Qu Wenruo <wqu@suse.com>
btrfs: set correct ram_bytes when splitting ordered extent
Dominique Martinet <dominique.martinet@atmark-techno.com>
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Nicolas Bouchinet <nicolas.bouchinet@ssi.gouv.fr>
mm/slub: avoid zeroing outside-object freepointer for single free
Takashi Sakamoto <o-takashi@sakamocchi.jp>
firewire: ohci: fulfill timestamp for some local asynchronous transaction
Takashi Iwai <tiwai@suse.de>
ALSA: hda/realtek: Fix conflicting PCI SSID 17aa:386f for Lenovo Legion models
Aman Dhoot <amandhoot12@gmail.com>
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Badhri Jagan Sridharan <badhri@google.com>
usb: typec: tcpm: Check for port partner validity before consuming it
Amit Sunil Dhamne <amitsd@google.com>
usb: typec: tcpm: unregister existing source caps before re-registration
RD Babiera <rdbabiera@google.com>
usb: typec: tcpm: clear pd_event queue in PORT_RESET
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: dwc3: core: Prevent phy suspend during init
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: xhci-plat: Don't include xhci.h
Chris Wulff <Chris.Wulff@biamp.com>
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Wesley Cheng <quic_wcheng@quicinc.com>
usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete
Ivan Avdeev <me@provod.works>
usb: gadget: uvc: use correct buffer size when parsing configfs lists
Peter Korsgaard <peter@korsgaard.com>
usb: gadget: composite: fix OS descriptors w_value logic
Alan Stern <stern@rowland.harvard.edu>
USB: core: Fix access violation during port device removal
Guenter Roeck <linux@roeck-us.net>
usb: ohci: Prevent missed ohci interrupts
Alan Stern <stern@rowland.harvard.edu>
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Fix connector check on init
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Check for notifications after init
Linus Torvalds <torvalds@linux-foundation.org>
Reapply "drm/qxl: simplify qxl_fence_wait"
Thanassis Avgerinos <thanassis.avgerinos@gmail.com>
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Christian König <christian.koenig@amd.com>
drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2
Michel Dänzer <mdaenzer@redhat.com>
drm/amdgpu: Fix comparison in amdgpu_res_cpu_visible
Gabe Teeger <gabe.teeger@amd.com>
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: fix uninitialised kfifo
Zhongqiu Han <quic_zhonhan@quicinc.com>
gpiolib: cdev: Fix use after free in lineinfo_changed_notify
Mario Limonciello <mario.limonciello@amd.com>
dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
Douglas Anderson <dianders@chromium.org>
drm/connector: Add \n to message about demoting connector force-probes
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: add bandgap setting for g12
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: power up phy on device init
Steffen Bätz <steffen@innosonix.de>
net: dsa: mv88e6xxx: add phylink_get_caps for the mv88e6320/21 family
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix kernel crash when devlink reload during initialization
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix port vlan filter not disabled issue
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: use appropriate barrier function after setting a bit value
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: release PTP resources if pf initialization failed
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: change type of numa_node_mask as nodemask_t
Jian Shen <shenjian15@huawei.com>
net: hns3: direct return when receive a unknown mailbox message
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: using user configure after hardware reset
Wen Gu <guwen@linux.alibaba.com>
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Eric Dumazet <edumazet@google.com>
ipv6: prevent NULL dereference in ip6_output()
Eric Dumazet <edumazet@google.com>
ipv6: annotate data-races around cnf.disable_ipv6
Lukasz Majewski <lukma@denx.de>
hsr: Simplify code for announcing HSR nodes timer setup
Eric Dumazet <edumazet@google.com>
net-sysfs: convert dev->operstate reads to lockless ones
Eric Dumazet <edumazet@google.com>
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
Daniel Golle <daniel@makrotopia.org>
dt-bindings: net: mediatek: remove wrongly added clocks and SerDes
David Howells <dhowells@redhat.com>
rxrpc: Only transmit one ACK per jumbo packet received
David Howells <dhowells@redhat.com>
rxrpc: Fix congestion control algorithm
David Howells <dhowells@redhat.com>
rxrpc: Fix the names of the fields in the ACK trailer struct
Ido Schimmel <idosch@nvidia.com>
selftests: test_bridge_neigh_suppress.sh: Fix failures due to duplicate MAC
Shigeru Yoshida <syoshida@redhat.com>
ipv6: Fix potential uninit-value access in __ip6_make_skb()
Felix Fietkau <nbd@nbd.name>
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
nfc: nci: Fix kcov check in nci_rx_work()
Donald Hunter <donald.hunter@gmail.com>
netlink: specs: Add missing bridge linkinfo attrs
Eric Dumazet <edumazet@google.com>
phonet: fix rtm_phonet_notify() skb allocation
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use a separate buffer for sending commands
Roded Zats <rzats@paloaltonetworks.com>
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Marek Vasut <marex@denx.de>
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: HCI: Fix potential null-ptr-deref
Chen-Yu Tsai <wenst@chromium.org>
arm64: dts: mediatek: mt8183-pico6: Fix bluetooth node
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Kuniyuki Iwashima <kuniyu@amazon.com>
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Eric Dumazet <edumazet@google.com>
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
Boy.Wu <boy.wu@mediatek.com>
ARM: 9381/1: kasan: clear stale stack poison
Paul Davey <paul.davey@alliedtelesis.co.nz>
xfrm: Preserve vlan tags for transport mode software GRO
Al Viro <viro@zeniv.linux.org.uk>
qibfs: fix dentry leak
Olga Kornievskaia <kolga@netapp.com>
SUNRPC: add a missing rpc_stat for TCP TLS
Li Nan <linan122@huawei.com>
blk-iocost: do not WARN if iocg was already offlined
Vanillan Wang <vanillanwang@163.com>
net:usb:qmi_wwan: support Rolling modules
Alex Deucher <alexander.deucher@amd.com>
drm/radeon: silence UBSAN warning (v3)
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
platform/x86: ISST: Add Granite Rapids-D to HPM CPU list
Mario Limonciello <mario.limonciello@amd.com>
platform/x86/amd: pmf: Decrease error message to debug
Lyude Paul <lyude@redhat.com>
drm/nouveau/dp: Don't probe eDP ports twice harder
Krzysztof Kozlowski <krzk@kernel.org>
gpio: lpc32xx: fix module autoloading
Joakim Sindholt <opensource@zhasha.com>
fs/9p: drop inodes immediately on non-.L too
Eric Van Hensbergen <ericvh@kernel.org>
fs/9p: remove erroneous nlink init from legacy stat2inode
Stephen Boyd <sboyd@kernel.org>
clk: Don't hold prepare_lock when calling kref_put()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: crystalcove: Use -ENOTSUPP consistently
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: wcove: Use -ENOTSUPP consistently
Michael Ellerman <mpe@ellerman.id.au>
powerpc/crypto/chacha-p10: Fix failure on non Power10
Jeff Layton <jlayton@kernel.org>
9p: explicitly deny setlease attempts
Joakim Sindholt <opensource@zhasha.com>
fs/9p: fix the cache always being enabled on files with qid flags
Joakim Sindholt <opensource@zhasha.com>
fs/9p: translate O_TRUNC into OTRUNC
Joakim Sindholt <opensource@zhasha.com>
fs/9p: only translate RWX permissions for plain 9P2000
Krzysztof Kozlowski <krzk@kernel.org>
iommu: mtk: fix module autoloading
Steve French <stfrench@microsoft.com>
smb3: fix broken reconnect when password changing on the server by allowing password rotation
Ashutosh Dixit <ashutosh.dixit@intel.com>
drm/xe: Label RING_CONTEXT_CONTROL as masked
Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
drm/xe/xe_migrate: Cast to output precision before multiplying operands
Michael Kelley <mhklinux@outlook.com>
Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted
Rick Edgecombe <rick.p.edgecombe@intel.com>
uio_hv_generic: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
hv_netvsc: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Leak pages if set_memory_encrypted() fails
John Stultz <jstultz@google.com>
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Zhigang Luo <Zhigang.Luo@amd.com>
amd/amdkfd: sync all devices to wait all processes being evicted
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Fix VCN allocation in CPX partition
Kenneth Feng <kenneth.feng@amd.com>
drm/amd/pm: fix the high voltage issue after unload
Alex Hung <alex.hung@amd.com>
drm/amd/display: Skip on writeback when it's not applicable
Tao Zhou <tao.zhou1@amd.com>
drm/amdgpu: implement IRQ_STATE_ENABLE for SDMA v4.4.2
Yifan Zhang <yifan1.zhang@amd.com>
drm/amdgpu: add smu 14.0.1 discovery support
Li Ma <li.ma@amd.com>
drm/amd/display: add DCN 351 version for microcode load
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Refine IB schedule error logging
Eric Dumazet <edumazet@google.com>
nfc: llcp: fix nfc_llcp_setsockopt() unsafe copies
Eric Dumazet <edumazet@google.com>
net: add copy_safe_from_sockptr() helper
Justin Ernst <justin.ernst@hpe.com>
tools/power/turbostat: Fix uncore frequency file string
Jiaxun Yang <jiaxun.yang@flygoat.com>
MIPS: scall: Save thread_info.syscall unconditionally on entry
Thierry Reding <treding@nvidia.com>
gpu: host1x: Do not setup DMA for virtual devices
Bernhard Rosenkränzer <bero@baylibre.com>
platform/x86: acer-wmi: Add support for Acer PH18-71
Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
accel/ivpu: Fix missed error message after VPU rename
Wachowski, Karol <karol.wachowski@intel.com>
accel/ivpu: Improve clarity of MMU error messages
Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
accel/ivpu: Remove d3hot_after_power_off WA
Rik van Riel <riel@surriel.com>
blk-iocost: avoid out of bounds shift
Xiang Chen <chenxiang66@hisilicon.com>
scsi: hisi_sas: Handle the NCQ error returned by D2H frame
Maurizio Lombardi <mlombard@redhat.com>
scsi: target: Fix SELinux error when systemd-modules loads the target module
Kees Cook <keescook@chromium.org>
nouveau/gsp: Avoid addressing beyond end of rpc->entries
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `BIT'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `panic'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `early_pfn_to_nid'
Boris Burkov <boris@bur.io>
btrfs: always clear PERTRANS metadata during commit
Boris Burkov <boris@bur.io>
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
Len Brown <len.brown@intel.com>
tools/power turbostat: Fix warning upon failed /dev/cpu_dma_latency read
Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com>
tools/power turbostat: Print ucode revision only if valid
Len Brown <len.brown@intel.com>
tools/power turbostat: Expand probe_intel_uncore_frequency()
Chen Yu <yu.c.chen@intel.com>
tools/power turbostat: Do not print negative LPI residency
Peng Liu <liupeng17@lenovo.com>
tools/power turbostat: Fix Bzy_MHz documentation typo
Wyes Karny <wyes.karny@amd.com>
tools/power turbostat: Increase the limit for fd opened
Doug Smythies <dsmythies@telus.net>
tools/power turbostat: Fix added raw MSR output
Adam Goldman <adamg@pobox.com>
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Chen Ni <nichen@iscas.ac.cn>
ata: sata_gemini: Check clk_enable() result
Jeff Layton <jlayton@kernel.org>
vboxsf: explicitly deny setlease attempts
Phil Elwell <phil@raspberrypi.com>
net: bcmgenet: Reset RBUF on first open
Zhang Yi <zhangyi@everest-semi.com>
ASoC: codecs: ES8326: modify clock table
Zhang Yi <zhangyi@everest-semi.com>
ASoC: codecs: ES8326: Solve error interruption issue
Li Nan <linan122@huawei.com>
block: fix overflow in blk_ioctl_discard()
Takashi Iwai <tiwai@suse.de>
ALSA: line6: Zero-initialize message buffers
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: Fix MCQ mode dev command timeout
Yihang Li <liyihang9@huawei.com>
scsi: libsas: Align SMP request allocation to ARCH_DMA_MINALIGN
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: WLUN suspend dev/link state error recovery
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
OSS: dmasound/paula: Mark driver struct with __refdata to prevent section mismatch
André Apitzsch <git@apitzsch.eu>
regulator: tps65132: Add of_match table
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
ASoC: SOF: Intel: hda-dsp: Skip IMR boot on ACE platforms in case of S3 suspend
Borislav Petkov (AMD) <bp@alien8.de>
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Mark Rutland <mark.rutland@arm.com>
selftests/ftrace: Fix event filter target_func selection
Andrei Matei <andreimatei1@gmail.com>
bpf: Check bloom filter map value size
Jonathan Kim <Jonathan.Kim@amd.com>
drm/amdkfd: range check cp bad op exception interrupts
Mukul Joshi <mukul.joshi@amd.com>
drm/amdkfd: Check cgroup when returning DMABuf info
Anand Jain <anand.jain@oracle.com>
btrfs: return accurate error code on open failure in open_fs_devices()
Saurav Kashyap <skashyap@marvell.com>
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
scsi: mpi3mr: Avoid memcpy field-spanning write WARNING
Lucas De Marchi <lucas.demarchi@intel.com>
drm/xe: Fix END redefinition
linke li <lilinke99@qq.com>
net: mark racy access on sk->sk_rcvbuf
Benjamin Berg <benjamin.berg@intel.com>
wifi: iwlwifi: mvm: guard against invalid STA ID on removal
Johannes Berg <johannes.berg@intel.com>
wifi: iwlwifi: read txq->read_ptr under lock
Johannes Berg <johannes.berg@intel.com>
wifi: mac80211: fix prep_connection error path
Igor Artemiev <Igor.A.Artemiev@mcst.ru>
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jeff Johnson <quic_jjohnson@quicinc.com>
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Eric Van Hensbergen <ericvh@kernel.org>
fs/9p: fix uninitialized values during inode evict
Andrew Price <anprice@redhat.com>
gfs2: Fix invalid metadata access in punch_hole
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Use a dedicated lock for ras_fwlog state
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Release hbalock before calling lpfc_worker_wake_up()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Remove IRQF_ONESHOT flag from threaded IRQ handling
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
Rohit Ner <rohitner@google.com>
scsi: ufs: core: Fix MCQ MAC configuration
Conor Dooley <conor.dooley@microchip.com>
firmware: microchip: don't unconditionally print validation success
Yuezhang Mo <Yuezhang.Mo@sony.com>
exfat: fix timing of synchronizing bitmap and inode
Oliver Upton <oliver.upton@linux.dev>
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Will Deacon <will@kernel.org>
swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y
Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
EDAC/versal: Do not log total error counts
Gaurav Batra <gbatra@linux.ibm.com>
powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: make max polling consistent for longer H_CALLs
Jernej Skrabec <jernej.skrabec@gmail.com>
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Adam Skladowski <a39.skl@gmail.com>
clk: qcom: smd-rpm: Restore msm8976 num_clk
Lucas De Marchi <lucas.demarchi@intel.com>
drm/xe/display: Fix ADL-N detection
Richard Gobert <richardbgobert@gmail.com>
net: gro: add flush check in udp_gro_receive_segment
Richard Gobert <richardbgobert@gmail.com>
net: gro: fix udp bad offset in socket lookup by adding {inner_}network_offset to napi_gro_cb
Shigeru Yoshida <syoshida@redhat.com>
ipv4: Fix uninit-value access in __ip_make_skb()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Use predefined error codes
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Respect deferred probe
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Correct use of device property APIs
Alexandra Winter <wintera@linux.ibm.com>
s390/qeth: Fix kernel panic after setting hsuid
Guillaume Nault <gnault@redhat.com>
vxlan: Pull inner IP header in vxlan_rcv().
Xin Long <lucien.xin@gmail.com>
tipc: fix a possible memleak in tipc_buf_append
Jeffrey Altman <jaltman@auristor.com>
rxrpc: Clients must accept conn from any address
Felix Fietkau <nbd@nbd.name>
net: core: reject skb_copy(_expand) for fraglist GSO skbs
Felix Fietkau <nbd@nbd.name>
net: bridge: fix multicast-to-unicast with fraglist GSO
Mans Rullgard <mans@mansr.com>
spi: fix null pointer dereference within spi_sync
Shashank Sharma <shashank.sharma@amd.com>
drm/amdgpu: fix doorbell regression
Marek Behún <kabel@kernel.org>
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
cxgb4: Properly lock TX queue for the selftest.
Bui Quang Minh <minhquangbui99@gmail.com>
s390/cio: Ensure the copied buf is NUL terminated
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: cards: select SND_DYNAMIC_MINORS
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-tdm-interface: manage formatters in trigger
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-card: make links nonatomic
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use threaded irq to check periods
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use FIELD helpers
Guillaume Nault <gnault@redhat.com>
vxlan: Add missing VNI filter counter update in arp_reduce().
Guillaume Nault <gnault@redhat.com>
vxlan: Fix racy device stats updates.
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_actions()
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flow_spec
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flower
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: fix E-MU dock initialization
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: move the whole GPIO event handling to the workqueue
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: factor out snd_emu1010_load_dock_firmware()
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: fix E-MU card dock presence monitoring
David Howells <dhowells@redhat.com>
Fix a potential infinite loop in extract_user_to_sg()
Jens Remus <jremus@linux.ibm.com>
s390/vdso: Add CFI for RA register to asm macro vdso_func
Rafael J. Wysocki <rafael.j.wysocki@intel.com>
thermal/debugfs: Prevent use-after-free from occurring after cdev removal
David Bauer <mail@david-bauer.net>
net l2tp: drop flow hash on forward
Kuniyuki Iwashima <kuniyu@amazon.com>
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
Rafael J. Wysocki <rafael.j.wysocki@intel.com>
thermal/debugfs: Fix two locking issues with thermal zone debug
Rafael J. Wysocki <rafael.j.wysocki@intel.com>
thermal/debugfs: Free all thermal zone debug memory on zone removal
Bui Quang Minh <minhquangbui99@gmail.com>
octeontx2-af: avoid off-by-one read from userspace
Bui Quang Minh <minhquangbui99@gmail.com>
bna: ensure the copied buf is NUL terminated
Bui Quang Minh <minhquangbui99@gmail.com>
ice: ensure the copied buf is NUL terminated
Chen Yu <yu.c.chen@intel.com>
efi/unaccepted: touch soft lockup during memory accept
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: use flags field to disambiguate broadcast redirect
Puranjay Mohan <puranjay@kernel.org>
arm32, bpf: Reimplement sign-extension mov instruction
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix clearing storage keys for huge pages
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix storage key clearing for guest huge pages
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
ASoC: codecs: wsa881x: set clk_stop_mode1 flag
Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
ASoC: Intel: avs: Set name of control as in topology
Xu Kuohai <xukuohai@huawei.com>
riscv, bpf: Fix incorrect runtime stats
Xu Kuohai <xukuohai@huawei.com>
bpf, arm64: Fix incorrect runtime stats
Devyn Liu <liudingyuan@huawei.com>
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: fix version format string
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use common AXI macros
Anton Protopopov <aspsk@isovalent.com>
bpf: Fix a verifier verbose message
Yi Zhang <yi.zhang@redhat.com>
nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ASoC: SOF: Intel: add default firmware library path for LNL
Richard Fitzgerald <rf@opensource.cirrus.com>
regmap: Add regmap_read_bypassed()
Jason Xing <kernelxing@tencent.com>
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Andrii Nakryiko <andrii@kernel.org>
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change devm_regulator_get_enable_optional() stub to return Ok
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change stubbed devm_regulator_get_enable to return Ok
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
regulator: mt6360: De-capitalize devicetree regulator subnodes
Chuck Lever <chuck.lever@oracle.com>
NFSD: Fix nfsd4_encode_fattr4() crasher
Dai Ngo <dai.ngo@oracle.com>
NFSD: add support for CB_GETATTR callback
Josef Bacik <josef@toxicpanda.com>
nfsd: make all of the nfsd stats per-network namespace
Josef Bacik <josef@toxicpanda.com>
nfsd: expose /proc/net/sunrpc/nfsd in net namespaces
Josef Bacik <josef@toxicpanda.com>
nfsd: rename NFSD_NET_* to NFSD_STATS_*
Zeng Heng <zengheng4@huawei.com>
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
Arnd Bergmann <arnd@arndb.de>
power: rt9455: hide unused rt9455_boost_voltage_values
Hans de Goede <hdegoede@redhat.com>
pinctrl: baytrail: Fix selecting gpio pinctrl state
Kuniyuki Iwashima <kuniyu@amazon.com>
nfs: Handle error of rpc_proc_register() in nfs_net_init().
Josef Bacik <josef@toxicpanda.com>
nfs: make the rpc_stat per net namespace
Josef Bacik <josef@toxicpanda.com>
nfs: expose /proc/net/sunrpc/nfs in net namespaces
Josef Bacik <josef@toxicpanda.com>
sunrpc: add a struct rpc_stats arg to rpc_create_args
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
Dan Carpenter <dan.carpenter@linaro.org>
pinctrl: core: delete incorrect free in pinctrl_enable()
Jan Dakinevich <jan.dakinevich@salutedevices.com>
pinctrl/meson: fix typo in PDM's pin name
Billy Tsai <billy_tsai@aspeedtech.com>
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Johannes Berg <johannes.berg@intel.com>
wifi: nl80211: don't free NULL coalescing rule
Benno Lossin <benno.lossin@proton.me>
rust: macros: fix soundness issue in `module!` macro
Thomas Bertschinger <tahbertschinger@gmail.com>
rust: module: place generated init_module() function in .init.text
-------------
Diffstat:
.../bindings/iio/health/maxim,max30102.yaml | 2 +-
.../devicetree/bindings/net/mediatek,net.yaml | 22 +--
Documentation/netlink/specs/rt_link.yaml | 6 +
Makefile | 4 +-
arch/arm/kernel/sleep.S | 4 +
arch/arm/net/bpf_jit_32.c | 56 +++++--
.../dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 3 +-
arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 30 ++--
arch/arm64/kvm/vgic/vgic-kvm-device.c | 8 +-
arch/arm64/net/bpf_jit_comp.c | 6 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/kernel/asm-offsets.c | 1 +
arch/mips/kernel/ptrace.c | 15 +-
arch/mips/kernel/scall32-o32.S | 23 +--
arch/mips/kernel/scall64-n32.S | 3 +-
arch/mips/kernel/scall64-n64.S | 3 +-
arch/mips/kernel/scall64-o32.S | 33 ++--
arch/powerpc/crypto/chacha-p10-glue.c | 8 +-
arch/powerpc/include/asm/plpks.h | 5 +-
arch/powerpc/platforms/pseries/iommu.c | 8 +
arch/powerpc/platforms/pseries/plpks.c | 10 +-
arch/riscv/net/bpf_jit_comp64.c | 6 +-
arch/s390/include/asm/dwarf.h | 1 +
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2 +
arch/s390/mm/gmap.c | 2 +-
arch/s390/mm/hugetlbpage.c | 2 +-
arch/x86/kernel/apic/apic.c | 16 +-
arch/xtensa/include/asm/processor.h | 8 +-
arch/xtensa/include/asm/ptrace.h | 2 +-
arch/xtensa/kernel/process.c | 5 +-
arch/xtensa/kernel/stacktrace.c | 3 +-
block/blk-iocost.c | 14 +-
block/ioctl.c | 5 +-
drivers/accel/ivpu/ivpu_drv.c | 20 +--
drivers/accel/ivpu/ivpu_drv.h | 3 +-
drivers/accel/ivpu/ivpu_hw_37xx.c | 4 +-
drivers/accel/ivpu/ivpu_mmu.c | 8 +-
drivers/accel/ivpu/ivpu_pm.c | 9 +-
drivers/ata/sata_gemini.c | 5 +-
drivers/base/regmap/regmap.c | 37 +++++
drivers/bluetooth/btqca.c | 140 ++++++++++++++--
drivers/bluetooth/btqca.h | 3 +-
drivers/bluetooth/hci_qca.c | 2 -
drivers/clk/clk.c | 12 +-
drivers/clk/qcom/clk-smd-rpm.c | 1 +
drivers/clk/samsung/clk-exynos-clkout.c | 13 +-
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 2 +
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 ++-
drivers/clk/sunxi-ng/ccu_common.c | 19 +++
drivers/clk/sunxi-ng/ccu_common.h | 3 +
drivers/dma/idxd/cdev.c | 77 +++++++++
drivers/dma/idxd/idxd.h | 3 +
drivers/dma/idxd/init.c | 4 +
drivers/dma/idxd/registers.h | 3 -
drivers/dma/idxd/sysfs.c | 27 ++-
drivers/edac/versal_edac.c | 4 +-
drivers/firewire/nosy.c | 6 +-
drivers/firewire/ohci.c | 14 +-
drivers/firmware/efi/unaccepted_memory.c | 4 +
drivers/firmware/microchip/mpfs-auto-update.c | 2 +
drivers/gpio/gpio-crystalcove.c | 2 +-
drivers/gpio/gpio-lpc32xx.c | 1 +
drivers/gpio/gpio-wcove.c | 2 +-
drivers/gpio/gpiolib-cdev.c | 16 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 56 ++++---
drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 15 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 16 +-
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 11 +-
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +-
.../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 48 ++++--
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 +
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6 +
.../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 33 +++-
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 27 ++-
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 +
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8 +-
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2 +-
drivers/gpu/drm/drm_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_audio.c | 113 +------------
drivers/gpu/drm/i915/display/intel_bios.c | 19 +--
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5 -
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c | 6 +-
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.h | 2 +-
drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +-
drivers/gpu/drm/imagination/pvr_fw_mips.h | 5 +-
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 ++++----
drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 4 +-
drivers/gpu/drm/nouveau/nouveau_dp.c | 13 +-
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 81 +++++----
drivers/gpu/drm/panel/Kconfig | 2 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 13 +-
drivers/gpu/drm/qxl/qxl_release.c | 50 +-----
drivers/gpu/drm/radeon/pptable.h | 10 +-
drivers/gpu/drm/ttm/ttm_tt.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 3 +-
drivers/gpu/drm/xe/regs/xe_engine_regs.h | 2 +-
drivers/gpu/drm/xe/xe_lrc.c | 25 ++-
drivers/gpu/drm/xe/xe_migrate.c | 8 +-
drivers/gpu/host1x/bus.c | 8 -
drivers/hv/channel.c | 29 +++-
drivers/hv/connection.c | 29 +++-
drivers/hwmon/corsair-cpro.c | 43 +++--
drivers/hwmon/pmbus/ucd9000.c | 6 +-
drivers/iio/accel/mxc4005.c | 92 +++++++++-
drivers/iio/imu/adis16475.c | 4 +-
drivers/iio/pressure/bmp280-core.c | 1 +
drivers/iio/pressure/bmp280-spi.c | 13 +-
drivers/iio/pressure/bmp280.h | 1 +
drivers/infiniband/hw/qib/qib_fs.c | 1 +
drivers/iommu/amd/iommu.c | 4 +
drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 4 +-
drivers/iommu/mtk_iommu.c | 1 +
drivers/iommu/mtk_iommu_v1.c | 1 +
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/misc/pvpanic/pvpanic-pci.c | 4 +-
drivers/net/dsa/mv88e6xxx/chip.c | 20 ++-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 32 +++-
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8 +-
drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +-
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 52 +++---
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 20 +--
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +-
drivers/net/ethernet/intel/e1000e/phy.c | 8 +-
drivers/net/ethernet/intel/ice/ice_debugfs.c | 8 +-
.../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +-
drivers/net/ethernet/micrel/ks8851_common.c | 16 +-
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14 +-
drivers/net/hyperv/netvsc.c | 7 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/vxlan/vxlan_core.c | 49 ++++--
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 7 +-
drivers/net/wireless/intel/iwlwifi/queue/tx.c | 2 +-
drivers/nvme/host/core.c | 2 +-
drivers/nvme/host/nvme.h | 5 +
drivers/nvme/host/pci.c | 14 +-
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 ++--
drivers/pinctrl/core.c | 8 +-
drivers/pinctrl/devicetree.c | 10 +-
drivers/pinctrl/intel/pinctrl-baytrail.c | 74 +++++----
drivers/pinctrl/intel/pinctrl-intel.h | 4 +
drivers/pinctrl/mediatek/pinctrl-paris.c | 40 ++---
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +-
drivers/platform/x86/acer-wmi.c | 9 +
drivers/platform/x86/amd/pmf/acpi.c | 2 +-
.../x86/intel/speed_select_if/isst_if_common.c | 1 +
drivers/power/supply/mt6360_charger.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +
drivers/regulator/core.c | 27 +--
drivers/regulator/mt6360-regulator.c | 32 ++--
drivers/regulator/tps65132-regulator.c | 7 +
drivers/s390/cio/cio_inject.c | 2 +-
drivers/s390/net/qeth_core_main.c | 69 ++++----
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 -
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 +-
drivers/scsi/libsas/sas_expander.c | 2 +-
drivers/scsi/lpfc/lpfc.h | 2 +-
drivers/scsi/lpfc/lpfc_attr.c | 4 +-
drivers/scsi/lpfc/lpfc_bsg.c | 20 +--
drivers/scsi/lpfc/lpfc_debugfs.c | 12 +-
drivers/scsi/lpfc/lpfc_els.c | 20 +--
drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +-
drivers/scsi/lpfc/lpfc_init.c | 5 +-
drivers/scsi/lpfc/lpfc_nvme.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 13 +-
drivers/scsi/lpfc/lpfc_sli.c | 34 ++--
drivers/scsi/lpfc/lpfc_vport.c | 8 +-
drivers/scsi/mpi3mr/mpi3mr_app.c | 2 +-
drivers/slimbus/qcom-ngd-ctrl.c | 6 +-
drivers/spi/spi-axi-spi-engine.c | 19 +--
drivers/spi/spi-hisi-kunpeng.c | 2 -
drivers/spi/spi-microchip-core-qspi.c | 1 +
drivers/spi/spi.c | 1 +
drivers/target/target_core_configfs.c | 12 ++
drivers/thermal/thermal_debugfs.c | 59 +++++--
drivers/ufs/core/ufs-mcq.c | 2 +-
drivers/ufs/core/ufshcd.c | 9 +-
drivers/uio/uio_hv_generic.c | 12 +-
drivers/usb/core/hub.c | 5 +-
drivers/usb/core/port.c | 8 +-
drivers/usb/dwc3/core.c | 90 +++++-----
drivers/usb/dwc3/core.h | 1 +
drivers/usb/dwc3/gadget.c | 2 +
drivers/usb/dwc3/host.c | 27 +++
drivers/usb/gadget/composite.c | 6 +-
drivers/usb/gadget/function/f_fs.c | 9 +-
drivers/usb/gadget/function/uvc_configfs.c | 4 +-
drivers/usb/host/ohci-hcd.c | 8 +
drivers/usb/host/xhci-plat.h | 4 +-
drivers/usb/host/xhci-rzv2m.c | 1 +
drivers/usb/typec/tcpm/tcpm.c | 36 +++-
drivers/usb/typec/ucsi/ucsi.c | 12 +-
drivers/vfio/pci/vfio_pci.c | 2 +
fs/9p/fid.h | 3 -
fs/9p/vfs_file.c | 2 +
fs/9p/vfs_inode.c | 23 ++-
fs/9p/vfs_super.c | 1 +
fs/btrfs/inode.c | 2 +-
fs/btrfs/ordered-data.c | 1 +
fs/btrfs/qgroup.c | 2 +
fs/btrfs/transaction.c | 2 +-
fs/btrfs/tree-checker.c | 30 ++--
fs/btrfs/tree-checker.h | 1 +
fs/btrfs/volumes.c | 18 +-
fs/exfat/file.c | 9 +-
fs/gfs2/bmap.c | 5 +-
fs/nfs/client.c | 5 +-
fs/nfs/inode.c | 13 +-
fs/nfs/internal.h | 2 -
fs/nfs/netns.h | 2 +
fs/nfsd/cache.h | 2 -
fs/nfsd/netns.h | 21 ++-
fs/nfsd/nfs4callback.c | 97 ++++++++++-
fs/nfsd/nfs4proc.c | 6 +-
fs/nfsd/nfs4state.c | 3 +-
fs/nfsd/nfs4xdr.c | 2 +-
fs/nfsd/nfscache.c | 40 +----
fs/nfsd/nfsctl.c | 14 +-
fs/nfsd/nfsfh.c | 3 +-
fs/nfsd/state.h | 14 ++
fs/nfsd/stats.c | 43 ++---
fs/nfsd/stats.h | 62 +++----
fs/nfsd/vfs.c | 6 +-
fs/nfsd/xdr4cb.h | 18 ++
fs/proc/task_mmu.c | 24 +--
fs/smb/client/cifsglob.h | 1 +
fs/smb/client/connect.c | 8 +
fs/smb/client/fs_context.c | 21 +++
fs/smb/client/fs_context.h | 2 +
fs/smb/client/misc.c | 1 +
fs/smb/client/smb2pdu.c | 11 ++
fs/smb/server/oplock.c | 35 ++--
fs/smb/server/transport_tcp.c | 4 +
fs/tracefs/event_inode.c | 45 +++--
fs/tracefs/inode.c | 92 +++++++++-
fs/tracefs/internal.h | 7 +-
fs/userfaultfd.c | 4 +
fs/vboxsf/file.c | 1 +
include/linux/compiler_types.h | 11 ++
include/linux/dma-fence.h | 7 -
include/linux/gfp_types.h | 2 +
include/linux/hyperv.h | 1 +
include/linux/pci_ids.h | 2 +
include/linux/regmap.h | 8 +
include/linux/regulator/consumer.h | 4 +-
include/linux/skbuff.h | 15 ++
include/linux/skmsg.h | 2 +
include/linux/slab.h | 4 +-
include/linux/sockptr.h | 25 +++
include/linux/sunrpc/clnt.h | 1 +
include/net/gro.h | 9 +
include/net/xfrm.h | 3 +
include/sound/emu10k1.h | 3 +-
include/trace/events/rxrpc.h | 2 +-
include/uapi/linux/kfd_ioctl.h | 17 +-
include/uapi/scsi/scsi_bsg_mpi3mr.h | 2 +-
kernel/bpf/bloom_filter.c | 13 ++
kernel/bpf/verifier.c | 3 +-
kernel/dma/swiotlb.c | 1 +
kernel/workqueue.c | 8 +-
lib/Kconfig.debug | 5 +-
lib/dynamic_debug.c | 6 +-
lib/maple_tree.c | 16 +-
lib/scatterlist.c | 2 +-
mm/readahead.c | 4 +
mm/slub.c | 52 +++---
net/8021q/vlan_core.c | 2 +
net/bluetooth/hci_core.c | 3 +-
net/bluetooth/hci_event.c | 2 +
net/bluetooth/l2cap_core.c | 3 +
net/bluetooth/msft.c | 2 +-
net/bluetooth/msft.h | 4 +-
net/bluetooth/sco.c | 4 +
net/bridge/br_forward.c | 9 +-
net/bridge/br_netlink.c | 3 +-
net/core/filter.c | 42 +++--
net/core/gro.c | 1 +
net/core/link_watch.c | 4 +-
net/core/net-sysfs.c | 4 +-
net/core/net_namespace.c | 13 +-
net/core/rtnetlink.c | 6 +-
net/core/skbuff.c | 27 ++-
net/core/skmsg.c | 5 +-
net/core/sock.c | 4 +-
net/hsr/hsr_device.c | 31 ++--
net/ipv4/af_inet.c | 1 +
net/ipv4/ip_output.c | 2 +-
net/ipv4/raw.c | 3 +
net/ipv4/tcp.c | 4 +-
net/ipv4/tcp_input.c | 2 +
net/ipv4/tcp_ipv4.c | 8 +-
net/ipv4/tcp_output.c | 4 +-
net/ipv4/udp.c | 3 +-
net/ipv4/udp_offload.c | 15 +-
net/ipv4/xfrm4_input.c | 6 +-
net/ipv6/addrconf.c | 11 +-
net/ipv6/fib6_rules.c | 6 +-
net/ipv6/ip6_input.c | 4 +-
net/ipv6/ip6_offload.c | 1 +
net/ipv6/ip6_output.c | 4 +-
net/ipv6/udp.c | 3 +-
net/ipv6/udp_offload.c | 3 +-
net/ipv6/xfrm6_input.c | 6 +-
net/l2tp/l2tp_eth.c | 3 +
net/mac80211/ieee80211_i.h | 4 +-
net/mac80211/mlme.c | 5 +-
net/mptcp/ctrl.c | 39 ++++-
net/mptcp/protocol.c | 3 +
net/nfc/llcp_sock.c | 12 +-
net/nfc/nci/core.c | 1 +
net/nsh/nsh.c | 14 +-
net/phonet/pn_netlink.c | 2 +-
net/rxrpc/ar-internal.h | 2 +-
net/rxrpc/call_object.c | 7 +-
net/rxrpc/conn_event.c | 16 +-
net/rxrpc/conn_object.c | 9 +-
net/rxrpc/input.c | 71 +++++---
net/rxrpc/output.c | 14 +-
net/rxrpc/protocol.h | 6 +-
net/smc/smc_ib.c | 19 ++-
net/sunrpc/clnt.c | 5 +-
net/sunrpc/xprtsock.c | 1 +
net/tipc/msg.c | 8 +-
net/wireless/nl80211.c | 2 +
net/wireless/trace.h | 2 +-
net/xfrm/xfrm_input.c | 8 +
rust/macros/module.rs | 185 +++++++++++++--------
scripts/Makefile.modfinal | 2 +-
security/keys/key.c | 3 +-
sound/hda/intel-sdw-acpi.c | 2 +
sound/oss/dmasound/dmasound_paula.c | 8 +-
sound/pci/emu10k1/emu10k1.c | 3 +-
sound/pci/emu10k1/emu10k1_main.c | 139 +++++++++-------
sound/pci/hda/patch_realtek.c | 25 ++-
sound/soc/codecs/es8326.c | 30 ++--
sound/soc/codecs/es8326.h | 2 +-
sound/soc/codecs/wsa881x.c | 1 +
sound/soc/intel/avs/topology.c | 2 +
sound/soc/meson/Kconfig | 1 +
sound/soc/meson/axg-card.c | 1 +
sound/soc/meson/axg-fifo.c | 56 ++++---
sound/soc/meson/axg-fifo.h | 12 +-
sound/soc/meson/axg-frddr.c | 5 +-
sound/soc/meson/axg-tdm-interface.c | 34 ++--
sound/soc/meson/axg-toddr.c | 22 ++-
sound/soc/sof/intel/hda-dsp.c | 20 ++-
sound/soc/sof/intel/pci-lnl.c | 3 +
sound/soc/tegra/tegra186_dspk.c | 7 +-
sound/soc/ti/davinci-mcasp.c | 12 +-
sound/usb/line6/driver.c | 6 +-
tools/include/linux/kernel.h | 1 +
tools/include/linux/mm.h | 5 +
tools/include/linux/panic.h | 19 +++
tools/power/x86/turbostat/turbostat.8 | 2 +-
tools/power/x86/turbostat/turbostat.c | 163 +++++++++++++-----
.../selftests/bpf/prog_tests/bloom_filter_map.c | 6 +
.../ftrace/test.d/filter/event-filter-function.tc | 2 +-
tools/testing/selftests/mm/Makefile | 6 +-
.../selftests/net/test_bridge_neigh_suppress.sh | 14 +-
tools/testing/selftests/timers/valid-adjtimex.c | 73 ++++----
377 files changed, 3373 insertions(+), 1845 deletions(-)
^ permalink raw reply [relevance 1%]
* Re: [PATCH 6.8 000/340] 6.8.10-rc2 review
2024-05-15 16:37 3% ` Mark Brown
@ 2024-05-16 12:10 0% ` Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-16 12:10 UTC (permalink / raw)
To: Mark Brown
Cc: stable, patches, linux-kernel, torvalds, akpm, linux, shuah,
patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml,
Steven Rostedt
On Wed, May 15, 2024 at 05:37:15PM +0100, Mark Brown wrote:
> On Wed, May 15, 2024 at 10:27:21AM +0200, Greg Kroah-Hartman wrote:
> > This is the start of the stable review cycle for the 6.8.10 release.
> > There are 340 patches in this series, all will be posted as a response
> > to this one. If anyone has any issues with these being applied, please
> > let me know.
>
> I'm seeing issues with the ftrace "Test file and directory owership
> changes for eventfs" test on several platforms, including both 32 Arm
> and whatever random x86_64 box Linaro have in their lab. The logs
> aren't terribly helpful since they just log a "not ok", example here:
>
> https://lava.sirena.org.uk/scheduler/job/265221#L3252
>
> Bisects land on "eventfs: Do not differentiate the toplevel events
> directory" as having introduced the issue. Other stables don't seem to
> be affected.
>
> Bisect log (this one from a Raspberry Pi 3 in 32 bit mode):
>
> # bad: [cfe824b75b3d9d13a891ad1c4a2d6fe0eceed1e9] Linux 6.8.10-rc2
> # good: [f3d61438b613b87afb63118bea6fb18c50ba7a6b] Linux 6.8.9
> # good: [428b806127e00d1c39ed72cbae36dbb4598e58dd] usb: dwc3: core: Prevent phy suspend during init
> # good: [a336529a6498c3e7208415b1c2710872aebf04aa] drm/vmwgfx: Fix invalid reads in fence signaled events
> # good: [dcca5ac4f5de7cca371138049a4a5877a6a3af97] hv_netvsc: Don't free decrypted memory
> git bisect start 'cfe824b75b3d9d13a891ad1c4a2d6fe0eceed1e9' 'f3d61438b613b87afb63118bea6fb18c50ba7a6b' '428b806127e00d1c39ed72cbae36dbb4598e58dd' 'a336529a6498c3e7208415b1c2710872aebf04aa' 'dcca5ac4f5de7cca371138049a4a5877a6a3af97'
> # bad: [cfe824b75b3d9d13a891ad1c4a2d6fe0eceed1e9] Linux 6.8.10-rc2
> git bisect bad cfe824b75b3d9d13a891ad1c4a2d6fe0eceed1e9
> # good: [00dfda4fc19df6f2235723e9529efa94cbc122a2] nvme-pci: Add quirk for broken MSIs
> git bisect good 00dfda4fc19df6f2235723e9529efa94cbc122a2
> # bad: [1239a1c5dc96166a0010de49e4769e08bc6d75b3] Bluetooth: qca: fix wcn3991 device address check
> git bisect bad 1239a1c5dc96166a0010de49e4769e08bc6d75b3
> # good: [a2ede3c7da39a8ab359cd23ebba04603e119ac59] ksmbd: do not grant v2 lease if parent lease key and epoch are not set
> git bisect good a2ede3c7da39a8ab359cd23ebba04603e119ac59
> # bad: [21b410a9ae24348d143dbfe3062eae67d52d5a76] eventfs: Do not differentiate the toplevel events directory
> git bisect bad 21b410a9ae24348d143dbfe3062eae67d52d5a76
> # good: [801cdc1467e661f2b151eeb8a25042593a487c78] tracefs: Still use mount point as default permissions for instances
> git bisect good 801cdc1467e661f2b151eeb8a25042593a487c78
> # first bad commit: [21b410a9ae24348d143dbfe3062eae67d52d5a76] eventfs: Do not differentiate the toplevel events directory
Thanks for the bisection, I'll go drop this from 6.8 and 6.6 queues.
Hopefully 6.9 doesn't also have this issue.
greg k-h
^ permalink raw reply [relevance 0%]
* [PATCH 6.1 000/244] 6.1.91-rc3 review
@ 2024-05-16 9:13 2% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-16 9:13 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 6.1.91 release.
There are 244 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sat, 18 May 2024 09:11:43 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.91-rc3.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 6.1.91-rc3
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize UMAC_CMD access
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
Florian Fainelli <f.fainelli@gmail.com>
net: bcmgenet: Clear RGMII_LINK upon link down
Li Nan <linan122@huawei.com>
md: fix kmemleak of rdev->serial
Oscar Salvador <osalvador@suse.de>
mm,swapops: update check in is_pfn_swap_entry for hwpoison entries
Miaohe Lin <linmiaohe@huawei.com>
mm/hugetlb: fix DEBUG_LOCKS_WARN_ON(1) when dissolve_free_hugetlb_folio()
Qu Wenruo <wqu@suse.com>
btrfs: do not wait for short bulk allocation
Silvio Gissi <sifonsec@amazon.com>
keys: Fix overwrite of key expiration on instantiation
Nikhil Rao <nikhil.rao@intel.com>
dmaengine: idxd: add a write() method for applications to submit work
Arjan van de Ven <arjan@linux.intel.com>
dmaengine: idxd: add a new security check to deal with a hardware erratum
Arjan van de Ven <arjan@linux.intel.com>
VFIO: Add the SPR_DSA and SPR_IAX devices to the denylist
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix firmware check error path
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching fw build id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching board id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix NVM configuration parsing
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: add missing firmware sanity checks
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: avoid to send duplicate lease break notifications
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: off ipv6only for both ipv4/ipv6 binding
Conor Dooley <conor.dooley@microchip.com>
spi: microchip-core-qspi: fix setting spi bus clock rate
Johan Hovold <johan+linaro@kernel.org>
regulator: core: fix debugfs creation regression
Kefeng Wang <wangkefeng.wang@huawei.com>
mm: use memalloc_nofs_save() in page_cache_ra_order()
Lakshmi Yadlapati <lakshmiy@us.ibm.com>
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
net: fix out-of-bounds access in ops_init
George Shen <george.shen@amd.com>
drm/amd/display: Handle Y carry-over in VCP X.Y calculation
Karthikeyan Ramasubramanian <kramasub@chromium.org>
drm/i915/bios: Fix parsing backlight BDB data
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix invalid reads in fence signaled events
Alex Deucher <alexander.deucher@amd.com>
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: add lunar lake point M DID
Viken Dadhaniya <quic_vdadhani@quicinc.com>
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Jim Cromie <jim.cromie@gmail.com>
dyndbg: fix old BUG_ON in >control parser
Joao Paulo Goncalves <joao.goncalves@toradex.com>
ASoC: ti: davinci-mcasp: Fix race condition during probe
Sameer Pujar <spujar@nvidia.com>
ASoC: tegra: Fix DSPK 16-bit playback
Paolo Abeni <pabeni@redhat.com>
tipc: fix UAF in error path
Alexander Potapenko <glider@google.com>
kmsan: compiler_types: declare __no_sanitize_or_inline
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Interrupt handling fixes
Ramona Gradinariu <ramona.bolboaca13@gmail.com>
iio:imu: adis16475: Fix sync mode setting
Javier Carrasco <javier.carrasco.cruz@gmail.com>
dt-bindings: iio: health: maxim,max30102: fix compatible check
Paolo Abeni <pabeni@redhat.com>
mptcp: ensure snd_nxt is properly initialized on connect
Dan Carpenter <dan.carpenter@linaro.org>
mm/slab: make __free(kfree) accept error pointers
Dominique Martinet <dominique.martinet@atmark-techno.com>
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Aman Dhoot <amandhoot12@gmail.com>
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Badhri Jagan Sridharan <badhri@google.com>
usb: typec: tcpm: Check for port partner validity before consuming it
Amit Sunil Dhamne <amitsd@google.com>
usb: typec: tcpm: unregister existing source caps before re-registration
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: dwc3: core: Prevent phy suspend during init
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: xhci-plat: Don't include xhci.h
Chris Wulff <Chris.Wulff@biamp.com>
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Peter Korsgaard <peter@korsgaard.com>
usb: gadget: composite: fix OS descriptors w_value logic
Alan Stern <stern@rowland.harvard.edu>
USB: core: Fix access violation during port device removal
Guenter Roeck <linux@roeck-us.net>
usb: ohci: Prevent missed ohci interrupts
Alan Stern <stern@rowland.harvard.edu>
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Fix connector check on init
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Check for notifications after init
Benno Lossin <benno.lossin@proton.me>
rust: macros: fix soundness issue in `module!` macro
Thomas Bertschinger <tahbertschinger@gmail.com>
rust: module: place generated init_module() function in .init.text
Andrea Righi <andrea.righi@canonical.com>
btf, scripts: rust: drop is_rust_module.sh
Andrea Righi <andrea.righi@canonical.com>
rust: fix regexp in scripts/is_rust_module.sh
Asahi Lina <lina@asahilina.net>
rust: error: Rename to_kernel_errno() -> to_errno()
Linus Torvalds <torvalds@linux-foundation.org>
Reapply "drm/qxl: simplify qxl_fence_wait"
Thanassis Avgerinos <thanassis.avgerinos@gmail.com>
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Dmitry Antipov <dmantipov@yandex.ru>
btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send()
Christian König <christian.koenig@amd.com>
drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2
Leah Rumancik <leah.rumancik@gmail.com>
MAINTAINERS: add leah to 6.1 MAINTAINERS file
Gabe Teeger <gabe.teeger@amd.com>
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: fix uninitialised kfifo
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: relocate debounce_period_us from struct gpio_desc
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpiolib: cdev: Add missing header(s)
Mario Limonciello <mario.limonciello@amd.com>
dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
Douglas Anderson <dianders@chromium.org>
drm/connector: Add \n to message about demoting connector force-probes
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: add bandgap setting for g12
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: power up phy on device init
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix kernel crash when devlink reload during initialization
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix port vlan filter not disabled issue
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: use appropriate barrier function after setting a bit value
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: release PTP resources if pf initialization failed
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: change type of numa_node_mask as nodemask_t
Jian Shen <shenjian15@huawei.com>
net: hns3: direct return when receive a unknown mailbox message
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: using user configure after hardware reset
Wen Gu <guwen@linux.alibaba.com>
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Eric Dumazet <edumazet@google.com>
ipv6: prevent NULL dereference in ip6_output()
Eric Dumazet <edumazet@google.com>
ipv6: annotate data-races around cnf.disable_ipv6
Lukasz Majewski <lukma@denx.de>
hsr: Simplify code for announcing HSR nodes timer setup
Eric Dumazet <edumazet@google.com>
net-sysfs: convert dev->operstate reads to lockless ones
Thomas Gleixner <tglx@linutronix.de>
timers: Rename del_timer() to timer_delete()
Thomas Gleixner <tglx@linutronix.de>
timers: Get rid of del_singleshot_timer_sync()
Eric Dumazet <edumazet@google.com>
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
Felix Fietkau <nbd@nbd.name>
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Eric Dumazet <edumazet@google.com>
phonet: fix rtm_phonet_notify() skb allocation
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use a separate buffer for sending commands
Roded Zats <rzats@paloaltonetworks.com>
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Marek Vasut <marex@denx.de>
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Kuniyuki Iwashima <kuniyu@amazon.com>
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Eric Dumazet <edumazet@google.com>
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
Boy.Wu <boy.wu@mediatek.com>
ARM: 9381/1: kasan: clear stale stack poison
Paul Davey <paul.davey@alliedtelesis.co.nz>
xfrm: Preserve vlan tags for transport mode software GRO
Al Viro <viro@zeniv.linux.org.uk>
qibfs: fix dentry leak
Namhyung Kim <namhyung@kernel.org>
perf unwind-libdw: Handle JIT-generated DSOs properly
Namhyung Kim <namhyung@kernel.org>
perf unwind-libunwind: Fix base address for .eh_frame
Geert Uytterhoeven <geert+renesas@glider.be>
spi: Merge spi_controller.{slave,target}_abort()
Miguel Ojeda <ojeda@kernel.org>
kbuild: rust: avoid creating temporary files
Vanillan Wang <vanillanwang@163.com>
net:usb:qmi_wwan: support Rolling modules
Lyude Paul <lyude@redhat.com>
drm/nouveau/dp: Don't probe eDP ports twice harder
Joakim Sindholt <opensource@zhasha.com>
fs/9p: drop inodes immediately on non-.L too
Stephen Boyd <sboyd@kernel.org>
clk: Don't hold prepare_lock when calling kref_put()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: crystalcove: Use -ENOTSUPP consistently
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: wcove: Use -ENOTSUPP consistently
Jeff Layton <jlayton@kernel.org>
9p: explicitly deny setlease attempts
Joakim Sindholt <opensource@zhasha.com>
fs/9p: translate O_TRUNC into OTRUNC
Joakim Sindholt <opensource@zhasha.com>
fs/9p: only translate RWX permissions for plain 9P2000
Krzysztof Kozlowski <krzk@kernel.org>
iommu: mtk: fix module autoloading
Michael Kelley <mhklinux@outlook.com>
Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted
Rick Edgecombe <rick.p.edgecombe@intel.com>
uio_hv_generic: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
John Stultz <jstultz@google.com>
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Refine IB schedule error logging
Justin Ernst <justin.ernst@hpe.com>
tools/power/turbostat: Fix uncore frequency file string
Jiaxun Yang <jiaxun.yang@flygoat.com>
MIPS: scall: Save thread_info.syscall unconditionally on entry
Thierry Reding <treding@nvidia.com>
gpu: host1x: Do not setup DMA for virtual devices
Rik van Riel <riel@surriel.com>
blk-iocost: avoid out of bounds shift
Maurizio Lombardi <mlombard@redhat.com>
scsi: target: Fix SELinux error when systemd-modules loads the target module
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `BIT'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `panic'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `early_pfn_to_nid'
Boris Burkov <boris@bur.io>
btrfs: always clear PERTRANS metadata during commit
Boris Burkov <boris@bur.io>
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
Peng Liu <liupeng17@lenovo.com>
tools/power turbostat: Fix Bzy_MHz documentation typo
Wyes Karny <wyes.karny@amd.com>
tools/power turbostat: Increase the limit for fd opened
Doug Smythies <dsmythies@telus.net>
tools/power turbostat: Fix added raw MSR output
Adam Goldman <adamg@pobox.com>
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Chen Ni <nichen@iscas.ac.cn>
ata: sata_gemini: Check clk_enable() result
Phil Elwell <phil@raspberrypi.com>
net: bcmgenet: Reset RBUF on first open
Li Nan <linan122@huawei.com>
block: fix overflow in blk_ioctl_discard()
Takashi Iwai <tiwai@suse.de>
ALSA: line6: Zero-initialize message buffers
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: WLUN suspend dev/link state error recovery
Borislav Petkov (AMD) <bp@alien8.de>
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Andrei Matei <andreimatei1@gmail.com>
bpf: Check bloom filter map value size
Anand Jain <anand.jain@oracle.com>
btrfs: return accurate error code on open failure in open_fs_devices()
Saurav Kashyap <skashyap@marvell.com>
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
scsi: mpi3mr: Avoid memcpy field-spanning write WARNING
linke li <lilinke99@qq.com>
net: mark racy access on sk->sk_rcvbuf
Igor Artemiev <Igor.A.Artemiev@mcst.ru>
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jeff Johnson <quic_jjohnson@quicinc.com>
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Andrew Price <anprice@redhat.com>
gfs2: Fix invalid metadata access in punch_hole
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Release hbalock before calling lpfc_worker_wake_up()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
Oliver Upton <oliver.upton@linux.dev>
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Marc Zyngier <maz@kernel.org>
KVM: arm64: vgic-v2: Use cpuid from userspace as vcpu_id
Gaurav Batra <gbatra@linux.ibm.com>
powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: make max polling consistent for longer H_CALLs
Russell Currey <ruscur@russell.cc>
powerpc/pseries: Move PLPKS constants to header file
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: replace kmalloc with kzalloc in PLPKS driver
Jernej Skrabec <jernej.skrabec@gmail.com>
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Richard Gobert <richardbgobert@gmail.com>
net: gro: add flush check in udp_gro_receive_segment
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Use predefined error codes
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Respect deferred probe
Alexandra Winter <wintera@linux.ibm.com>
s390/qeth: Fix kernel panic after setting hsuid
Guillaume Nault <gnault@redhat.com>
vxlan: Pull inner IP header in vxlan_rcv().
Xin Long <lucien.xin@gmail.com>
tipc: fix a possible memleak in tipc_buf_append
Felix Fietkau <nbd@nbd.name>
net: core: reject skb_copy(_expand) for fraglist GSO skbs
Felix Fietkau <nbd@nbd.name>
net: bridge: fix multicast-to-unicast with fraglist GSO
Mans Rullgard <mans@mansr.com>
spi: fix null pointer dereference within spi_sync
Marek Behún <kabel@kernel.org>
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
cxgb4: Properly lock TX queue for the selftest.
Bui Quang Minh <minhquangbui99@gmail.com>
s390/cio: Ensure the copied buf is NUL terminated
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: cards: select SND_DYNAMIC_MINORS
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-tdm-interface: manage formatters in trigger
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-card: make links nonatomic
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use threaded irq to check periods
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use FIELD helpers
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_actions()
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flow_spec
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flower
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
Jens Remus <jremus@linux.ibm.com>
s390/vdso: Add CFI for RA register to asm macro vdso_func
David Bauer <mail@david-bauer.net>
net l2tp: drop flow hash on forward
Kuniyuki Iwashima <kuniyu@amazon.com>
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
Bui Quang Minh <minhquangbui99@gmail.com>
octeontx2-af: avoid off-by-one read from userspace
Bui Quang Minh <minhquangbui99@gmail.com>
bna: ensure the copied buf is NUL terminated
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: use flags field to disambiguate broadcast redirect
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix clearing storage keys for huge pages
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix storage key clearing for guest huge pages
Xu Kuohai <xukuohai@huawei.com>
bpf, arm64: Fix incorrect runtime stats
Devyn Liu <liudingyuan@huawei.com>
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: fix version format string
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use common AXI macros
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: move msg state to new struct
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use devm_spi_alloc_host()
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: simplify driver data allocation
Li Zetao <lizetao1@huawei.com>
spi: spi-axi-spi-engine: Use helper function devm_clk_get_enabled()
Yang Yingliang <yangyingliang@huawei.com>
spi: spi-axi-spi-engine: switch to use modern name
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
spi: axi-spi-engine: Convert to platform remove callback returning void
Yang Yingliang <yangyingliang@huawei.com>
spi: introduce new helpers with using modern naming
Anton Protopopov <aspsk@isovalent.com>
bpf: Fix a verifier verbose message
Yi Zhang <yi.zhang@redhat.com>
nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
Jason Xing <kernelxing@tencent.com>
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Andrii Nakryiko <andrii@kernel.org>
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change devm_regulator_get_enable_optional() stub to return Ok
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change stubbed devm_regulator_get_enable to return Ok
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
regulator: mt6360: De-capitalize devicetree regulator subnodes
Zeng Heng <zengheng4@huawei.com>
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
Arnd Bergmann <arnd@arndb.de>
power: rt9455: hide unused rt9455_boost_voltage_values
Hans de Goede <hdegoede@redhat.com>
pinctrl: baytrail: Fix selecting gpio pinctrl state
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
pinctrl: intel: Make use of struct pinfunction and PINCTRL_PINFUNCTION()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
pinctrl: Introduce struct pinfunction and PINCTRL_PINFUNCTION() macro
Kuniyuki Iwashima <kuniyu@amazon.com>
nfs: Handle error of rpc_proc_register() in nfs_net_init().
Josef Bacik <josef@toxicpanda.com>
nfs: make the rpc_stat per net namespace
Josef Bacik <josef@toxicpanda.com>
nfs: expose /proc/net/sunrpc/nfs in net namespaces
Josef Bacik <josef@toxicpanda.com>
sunrpc: add a struct rpc_stats arg to rpc_create_args
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
Dan Carpenter <dan.carpenter@linaro.org>
pinctrl: core: delete incorrect free in pinctrl_enable()
Jan Dakinevich <jan.dakinevich@salutedevices.com>
pinctrl/meson: fix typo in PDM's pin name
Billy Tsai <billy_tsai@aspeedtech.com>
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Steve French <stfrench@microsoft.com>
smb3: missing lock when picking channel
Shyam Prasad N <sprasad@microsoft.com>
cifs: use the least loaded channel for sending requests
Masahiro Yamada <masahiroy@kernel.org>
kbuild: specify output names separately for each emission type from rustc
Masahiro Yamada <masahiroy@kernel.org>
kbuild: refactor host*_flags
Peter Xu <peterx@redhat.com>
mm/hugetlb: fix missing hugetlb_lock for resv uncharge
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb_cgroup: convert hugetlb_cgroup_uncharge_page() to folios
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb: convert free_huge_page to folios
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb_cgroup: convert hugetlb_cgroup_from_page() to folios
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb_cgroup: convert __set_hugetlb_cgroup() to folios
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb: add folio_hstate()
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb: add hugetlb_folio_subpool() helpers
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm: add private field of first tail to struct page and struct folio
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb: add folio support to hugetlb specific flag macros
Tim Jiang <quic_tjiang@quicinc.com>
Bluetooth: qca: add support for QCA2066
Daniel Okazaki <dtokazaki@google.com>
eeprom: at24: fix memory corruption race condition
Heiner Kallweit <hkallweit1@gmail.com>
eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
Alexander Stein <alexander.stein@ew.tq-group.com>
eeprom: at24: Use dev_err_probe for nvmem register failure
Wedson Almeida Filho <walmeida@microsoft.com>
rust: kernel: require `Send` for `Module` implementations
Johannes Berg <johannes.berg@intel.com>
wifi: nl80211: don't free NULL coalescing rule
Vinod Koul <vkoul@kernel.org>
dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
Bumyong Lee <bumyong.lee@samsung.com>
dmaengine: pl330: issue_pending waits until WFP state
-------------
Diffstat:
.../bindings/iio/health/maxim,max30102.yaml | 2 +-
MAINTAINERS | 1 +
Makefile | 4 +-
arch/arm/kernel/sleep.S | 4 +
arch/arm64/kvm/vgic/vgic-kvm-device.c | 12 +-
arch/arm64/net/bpf_jit_comp.c | 6 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/kernel/asm-offsets.c | 1 +
arch/mips/kernel/ptrace.c | 15 +-
arch/mips/kernel/scall32-o32.S | 23 +-
arch/mips/kernel/scall64-n32.S | 3 +-
arch/mips/kernel/scall64-n64.S | 3 +-
arch/mips/kernel/scall64-o32.S | 33 +--
arch/powerpc/platforms/pseries/iommu.c | 8 +
arch/powerpc/platforms/pseries/plpks.c | 62 ++---
arch/powerpc/platforms/pseries/plpks.h | 35 ++-
arch/s390/include/asm/dwarf.h | 1 +
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2 +
arch/s390/mm/gmap.c | 2 +-
arch/s390/mm/hugetlbpage.c | 2 +-
block/blk-iocost.c | 7 +-
block/ioctl.c | 5 +-
drivers/ata/sata_gemini.c | 5 +-
drivers/bluetooth/btqca.c | 162 +++++++++++-
drivers/bluetooth/btqca.h | 6 +-
drivers/bluetooth/hci_qca.c | 11 +
drivers/char/tpm/tpm-dev-common.c | 4 +-
drivers/clk/clk.c | 12 +-
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 +-
drivers/dma/idxd/cdev.c | 77 ++++++
drivers/dma/idxd/idxd.h | 3 +
drivers/dma/idxd/init.c | 4 +
drivers/dma/idxd/registers.h | 3 -
drivers/dma/idxd/sysfs.c | 27 +-
drivers/firewire/nosy.c | 6 +-
drivers/firewire/ohci.c | 6 +-
drivers/gpio/gpio-crystalcove.c | 2 +-
drivers/gpio/gpio-wcove.c | 2 +-
drivers/gpio/gpiolib-cdev.c | 183 ++++++++++++--
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 52 ++--
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 7 +-
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 +
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6 +
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2 +-
drivers/gpu/drm/drm_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_bios.c | 19 +-
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5 -
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 +++---
drivers/gpu/drm/nouveau/nouveau_dp.c | 13 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 8 +-
drivers/gpu/drm/qxl/qxl_release.c | 50 +---
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
drivers/gpu/host1x/bus.c | 8 -
drivers/hv/channel.c | 29 ++-
drivers/hwmon/corsair-cpro.c | 43 +++-
drivers/hwmon/pmbus/ucd9000.c | 6 +-
drivers/iio/accel/mxc4005.c | 24 +-
drivers/iio/imu/adis16475.c | 4 +-
drivers/infiniband/hw/qib/qib_fs.c | 1 +
drivers/iommu/mtk_iommu.c | 1 +
drivers/iommu/mtk_iommu_v1.c | 1 +
drivers/md/md.c | 1 +
drivers/misc/eeprom/at24.c | 46 +++-
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/net/dsa/mv88e6xxx/chip.c | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 32 ++-
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8 +-
drivers/net/ethernet/broadcom/genet/bcmmii.c | 25 +-
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 52 ++--
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 20 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +-
.../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +-
drivers/net/ethernet/micrel/ks8851_common.c | 16 +-
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/vxlan/vxlan_core.c | 19 +-
drivers/nvme/host/core.c | 2 +-
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 +--
drivers/pinctrl/core.c | 8 +-
drivers/pinctrl/devicetree.c | 10 +-
drivers/pinctrl/intel/pinctrl-baytrail.c | 74 +++---
drivers/pinctrl/intel/pinctrl-intel.c | 6 +-
drivers/pinctrl/intel/pinctrl-intel.h | 17 +-
drivers/pinctrl/mediatek/pinctrl-paris.c | 40 +--
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +-
drivers/power/supply/mt6360_charger.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +
drivers/regulator/core.c | 27 +-
drivers/regulator/mt6360-regulator.c | 32 ++-
drivers/s390/cio/cio_inject.c | 2 +-
drivers/s390/net/qeth_core_main.c | 69 +++---
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 -
drivers/scsi/lpfc/lpfc.h | 1 -
drivers/scsi/lpfc/lpfc_els.c | 20 +-
drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +-
drivers/scsi/lpfc/lpfc_nvme.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 13 +-
drivers/scsi/lpfc/lpfc_sli.c | 14 +-
drivers/scsi/lpfc/lpfc_vport.c | 8 +-
drivers/scsi/mpi3mr/mpi3mr_app.c | 2 +-
drivers/slimbus/qcom-ngd-ctrl.c | 6 +-
drivers/spi/spi-axi-spi-engine.c | 275 +++++++++++----------
drivers/spi/spi-hisi-kunpeng.c | 2 -
drivers/spi/spi-microchip-core-qspi.c | 1 +
drivers/spi/spi.c | 12 +
drivers/staging/wlan-ng/hfa384x_usb.c | 4 +-
drivers/staging/wlan-ng/prism2usb.c | 6 +-
drivers/target/target_core_configfs.c | 12 +
drivers/ufs/core/ufshcd.c | 5 +-
drivers/uio/uio_hv_generic.c | 12 +-
drivers/usb/core/hub.c | 5 +-
drivers/usb/core/port.c | 8 +-
drivers/usb/dwc3/core.c | 90 +++----
drivers/usb/dwc3/core.h | 1 +
drivers/usb/dwc3/gadget.c | 2 +
drivers/usb/dwc3/host.c | 27 ++
drivers/usb/gadget/composite.c | 6 +-
drivers/usb/gadget/function/f_fs.c | 2 +-
drivers/usb/host/ohci-hcd.c | 8 +
drivers/usb/host/xhci-plat.h | 4 +-
drivers/usb/typec/tcpm/tcpm.c | 35 ++-
drivers/usb/typec/ucsi/ucsi.c | 12 +-
drivers/vfio/pci/vfio_pci.c | 2 +
fs/9p/vfs_file.c | 2 +
fs/9p/vfs_inode.c | 5 +-
fs/9p/vfs_super.c | 1 +
fs/btrfs/extent_io.c | 19 +-
fs/btrfs/inode.c | 2 +-
fs/btrfs/send.c | 4 +-
fs/btrfs/transaction.c | 2 +-
fs/btrfs/volumes.c | 18 +-
fs/gfs2/bmap.c | 5 +-
fs/hugetlbfs/inode.c | 8 +-
fs/nfs/client.c | 5 +-
fs/nfs/inode.c | 13 +-
fs/nfs/internal.h | 2 -
fs/nfs/netns.h | 2 +
fs/smb/client/transport.c | 37 ++-
fs/smb/server/oplock.c | 35 ++-
fs/smb/server/transport_tcp.c | 4 +
include/linux/compiler_types.h | 11 +
include/linux/dma-fence.h | 7 -
include/linux/gfp_types.h | 2 +
include/linux/hugetlb.h | 53 +++-
include/linux/hugetlb_cgroup.h | 69 +++---
include/linux/hyperv.h | 1 +
include/linux/mm_types.h | 14 ++
include/linux/pci_ids.h | 2 +
include/linux/pinctrl/pinctrl.h | 20 ++
include/linux/regulator/consumer.h | 4 +-
include/linux/skbuff.h | 15 ++
include/linux/skmsg.h | 2 +
include/linux/slab.h | 2 +-
include/linux/spi/spi.h | 51 +++-
include/linux/sunrpc/clnt.h | 1 +
include/linux/swapops.h | 105 ++++----
include/linux/timer.h | 15 +-
include/net/xfrm.h | 3 +
include/uapi/scsi/scsi_bsg_mpi3mr.h | 2 +-
kernel/bpf/bloom_filter.c | 13 +
kernel/bpf/verifier.c | 3 +-
kernel/time/timer.c | 8 +-
lib/Kconfig.debug | 5 +-
lib/dynamic_debug.c | 6 +-
mm/hugetlb.c | 55 +++--
mm/hugetlb_cgroup.c | 34 +--
mm/migrate.c | 2 +-
mm/readahead.c | 4 +
net/bluetooth/hci_core.c | 3 +-
net/bluetooth/l2cap_core.c | 3 +
net/bluetooth/msft.c | 2 +-
net/bluetooth/msft.h | 4 +-
net/bluetooth/sco.c | 4 +
net/bridge/br_forward.c | 9 +-
net/bridge/br_netlink.c | 3 +-
net/core/filter.c | 42 +++-
net/core/link_watch.c | 4 +-
net/core/net-sysfs.c | 4 +-
net/core/net_namespace.c | 13 +-
net/core/rtnetlink.c | 6 +-
net/core/skbuff.c | 27 +-
net/core/skmsg.c | 5 +-
net/core/sock.c | 4 +-
net/hsr/hsr_device.c | 31 ++-
net/ipv4/tcp.c | 4 +-
net/ipv4/tcp_input.c | 2 +
net/ipv4/tcp_ipv4.c | 8 +-
net/ipv4/tcp_output.c | 4 +-
net/ipv4/udp_offload.c | 12 +-
net/ipv4/xfrm4_input.c | 6 +-
net/ipv6/addrconf.c | 11 +-
net/ipv6/fib6_rules.c | 6 +-
net/ipv6/ip6_input.c | 4 +-
net/ipv6/ip6_output.c | 2 +-
net/ipv6/xfrm6_input.c | 6 +-
net/l2tp/l2tp_eth.c | 3 +
net/mac80211/ieee80211_i.h | 4 +-
net/mptcp/protocol.c | 3 +
net/nsh/nsh.c | 14 +-
net/phonet/pn_netlink.c | 2 +-
net/smc/smc_ib.c | 19 +-
net/sunrpc/clnt.c | 5 +-
net/sunrpc/xprt.c | 2 +-
net/tipc/msg.c | 8 +-
net/wireless/nl80211.c | 2 +
net/wireless/trace.h | 2 +-
net/xfrm/xfrm_input.c | 8 +
rust/Makefile | 11 +-
rust/kernel/error.rs | 2 +-
rust/kernel/lib.rs | 2 +-
rust/macros/module.rs | 185 ++++++++------
scripts/Makefile.build | 17 +-
scripts/Makefile.host | 27 +-
scripts/Makefile.modfinal | 4 +-
scripts/is_rust_module.sh | 16 --
security/keys/key.c | 3 +-
sound/hda/intel-sdw-acpi.c | 2 +
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/meson/Kconfig | 1 +
sound/soc/meson/axg-card.c | 1 +
sound/soc/meson/axg-fifo.c | 56 +++--
sound/soc/meson/axg-fifo.h | 12 +-
sound/soc/meson/axg-frddr.c | 5 +-
sound/soc/meson/axg-tdm-interface.c | 34 +--
sound/soc/meson/axg-toddr.c | 22 +-
sound/soc/tegra/tegra186_dspk.c | 7 +-
sound/soc/ti/davinci-mcasp.c | 12 +-
sound/usb/line6/driver.c | 6 +-
tools/include/linux/kernel.h | 1 +
tools/include/linux/mm.h | 5 +
tools/include/linux/panic.h | 19 ++
tools/perf/util/unwind-libdw.c | 21 +-
tools/perf/util/unwind-libunwind-local.c | 2 +-
tools/power/x86/turbostat/turbostat.8 | 2 +-
tools/power/x86/turbostat/turbostat.c | 30 ++-
.../selftests/bpf/prog_tests/bloom_filter_map.c | 6 +
tools/testing/selftests/timers/valid-adjtimex.c | 73 +++---
247 files changed, 2515 insertions(+), 1401 deletions(-)
^ permalink raw reply [relevance 2%]
* linux-next: Tree for May 16
@ 2024-05-16 5:00 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-16 5:00 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 40182 bytes --]
Hi all,
Do not add any work intended for v6.11 to your linux-next included
branches until after v6.10-rc1 has been released.
Changes since 20240515:
The risc-v tree gained a conflict against Linus' tree.
The ftrace tree lost its build failure.
The refactor-heap tree still had its conflicts against the block tree
for which I dropped the refactor-heap tree.
Non-merge commits (relative to Linus' tree): 5263
5587 files changed, 513979 insertions(+), 89381 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (8c06da67d0bd Merge tag 'livepatching-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (9ff3ffc369ed mm/vmalloc: fix vmalloc which may return null if called with __GFP_NOFAIL)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (5549d1e39989 Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (7bbe449d0bdb s390/paes: Reestablish retry loop in paes)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (621cde16e49b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging bpf/master (2322113ac9d0 selftests/bpf: add more variations of map-in-map situations)
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (621cde16e49b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging ipvs/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging wireless/for-next (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (d731b1ed1505 ALSA: hda/realtek: Drop doubly quirk entry for 103c:8a2e)
Merging sound-asoc-fixes/for-linus (225468b9f96f Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (2a4b49bb5812 regulator: core: fix debugfs creation regression)
Merging spi-fixes/for-linus (ef13561d2b16 spi: microchip-core-qspi: fix setting spi bus clock rate)
Merging pci-current/for-linus (f3d049b35b01 PCI/ASPM: Restore parent state to parent, child state to child)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler)
Merging usb.current/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging usb-serial-fixes/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (bb198e29fe75 iio: dac: ad5592r: fix temperature channel scaling value)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (008ab3c53bc4 speakup: Fix sizeof() vs ARRAY_SIZE() bug)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (a38297e3fb01 Linux 6.9)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (0a9c28bec202 Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (26e8383b116d hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (039b2b6e9d07 Merge branch 'misc-6.10' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (a38297e3fb01 Linux 6.9)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so)
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (a38297e3fb01 Linux 6.9)
Merging drm-intel-fixes/for-linux-next-fixes (43b26bdd2ee5 drm/i915/bios: Fix parsing backlight BDB data)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (a38297e3fb01 Linux 6.9)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (a38297e3fb01 Linux 6.9)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (55750148e559 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe())
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (aed9a1a4f710 drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations)
Merging mm-stable/mm-stable (76edc534cc28 memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order)
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging mm-nonmm-stable/mm-nonmm-stable (5cbcb62dddf5 fs/proc: fix softlockup in __read_vmcore)
Merging mm/mm-everything (529891be5997 foo)
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h
Merging kbuild/for-next (6ffe4fdf8901 kconfig: use sym_get_choice_menu() in sym_check_prop())
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Makefile
CONFLICT (content): Merge conflict in drivers/misc/lkdtm/Makefile
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/Makefile
CONFLICT (content): Merge conflict in rust/Makefile
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (ea558c86248b tools lib subcmd: Show parent options in help)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a6016aac5252 dma: fix DMA sync for drivers not calling dma_set_mask*())
CONFLICT (content): Merge conflict in net/core/page_pool.c
Merging asm-generic/master (02af68767d27 Merge branch 'alpha-cleanup-6.9' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (64ae2326dd77 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (f0cc697f9f65 Merge branch 'for-next/errata' into for-next/core)
Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support)
Merging arm-soc/for-next (1e3dd71e2587 Merge branch 'soc/defconfig' into for-next)
Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (4cece7649650 Linux 6.9-rc1)
Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (7468eb6710ce Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-clk/next' into for-next)
Merging samsung-krzk/for-next (a9c32618cd2a Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (02ba7b5a731a Merge branch 'for-next/vexpress/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (3bdc4c661d47 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (e649f89a1cda Merge branch 'clk-samsung' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (9f4047a4c9ca LoongArch: Update Loongson-3 default config file)
Merging m68k/for-next (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging m68knommu/for-next (a5044ce7d1d9 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (d4a599910193 parisc: Define HAVE_ARCH_HUGETLB_UNMAPPED_AREA)
Merging powerpc/next (e789d4499abd Merge branch 'topic/kdump-hotplug' into next)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree())
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (5e3964ba8400 riscv: show help string for riscv-specific targets)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
CONFLICT (content): Merge conflict in arch/riscv/Makefile
CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
CONFLICT (content): Merge conflict in kernel/sys.c
Merging riscv-dt/riscv-dt-for-next (1c80d50bb697 riscv: dts: microchip: add pac1934 power-monitor to icicle)
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (a99fb341e8d2 Merge branch 'features' into for-next)
CONFLICT (content): Merge conflict in scripts/Makefile.vdsoinst
Merging sh/for-next (efe976b7eecf sh: setup: Add missing forward declaration for sh_fdt_init())
Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask var)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (07f9a27f1969 bcachefs: add no_invalid_checks flag)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (7b79c81bbd20 Merge branch 'for-next-next-v6.10-20240515' into for-next-20240515)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (a395726cf823 cifs: fix data corruption in read after invalidate)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (7c35de4df105 erofs: Zstandard compression support)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (82172cca18b2 Merge isofs Makefile cleanup.)
Merging ext4/dev (26770a717cac jbd2: add prefix 'jbd2' for 'shrink_type')
CONFLICT (content): Merge conflict in fs/ext4/file.c
Merging f2fs/dev (16409fdbb882 f2fs: initialize last_block_in_bio variable)
Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning)
Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support)
Merging gfs2/for-next (c1c53c26e338 gfs2: make timeout values more explicit)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (c91ecba9e421 ksmbd: avoid to send duplicate oplock break notifications)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (8d915bbf3926 NFSD: Force all NFSv4.2 COPY requests to be synchronous)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access)
Merging overlayfs/overlayfs-next (e9229c18dae3 ovl: remove duplicate included header)
Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address access in jffs2_free_inode)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (a38297e3fb01 Linux 6.9)
Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (584bbf439d0f Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in include/linux/fs.h
Merging vfs/for-next (39d57a87e672 Merge branch 'work.bdev' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
CONFLICT (content): Merge conflict in block/ioctl.c
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flags"
Merging printk/for-next (596ffa476e20 Merge branch 'for-6.10' into for-next)
Merging pci/next (a38bebb28682 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (14ee3d12f37b Merge branch 'for-6.10/hid-bpf' into for-next)
Merging i2c/i2c/for-next (24a9d78e808c Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE())
Merging i3c/i3c/next (acec16dbb338 i3c: dw: Add hot-join support.)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (5fbf8734fb36 hwmon: (nzxt-kraken3) Bail out for unsupported device variants)
Merging jc_docs/docs-next (955e15969c1d Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (4a7d735191de media: dw2102: fix coding style issues)
Merging v4l-dvb-next/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK)
Merging pm/linux-next (bb3ddcac03b2 Merge branch 'thermal' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (ccad360a2d41 PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions)
Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (69b08420b697 thermal: renesas: rcar: Add dependency on OF)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (49ca2b2ef3d0 RDMA/IPoIB: Fix format truncation compilation errors)
Merging net-next/main (1b294a1f3561 Merge tag 'net-next-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging bpf-next/for-next (5c1672705a1a net: revert partially applied PHY topology series)
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (5c1672705a1a net: revert partially applied PHY topology series)
Merging ipvs-next/main (5c1672705a1a net: revert partially applied PHY topology series)
Merging bluetooth/master (3b42b64036e5 Bluetooth: btnxpuart: Handle FW Download Abort scenario)
Merging wireless-next/for-next (1d60eabb8269 wifi: mwl8k: initialize cmd->addr[] properly)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content)
Merging drm/drm-next (275654c02f0b Merge tag 'drm-xe-next-fixes-2024-05-09-1' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging drm-exynos/for-linux-next (7a5bdb7ca1b4 drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found)
Merging drm-misc/for-linux-next (959314c438ca drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations)
Merging amdgpu/drm-next (a83048bfa402 drm/amd/amdgpu: Add ISP support to amdgpu_discovery)
Merging drm-intel/for-linux-next (d2c4b1db1c4f drm/i915/pciids: don't include RPL-U PCI IDs in RPL-P)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vbt_defs.h
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (b587f413ca47 drm/msm/gen_header: allow skipping the validation)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (9aa8586063a4 drm/xe/pf: Implement pci_driver.sriov_configure callback)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (a38297e3fb01 Linux 6.9)
Merging regmap/for-next (9b1fe0510494 regmap: Reorder fields in 'struct regmap_config' to save some memory)
Merging sound/for-next (d731b1ed1505 ALSA: hda/realtek: Drop doubly quirk entry for 103c:8a2e)
Merging ieee1394/for-next (21151fd8f0ea firewire: obsolete usage of *-objs in Makefile for KUnit test)
Merging sound-asoc/for-next (225468b9f96f Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus)
Merging modules/modules-next (2c9e5d4a0082 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (5852f2afcdd9 Input: drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging block/for-next (c1e14167e35b Merge branch 'block-6.10' into for-next)
Merging device-mapper/for-next (8b21ac87d550 dm-delay: remove timer_lock)
Merging libata/for-next (d4a89339f17c ata: pata_legacy: make legacy_exit() work again)
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs)
Merging mfd/for-mfd-next (1482489b5196 dt-bindings: mfd: Use full path to other schemas)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (1fd949f653ee backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (00d1d63ef2da Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (dd80c7465029 MAINTAINERS: repair file entry in SECURITY SUBSYSTEM)
Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL pointer dereference)
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (f4e8d8029285 Merge tag 'vfs-6.10.rw' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs)
Merging watchdog/master (c45b8cfc6d5c watchdog: LENOVO_SE10_WDT should depend on X86 && DMI)
Merging iommu/next (2bd5059c6cc0 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (d976c6f4b32c of: property: Add fw_devlink support for interrupt-map property)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (e958cffa42df Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (367b87459d91 Merge branch into tip/master: 'sched/urgent')
Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/arm_arch_timer: Mark hisi_161010101_oem_info const)
Merging edac/edac-for-next (ab80b31cd7b2 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (fde0aeca5926 Merge user-events/for-next)
CONFLICT (content): Merge conflict in init/main.c
Merging rcu/rcu/next (0e9b1d2b0560 Merge branches 'cmpxchg.2024.05.11a', 'kcsan.2024.05.07a', 'lkmm.2024.05.06a', 'rcu-merge.2024.05.01a' and 'tsc.2024.04.09c' into HEAD)
Merging kvm/next (6f627b425378 KVM: SVM: Add module parameter to enable SEV-SNP)
CONFLICT (content): Merge conflict in arch/loongarch/kernel/irq.c
Applying: fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code"
Merging kvm-arm/next (eaa46a28d596 Merge branch kvm-arm64/mpidr-reset into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (b52e8cd3f835 KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info())
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
Merging xen-tip/linux-next (d4c16b4755de xen/xenbus: Use *-y instead of *-objs in Makefile)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (2513563edc98 platform/x86: Add new MeeGoPad ANX7428 Type-C Cross Switch driver)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (880a746fa3ea device property: Fix a typo in the description of device_get_child_node_count())
Merging usb/usb-next (51474ab44abf drm/bridge: aux-hpd-bridge: correct devm_drm_dp_hpd_bridge_add() stub)
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (e21de1455a72 serial: Clear UPF_DEAD before calling tty_port_register_device_attr_serdev())
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (f5b335dc025c misc: ntsync: mark driver as "broken" to prevent from building)
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x)
Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property)
Merging extcon/extcon-next (3e8e45b65d9f extcon: adc-jack: Document missing struct members)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (dda057ad8c9c vfio: remove an extra semicolon)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (4cece7649650 Linux 6.9-rc1)
Merging staging/staging-next (eb563dc752d3 staging: pi433: Remove unused driver)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (28059ddbee0e MAINTAINERS: Update role for IDXD driver)
Merging cgroup/for-next (21c38a3bd4ee cgroup/rstat: add cgroup_rstat_cpu_lock helpers and tracepoints)
Merging scsi/for-next (9ba1fbe2ed0c Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (e4f5f8298cf6 scsi: mpt3sas: Add missing kerneldoc parameter descriptions)
Merging vhost/linux-next (0b8dbbdcf2e4 Merge tag 'for_linus' into vhost)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_ring.c
Merging rpmsg/for-next (c8d8f841e95b Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (7f45fe2ea3b8 gpio: nuvoton: Fix sgpio irq handle error)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (9429f847dd72 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (4817118f257e pwm: pca9685: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (2c3b8f8f37c6 selftests/sgx: Include KHDR_INCLUDES in Makefile)
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (5496b9b77d74 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (73a98bc5a947 Merge branch 'for-6.10' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (e406737b1110 seccomp: Constify sysctl subhelpers)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (4cece7649650 Linux 6.9-rc1)
Merging nvmem/for-next (4cece7649650 Linux 6.9-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (5bf9e57e634b MAINTAINERS: Add Günther Noack as Landlock reviewer)
Merging rust/rust-next (97ab3e8eec0c rust: alloc: fix dangling pointer in VecExt<T>::reserve())
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (4bbf9c3b53e6 fs/coredump: Enable dynamic configuration of max file note size)
Merging bitmap/bitmap-for-next (c3052c2f53d3 usercopy: Don't use "proxy" headers)
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (5a1f2a9c4236 ubsan: Restore dependency on ARCH_HAS_UBSAN)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (256d218ec6ae tools/power turbostat: version 2024.05.10)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.c
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.h
CONFLICT (content): Merge conflict in drivers/md/bcache/btree.c
CONFLICT (content): Merge conflict in drivers/md/bcache/writeback.c
$ git merge --abort
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Applying: fix up for bad risc-v tree merge
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Re: [PATCH 6.8 000/340] 6.8.10-rc2 review
2024-05-15 8:27 1% [PATCH 6.8 000/340] 6.8.10-rc2 review Greg Kroah-Hartman
@ 2024-05-15 16:37 3% ` Mark Brown
2024-05-16 12:10 0% ` Greg Kroah-Hartman
0 siblings, 1 reply; 200+ results
From: Mark Brown @ 2024-05-15 16:37 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: stable, patches, linux-kernel, torvalds, akpm, linux, shuah,
patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml,
Steven Rostedt
[-- Attachment #1: Type: text/plain, Size: 2573 bytes --]
On Wed, May 15, 2024 at 10:27:21AM +0200, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 6.8.10 release.
> There are 340 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
I'm seeing issues with the ftrace "Test file and directory owership
changes for eventfs" test on several platforms, including both 32 Arm
and whatever random x86_64 box Linaro have in their lab. The logs
aren't terribly helpful since they just log a "not ok", example here:
https://lava.sirena.org.uk/scheduler/job/265221#L3252
Bisects land on "eventfs: Do not differentiate the toplevel events
directory" as having introduced the issue. Other stables don't seem to
be affected.
Bisect log (this one from a Raspberry Pi 3 in 32 bit mode):
# bad: [cfe824b75b3d9d13a891ad1c4a2d6fe0eceed1e9] Linux 6.8.10-rc2
# good: [f3d61438b613b87afb63118bea6fb18c50ba7a6b] Linux 6.8.9
# good: [428b806127e00d1c39ed72cbae36dbb4598e58dd] usb: dwc3: core: Prevent phy suspend during init
# good: [a336529a6498c3e7208415b1c2710872aebf04aa] drm/vmwgfx: Fix invalid reads in fence signaled events
# good: [dcca5ac4f5de7cca371138049a4a5877a6a3af97] hv_netvsc: Don't free decrypted memory
git bisect start 'cfe824b75b3d9d13a891ad1c4a2d6fe0eceed1e9' 'f3d61438b613b87afb63118bea6fb18c50ba7a6b' '428b806127e00d1c39ed72cbae36dbb4598e58dd' 'a336529a6498c3e7208415b1c2710872aebf04aa' 'dcca5ac4f5de7cca371138049a4a5877a6a3af97'
# bad: [cfe824b75b3d9d13a891ad1c4a2d6fe0eceed1e9] Linux 6.8.10-rc2
git bisect bad cfe824b75b3d9d13a891ad1c4a2d6fe0eceed1e9
# good: [00dfda4fc19df6f2235723e9529efa94cbc122a2] nvme-pci: Add quirk for broken MSIs
git bisect good 00dfda4fc19df6f2235723e9529efa94cbc122a2
# bad: [1239a1c5dc96166a0010de49e4769e08bc6d75b3] Bluetooth: qca: fix wcn3991 device address check
git bisect bad 1239a1c5dc96166a0010de49e4769e08bc6d75b3
# good: [a2ede3c7da39a8ab359cd23ebba04603e119ac59] ksmbd: do not grant v2 lease if parent lease key and epoch are not set
git bisect good a2ede3c7da39a8ab359cd23ebba04603e119ac59
# bad: [21b410a9ae24348d143dbfe3062eae67d52d5a76] eventfs: Do not differentiate the toplevel events directory
git bisect bad 21b410a9ae24348d143dbfe3062eae67d52d5a76
# good: [801cdc1467e661f2b151eeb8a25042593a487c78] tracefs: Still use mount point as default permissions for instances
git bisect good 801cdc1467e661f2b151eeb8a25042593a487c78
# first bad commit: [21b410a9ae24348d143dbfe3062eae67d52d5a76] eventfs: Do not differentiate the toplevel events directory
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 3%]
* [PATCH 5.15 000/168] 5.15.159-rc2 review
@ 2024-05-15 8:27 4% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-15 8:27 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 5.15.159 release.
There are 168 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Fri, 17 May 2024 08:23:27 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.159-rc2.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 5.15.159-rc2
Li Nan <linan122@huawei.com>
md: fix kmemleak of rdev->serial
Silvio Gissi <sifonsec@amazon.com>
keys: Fix overwrite of key expiration on instantiation
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix firmware check error path
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix NVM configuration parsing
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: add missing firmware sanity checks
Johan Hovold <johan+linaro@kernel.org>
regulator: core: fix debugfs creation regression
Lakshmi Yadlapati <lakshmiy@us.ibm.com>
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
net: fix out-of-bounds access in ops_init
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix invalid reads in fence signaled events
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: add lunar lake point M DID
Viken Dadhaniya <quic_vdadhani@quicinc.com>
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Jim Cromie <jim.cromie@gmail.com>
dyndbg: fix old BUG_ON in >control parser
Joao Paulo Goncalves <joao.goncalves@toradex.com>
ASoC: ti: davinci-mcasp: Fix race condition during probe
Sameer Pujar <spujar@nvidia.com>
ASoC: tegra: Fix DSPK 16-bit playback
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
Paolo Abeni <pabeni@redhat.com>
tipc: fix UAF in error path
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Interrupt handling fixes
Ramona Gradinariu <ramona.bolboaca13@gmail.com>
iio:imu: adis16475: Fix sync mode setting
Javier Carrasco <javier.carrasco.cruz@gmail.com>
dt-bindings: iio: health: maxim,max30102: fix compatible check
Paolo Abeni <pabeni@redhat.com>
mptcp: ensure snd_nxt is properly initialized on connect
Dominique Martinet <dominique.martinet@atmark-techno.com>
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Aman Dhoot <amandhoot12@gmail.com>
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: dwc3: core: Prevent phy suspend during init
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: xhci-plat: Don't include xhci.h
Chris Wulff <Chris.Wulff@biamp.com>
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Peter Korsgaard <peter@korsgaard.com>
usb: gadget: composite: fix OS descriptors w_value logic
Guenter Roeck <linux@roeck-us.net>
usb: ohci: Prevent missed ohci interrupts
Alan Stern <stern@rowland.harvard.edu>
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Fix connector check on init
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Check for notifications after init
Rob Herring <robh@kernel.org>
arm64: dts: qcom: Fix 'interrupt-map' parent address cells
Linus Torvalds <torvalds@linux-foundation.org>
Reapply "drm/qxl: simplify qxl_fence_wait"
Thanassis Avgerinos <thanassis.avgerinos@gmail.com>
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Dmitry Antipov <dmantipov@yandex.ru>
btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send()
Vanshidhar Konda <vanshikonda@os.amperecomputing.com>
ACPI: CPPC: Fix access width used for PCC registers
Jarred White <jarredwhite@linux.microsoft.com>
ACPI: CPPC: Fix bit_offset shift in MASK_VAL() macro
Easwar Hariharan <eahariha@linux.microsoft.com>
Revert "Revert "ACPI: CPPC: Use access_width over bit_width for system memory accesses""
Gabe Teeger <gabe.teeger@amd.com>
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Douglas Anderson <dianders@chromium.org>
drm/connector: Add \n to message about demoting connector force-probes
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: add bandgap setting for g12
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: power up phy on device init
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix port vlan filter not disabled issue
Jian Shen <shenjian15@huawei.com>
net: hns3: split function hclge_init_vlan_config()
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: use appropriate barrier function after setting a bit value
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: change type of numa_node_mask as nodemask_t
Jie Wang <wangjie125@huawei.com>
net: hns3: refactor hclge_cmd_send with new hclge_comm_cmd_send API
Jie Wang <wangjie125@huawei.com>
net: hns3: create new set of unified hclge_comm_cmd_send APIs
Jie Wang <wangjie125@huawei.com>
net: hns3: create new cmdq hardware description structure hclge_comm_hw
Jie Wang <wangjie125@huawei.com>
net: hns3: refactor hns3 makefile to support hns3_common module
Jian Shen <shenjian15@huawei.com>
net: hns3: direct return when receive a unknown mailbox message
Hao Lan <lanhao@huawei.com>
net: hns3: refactor function hclge_mbx_handler()
Guangbin Huang <huangguangbin2@huawei.com>
net: hns3: add query vf ring and vector map relation
Yufeng Mo <moyufeng@huawei.com>
net: hns3: add log for workqueue scheduled late
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: using user configure after hardware reset
Guangbin Huang <huangguangbin2@huawei.com>
net: hns3: PF support get unicast MAC address space assigned by firmware
Eric Dumazet <edumazet@google.com>
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
Felix Fietkau <nbd@nbd.name>
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Eric Dumazet <edumazet@google.com>
phonet: fix rtm_phonet_notify() skb allocation
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use a separate buffer for sending commands
Roded Zats <rzats@paloaltonetworks.com>
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Kuniyuki Iwashima <kuniyu@amazon.com>
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Eric Dumazet <edumazet@google.com>
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
Boy.Wu <boy.wu@mediatek.com>
ARM: 9381/1: kasan: clear stale stack poison
Paul Davey <paul.davey@alliedtelesis.co.nz>
xfrm: Preserve vlan tags for transport mode software GRO
Al Viro <viro@zeniv.linux.org.uk>
qibfs: fix dentry leak
John Fastabend <john.fastabend@gmail.com>
bpf, sockmap: Improved check for empty queue
John Fastabend <john.fastabend@gmail.com>
bpf, sockmap: Reschedule is now done through backlog
John Fastabend <john.fastabend@gmail.com>
bpf, sockmap: Convert schedule_work into delayed_work
John Fastabend <john.fastabend@gmail.com>
bpf, sockmap: Handle fin correctly
John Fastabend <john.fastabend@gmail.com>
bpf, sockmap: TCP data stall on recv before accept
Vanillan Wang <vanillanwang@163.com>
net:usb:qmi_wwan: support Rolling modules
Lyude Paul <lyude@redhat.com>
drm/nouveau/dp: Don't probe eDP ports twice harder
Joakim Sindholt <opensource@zhasha.com>
fs/9p: drop inodes immediately on non-.L too
Stephen Boyd <sboyd@kernel.org>
clk: Don't hold prepare_lock when calling kref_put()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: crystalcove: Use -ENOTSUPP consistently
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: wcove: Use -ENOTSUPP consistently
Jeff Layton <jlayton@kernel.org>
9p: explicitly deny setlease attempts
Joakim Sindholt <opensource@zhasha.com>
fs/9p: translate O_TRUNC into OTRUNC
Joakim Sindholt <opensource@zhasha.com>
fs/9p: only translate RWX permissions for plain 9P2000
Krzysztof Kozlowski <krzk@kernel.org>
iommu: mtk: fix module autoloading
John Stultz <jstultz@google.com>
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Jiaxun Yang <jiaxun.yang@flygoat.com>
MIPS: scall: Save thread_info.syscall unconditionally on entry
Thierry Reding <treding@nvidia.com>
gpu: host1x: Do not setup DMA for virtual devices
Rik van Riel <riel@surriel.com>
blk-iocost: avoid out of bounds shift
Maurizio Lombardi <mlombard@redhat.com>
scsi: target: Fix SELinux error when systemd-modules loads the target module
Boris Burkov <boris@bur.io>
btrfs: always clear PERTRANS metadata during commit
Boris Burkov <boris@bur.io>
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
Peng Liu <liupeng17@lenovo.com>
tools/power turbostat: Fix Bzy_MHz documentation typo
Doug Smythies <dsmythies@telus.net>
tools/power turbostat: Fix added raw MSR output
Adam Goldman <adamg@pobox.com>
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Chen Ni <nichen@iscas.ac.cn>
ata: sata_gemini: Check clk_enable() result
Phil Elwell <phil@raspberrypi.com>
net: bcmgenet: Reset RBUF on first open
Takashi Iwai <tiwai@suse.de>
ALSA: line6: Zero-initialize message buffers
Borislav Petkov (AMD) <bp@alien8.de>
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Anand Jain <anand.jain@oracle.com>
btrfs: return accurate error code on open failure in open_fs_devices()
Saurav Kashyap <skashyap@marvell.com>
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
linke li <lilinke99@qq.com>
net: mark racy access on sk->sk_rcvbuf
Igor Artemiev <Igor.A.Artemiev@mcst.ru>
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jeff Johnson <quic_jjohnson@quicinc.com>
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Andrew Price <anprice@redhat.com>
gfs2: Fix invalid metadata access in punch_hole
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
Oliver Upton <oliver.upton@linux.dev>
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Marc Zyngier <maz@kernel.org>
KVM: arm64: vgic-v2: Use cpuid from userspace as vcpu_id
Jernej Skrabec <jernej.skrabec@gmail.com>
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Richard Gobert <richardbgobert@gmail.com>
net: gro: add flush check in udp_gro_receive_segment
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Use predefined error codes
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Respect deferred probe
Alexandra Winter <wintera@linux.ibm.com>
s390/qeth: Fix kernel panic after setting hsuid
Julian Wiedmann <jwi@linux.ibm.com>
s390/qeth: don't keep track of Input Queue count
Xin Long <lucien.xin@gmail.com>
tipc: fix a possible memleak in tipc_buf_append
Felix Fietkau <nbd@nbd.name>
net: core: reject skb_copy(_expand) for fraglist GSO skbs
Felix Fietkau <nbd@nbd.name>
net: bridge: fix multicast-to-unicast with fraglist GSO
Marek Behún <kabel@kernel.org>
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
cxgb4: Properly lock TX queue for the selftest.
Bui Quang Minh <minhquangbui99@gmail.com>
s390/cio: Ensure the copied buf is NUL terminated
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: cards: select SND_DYNAMIC_MINORS
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-tdm-interface: manage formatters in trigger
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-card: make links nonatomic
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use threaded irq to check periods
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use FIELD helpers
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_actions()
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flow_spec
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flower
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
Jens Remus <jremus@linux.ibm.com>
s390/vdso: Add CFI for RA register to asm macro vdso_func
David Bauer <mail@david-bauer.net>
net l2tp: drop flow hash on forward
Kuniyuki Iwashima <kuniyu@amazon.com>
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
Bui Quang Minh <minhquangbui99@gmail.com>
octeontx2-af: avoid off-by-one read from userspace
Bui Quang Minh <minhquangbui99@gmail.com>
bna: ensure the copied buf is NUL terminated
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: use flags field to disambiguate broadcast redirect
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: Add xdp_do_redirect_frame() for pre-computed xdp_frames
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: Move conversion to xdp_frame out of map functions
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix clearing storage keys for huge pages
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix storage key clearing for guest huge pages
Devyn Liu <liudingyuan@huawei.com>
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
Anton Protopopov <aspsk@isovalent.com>
bpf: Fix a verifier verbose message
Jason Xing <kernelxing@tencent.com>
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Andrii Nakryiko <andrii@kernel.org>
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
regulator: mt6360: De-capitalize devicetree regulator subnodes
Zeng Heng <zengheng4@huawei.com>
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
Arnd Bergmann <arnd@arndb.de>
power: rt9455: hide unused rt9455_boost_voltage_values
Kuniyuki Iwashima <kuniyu@amazon.com>
nfs: Handle error of rpc_proc_register() in nfs_net_init().
Josef Bacik <josef@toxicpanda.com>
nfs: make the rpc_stat per net namespace
Josef Bacik <josef@toxicpanda.com>
nfs: expose /proc/net/sunrpc/nfs in net namespaces
Josef Bacik <josef@toxicpanda.com>
sunrpc: add a struct rpc_stats arg to rpc_create_args
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework mtk_pinconf_{get,set} switch/case logic
Dan Carpenter <dan.carpenter@linaro.org>
pinctrl: core: delete incorrect free in pinctrl_enable()
Jan Dakinevich <jan.dakinevich@salutedevices.com>
pinctrl/meson: fix typo in PDM's pin name
Billy Tsai <billy_tsai@aspeedtech.com>
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Daniel Okazaki <dtokazaki@google.com>
eeprom: at24: fix memory corruption race condition
Heiner Kallweit <hkallweit1@gmail.com>
eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
Alexander Stein <alexander.stein@ew.tq-group.com>
eeprom: at24: Use dev_err_probe for nvmem register failure
Marios Makassikis <mmakassikis@freebox.fr>
ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
Johannes Berg <johannes.berg@intel.com>
wifi: nl80211: don't free NULL coalescing rule
Vinod Koul <vkoul@kernel.org>
dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
Bumyong Lee <bumyong.lee@samsung.com>
dmaengine: pl330: issue_pending waits until WFP state
-------------
Diffstat:
.../bindings/iio/health/maxim,max30102.yaml | 2 +-
Makefile | 4 +-
arch/arm/kernel/sleep.S | 4 +
arch/arm64/boot/dts/qcom/msm8998.dtsi | 8 +-
arch/arm64/boot/dts/qcom/sdm845.dtsi | 16 +-
arch/arm64/kvm/vgic/vgic-kvm-device.c | 12 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/kernel/asm-offsets.c | 1 +
arch/mips/kernel/ptrace.c | 15 +-
arch/mips/kernel/scall32-o32.S | 23 +-
arch/mips/kernel/scall64-n32.S | 3 +-
arch/mips/kernel/scall64-n64.S | 3 +-
arch/mips/kernel/scall64-o32.S | 33 +-
arch/s390/include/asm/dwarf.h | 1 +
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2 +
arch/s390/mm/gmap.c | 2 +-
arch/s390/mm/hugetlbpage.c | 2 +-
block/blk-iocost.c | 7 +-
drivers/acpi/cppc_acpi.c | 67 ++-
drivers/ata/sata_gemini.c | 5 +-
drivers/bluetooth/btqca.c | 62 ++-
drivers/clk/clk.c | 12 +-
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 +-
drivers/firewire/nosy.c | 6 +-
drivers/firewire/ohci.c | 6 +-
drivers/gpio/gpio-crystalcove.c | 2 +-
drivers/gpio/gpio-wcove.c | 2 +-
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 +
drivers/gpu/drm/drm_connector.c | 2 +-
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 ++-
drivers/gpu/drm/nouveau/nouveau_dp.c | 13 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 8 +-
drivers/gpu/drm/qxl/qxl_release.c | 50 +--
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
drivers/gpu/host1x/bus.c | 8 -
drivers/hwmon/corsair-cpro.c | 43 +-
drivers/hwmon/pmbus/ucd9000.c | 6 +-
drivers/iio/accel/mxc4005.c | 24 +-
drivers/iio/imu/adis16475.c | 4 +-
drivers/infiniband/hw/qib/qib_fs.c | 1 +
drivers/iommu/mtk_iommu.c | 1 +
drivers/iommu/mtk_iommu_v1.c | 1 +
drivers/md/md.c | 1 +
drivers/misc/eeprom/at24.c | 46 +-
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/net/dsa/mv88e6xxx/chip.c | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 20 +-
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
drivers/net/ethernet/hisilicon/hns3/Makefile | 18 +-
drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 15 +
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 +-
.../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 259 +++++++++++
.../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 121 +++++
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2 +
.../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 12 -
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 311 ++-----------
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 85 +---
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 221 +++++----
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 17 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 494 +++++++++++++++------
.../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 4 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 2 +-
.../net/ethernet/hisilicon/hns3/hns3vf/Makefile | 10 -
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 10 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +-
.../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +-
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 +-
drivers/pinctrl/core.c | 8 +-
drivers/pinctrl/devicetree.c | 10 +-
drivers/pinctrl/mediatek/pinctrl-paris.c | 180 +++-----
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +-
drivers/power/supply/mt6360_charger.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +
drivers/regulator/core.c | 27 +-
drivers/regulator/mt6360-regulator.c | 32 +-
drivers/s390/cio/cio_inject.c | 2 +-
drivers/s390/net/qeth_core.h | 1 -
drivers/s390/net/qeth_core_main.c | 78 ++--
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 -
drivers/scsi/lpfc/lpfc.h | 1 -
drivers/scsi/lpfc/lpfc_nvme.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 13 +-
drivers/scsi/lpfc/lpfc_vport.c | 8 +-
drivers/slimbus/qcom-ngd-ctrl.c | 6 +-
drivers/spi/spi-hisi-kunpeng.c | 2 -
drivers/target/target_core_configfs.c | 12 +
drivers/usb/core/hub.c | 5 +-
drivers/usb/dwc3/core.c | 90 ++--
drivers/usb/dwc3/core.h | 1 +
drivers/usb/dwc3/gadget.c | 2 +
drivers/usb/dwc3/host.c | 27 ++
drivers/usb/gadget/composite.c | 6 +-
drivers/usb/gadget/function/f_fs.c | 2 +-
drivers/usb/host/ohci-hcd.c | 8 +
drivers/usb/host/xhci-plat.h | 4 +-
drivers/usb/typec/ucsi/ucsi.c | 12 +-
fs/9p/vfs_file.c | 2 +
fs/9p/vfs_inode.c | 5 +-
fs/9p/vfs_super.c | 1 +
fs/btrfs/inode.c | 2 +-
fs/btrfs/send.c | 4 +-
fs/btrfs/transaction.c | 2 +-
fs/btrfs/volumes.c | 18 +-
fs/gfs2/bmap.c | 5 +-
fs/ksmbd/server.c | 13 +-
fs/ksmbd/smb2pdu.c | 4 +
fs/ksmbd/vfs.c | 5 +
fs/nfs/client.c | 5 +-
fs/nfs/inode.c | 13 +-
fs/nfs/internal.h | 2 -
fs/nfs/netns.h | 2 +
include/linux/bpf.h | 20 +-
include/linux/dma-fence.h | 7 -
include/linux/filter.h | 4 +
include/linux/skbuff.h | 15 +
include/linux/skmsg.h | 5 +-
include/linux/sunrpc/clnt.h | 1 +
include/net/xfrm.h | 3 +
kernel/bpf/cpumap.c | 8 +-
kernel/bpf/devmap.c | 32 +-
kernel/bpf/verifier.c | 3 +-
lib/Kconfig.debug | 5 +-
lib/dynamic_debug.c | 6 +-
net/bluetooth/l2cap_core.c | 3 +
net/bluetooth/sco.c | 4 +
net/bridge/br_forward.c | 9 +-
net/core/filter.c | 117 ++++-
net/core/net_namespace.c | 13 +-
net/core/rtnetlink.c | 2 +-
net/core/skbuff.c | 27 +-
net/core/skmsg.c | 53 +--
net/core/sock.c | 4 +-
net/core/sock_map.c | 3 +-
net/ipv4/tcp.c | 4 +-
net/ipv4/tcp_bpf.c | 51 +++
net/ipv4/tcp_input.c | 2 +
net/ipv4/tcp_ipv4.c | 8 +-
net/ipv4/tcp_output.c | 4 +-
net/ipv4/udp_offload.c | 12 +-
net/ipv4/xfrm4_input.c | 6 +-
net/ipv6/fib6_rules.c | 6 +-
net/ipv6/xfrm6_input.c | 6 +-
net/l2tp/l2tp_eth.c | 3 +
net/mac80211/ieee80211_i.h | 4 +-
net/mptcp/protocol.c | 3 +
net/nsh/nsh.c | 14 +-
net/phonet/pn_netlink.c | 2 +-
net/sunrpc/clnt.c | 5 +-
net/tipc/msg.c | 8 +-
net/wireless/nl80211.c | 2 +
net/wireless/trace.h | 2 +-
net/xfrm/xfrm_input.c | 8 +
scripts/Makefile.modfinal | 2 +-
security/keys/key.c | 3 +-
sound/hda/intel-sdw-acpi.c | 2 +
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/meson/Kconfig | 1 +
sound/soc/meson/axg-card.c | 1 +
sound/soc/meson/axg-fifo.c | 56 ++-
sound/soc/meson/axg-fifo.h | 12 +-
sound/soc/meson/axg-frddr.c | 5 +-
sound/soc/meson/axg-tdm-interface.c | 26 +-
sound/soc/meson/axg-toddr.c | 22 +-
sound/soc/tegra/tegra186_dspk.c | 7 +-
sound/soc/ti/davinci-mcasp.c | 12 +-
sound/usb/line6/driver.c | 6 +-
tools/power/x86/turbostat/turbostat.8 | 2 +-
tools/power/x86/turbostat/turbostat.c | 7 +-
tools/testing/selftests/timers/valid-adjtimex.c | 73 ++-
173 files changed, 2224 insertions(+), 1423 deletions(-)
^ permalink raw reply [relevance 4%]
* [PATCH 6.1 000/243] 6.1.91-rc2 review
@ 2024-05-15 8:27 2% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-15 8:27 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 6.1.91 release.
There are 243 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Fri, 17 May 2024 08:23:27 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.91-rc2.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 6.1.91-rc2
Li Nan <linan122@huawei.com>
md: fix kmemleak of rdev->serial
Oscar Salvador <osalvador@suse.de>
mm,swapops: update check in is_pfn_swap_entry for hwpoison entries
Miaohe Lin <linmiaohe@huawei.com>
mm/hugetlb: fix DEBUG_LOCKS_WARN_ON(1) when dissolve_free_hugetlb_folio()
Qu Wenruo <wqu@suse.com>
btrfs: do not wait for short bulk allocation
Silvio Gissi <sifonsec@amazon.com>
keys: Fix overwrite of key expiration on instantiation
Nikhil Rao <nikhil.rao@intel.com>
dmaengine: idxd: add a write() method for applications to submit work
Arjan van de Ven <arjan@linux.intel.com>
dmaengine: idxd: add a new security check to deal with a hardware erratum
Arjan van de Ven <arjan@linux.intel.com>
VFIO: Add the SPR_DSA and SPR_IAX devices to the denylist
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix firmware check error path
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching fw build id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching board id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix NVM configuration parsing
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: add missing firmware sanity checks
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: avoid to send duplicate lease break notifications
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: off ipv6only for both ipv4/ipv6 binding
Conor Dooley <conor.dooley@microchip.com>
spi: microchip-core-qspi: fix setting spi bus clock rate
Johan Hovold <johan+linaro@kernel.org>
regulator: core: fix debugfs creation regression
Kefeng Wang <wangkefeng.wang@huawei.com>
mm: use memalloc_nofs_save() in page_cache_ra_order()
Lakshmi Yadlapati <lakshmiy@us.ibm.com>
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
net: fix out-of-bounds access in ops_init
George Shen <george.shen@amd.com>
drm/amd/display: Handle Y carry-over in VCP X.Y calculation
Karthikeyan Ramasubramanian <kramasub@chromium.org>
drm/i915/bios: Fix parsing backlight BDB data
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix invalid reads in fence signaled events
Alex Deucher <alexander.deucher@amd.com>
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: add lunar lake point M DID
Viken Dadhaniya <quic_vdadhani@quicinc.com>
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Jim Cromie <jim.cromie@gmail.com>
dyndbg: fix old BUG_ON in >control parser
Joao Paulo Goncalves <joao.goncalves@toradex.com>
ASoC: ti: davinci-mcasp: Fix race condition during probe
Sameer Pujar <spujar@nvidia.com>
ASoC: tegra: Fix DSPK 16-bit playback
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize UMAC_CMD access
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
Paolo Abeni <pabeni@redhat.com>
tipc: fix UAF in error path
Alexander Potapenko <glider@google.com>
kmsan: compiler_types: declare __no_sanitize_or_inline
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Interrupt handling fixes
Ramona Gradinariu <ramona.bolboaca13@gmail.com>
iio:imu: adis16475: Fix sync mode setting
Javier Carrasco <javier.carrasco.cruz@gmail.com>
dt-bindings: iio: health: maxim,max30102: fix compatible check
Paolo Abeni <pabeni@redhat.com>
mptcp: ensure snd_nxt is properly initialized on connect
Dan Carpenter <dan.carpenter@linaro.org>
mm/slab: make __free(kfree) accept error pointers
Dominique Martinet <dominique.martinet@atmark-techno.com>
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Aman Dhoot <amandhoot12@gmail.com>
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Badhri Jagan Sridharan <badhri@google.com>
usb: typec: tcpm: Check for port partner validity before consuming it
Amit Sunil Dhamne <amitsd@google.com>
usb: typec: tcpm: unregister existing source caps before re-registration
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: dwc3: core: Prevent phy suspend during init
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: xhci-plat: Don't include xhci.h
Chris Wulff <Chris.Wulff@biamp.com>
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Peter Korsgaard <peter@korsgaard.com>
usb: gadget: composite: fix OS descriptors w_value logic
Alan Stern <stern@rowland.harvard.edu>
USB: core: Fix access violation during port device removal
Guenter Roeck <linux@roeck-us.net>
usb: ohci: Prevent missed ohci interrupts
Alan Stern <stern@rowland.harvard.edu>
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Fix connector check on init
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Check for notifications after init
Benno Lossin <benno.lossin@proton.me>
rust: macros: fix soundness issue in `module!` macro
Thomas Bertschinger <tahbertschinger@gmail.com>
rust: module: place generated init_module() function in .init.text
Andrea Righi <andrea.righi@canonical.com>
btf, scripts: rust: drop is_rust_module.sh
Andrea Righi <andrea.righi@canonical.com>
rust: fix regexp in scripts/is_rust_module.sh
Asahi Lina <lina@asahilina.net>
rust: error: Rename to_kernel_errno() -> to_errno()
Linus Torvalds <torvalds@linux-foundation.org>
Reapply "drm/qxl: simplify qxl_fence_wait"
Thanassis Avgerinos <thanassis.avgerinos@gmail.com>
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Dmitry Antipov <dmantipov@yandex.ru>
btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send()
Christian König <christian.koenig@amd.com>
drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2
Leah Rumancik <leah.rumancik@gmail.com>
MAINTAINERS: add leah to 6.1 MAINTAINERS file
Gabe Teeger <gabe.teeger@amd.com>
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: fix uninitialised kfifo
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: relocate debounce_period_us from struct gpio_desc
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpiolib: cdev: Add missing header(s)
Mario Limonciello <mario.limonciello@amd.com>
dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
Douglas Anderson <dianders@chromium.org>
drm/connector: Add \n to message about demoting connector force-probes
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: add bandgap setting for g12
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: power up phy on device init
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix kernel crash when devlink reload during initialization
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix port vlan filter not disabled issue
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: use appropriate barrier function after setting a bit value
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: release PTP resources if pf initialization failed
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: change type of numa_node_mask as nodemask_t
Jian Shen <shenjian15@huawei.com>
net: hns3: direct return when receive a unknown mailbox message
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: using user configure after hardware reset
Wen Gu <guwen@linux.alibaba.com>
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Eric Dumazet <edumazet@google.com>
ipv6: prevent NULL dereference in ip6_output()
Eric Dumazet <edumazet@google.com>
ipv6: annotate data-races around cnf.disable_ipv6
Lukasz Majewski <lukma@denx.de>
hsr: Simplify code for announcing HSR nodes timer setup
Eric Dumazet <edumazet@google.com>
net-sysfs: convert dev->operstate reads to lockless ones
Thomas Gleixner <tglx@linutronix.de>
timers: Rename del_timer() to timer_delete()
Thomas Gleixner <tglx@linutronix.de>
timers: Get rid of del_singleshot_timer_sync()
Eric Dumazet <edumazet@google.com>
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
Felix Fietkau <nbd@nbd.name>
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Eric Dumazet <edumazet@google.com>
phonet: fix rtm_phonet_notify() skb allocation
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use a separate buffer for sending commands
Roded Zats <rzats@paloaltonetworks.com>
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Marek Vasut <marex@denx.de>
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Kuniyuki Iwashima <kuniyu@amazon.com>
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Eric Dumazet <edumazet@google.com>
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
Boy.Wu <boy.wu@mediatek.com>
ARM: 9381/1: kasan: clear stale stack poison
Paul Davey <paul.davey@alliedtelesis.co.nz>
xfrm: Preserve vlan tags for transport mode software GRO
Al Viro <viro@zeniv.linux.org.uk>
qibfs: fix dentry leak
Namhyung Kim <namhyung@kernel.org>
perf unwind-libdw: Handle JIT-generated DSOs properly
Namhyung Kim <namhyung@kernel.org>
perf unwind-libunwind: Fix base address for .eh_frame
Geert Uytterhoeven <geert+renesas@glider.be>
spi: Merge spi_controller.{slave,target}_abort()
Miguel Ojeda <ojeda@kernel.org>
kbuild: rust: avoid creating temporary files
Vanillan Wang <vanillanwang@163.com>
net:usb:qmi_wwan: support Rolling modules
Lyude Paul <lyude@redhat.com>
drm/nouveau/dp: Don't probe eDP ports twice harder
Joakim Sindholt <opensource@zhasha.com>
fs/9p: drop inodes immediately on non-.L too
Stephen Boyd <sboyd@kernel.org>
clk: Don't hold prepare_lock when calling kref_put()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: crystalcove: Use -ENOTSUPP consistently
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: wcove: Use -ENOTSUPP consistently
Jeff Layton <jlayton@kernel.org>
9p: explicitly deny setlease attempts
Joakim Sindholt <opensource@zhasha.com>
fs/9p: translate O_TRUNC into OTRUNC
Joakim Sindholt <opensource@zhasha.com>
fs/9p: only translate RWX permissions for plain 9P2000
Krzysztof Kozlowski <krzk@kernel.org>
iommu: mtk: fix module autoloading
Michael Kelley <mhklinux@outlook.com>
Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted
Rick Edgecombe <rick.p.edgecombe@intel.com>
uio_hv_generic: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
John Stultz <jstultz@google.com>
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Refine IB schedule error logging
Justin Ernst <justin.ernst@hpe.com>
tools/power/turbostat: Fix uncore frequency file string
Jiaxun Yang <jiaxun.yang@flygoat.com>
MIPS: scall: Save thread_info.syscall unconditionally on entry
Thierry Reding <treding@nvidia.com>
gpu: host1x: Do not setup DMA for virtual devices
Rik van Riel <riel@surriel.com>
blk-iocost: avoid out of bounds shift
Maurizio Lombardi <mlombard@redhat.com>
scsi: target: Fix SELinux error when systemd-modules loads the target module
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `BIT'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `panic'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `early_pfn_to_nid'
Boris Burkov <boris@bur.io>
btrfs: always clear PERTRANS metadata during commit
Boris Burkov <boris@bur.io>
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
Peng Liu <liupeng17@lenovo.com>
tools/power turbostat: Fix Bzy_MHz documentation typo
Wyes Karny <wyes.karny@amd.com>
tools/power turbostat: Increase the limit for fd opened
Doug Smythies <dsmythies@telus.net>
tools/power turbostat: Fix added raw MSR output
Adam Goldman <adamg@pobox.com>
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Chen Ni <nichen@iscas.ac.cn>
ata: sata_gemini: Check clk_enable() result
Phil Elwell <phil@raspberrypi.com>
net: bcmgenet: Reset RBUF on first open
Li Nan <linan122@huawei.com>
block: fix overflow in blk_ioctl_discard()
Takashi Iwai <tiwai@suse.de>
ALSA: line6: Zero-initialize message buffers
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: WLUN suspend dev/link state error recovery
Borislav Petkov (AMD) <bp@alien8.de>
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Andrei Matei <andreimatei1@gmail.com>
bpf: Check bloom filter map value size
Anand Jain <anand.jain@oracle.com>
btrfs: return accurate error code on open failure in open_fs_devices()
Saurav Kashyap <skashyap@marvell.com>
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
scsi: mpi3mr: Avoid memcpy field-spanning write WARNING
linke li <lilinke99@qq.com>
net: mark racy access on sk->sk_rcvbuf
Igor Artemiev <Igor.A.Artemiev@mcst.ru>
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jeff Johnson <quic_jjohnson@quicinc.com>
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Andrew Price <anprice@redhat.com>
gfs2: Fix invalid metadata access in punch_hole
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Release hbalock before calling lpfc_worker_wake_up()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
Oliver Upton <oliver.upton@linux.dev>
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Marc Zyngier <maz@kernel.org>
KVM: arm64: vgic-v2: Use cpuid from userspace as vcpu_id
Gaurav Batra <gbatra@linux.ibm.com>
powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: make max polling consistent for longer H_CALLs
Russell Currey <ruscur@russell.cc>
powerpc/pseries: Move PLPKS constants to header file
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: replace kmalloc with kzalloc in PLPKS driver
Jernej Skrabec <jernej.skrabec@gmail.com>
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Richard Gobert <richardbgobert@gmail.com>
net: gro: add flush check in udp_gro_receive_segment
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Use predefined error codes
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Respect deferred probe
Alexandra Winter <wintera@linux.ibm.com>
s390/qeth: Fix kernel panic after setting hsuid
Guillaume Nault <gnault@redhat.com>
vxlan: Pull inner IP header in vxlan_rcv().
Xin Long <lucien.xin@gmail.com>
tipc: fix a possible memleak in tipc_buf_append
Felix Fietkau <nbd@nbd.name>
net: core: reject skb_copy(_expand) for fraglist GSO skbs
Felix Fietkau <nbd@nbd.name>
net: bridge: fix multicast-to-unicast with fraglist GSO
Mans Rullgard <mans@mansr.com>
spi: fix null pointer dereference within spi_sync
Marek Behún <kabel@kernel.org>
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
cxgb4: Properly lock TX queue for the selftest.
Bui Quang Minh <minhquangbui99@gmail.com>
s390/cio: Ensure the copied buf is NUL terminated
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: cards: select SND_DYNAMIC_MINORS
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-tdm-interface: manage formatters in trigger
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-card: make links nonatomic
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use threaded irq to check periods
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use FIELD helpers
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_actions()
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flow_spec
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flower
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
Jens Remus <jremus@linux.ibm.com>
s390/vdso: Add CFI for RA register to asm macro vdso_func
David Bauer <mail@david-bauer.net>
net l2tp: drop flow hash on forward
Kuniyuki Iwashima <kuniyu@amazon.com>
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
Bui Quang Minh <minhquangbui99@gmail.com>
octeontx2-af: avoid off-by-one read from userspace
Bui Quang Minh <minhquangbui99@gmail.com>
bna: ensure the copied buf is NUL terminated
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: use flags field to disambiguate broadcast redirect
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix clearing storage keys for huge pages
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix storage key clearing for guest huge pages
Xu Kuohai <xukuohai@huawei.com>
bpf, arm64: Fix incorrect runtime stats
Devyn Liu <liudingyuan@huawei.com>
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: fix version format string
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use common AXI macros
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: move msg state to new struct
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use devm_spi_alloc_host()
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: simplify driver data allocation
Li Zetao <lizetao1@huawei.com>
spi: spi-axi-spi-engine: Use helper function devm_clk_get_enabled()
Yang Yingliang <yangyingliang@huawei.com>
spi: spi-axi-spi-engine: switch to use modern name
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
spi: axi-spi-engine: Convert to platform remove callback returning void
Yang Yingliang <yangyingliang@huawei.com>
spi: introduce new helpers with using modern naming
Anton Protopopov <aspsk@isovalent.com>
bpf: Fix a verifier verbose message
Yi Zhang <yi.zhang@redhat.com>
nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
Jason Xing <kernelxing@tencent.com>
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Andrii Nakryiko <andrii@kernel.org>
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change devm_regulator_get_enable_optional() stub to return Ok
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change stubbed devm_regulator_get_enable to return Ok
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
regulator: mt6360: De-capitalize devicetree regulator subnodes
Zeng Heng <zengheng4@huawei.com>
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
Arnd Bergmann <arnd@arndb.de>
power: rt9455: hide unused rt9455_boost_voltage_values
Hans de Goede <hdegoede@redhat.com>
pinctrl: baytrail: Fix selecting gpio pinctrl state
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
pinctrl: intel: Make use of struct pinfunction and PINCTRL_PINFUNCTION()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
pinctrl: Introduce struct pinfunction and PINCTRL_PINFUNCTION() macro
Kuniyuki Iwashima <kuniyu@amazon.com>
nfs: Handle error of rpc_proc_register() in nfs_net_init().
Josef Bacik <josef@toxicpanda.com>
nfs: make the rpc_stat per net namespace
Josef Bacik <josef@toxicpanda.com>
nfs: expose /proc/net/sunrpc/nfs in net namespaces
Josef Bacik <josef@toxicpanda.com>
sunrpc: add a struct rpc_stats arg to rpc_create_args
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
Dan Carpenter <dan.carpenter@linaro.org>
pinctrl: core: delete incorrect free in pinctrl_enable()
Jan Dakinevich <jan.dakinevich@salutedevices.com>
pinctrl/meson: fix typo in PDM's pin name
Billy Tsai <billy_tsai@aspeedtech.com>
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Steve French <stfrench@microsoft.com>
smb3: missing lock when picking channel
Shyam Prasad N <sprasad@microsoft.com>
cifs: use the least loaded channel for sending requests
Masahiro Yamada <masahiroy@kernel.org>
kbuild: specify output names separately for each emission type from rustc
Masahiro Yamada <masahiroy@kernel.org>
kbuild: refactor host*_flags
Peter Xu <peterx@redhat.com>
mm/hugetlb: fix missing hugetlb_lock for resv uncharge
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb_cgroup: convert hugetlb_cgroup_uncharge_page() to folios
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb: convert free_huge_page to folios
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb_cgroup: convert hugetlb_cgroup_from_page() to folios
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb_cgroup: convert __set_hugetlb_cgroup() to folios
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb: add folio_hstate()
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb: add hugetlb_folio_subpool() helpers
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm: add private field of first tail to struct page and struct folio
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb: add folio support to hugetlb specific flag macros
Tim Jiang <quic_tjiang@quicinc.com>
Bluetooth: qca: add support for QCA2066
Daniel Okazaki <dtokazaki@google.com>
eeprom: at24: fix memory corruption race condition
Heiner Kallweit <hkallweit1@gmail.com>
eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
Alexander Stein <alexander.stein@ew.tq-group.com>
eeprom: at24: Use dev_err_probe for nvmem register failure
Wedson Almeida Filho <walmeida@microsoft.com>
rust: kernel: require `Send` for `Module` implementations
Johannes Berg <johannes.berg@intel.com>
wifi: nl80211: don't free NULL coalescing rule
Vinod Koul <vkoul@kernel.org>
dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
Bumyong Lee <bumyong.lee@samsung.com>
dmaengine: pl330: issue_pending waits until WFP state
-------------
Diffstat:
.../bindings/iio/health/maxim,max30102.yaml | 2 +-
MAINTAINERS | 1 +
Makefile | 4 +-
arch/arm/kernel/sleep.S | 4 +
arch/arm64/kvm/vgic/vgic-kvm-device.c | 12 +-
arch/arm64/net/bpf_jit_comp.c | 6 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/kernel/asm-offsets.c | 1 +
arch/mips/kernel/ptrace.c | 15 +-
arch/mips/kernel/scall32-o32.S | 23 +-
arch/mips/kernel/scall64-n32.S | 3 +-
arch/mips/kernel/scall64-n64.S | 3 +-
arch/mips/kernel/scall64-o32.S | 33 +--
arch/powerpc/platforms/pseries/iommu.c | 8 +
arch/powerpc/platforms/pseries/plpks.c | 62 ++---
arch/powerpc/platforms/pseries/plpks.h | 35 ++-
arch/s390/include/asm/dwarf.h | 1 +
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2 +
arch/s390/mm/gmap.c | 2 +-
arch/s390/mm/hugetlbpage.c | 2 +-
block/blk-iocost.c | 7 +-
block/ioctl.c | 5 +-
drivers/ata/sata_gemini.c | 5 +-
drivers/bluetooth/btqca.c | 162 +++++++++++-
drivers/bluetooth/btqca.h | 6 +-
drivers/bluetooth/hci_qca.c | 11 +
drivers/char/tpm/tpm-dev-common.c | 4 +-
drivers/clk/clk.c | 12 +-
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 +-
drivers/dma/idxd/cdev.c | 77 ++++++
drivers/dma/idxd/idxd.h | 3 +
drivers/dma/idxd/init.c | 4 +
drivers/dma/idxd/registers.h | 3 -
drivers/dma/idxd/sysfs.c | 27 +-
drivers/firewire/nosy.c | 6 +-
drivers/firewire/ohci.c | 6 +-
drivers/gpio/gpio-crystalcove.c | 2 +-
drivers/gpio/gpio-wcove.c | 2 +-
drivers/gpio/gpiolib-cdev.c | 183 ++++++++++++--
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 52 ++--
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 7 +-
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 +
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6 +
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2 +-
drivers/gpu/drm/drm_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_bios.c | 19 +-
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5 -
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 +++---
drivers/gpu/drm/nouveau/nouveau_dp.c | 13 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 8 +-
drivers/gpu/drm/qxl/qxl_release.c | 50 +---
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
drivers/gpu/host1x/bus.c | 8 -
drivers/hv/channel.c | 29 ++-
drivers/hwmon/corsair-cpro.c | 43 +++-
drivers/hwmon/pmbus/ucd9000.c | 6 +-
drivers/iio/accel/mxc4005.c | 24 +-
drivers/iio/imu/adis16475.c | 4 +-
drivers/infiniband/hw/qib/qib_fs.c | 1 +
drivers/iommu/mtk_iommu.c | 1 +
drivers/iommu/mtk_iommu_v1.c | 1 +
drivers/md/md.c | 1 +
drivers/misc/eeprom/at24.c | 46 +++-
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/net/dsa/mv88e6xxx/chip.c | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 32 ++-
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8 +-
drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +-
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 52 ++--
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 20 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +-
.../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +-
drivers/net/ethernet/micrel/ks8851_common.c | 16 +-
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/vxlan/vxlan_core.c | 19 +-
drivers/nvme/host/core.c | 2 +-
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 +--
drivers/pinctrl/core.c | 8 +-
drivers/pinctrl/devicetree.c | 10 +-
drivers/pinctrl/intel/pinctrl-baytrail.c | 74 +++---
drivers/pinctrl/intel/pinctrl-intel.c | 6 +-
drivers/pinctrl/intel/pinctrl-intel.h | 17 +-
drivers/pinctrl/mediatek/pinctrl-paris.c | 40 +--
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +-
drivers/power/supply/mt6360_charger.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +
drivers/regulator/core.c | 27 +-
drivers/regulator/mt6360-regulator.c | 32 ++-
drivers/s390/cio/cio_inject.c | 2 +-
drivers/s390/net/qeth_core_main.c | 69 +++---
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 -
drivers/scsi/lpfc/lpfc.h | 1 -
drivers/scsi/lpfc/lpfc_els.c | 20 +-
drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +-
drivers/scsi/lpfc/lpfc_nvme.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 13 +-
drivers/scsi/lpfc/lpfc_sli.c | 14 +-
drivers/scsi/lpfc/lpfc_vport.c | 8 +-
drivers/scsi/mpi3mr/mpi3mr_app.c | 2 +-
drivers/slimbus/qcom-ngd-ctrl.c | 6 +-
drivers/spi/spi-axi-spi-engine.c | 275 +++++++++++----------
drivers/spi/spi-hisi-kunpeng.c | 2 -
drivers/spi/spi-microchip-core-qspi.c | 1 +
drivers/spi/spi.c | 12 +
drivers/staging/wlan-ng/hfa384x_usb.c | 4 +-
drivers/staging/wlan-ng/prism2usb.c | 6 +-
drivers/target/target_core_configfs.c | 12 +
drivers/ufs/core/ufshcd.c | 5 +-
drivers/uio/uio_hv_generic.c | 12 +-
drivers/usb/core/hub.c | 5 +-
drivers/usb/core/port.c | 8 +-
drivers/usb/dwc3/core.c | 90 +++----
drivers/usb/dwc3/core.h | 1 +
drivers/usb/dwc3/gadget.c | 2 +
drivers/usb/dwc3/host.c | 27 ++
drivers/usb/gadget/composite.c | 6 +-
drivers/usb/gadget/function/f_fs.c | 2 +-
drivers/usb/host/ohci-hcd.c | 8 +
drivers/usb/host/xhci-plat.h | 4 +-
drivers/usb/typec/tcpm/tcpm.c | 35 ++-
drivers/usb/typec/ucsi/ucsi.c | 12 +-
drivers/vfio/pci/vfio_pci.c | 2 +
fs/9p/vfs_file.c | 2 +
fs/9p/vfs_inode.c | 5 +-
fs/9p/vfs_super.c | 1 +
fs/btrfs/extent_io.c | 19 +-
fs/btrfs/inode.c | 2 +-
fs/btrfs/send.c | 4 +-
fs/btrfs/transaction.c | 2 +-
fs/btrfs/volumes.c | 18 +-
fs/gfs2/bmap.c | 5 +-
fs/hugetlbfs/inode.c | 8 +-
fs/nfs/client.c | 5 +-
fs/nfs/inode.c | 13 +-
fs/nfs/internal.h | 2 -
fs/nfs/netns.h | 2 +
fs/smb/client/transport.c | 37 ++-
fs/smb/server/oplock.c | 35 ++-
fs/smb/server/transport_tcp.c | 4 +
include/linux/compiler_types.h | 11 +
include/linux/dma-fence.h | 7 -
include/linux/gfp_types.h | 2 +
include/linux/hugetlb.h | 53 +++-
include/linux/hugetlb_cgroup.h | 69 +++---
include/linux/hyperv.h | 1 +
include/linux/mm_types.h | 14 ++
include/linux/pci_ids.h | 2 +
include/linux/pinctrl/pinctrl.h | 20 ++
include/linux/regulator/consumer.h | 4 +-
include/linux/skbuff.h | 15 ++
include/linux/skmsg.h | 2 +
include/linux/slab.h | 2 +-
include/linux/spi/spi.h | 51 +++-
include/linux/sunrpc/clnt.h | 1 +
include/linux/swapops.h | 105 ++++----
include/linux/timer.h | 15 +-
include/net/xfrm.h | 3 +
include/uapi/scsi/scsi_bsg_mpi3mr.h | 2 +-
kernel/bpf/bloom_filter.c | 13 +
kernel/bpf/verifier.c | 3 +-
kernel/time/timer.c | 8 +-
lib/Kconfig.debug | 5 +-
lib/dynamic_debug.c | 6 +-
mm/hugetlb.c | 55 +++--
mm/hugetlb_cgroup.c | 34 +--
mm/migrate.c | 2 +-
mm/readahead.c | 4 +
net/bluetooth/hci_core.c | 3 +-
net/bluetooth/l2cap_core.c | 3 +
net/bluetooth/msft.c | 2 +-
net/bluetooth/msft.h | 4 +-
net/bluetooth/sco.c | 4 +
net/bridge/br_forward.c | 9 +-
net/bridge/br_netlink.c | 3 +-
net/core/filter.c | 42 +++-
net/core/link_watch.c | 4 +-
net/core/net-sysfs.c | 4 +-
net/core/net_namespace.c | 13 +-
net/core/rtnetlink.c | 6 +-
net/core/skbuff.c | 27 +-
net/core/skmsg.c | 5 +-
net/core/sock.c | 4 +-
net/hsr/hsr_device.c | 31 ++-
net/ipv4/tcp.c | 4 +-
net/ipv4/tcp_input.c | 2 +
net/ipv4/tcp_ipv4.c | 8 +-
net/ipv4/tcp_output.c | 4 +-
net/ipv4/udp_offload.c | 12 +-
net/ipv4/xfrm4_input.c | 6 +-
net/ipv6/addrconf.c | 11 +-
net/ipv6/fib6_rules.c | 6 +-
net/ipv6/ip6_input.c | 4 +-
net/ipv6/ip6_output.c | 2 +-
net/ipv6/xfrm6_input.c | 6 +-
net/l2tp/l2tp_eth.c | 3 +
net/mac80211/ieee80211_i.h | 4 +-
net/mptcp/protocol.c | 3 +
net/nsh/nsh.c | 14 +-
net/phonet/pn_netlink.c | 2 +-
net/smc/smc_ib.c | 19 +-
net/sunrpc/clnt.c | 5 +-
net/sunrpc/xprt.c | 2 +-
net/tipc/msg.c | 8 +-
net/wireless/nl80211.c | 2 +
net/wireless/trace.h | 2 +-
net/xfrm/xfrm_input.c | 8 +
rust/Makefile | 11 +-
rust/kernel/error.rs | 2 +-
rust/kernel/lib.rs | 2 +-
rust/macros/module.rs | 185 ++++++++------
scripts/Makefile.build | 17 +-
scripts/Makefile.host | 27 +-
scripts/Makefile.modfinal | 4 +-
scripts/is_rust_module.sh | 16 --
security/keys/key.c | 3 +-
sound/hda/intel-sdw-acpi.c | 2 +
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/meson/Kconfig | 1 +
sound/soc/meson/axg-card.c | 1 +
sound/soc/meson/axg-fifo.c | 56 +++--
sound/soc/meson/axg-fifo.h | 12 +-
sound/soc/meson/axg-frddr.c | 5 +-
sound/soc/meson/axg-tdm-interface.c | 34 +--
sound/soc/meson/axg-toddr.c | 22 +-
sound/soc/tegra/tegra186_dspk.c | 7 +-
sound/soc/ti/davinci-mcasp.c | 12 +-
sound/usb/line6/driver.c | 6 +-
tools/include/linux/kernel.h | 1 +
tools/include/linux/mm.h | 5 +
tools/include/linux/panic.h | 19 ++
tools/perf/util/unwind-libdw.c | 21 +-
tools/perf/util/unwind-libunwind-local.c | 2 +-
tools/power/x86/turbostat/turbostat.8 | 2 +-
tools/power/x86/turbostat/turbostat.c | 30 ++-
.../selftests/bpf/prog_tests/bloom_filter_map.c | 6 +
tools/testing/selftests/timers/valid-adjtimex.c | 73 +++---
247 files changed, 2501 insertions(+), 1396 deletions(-)
^ permalink raw reply [relevance 2%]
* [PATCH 6.8 000/340] 6.8.10-rc2 review
@ 2024-05-15 8:27 1% Greg Kroah-Hartman
2024-05-15 16:37 3% ` Mark Brown
0 siblings, 1 reply; 200+ results
From: Greg Kroah-Hartman @ 2024-05-15 8:27 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 6.8.10 release.
There are 340 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Fri, 17 May 2024 08:23:27 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.8.10-rc2.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.8.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 6.8.10-rc2
Silvio Gissi <sifonsec@amazon.com>
keys: Fix overwrite of key expiration on instantiation
Nikhil Rao <nikhil.rao@intel.com>
dmaengine: idxd: add a write() method for applications to submit work
Arjan van de Ven <arjan@linux.intel.com>
dmaengine: idxd: add a new security check to deal with a hardware erratum
Arjan van de Ven <arjan@linux.intel.com>
VFIO: Add the SPR_DSA and SPR_IAX devices to the denylist
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix firmware check error path
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching fw build id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching board id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: generalise device address check
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix NVM configuration parsing
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: add missing firmware sanity checks
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix wcn3991 device address check
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix invalid device address check
Steven Rostedt (Google) <rostedt@goodmis.org>
eventfs: Do not treat events directory different than other directories
Steven Rostedt (Google) <rostedt@goodmis.org>
eventfs: Do not differentiate the toplevel events directory
Steven Rostedt (Google) <rostedt@goodmis.org>
tracefs: Still use mount point as default permissions for instances
Steven Rostedt (Google) <rostedt@goodmis.org>
tracefs: Reset permissions on remount if permissions are options
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: avoid to send duplicate lease break notifications
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: off ipv6only for both ipv4/ipv6 binding
Conor Dooley <conor.dooley@microchip.com>
spi: microchip-core-qspi: fix setting spi bus clock rate
Johan Hovold <johan+linaro@kernel.org>
regulator: core: fix debugfs creation regression
Sean Anderson <sean.anderson@linux.dev>
nvme-pci: Add quirk for broken MSIs
Ryan Roberts <ryan.roberts@arm.com>
fs/proc/task_mmu: fix uffd-wp confusion in pagemap_scan_pmd_entry()
Ryan Roberts <ryan.roberts@arm.com>
fs/proc/task_mmu: fix loss of young/dirty bits during pagemap scan
Vasant Hegde <vasant.hegde@amd.com>
iommu/amd: Enhance def_domain_type to handle untrusted device
Peter Xu <peterx@redhat.com>
mm/userfaultfd: reset ptes when close() for wr-protected ones
Kefeng Wang <wangkefeng.wang@huawei.com>
mm: use memalloc_nofs_save() in page_cache_ra_order()
Michael Ellerman <mpe@ellerman.id.au>
selftests/mm: fix powerpc ARCH check
Thomas Gleixner <tglx@linutronix.de>
x86/apic: Don't access the APIC when disabling x2APIC
Thomas Weißschuh <linux@weissschuh.net>
misc/pvpanic-pci: register attributes via pci_driver
Lakshmi Yadlapati <lakshmiy@us.ibm.com>
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
net: fix out-of-bounds access in ops_init
Jason Gunthorpe <jgg@ziepe.ca>
iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault()
Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
arm64: dts: qcom: sa8155p-adp: fix SDHC2 CD pin configuration
Hersen Wu <hersenxs.wu@amd.com>
drm/amd/display: Fix incorrect DSC instance for MST
George Shen <george.shen@amd.com>
drm/amd/display: Handle Y carry-over in VCP X.Y calculation
Karthikeyan Ramasubramanian <kramasub@chromium.org>
drm/i915/bios: Fix parsing backlight BDB data
Andi Shyti <andi.shyti@linux.intel.com>
drm/i915/gt: Automate CCS Mode setting during engine resets
Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
drm/i915/audio: Fix audio time stamp programming for DP
Lyude Paul <lyude@redhat.com>
drm/nouveau/gsp: Use the sg allocator for level 2 of radix3
Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
drm/amd/display: Fix idle optimization checks for multi-display and dual eDP
Matt Coster <matt.coster@imgtec.com>
drm/imagination: Ensure PVR_MIPS_PT_PAGE_COUNT is never zero
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix invalid reads in fence signaled events
Ian Forbes <ian.forbes@broadcom.com>
drm/vmwgfx: Fix Legacy Display Unit
Zack Rusin <zack.rusin@broadcom.com>
drm/ttm: Print the memory decryption status just once
Alex Deucher <alexander.deucher@amd.com>
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Dave Airlie <airlied@redhat.com>
Revert "drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()"
Lyude Paul <lyude@redhat.com>
drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: add lunar lake point M DID
Frank Oltmanns <frank@oltmanns.dev>
clk: sunxi-ng: a64: Set minimum and maximum rate for PLL-MIPI
Frank Oltmanns <frank@oltmanns.dev>
clk: sunxi-ng: common: Support minimum and maximum rate
Marek Szyprowski <m.szyprowski@samsung.com>
clk: samsung: Revert "clk: Use device_get_match_data()"
Viken Dadhaniya <quic_vdadhani@quicinc.com>
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Jim Cromie <jim.cromie@gmail.com>
dyndbg: fix old BUG_ON in >control parser
Joao Paulo Goncalves <joao.goncalves@toradex.com>
ASoC: ti: davinci-mcasp: Fix race condition during probe
Sameer Pujar <spujar@nvidia.com>
ASoC: tegra: Fix DSPK 16-bit playback
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize UMAC_CMD access
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
Max Filippov <jcmvbkbc@gmail.com>
xtensa: fix MAKE_PC_FROM_RA second argument
Paolo Abeni <pabeni@redhat.com>
tipc: fix UAF in error path
Vitaly Lifshits <vitaly.lifshits@intel.com>
e1000e: change usleep_range to udelay in PHY mdic access
Alexander Potapenko <glider@google.com>
kmsan: compiler_types: declare __no_sanitize_or_inline
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Reset chip on probe() and resume()
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Interrupt handling fixes
Vasileios Amoiridis <vassilisamir@gmail.com>
iio: pressure: Fixes SPI support for BMP3xx devices
Vasileios Amoiridis <vassilisamir@gmail.com>
iio: pressure: Fixes BME280 SPI driver data
Ramona Gradinariu <ramona.bolboaca13@gmail.com>
iio:imu: adis16475: Fix sync mode setting
Javier Carrasco <javier.carrasco.cruz@gmail.com>
dt-bindings: iio: health: maxim,max30102: fix compatible check
Sven Schnelle <svens@linux.ibm.com>
workqueue: Fix selection of wake_cpu in kick_pool()
Gregory Detal <gregory.detal@gmail.com>
mptcp: only allow set existing scheduler for net.mptcp.scheduler
Paolo Abeni <pabeni@redhat.com>
mptcp: ensure snd_nxt is properly initialized on connect
Dan Carpenter <dan.carpenter@linaro.org>
mm/slab: make __free(kfree) accept error pointers
Liam R. Howlett <Liam.Howlett@oracle.com>
maple_tree: fix mas_empty_area_rev() null pointer dereference
Josef Bacik <josef@toxicpanda.com>
btrfs: make sure that WRITTEN is set on all metadata blocks
Qu Wenruo <wqu@suse.com>
btrfs: qgroup: do not check qgroup inherit if qgroup is disabled
Qu Wenruo <wqu@suse.com>
btrfs: set correct ram_bytes when splitting ordered extent
Dominique Martinet <dominique.martinet@atmark-techno.com>
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Nicolas Bouchinet <nicolas.bouchinet@ssi.gouv.fr>
mm/slub: avoid zeroing outside-object freepointer for single free
Takashi Sakamoto <o-takashi@sakamocchi.jp>
firewire: ohci: fulfill timestamp for some local asynchronous transaction
Takashi Iwai <tiwai@suse.de>
ALSA: hda/realtek: Fix conflicting PCI SSID 17aa:386f for Lenovo Legion models
Aman Dhoot <amandhoot12@gmail.com>
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Badhri Jagan Sridharan <badhri@google.com>
usb: typec: tcpm: Check for port partner validity before consuming it
Amit Sunil Dhamne <amitsd@google.com>
usb: typec: tcpm: unregister existing source caps before re-registration
RD Babiera <rdbabiera@google.com>
usb: typec: tcpm: clear pd_event queue in PORT_RESET
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: dwc3: core: Prevent phy suspend during init
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: xhci-plat: Don't include xhci.h
Chris Wulff <Chris.Wulff@biamp.com>
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Wesley Cheng <quic_wcheng@quicinc.com>
usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete
Ivan Avdeev <me@provod.works>
usb: gadget: uvc: use correct buffer size when parsing configfs lists
Peter Korsgaard <peter@korsgaard.com>
usb: gadget: composite: fix OS descriptors w_value logic
Alan Stern <stern@rowland.harvard.edu>
USB: core: Fix access violation during port device removal
Guenter Roeck <linux@roeck-us.net>
usb: ohci: Prevent missed ohci interrupts
Alan Stern <stern@rowland.harvard.edu>
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Fix connector check on init
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Check for notifications after init
Linus Torvalds <torvalds@linux-foundation.org>
Reapply "drm/qxl: simplify qxl_fence_wait"
Thanassis Avgerinos <thanassis.avgerinos@gmail.com>
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Christian König <christian.koenig@amd.com>
drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2
Michel Dänzer <mdaenzer@redhat.com>
drm/amdgpu: Fix comparison in amdgpu_res_cpu_visible
Gabe Teeger <gabe.teeger@amd.com>
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: fix uninitialised kfifo
Zhongqiu Han <quic_zhonhan@quicinc.com>
gpiolib: cdev: Fix use after free in lineinfo_changed_notify
Mario Limonciello <mario.limonciello@amd.com>
dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
Douglas Anderson <dianders@chromium.org>
drm/connector: Add \n to message about demoting connector force-probes
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: add bandgap setting for g12
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: power up phy on device init
Steffen Bätz <steffen@innosonix.de>
net: dsa: mv88e6xxx: add phylink_get_caps for the mv88e6320/21 family
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix kernel crash when devlink reload during initialization
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix port vlan filter not disabled issue
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: use appropriate barrier function after setting a bit value
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: release PTP resources if pf initialization failed
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: change type of numa_node_mask as nodemask_t
Jian Shen <shenjian15@huawei.com>
net: hns3: direct return when receive a unknown mailbox message
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: using user configure after hardware reset
Wen Gu <guwen@linux.alibaba.com>
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Eric Dumazet <edumazet@google.com>
ipv6: prevent NULL dereference in ip6_output()
Eric Dumazet <edumazet@google.com>
ipv6: annotate data-races around cnf.disable_ipv6
Lukasz Majewski <lukma@denx.de>
hsr: Simplify code for announcing HSR nodes timer setup
Eric Dumazet <edumazet@google.com>
net-sysfs: convert dev->operstate reads to lockless ones
Eric Dumazet <edumazet@google.com>
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
Daniel Golle <daniel@makrotopia.org>
dt-bindings: net: mediatek: remove wrongly added clocks and SerDes
David Howells <dhowells@redhat.com>
rxrpc: Only transmit one ACK per jumbo packet received
David Howells <dhowells@redhat.com>
rxrpc: Fix congestion control algorithm
David Howells <dhowells@redhat.com>
rxrpc: Fix the names of the fields in the ACK trailer struct
Ido Schimmel <idosch@nvidia.com>
selftests: test_bridge_neigh_suppress.sh: Fix failures due to duplicate MAC
Shigeru Yoshida <syoshida@redhat.com>
ipv6: Fix potential uninit-value access in __ip6_make_skb()
Felix Fietkau <nbd@nbd.name>
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
nfc: nci: Fix kcov check in nci_rx_work()
Donald Hunter <donald.hunter@gmail.com>
netlink: specs: Add missing bridge linkinfo attrs
Eric Dumazet <edumazet@google.com>
phonet: fix rtm_phonet_notify() skb allocation
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use a separate buffer for sending commands
Roded Zats <rzats@paloaltonetworks.com>
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Marek Vasut <marex@denx.de>
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: HCI: Fix potential null-ptr-deref
Chen-Yu Tsai <wenst@chromium.org>
arm64: dts: mediatek: mt8183-pico6: Fix bluetooth node
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Kuniyuki Iwashima <kuniyu@amazon.com>
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Eric Dumazet <edumazet@google.com>
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
Boy.Wu <boy.wu@mediatek.com>
ARM: 9381/1: kasan: clear stale stack poison
Paul Davey <paul.davey@alliedtelesis.co.nz>
xfrm: Preserve vlan tags for transport mode software GRO
Al Viro <viro@zeniv.linux.org.uk>
qibfs: fix dentry leak
Olga Kornievskaia <kolga@netapp.com>
SUNRPC: add a missing rpc_stat for TCP TLS
Li Nan <linan122@huawei.com>
blk-iocost: do not WARN if iocg was already offlined
Vanillan Wang <vanillanwang@163.com>
net:usb:qmi_wwan: support Rolling modules
Alex Deucher <alexander.deucher@amd.com>
drm/radeon: silence UBSAN warning (v3)
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
platform/x86: ISST: Add Granite Rapids-D to HPM CPU list
Mario Limonciello <mario.limonciello@amd.com>
platform/x86/amd: pmf: Decrease error message to debug
Lyude Paul <lyude@redhat.com>
drm/nouveau/dp: Don't probe eDP ports twice harder
Krzysztof Kozlowski <krzk@kernel.org>
gpio: lpc32xx: fix module autoloading
Joakim Sindholt <opensource@zhasha.com>
fs/9p: drop inodes immediately on non-.L too
Eric Van Hensbergen <ericvh@kernel.org>
fs/9p: remove erroneous nlink init from legacy stat2inode
Stephen Boyd <sboyd@kernel.org>
clk: Don't hold prepare_lock when calling kref_put()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: crystalcove: Use -ENOTSUPP consistently
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: wcove: Use -ENOTSUPP consistently
Michael Ellerman <mpe@ellerman.id.au>
powerpc/crypto/chacha-p10: Fix failure on non Power10
Jeff Layton <jlayton@kernel.org>
9p: explicitly deny setlease attempts
Joakim Sindholt <opensource@zhasha.com>
fs/9p: fix the cache always being enabled on files with qid flags
Joakim Sindholt <opensource@zhasha.com>
fs/9p: translate O_TRUNC into OTRUNC
Joakim Sindholt <opensource@zhasha.com>
fs/9p: only translate RWX permissions for plain 9P2000
Krzysztof Kozlowski <krzk@kernel.org>
iommu: mtk: fix module autoloading
Steve French <stfrench@microsoft.com>
smb3: fix broken reconnect when password changing on the server by allowing password rotation
Ashutosh Dixit <ashutosh.dixit@intel.com>
drm/xe: Label RING_CONTEXT_CONTROL as masked
Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
drm/xe/xe_migrate: Cast to output precision before multiplying operands
Michael Kelley <mhklinux@outlook.com>
Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted
Rick Edgecombe <rick.p.edgecombe@intel.com>
uio_hv_generic: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
hv_netvsc: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Leak pages if set_memory_encrypted() fails
John Stultz <jstultz@google.com>
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Zhigang Luo <Zhigang.Luo@amd.com>
amd/amdkfd: sync all devices to wait all processes being evicted
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Fix VCN allocation in CPX partition
Kenneth Feng <kenneth.feng@amd.com>
drm/amd/pm: fix the high voltage issue after unload
Alex Hung <alex.hung@amd.com>
drm/amd/display: Skip on writeback when it's not applicable
Tao Zhou <tao.zhou1@amd.com>
drm/amdgpu: implement IRQ_STATE_ENABLE for SDMA v4.4.2
Yifan Zhang <yifan1.zhang@amd.com>
drm/amdgpu: add smu 14.0.1 discovery support
Li Ma <li.ma@amd.com>
drm/amd/display: add DCN 351 version for microcode load
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Refine IB schedule error logging
Eric Dumazet <edumazet@google.com>
nfc: llcp: fix nfc_llcp_setsockopt() unsafe copies
Eric Dumazet <edumazet@google.com>
net: add copy_safe_from_sockptr() helper
Justin Ernst <justin.ernst@hpe.com>
tools/power/turbostat: Fix uncore frequency file string
Jiaxun Yang <jiaxun.yang@flygoat.com>
MIPS: scall: Save thread_info.syscall unconditionally on entry
Thierry Reding <treding@nvidia.com>
gpu: host1x: Do not setup DMA for virtual devices
Bernhard Rosenkränzer <bero@baylibre.com>
platform/x86: acer-wmi: Add support for Acer PH18-71
Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
accel/ivpu: Fix missed error message after VPU rename
Wachowski, Karol <karol.wachowski@intel.com>
accel/ivpu: Improve clarity of MMU error messages
Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
accel/ivpu: Remove d3hot_after_power_off WA
Rik van Riel <riel@surriel.com>
blk-iocost: avoid out of bounds shift
Xiang Chen <chenxiang66@hisilicon.com>
scsi: hisi_sas: Handle the NCQ error returned by D2H frame
Maurizio Lombardi <mlombard@redhat.com>
scsi: target: Fix SELinux error when systemd-modules loads the target module
Kees Cook <keescook@chromium.org>
nouveau/gsp: Avoid addressing beyond end of rpc->entries
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `BIT'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `panic'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `early_pfn_to_nid'
Boris Burkov <boris@bur.io>
btrfs: always clear PERTRANS metadata during commit
Boris Burkov <boris@bur.io>
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
Len Brown <len.brown@intel.com>
tools/power turbostat: Fix warning upon failed /dev/cpu_dma_latency read
Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com>
tools/power turbostat: Print ucode revision only if valid
Len Brown <len.brown@intel.com>
tools/power turbostat: Expand probe_intel_uncore_frequency()
Chen Yu <yu.c.chen@intel.com>
tools/power turbostat: Do not print negative LPI residency
Peng Liu <liupeng17@lenovo.com>
tools/power turbostat: Fix Bzy_MHz documentation typo
Wyes Karny <wyes.karny@amd.com>
tools/power turbostat: Increase the limit for fd opened
Doug Smythies <dsmythies@telus.net>
tools/power turbostat: Fix added raw MSR output
Adam Goldman <adamg@pobox.com>
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Chen Ni <nichen@iscas.ac.cn>
ata: sata_gemini: Check clk_enable() result
Jeff Layton <jlayton@kernel.org>
vboxsf: explicitly deny setlease attempts
Phil Elwell <phil@raspberrypi.com>
net: bcmgenet: Reset RBUF on first open
Zhang Yi <zhangyi@everest-semi.com>
ASoC: codecs: ES8326: modify clock table
Zhang Yi <zhangyi@everest-semi.com>
ASoC: codecs: ES8326: Solve error interruption issue
Li Nan <linan122@huawei.com>
block: fix overflow in blk_ioctl_discard()
Takashi Iwai <tiwai@suse.de>
ALSA: line6: Zero-initialize message buffers
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: Fix MCQ mode dev command timeout
Yihang Li <liyihang9@huawei.com>
scsi: libsas: Align SMP request allocation to ARCH_DMA_MINALIGN
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: WLUN suspend dev/link state error recovery
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
OSS: dmasound/paula: Mark driver struct with __refdata to prevent section mismatch
André Apitzsch <git@apitzsch.eu>
regulator: tps65132: Add of_match table
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
ASoC: SOF: Intel: hda-dsp: Skip IMR boot on ACE platforms in case of S3 suspend
Borislav Petkov (AMD) <bp@alien8.de>
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Mark Rutland <mark.rutland@arm.com>
selftests/ftrace: Fix event filter target_func selection
Andrei Matei <andreimatei1@gmail.com>
bpf: Check bloom filter map value size
Jonathan Kim <Jonathan.Kim@amd.com>
drm/amdkfd: range check cp bad op exception interrupts
Mukul Joshi <mukul.joshi@amd.com>
drm/amdkfd: Check cgroup when returning DMABuf info
Anand Jain <anand.jain@oracle.com>
btrfs: return accurate error code on open failure in open_fs_devices()
Saurav Kashyap <skashyap@marvell.com>
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
scsi: mpi3mr: Avoid memcpy field-spanning write WARNING
Lucas De Marchi <lucas.demarchi@intel.com>
drm/xe: Fix END redefinition
linke li <lilinke99@qq.com>
net: mark racy access on sk->sk_rcvbuf
Benjamin Berg <benjamin.berg@intel.com>
wifi: iwlwifi: mvm: guard against invalid STA ID on removal
Johannes Berg <johannes.berg@intel.com>
wifi: iwlwifi: read txq->read_ptr under lock
Johannes Berg <johannes.berg@intel.com>
wifi: mac80211: fix prep_connection error path
Igor Artemiev <Igor.A.Artemiev@mcst.ru>
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jeff Johnson <quic_jjohnson@quicinc.com>
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Eric Van Hensbergen <ericvh@kernel.org>
fs/9p: fix uninitialized values during inode evict
Andrew Price <anprice@redhat.com>
gfs2: Fix invalid metadata access in punch_hole
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Use a dedicated lock for ras_fwlog state
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Release hbalock before calling lpfc_worker_wake_up()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Remove IRQF_ONESHOT flag from threaded IRQ handling
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
Rohit Ner <rohitner@google.com>
scsi: ufs: core: Fix MCQ MAC configuration
Conor Dooley <conor.dooley@microchip.com>
firmware: microchip: don't unconditionally print validation success
Yuezhang Mo <Yuezhang.Mo@sony.com>
exfat: fix timing of synchronizing bitmap and inode
Oliver Upton <oliver.upton@linux.dev>
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Will Deacon <will@kernel.org>
swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y
Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
EDAC/versal: Do not log total error counts
Gaurav Batra <gbatra@linux.ibm.com>
powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: make max polling consistent for longer H_CALLs
Jernej Skrabec <jernej.skrabec@gmail.com>
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Adam Skladowski <a39.skl@gmail.com>
clk: qcom: smd-rpm: Restore msm8976 num_clk
Lucas De Marchi <lucas.demarchi@intel.com>
drm/xe/display: Fix ADL-N detection
Richard Gobert <richardbgobert@gmail.com>
net: gro: add flush check in udp_gro_receive_segment
Richard Gobert <richardbgobert@gmail.com>
net: gro: fix udp bad offset in socket lookup by adding {inner_}network_offset to napi_gro_cb
Shigeru Yoshida <syoshida@redhat.com>
ipv4: Fix uninit-value access in __ip_make_skb()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Use predefined error codes
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Respect deferred probe
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Correct use of device property APIs
Alexandra Winter <wintera@linux.ibm.com>
s390/qeth: Fix kernel panic after setting hsuid
Guillaume Nault <gnault@redhat.com>
vxlan: Pull inner IP header in vxlan_rcv().
Xin Long <lucien.xin@gmail.com>
tipc: fix a possible memleak in tipc_buf_append
Jeffrey Altman <jaltman@auristor.com>
rxrpc: Clients must accept conn from any address
Felix Fietkau <nbd@nbd.name>
net: core: reject skb_copy(_expand) for fraglist GSO skbs
Felix Fietkau <nbd@nbd.name>
net: bridge: fix multicast-to-unicast with fraglist GSO
Mans Rullgard <mans@mansr.com>
spi: fix null pointer dereference within spi_sync
Shashank Sharma <shashank.sharma@amd.com>
drm/amdgpu: fix doorbell regression
Marek Behún <kabel@kernel.org>
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
cxgb4: Properly lock TX queue for the selftest.
Bui Quang Minh <minhquangbui99@gmail.com>
s390/cio: Ensure the copied buf is NUL terminated
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: cards: select SND_DYNAMIC_MINORS
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-tdm-interface: manage formatters in trigger
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-card: make links nonatomic
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use threaded irq to check periods
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use FIELD helpers
Guillaume Nault <gnault@redhat.com>
vxlan: Add missing VNI filter counter update in arp_reduce().
Guillaume Nault <gnault@redhat.com>
vxlan: Fix racy device stats updates.
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_actions()
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flow_spec
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flower
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: fix E-MU dock initialization
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: move the whole GPIO event handling to the workqueue
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: factor out snd_emu1010_load_dock_firmware()
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: fix E-MU card dock presence monitoring
David Howells <dhowells@redhat.com>
Fix a potential infinite loop in extract_user_to_sg()
Jens Remus <jremus@linux.ibm.com>
s390/vdso: Add CFI for RA register to asm macro vdso_func
Rafael J. Wysocki <rafael.j.wysocki@intel.com>
thermal/debugfs: Prevent use-after-free from occurring after cdev removal
David Bauer <mail@david-bauer.net>
net l2tp: drop flow hash on forward
Kuniyuki Iwashima <kuniyu@amazon.com>
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
Rafael J. Wysocki <rafael.j.wysocki@intel.com>
thermal/debugfs: Fix two locking issues with thermal zone debug
Rafael J. Wysocki <rafael.j.wysocki@intel.com>
thermal/debugfs: Free all thermal zone debug memory on zone removal
Bui Quang Minh <minhquangbui99@gmail.com>
octeontx2-af: avoid off-by-one read from userspace
Bui Quang Minh <minhquangbui99@gmail.com>
bna: ensure the copied buf is NUL terminated
Bui Quang Minh <minhquangbui99@gmail.com>
ice: ensure the copied buf is NUL terminated
Chen Yu <yu.c.chen@intel.com>
efi/unaccepted: touch soft lockup during memory accept
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: use flags field to disambiguate broadcast redirect
Puranjay Mohan <puranjay@kernel.org>
arm32, bpf: Reimplement sign-extension mov instruction
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix clearing storage keys for huge pages
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix storage key clearing for guest huge pages
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
ASoC: codecs: wsa881x: set clk_stop_mode1 flag
Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
ASoC: Intel: avs: Set name of control as in topology
Xu Kuohai <xukuohai@huawei.com>
riscv, bpf: Fix incorrect runtime stats
Xu Kuohai <xukuohai@huawei.com>
bpf, arm64: Fix incorrect runtime stats
Devyn Liu <liudingyuan@huawei.com>
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: fix version format string
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use common AXI macros
Anton Protopopov <aspsk@isovalent.com>
bpf: Fix a verifier verbose message
Yi Zhang <yi.zhang@redhat.com>
nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ASoC: SOF: Intel: add default firmware library path for LNL
Richard Fitzgerald <rf@opensource.cirrus.com>
regmap: Add regmap_read_bypassed()
Jason Xing <kernelxing@tencent.com>
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Andrii Nakryiko <andrii@kernel.org>
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change devm_regulator_get_enable_optional() stub to return Ok
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change stubbed devm_regulator_get_enable to return Ok
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
regulator: mt6360: De-capitalize devicetree regulator subnodes
Chuck Lever <chuck.lever@oracle.com>
NFSD: Fix nfsd4_encode_fattr4() crasher
Dai Ngo <dai.ngo@oracle.com>
NFSD: add support for CB_GETATTR callback
Josef Bacik <josef@toxicpanda.com>
nfsd: make all of the nfsd stats per-network namespace
Josef Bacik <josef@toxicpanda.com>
nfsd: expose /proc/net/sunrpc/nfsd in net namespaces
Josef Bacik <josef@toxicpanda.com>
nfsd: rename NFSD_NET_* to NFSD_STATS_*
Zeng Heng <zengheng4@huawei.com>
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
Arnd Bergmann <arnd@arndb.de>
power: rt9455: hide unused rt9455_boost_voltage_values
Hans de Goede <hdegoede@redhat.com>
pinctrl: baytrail: Fix selecting gpio pinctrl state
Kuniyuki Iwashima <kuniyu@amazon.com>
nfs: Handle error of rpc_proc_register() in nfs_net_init().
Josef Bacik <josef@toxicpanda.com>
nfs: make the rpc_stat per net namespace
Josef Bacik <josef@toxicpanda.com>
nfs: expose /proc/net/sunrpc/nfs in net namespaces
Josef Bacik <josef@toxicpanda.com>
sunrpc: add a struct rpc_stats arg to rpc_create_args
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
Dan Carpenter <dan.carpenter@linaro.org>
pinctrl: core: delete incorrect free in pinctrl_enable()
Jan Dakinevich <jan.dakinevich@salutedevices.com>
pinctrl/meson: fix typo in PDM's pin name
Billy Tsai <billy_tsai@aspeedtech.com>
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Johannes Berg <johannes.berg@intel.com>
wifi: nl80211: don't free NULL coalescing rule
Benno Lossin <benno.lossin@proton.me>
rust: macros: fix soundness issue in `module!` macro
Thomas Bertschinger <tahbertschinger@gmail.com>
rust: module: place generated init_module() function in .init.text
-------------
Diffstat:
.../bindings/iio/health/maxim,max30102.yaml | 2 +-
.../devicetree/bindings/net/mediatek,net.yaml | 22 +--
Documentation/netlink/specs/rt_link.yaml | 6 +
Makefile | 4 +-
arch/arm/kernel/sleep.S | 4 +
arch/arm/net/bpf_jit_32.c | 56 +++++--
.../dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 3 +-
arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 30 ++--
arch/arm64/kvm/vgic/vgic-kvm-device.c | 8 +-
arch/arm64/net/bpf_jit_comp.c | 6 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/kernel/asm-offsets.c | 1 +
arch/mips/kernel/ptrace.c | 15 +-
arch/mips/kernel/scall32-o32.S | 23 +--
arch/mips/kernel/scall64-n32.S | 3 +-
arch/mips/kernel/scall64-n64.S | 3 +-
arch/mips/kernel/scall64-o32.S | 33 ++--
arch/powerpc/crypto/chacha-p10-glue.c | 8 +-
arch/powerpc/include/asm/plpks.h | 5 +-
arch/powerpc/platforms/pseries/iommu.c | 8 +
arch/powerpc/platforms/pseries/plpks.c | 10 +-
arch/riscv/net/bpf_jit_comp64.c | 6 +-
arch/s390/include/asm/dwarf.h | 1 +
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2 +
arch/s390/mm/gmap.c | 2 +-
arch/s390/mm/hugetlbpage.c | 2 +-
arch/x86/kernel/apic/apic.c | 16 +-
arch/xtensa/include/asm/processor.h | 8 +-
arch/xtensa/include/asm/ptrace.h | 2 +-
arch/xtensa/kernel/process.c | 5 +-
arch/xtensa/kernel/stacktrace.c | 3 +-
block/blk-iocost.c | 14 +-
block/ioctl.c | 5 +-
drivers/accel/ivpu/ivpu_drv.c | 20 +--
drivers/accel/ivpu/ivpu_drv.h | 3 +-
drivers/accel/ivpu/ivpu_hw_37xx.c | 4 +-
drivers/accel/ivpu/ivpu_mmu.c | 8 +-
drivers/accel/ivpu/ivpu_pm.c | 9 +-
drivers/ata/sata_gemini.c | 5 +-
drivers/base/regmap/regmap.c | 37 +++++
drivers/bluetooth/btqca.c | 140 ++++++++++++++--
drivers/bluetooth/btqca.h | 3 +-
drivers/bluetooth/hci_qca.c | 2 -
drivers/clk/clk.c | 12 +-
drivers/clk/qcom/clk-smd-rpm.c | 1 +
drivers/clk/samsung/clk-exynos-clkout.c | 13 +-
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 2 +
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 ++-
drivers/clk/sunxi-ng/ccu_common.c | 19 +++
drivers/clk/sunxi-ng/ccu_common.h | 3 +
drivers/dma/idxd/cdev.c | 77 +++++++++
drivers/dma/idxd/idxd.h | 3 +
drivers/dma/idxd/init.c | 4 +
drivers/dma/idxd/registers.h | 3 -
drivers/dma/idxd/sysfs.c | 27 ++-
drivers/edac/versal_edac.c | 4 +-
drivers/firewire/nosy.c | 6 +-
drivers/firewire/ohci.c | 14 +-
drivers/firmware/efi/unaccepted_memory.c | 4 +
drivers/firmware/microchip/mpfs-auto-update.c | 2 +
drivers/gpio/gpio-crystalcove.c | 2 +-
drivers/gpio/gpio-lpc32xx.c | 1 +
drivers/gpio/gpio-wcove.c | 2 +-
drivers/gpio/gpiolib-cdev.c | 16 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 56 ++++---
drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 15 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 16 +-
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 11 +-
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +-
.../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 48 ++++--
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 +
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6 +
.../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 33 +++-
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 27 ++-
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 +
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8 +-
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2 +-
drivers/gpu/drm/drm_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_audio.c | 113 +------------
drivers/gpu/drm/i915/display/intel_bios.c | 19 +--
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5 -
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c | 6 +-
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.h | 2 +-
drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +-
drivers/gpu/drm/imagination/pvr_fw_mips.h | 5 +-
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 ++++----
drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 4 +-
drivers/gpu/drm/nouveau/nouveau_dp.c | 13 +-
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 81 +++++----
drivers/gpu/drm/panel/Kconfig | 2 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 13 +-
drivers/gpu/drm/qxl/qxl_release.c | 50 +-----
drivers/gpu/drm/radeon/pptable.h | 10 +-
drivers/gpu/drm/ttm/ttm_tt.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 3 +-
drivers/gpu/drm/xe/regs/xe_engine_regs.h | 2 +-
drivers/gpu/drm/xe/xe_lrc.c | 25 ++-
drivers/gpu/drm/xe/xe_migrate.c | 8 +-
drivers/gpu/host1x/bus.c | 8 -
drivers/hv/channel.c | 29 +++-
drivers/hv/connection.c | 29 +++-
drivers/hwmon/corsair-cpro.c | 43 +++--
drivers/hwmon/pmbus/ucd9000.c | 6 +-
drivers/iio/accel/mxc4005.c | 92 +++++++++-
drivers/iio/imu/adis16475.c | 4 +-
drivers/iio/pressure/bmp280-core.c | 1 +
drivers/iio/pressure/bmp280-spi.c | 13 +-
drivers/iio/pressure/bmp280.h | 1 +
drivers/infiniband/hw/qib/qib_fs.c | 1 +
drivers/iommu/amd/iommu.c | 4 +
drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 4 +-
drivers/iommu/mtk_iommu.c | 1 +
drivers/iommu/mtk_iommu_v1.c | 1 +
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/misc/pvpanic/pvpanic-pci.c | 4 +-
drivers/net/dsa/mv88e6xxx/chip.c | 20 ++-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 32 +++-
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8 +-
drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +-
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 52 +++---
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 20 +--
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +-
drivers/net/ethernet/intel/e1000e/phy.c | 8 +-
drivers/net/ethernet/intel/ice/ice_debugfs.c | 8 +-
.../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +-
drivers/net/ethernet/micrel/ks8851_common.c | 16 +-
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14 +-
drivers/net/hyperv/netvsc.c | 7 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/vxlan/vxlan_core.c | 49 ++++--
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 7 +-
drivers/net/wireless/intel/iwlwifi/queue/tx.c | 2 +-
drivers/nvme/host/core.c | 2 +-
drivers/nvme/host/nvme.h | 5 +
drivers/nvme/host/pci.c | 14 +-
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 ++--
drivers/pinctrl/core.c | 8 +-
drivers/pinctrl/devicetree.c | 10 +-
drivers/pinctrl/intel/pinctrl-baytrail.c | 74 +++++----
drivers/pinctrl/intel/pinctrl-intel.h | 4 +
drivers/pinctrl/mediatek/pinctrl-paris.c | 40 ++---
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +-
drivers/platform/x86/acer-wmi.c | 9 +
drivers/platform/x86/amd/pmf/acpi.c | 2 +-
.../x86/intel/speed_select_if/isst_if_common.c | 1 +
drivers/power/supply/mt6360_charger.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +
drivers/regulator/core.c | 27 +--
drivers/regulator/mt6360-regulator.c | 32 ++--
drivers/regulator/tps65132-regulator.c | 7 +
drivers/s390/cio/cio_inject.c | 2 +-
drivers/s390/net/qeth_core_main.c | 69 ++++----
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 -
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 +-
drivers/scsi/libsas/sas_expander.c | 2 +-
drivers/scsi/lpfc/lpfc.h | 2 +-
drivers/scsi/lpfc/lpfc_attr.c | 4 +-
drivers/scsi/lpfc/lpfc_bsg.c | 20 +--
drivers/scsi/lpfc/lpfc_debugfs.c | 12 +-
drivers/scsi/lpfc/lpfc_els.c | 20 +--
drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +-
drivers/scsi/lpfc/lpfc_init.c | 5 +-
drivers/scsi/lpfc/lpfc_nvme.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 13 +-
drivers/scsi/lpfc/lpfc_sli.c | 34 ++--
drivers/scsi/lpfc/lpfc_vport.c | 8 +-
drivers/scsi/mpi3mr/mpi3mr_app.c | 2 +-
drivers/slimbus/qcom-ngd-ctrl.c | 6 +-
drivers/spi/spi-axi-spi-engine.c | 19 +--
drivers/spi/spi-hisi-kunpeng.c | 2 -
drivers/spi/spi-microchip-core-qspi.c | 1 +
drivers/spi/spi.c | 1 +
drivers/target/target_core_configfs.c | 12 ++
drivers/thermal/thermal_debugfs.c | 59 +++++--
drivers/ufs/core/ufs-mcq.c | 2 +-
drivers/ufs/core/ufshcd.c | 9 +-
drivers/uio/uio_hv_generic.c | 12 +-
drivers/usb/core/hub.c | 5 +-
drivers/usb/core/port.c | 8 +-
drivers/usb/dwc3/core.c | 90 +++++-----
drivers/usb/dwc3/core.h | 1 +
drivers/usb/dwc3/gadget.c | 2 +
drivers/usb/dwc3/host.c | 27 +++
drivers/usb/gadget/composite.c | 6 +-
drivers/usb/gadget/function/f_fs.c | 9 +-
drivers/usb/gadget/function/uvc_configfs.c | 4 +-
drivers/usb/host/ohci-hcd.c | 8 +
drivers/usb/host/xhci-plat.h | 4 +-
drivers/usb/host/xhci-rzv2m.c | 1 +
drivers/usb/typec/tcpm/tcpm.c | 36 +++-
drivers/usb/typec/ucsi/ucsi.c | 12 +-
drivers/vfio/pci/vfio_pci.c | 2 +
fs/9p/fid.h | 3 -
fs/9p/vfs_file.c | 2 +
fs/9p/vfs_inode.c | 23 ++-
fs/9p/vfs_super.c | 1 +
fs/btrfs/inode.c | 2 +-
fs/btrfs/ordered-data.c | 1 +
fs/btrfs/qgroup.c | 2 +
fs/btrfs/transaction.c | 2 +-
fs/btrfs/tree-checker.c | 30 ++--
fs/btrfs/tree-checker.h | 1 +
fs/btrfs/volumes.c | 18 +-
fs/exfat/file.c | 9 +-
fs/gfs2/bmap.c | 5 +-
fs/nfs/client.c | 5 +-
fs/nfs/inode.c | 13 +-
fs/nfs/internal.h | 2 -
fs/nfs/netns.h | 2 +
fs/nfsd/cache.h | 2 -
fs/nfsd/netns.h | 21 ++-
fs/nfsd/nfs4callback.c | 97 ++++++++++-
fs/nfsd/nfs4proc.c | 6 +-
fs/nfsd/nfs4state.c | 3 +-
fs/nfsd/nfs4xdr.c | 2 +-
fs/nfsd/nfscache.c | 40 +----
fs/nfsd/nfsctl.c | 14 +-
fs/nfsd/nfsfh.c | 3 +-
fs/nfsd/state.h | 14 ++
fs/nfsd/stats.c | 43 ++---
fs/nfsd/stats.h | 62 +++----
fs/nfsd/vfs.c | 6 +-
fs/nfsd/xdr4cb.h | 18 ++
fs/proc/task_mmu.c | 24 +--
fs/smb/client/cifsglob.h | 1 +
fs/smb/client/connect.c | 8 +
fs/smb/client/fs_context.c | 21 +++
fs/smb/client/fs_context.h | 2 +
fs/smb/client/misc.c | 1 +
fs/smb/client/smb2pdu.c | 11 ++
fs/smb/server/oplock.c | 35 ++--
fs/smb/server/transport_tcp.c | 4 +
fs/tracefs/event_inode.c | 74 +++++----
fs/tracefs/inode.c | 92 +++++++++-
fs/tracefs/internal.h | 14 +-
fs/userfaultfd.c | 4 +
fs/vboxsf/file.c | 1 +
include/linux/compiler_types.h | 11 ++
include/linux/dma-fence.h | 7 -
include/linux/gfp_types.h | 2 +
include/linux/hyperv.h | 1 +
include/linux/pci_ids.h | 2 +
include/linux/regmap.h | 8 +
include/linux/regulator/consumer.h | 4 +-
include/linux/skbuff.h | 15 ++
include/linux/skmsg.h | 2 +
include/linux/slab.h | 4 +-
include/linux/sockptr.h | 25 +++
include/linux/sunrpc/clnt.h | 1 +
include/net/gro.h | 9 +
include/net/xfrm.h | 3 +
include/sound/emu10k1.h | 3 +-
include/trace/events/rxrpc.h | 2 +-
include/uapi/linux/kfd_ioctl.h | 17 +-
include/uapi/scsi/scsi_bsg_mpi3mr.h | 2 +-
kernel/bpf/bloom_filter.c | 13 ++
kernel/bpf/verifier.c | 3 +-
kernel/dma/swiotlb.c | 1 +
kernel/workqueue.c | 8 +-
lib/Kconfig.debug | 5 +-
lib/dynamic_debug.c | 6 +-
lib/maple_tree.c | 16 +-
lib/scatterlist.c | 2 +-
mm/readahead.c | 4 +
mm/slub.c | 52 +++---
net/8021q/vlan_core.c | 2 +
net/bluetooth/hci_core.c | 3 +-
net/bluetooth/hci_event.c | 2 +
net/bluetooth/l2cap_core.c | 3 +
net/bluetooth/msft.c | 2 +-
net/bluetooth/msft.h | 4 +-
net/bluetooth/sco.c | 4 +
net/bridge/br_forward.c | 9 +-
net/bridge/br_netlink.c | 3 +-
net/core/filter.c | 42 +++--
net/core/gro.c | 1 +
net/core/link_watch.c | 4 +-
net/core/net-sysfs.c | 4 +-
net/core/net_namespace.c | 13 +-
net/core/rtnetlink.c | 6 +-
net/core/skbuff.c | 27 ++-
net/core/skmsg.c | 5 +-
net/core/sock.c | 4 +-
net/hsr/hsr_device.c | 31 ++--
net/ipv4/af_inet.c | 1 +
net/ipv4/ip_output.c | 2 +-
net/ipv4/raw.c | 3 +
net/ipv4/tcp.c | 4 +-
net/ipv4/tcp_input.c | 2 +
net/ipv4/tcp_ipv4.c | 8 +-
net/ipv4/tcp_output.c | 4 +-
net/ipv4/udp.c | 3 +-
net/ipv4/udp_offload.c | 15 +-
net/ipv4/xfrm4_input.c | 6 +-
net/ipv6/addrconf.c | 11 +-
net/ipv6/fib6_rules.c | 6 +-
net/ipv6/ip6_input.c | 4 +-
net/ipv6/ip6_offload.c | 1 +
net/ipv6/ip6_output.c | 4 +-
net/ipv6/udp.c | 3 +-
net/ipv6/udp_offload.c | 3 +-
net/ipv6/xfrm6_input.c | 6 +-
net/l2tp/l2tp_eth.c | 3 +
net/mac80211/ieee80211_i.h | 4 +-
net/mac80211/mlme.c | 5 +-
net/mptcp/ctrl.c | 39 ++++-
net/mptcp/protocol.c | 3 +
net/nfc/llcp_sock.c | 12 +-
net/nfc/nci/core.c | 1 +
net/nsh/nsh.c | 14 +-
net/phonet/pn_netlink.c | 2 +-
net/rxrpc/ar-internal.h | 2 +-
net/rxrpc/call_object.c | 7 +-
net/rxrpc/conn_event.c | 16 +-
net/rxrpc/conn_object.c | 9 +-
net/rxrpc/input.c | 71 +++++---
net/rxrpc/output.c | 14 +-
net/rxrpc/protocol.h | 6 +-
net/smc/smc_ib.c | 19 ++-
net/sunrpc/clnt.c | 5 +-
net/sunrpc/xprtsock.c | 1 +
net/tipc/msg.c | 8 +-
net/wireless/nl80211.c | 2 +
net/wireless/trace.h | 2 +-
net/xfrm/xfrm_input.c | 8 +
rust/macros/module.rs | 185 +++++++++++++--------
scripts/Makefile.modfinal | 2 +-
security/keys/key.c | 3 +-
sound/hda/intel-sdw-acpi.c | 2 +
sound/oss/dmasound/dmasound_paula.c | 8 +-
sound/pci/emu10k1/emu10k1.c | 3 +-
sound/pci/emu10k1/emu10k1_main.c | 139 +++++++++-------
sound/pci/hda/patch_realtek.c | 25 ++-
sound/soc/codecs/es8326.c | 30 ++--
sound/soc/codecs/es8326.h | 2 +-
sound/soc/codecs/wsa881x.c | 1 +
sound/soc/intel/avs/topology.c | 2 +
sound/soc/meson/Kconfig | 1 +
sound/soc/meson/axg-card.c | 1 +
sound/soc/meson/axg-fifo.c | 56 ++++---
sound/soc/meson/axg-fifo.h | 12 +-
sound/soc/meson/axg-frddr.c | 5 +-
sound/soc/meson/axg-tdm-interface.c | 34 ++--
sound/soc/meson/axg-toddr.c | 22 ++-
sound/soc/sof/intel/hda-dsp.c | 20 ++-
sound/soc/sof/intel/pci-lnl.c | 3 +
sound/soc/tegra/tegra186_dspk.c | 7 +-
sound/soc/ti/davinci-mcasp.c | 12 +-
sound/usb/line6/driver.c | 6 +-
tools/include/linux/kernel.h | 1 +
tools/include/linux/mm.h | 5 +
tools/include/linux/panic.h | 19 +++
tools/power/x86/turbostat/turbostat.8 | 2 +-
tools/power/x86/turbostat/turbostat.c | 163 +++++++++++++-----
.../selftests/bpf/prog_tests/bloom_filter_map.c | 6 +
.../ftrace/test.d/filter/event-filter-function.tc | 2 +-
tools/testing/selftests/mm/Makefile | 6 +-
.../selftests/net/test_bridge_neigh_suppress.sh | 14 +-
tools/testing/selftests/timers/valid-adjtimex.c | 73 ++++----
377 files changed, 3384 insertions(+), 1870 deletions(-)
^ permalink raw reply [relevance 1%]
* [PATCH 6.6 000/309] 6.6.31-rc2 review
@ 2024-05-15 8:27 2% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-15 8:27 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 6.6.31 release.
There are 309 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Fri, 17 May 2024 08:23:27 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.31-rc2.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 6.6.31-rc2
Li Nan <linan122@huawei.com>
md: fix kmemleak of rdev->serial
Pei Xiao <xiaopei01@kylinos.cn>
Revert "selftests/bpf: Add netkit to tc_redirect selftest"
Miaohe Lin <linmiaohe@huawei.com>
mm/hugetlb: fix DEBUG_LOCKS_WARN_ON(1) when dissolve_free_hugetlb_folio()
Qu Wenruo <wqu@suse.com>
btrfs: do not wait for short bulk allocation
Silvio Gissi <sifonsec@amazon.com>
keys: Fix overwrite of key expiration on instantiation
Nikhil Rao <nikhil.rao@intel.com>
dmaengine: idxd: add a write() method for applications to submit work
Arjan van de Ven <arjan@linux.intel.com>
dmaengine: idxd: add a new security check to deal with a hardware erratum
Arjan van de Ven <arjan@linux.intel.com>
VFIO: Add the SPR_DSA and SPR_IAX devices to the denylist
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix firmware check error path
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching fw build id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching board id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: generalise device address check
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix NVM configuration parsing
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: add missing firmware sanity checks
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix wcn3991 device address check
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix invalid device address check
Steven Rostedt (Google) <rostedt@goodmis.org>
eventfs: Do not treat events directory different than other directories
Steven Rostedt (Google) <rostedt@goodmis.org>
eventfs: Do not differentiate the toplevel events directory
Steven Rostedt (Google) <rostedt@goodmis.org>
tracefs: Still use mount point as default permissions for instances
Steven Rostedt (Google) <rostedt@goodmis.org>
tracefs: Reset permissions on remount if permissions are options
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: avoid to send duplicate lease break notifications
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: off ipv6only for both ipv4/ipv6 binding
Conor Dooley <conor.dooley@microchip.com>
spi: microchip-core-qspi: fix setting spi bus clock rate
Johan Hovold <johan+linaro@kernel.org>
regulator: core: fix debugfs creation regression
Sean Anderson <sean.anderson@linux.dev>
nvme-pci: Add quirk for broken MSIs
Peter Xu <peterx@redhat.com>
mm/userfaultfd: reset ptes when close() for wr-protected ones
Kefeng Wang <wangkefeng.wang@huawei.com>
mm: use memalloc_nofs_save() in page_cache_ra_order()
Michael Ellerman <mpe@ellerman.id.au>
selftests/mm: fix powerpc ARCH check
Thomas Gleixner <tglx@linutronix.de>
x86/apic: Don't access the APIC when disabling x2APIC
Lakshmi Yadlapati <lakshmiy@us.ibm.com>
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
net: fix out-of-bounds access in ops_init
Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
arm64: dts: qcom: sa8155p-adp: fix SDHC2 CD pin configuration
Hersen Wu <hersenxs.wu@amd.com>
drm/amd/display: Fix incorrect DSC instance for MST
George Shen <george.shen@amd.com>
drm/amd/display: Handle Y carry-over in VCP X.Y calculation
Karthikeyan Ramasubramanian <kramasub@chromium.org>
drm/i915/bios: Fix parsing backlight BDB data
Andi Shyti <andi.shyti@linux.intel.com>
drm/i915/gt: Automate CCS Mode setting during engine resets
Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
drm/i915/audio: Fix audio time stamp programming for DP
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix invalid reads in fence signaled events
Ian Forbes <ian.forbes@broadcom.com>
drm/vmwgfx: Fix Legacy Display Unit
Zack Rusin <zack.rusin@broadcom.com>
drm/ttm: Print the memory decryption status just once
Alex Deucher <alexander.deucher@amd.com>
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Dave Airlie <airlied@redhat.com>
Revert "drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()"
Lyude Paul <lyude@redhat.com>
drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: add lunar lake point M DID
Frank Oltmanns <frank@oltmanns.dev>
clk: sunxi-ng: a64: Set minimum and maximum rate for PLL-MIPI
Frank Oltmanns <frank@oltmanns.dev>
clk: sunxi-ng: common: Support minimum and maximum rate
Viken Dadhaniya <quic_vdadhani@quicinc.com>
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Jim Cromie <jim.cromie@gmail.com>
dyndbg: fix old BUG_ON in >control parser
Joao Paulo Goncalves <joao.goncalves@toradex.com>
ASoC: ti: davinci-mcasp: Fix race condition during probe
Sameer Pujar <spujar@nvidia.com>
ASoC: tegra: Fix DSPK 16-bit playback
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize UMAC_CMD access
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
Max Filippov <jcmvbkbc@gmail.com>
xtensa: fix MAKE_PC_FROM_RA second argument
Paolo Abeni <pabeni@redhat.com>
tipc: fix UAF in error path
Vitaly Lifshits <vitaly.lifshits@intel.com>
e1000e: change usleep_range to udelay in PHY mdic access
Alexander Potapenko <glider@google.com>
kmsan: compiler_types: declare __no_sanitize_or_inline
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Interrupt handling fixes
Vasileios Amoiridis <vassilisamir@gmail.com>
iio: pressure: Fixes BME280 SPI driver data
Ramona Gradinariu <ramona.bolboaca13@gmail.com>
iio:imu: adis16475: Fix sync mode setting
Javier Carrasco <javier.carrasco.cruz@gmail.com>
dt-bindings: iio: health: maxim,max30102: fix compatible check
Sven Schnelle <svens@linux.ibm.com>
workqueue: Fix selection of wake_cpu in kick_pool()
Gregory Detal <gregory.detal@gmail.com>
mptcp: only allow set existing scheduler for net.mptcp.scheduler
Paolo Abeni <pabeni@redhat.com>
mptcp: ensure snd_nxt is properly initialized on connect
Dan Carpenter <dan.carpenter@linaro.org>
mm/slab: make __free(kfree) accept error pointers
Liam R. Howlett <Liam.Howlett@oracle.com>
maple_tree: fix mas_empty_area_rev() null pointer dereference
Qu Wenruo <wqu@suse.com>
btrfs: set correct ram_bytes when splitting ordered extent
Dominique Martinet <dominique.martinet@atmark-techno.com>
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Takashi Sakamoto <o-takashi@sakamocchi.jp>
firewire: ohci: fulfill timestamp for some local asynchronous transaction
Aman Dhoot <amandhoot12@gmail.com>
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Badhri Jagan Sridharan <badhri@google.com>
usb: typec: tcpm: Check for port partner validity before consuming it
Amit Sunil Dhamne <amitsd@google.com>
usb: typec: tcpm: unregister existing source caps before re-registration
RD Babiera <rdbabiera@google.com>
usb: typec: tcpm: clear pd_event queue in PORT_RESET
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: dwc3: core: Prevent phy suspend during init
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: xhci-plat: Don't include xhci.h
Chris Wulff <Chris.Wulff@biamp.com>
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Wesley Cheng <quic_wcheng@quicinc.com>
usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete
Ivan Avdeev <me@provod.works>
usb: gadget: uvc: use correct buffer size when parsing configfs lists
Peter Korsgaard <peter@korsgaard.com>
usb: gadget: composite: fix OS descriptors w_value logic
Alan Stern <stern@rowland.harvard.edu>
USB: core: Fix access violation during port device removal
Guenter Roeck <linux@roeck-us.net>
usb: ohci: Prevent missed ohci interrupts
Alan Stern <stern@rowland.harvard.edu>
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Fix connector check on init
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Check for notifications after init
Linus Torvalds <torvalds@linux-foundation.org>
Reapply "drm/qxl: simplify qxl_fence_wait"
Thanassis Avgerinos <thanassis.avgerinos@gmail.com>
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Dmitry Antipov <dmantipov@yandex.ru>
btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send()
Christian König <christian.koenig@amd.com>
drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2
Michel Dänzer <mdaenzer@redhat.com>
drm/amdgpu: Fix comparison in amdgpu_res_cpu_visible
Gabe Teeger <gabe.teeger@amd.com>
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: fix uninitialised kfifo
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: relocate debounce_period_us from struct gpio_desc
Zhongqiu Han <quic_zhonhan@quicinc.com>
gpiolib: cdev: Fix use after free in lineinfo_changed_notify
Mario Limonciello <mario.limonciello@amd.com>
dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
Douglas Anderson <dianders@chromium.org>
drm/connector: Add \n to message about demoting connector force-probes
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: add bandgap setting for g12
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: power up phy on device init
Steffen Bätz <steffen@innosonix.de>
net: dsa: mv88e6xxx: add phylink_get_caps for the mv88e6320/21 family
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix kernel crash when devlink reload during initialization
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix port vlan filter not disabled issue
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: use appropriate barrier function after setting a bit value
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: release PTP resources if pf initialization failed
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: change type of numa_node_mask as nodemask_t
Jian Shen <shenjian15@huawei.com>
net: hns3: direct return when receive a unknown mailbox message
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: using user configure after hardware reset
Wen Gu <guwen@linux.alibaba.com>
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Eric Dumazet <edumazet@google.com>
ipv6: prevent NULL dereference in ip6_output()
Eric Dumazet <edumazet@google.com>
ipv6: annotate data-races around cnf.disable_ipv6
Lukasz Majewski <lukma@denx.de>
hsr: Simplify code for announcing HSR nodes timer setup
Eric Dumazet <edumazet@google.com>
net-sysfs: convert dev->operstate reads to lockless ones
Eric Dumazet <edumazet@google.com>
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
Daniel Golle <daniel@makrotopia.org>
dt-bindings: net: mediatek: remove wrongly added clocks and SerDes
David Howells <dhowells@redhat.com>
rxrpc: Only transmit one ACK per jumbo packet received
David Howells <dhowells@redhat.com>
rxrpc: Fix congestion control algorithm
David Howells <dhowells@redhat.com>
rxrpc: Fix the names of the fields in the ACK trailer struct
Ido Schimmel <idosch@nvidia.com>
selftests: test_bridge_neigh_suppress.sh: Fix failures due to duplicate MAC
Hangbin Liu <liuhangbin@gmail.com>
selftests/net: convert test_bridge_neigh_suppress.sh to run it in unique namespace
Shigeru Yoshida <syoshida@redhat.com>
ipv6: Fix potential uninit-value access in __ip6_make_skb()
Felix Fietkau <nbd@nbd.name>
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
nfc: nci: Fix kcov check in nci_rx_work()
Eric Dumazet <edumazet@google.com>
phonet: fix rtm_phonet_notify() skb allocation
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use a separate buffer for sending commands
Roded Zats <rzats@paloaltonetworks.com>
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Marek Vasut <marex@denx.de>
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: HCI: Fix potential null-ptr-deref
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Kuniyuki Iwashima <kuniyu@amazon.com>
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Eric Dumazet <edumazet@google.com>
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
Boy.Wu <boy.wu@mediatek.com>
ARM: 9381/1: kasan: clear stale stack poison
Paul Davey <paul.davey@alliedtelesis.co.nz>
xfrm: Preserve vlan tags for transport mode software GRO
Al Viro <viro@zeniv.linux.org.uk>
qibfs: fix dentry leak
Olga Kornievskaia <kolga@netapp.com>
SUNRPC: add a missing rpc_stat for TCP TLS
Li Nan <linan122@huawei.com>
blk-iocost: do not WARN if iocg was already offlined
Vanillan Wang <vanillanwang@163.com>
net:usb:qmi_wwan: support Rolling modules
Alex Deucher <alexander.deucher@amd.com>
drm/radeon: silence UBSAN warning (v3)
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
platform/x86: ISST: Add Granite Rapids-D to HPM CPU list
Lyude Paul <lyude@redhat.com>
drm/nouveau/dp: Don't probe eDP ports twice harder
Krzysztof Kozlowski <krzk@kernel.org>
gpio: lpc32xx: fix module autoloading
Joakim Sindholt <opensource@zhasha.com>
fs/9p: drop inodes immediately on non-.L too
Stephen Boyd <sboyd@kernel.org>
clk: Don't hold prepare_lock when calling kref_put()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: crystalcove: Use -ENOTSUPP consistently
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: wcove: Use -ENOTSUPP consistently
Michael Ellerman <mpe@ellerman.id.au>
powerpc/crypto/chacha-p10: Fix failure on non Power10
Jeff Layton <jlayton@kernel.org>
9p: explicitly deny setlease attempts
Joakim Sindholt <opensource@zhasha.com>
fs/9p: fix the cache always being enabled on files with qid flags
Joakim Sindholt <opensource@zhasha.com>
fs/9p: translate O_TRUNC into OTRUNC
Joakim Sindholt <opensource@zhasha.com>
fs/9p: only translate RWX permissions for plain 9P2000
Krzysztof Kozlowski <krzk@kernel.org>
iommu: mtk: fix module autoloading
Steve French <stfrench@microsoft.com>
smb3: fix broken reconnect when password changing on the server by allowing password rotation
Michael Kelley <mhklinux@outlook.com>
Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted
Rick Edgecombe <rick.p.edgecombe@intel.com>
uio_hv_generic: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
hv_netvsc: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Leak pages if set_memory_encrypted() fails
John Stultz <jstultz@google.com>
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Zhigang Luo <Zhigang.Luo@amd.com>
amd/amdkfd: sync all devices to wait all processes being evicted
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Fix VCN allocation in CPX partition
Alex Hung <alex.hung@amd.com>
drm/amd/display: Skip on writeback when it's not applicable
Tao Zhou <tao.zhou1@amd.com>
drm/amdgpu: implement IRQ_STATE_ENABLE for SDMA v4.4.2
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Refine IB schedule error logging
Justin Ernst <justin.ernst@hpe.com>
tools/power/turbostat: Fix uncore frequency file string
Jiaxun Yang <jiaxun.yang@flygoat.com>
MIPS: scall: Save thread_info.syscall unconditionally on entry
Thierry Reding <treding@nvidia.com>
gpu: host1x: Do not setup DMA for virtual devices
Rik van Riel <riel@surriel.com>
blk-iocost: avoid out of bounds shift
Xiang Chen <chenxiang66@hisilicon.com>
scsi: hisi_sas: Handle the NCQ error returned by D2H frame
Maurizio Lombardi <mlombard@redhat.com>
scsi: target: Fix SELinux error when systemd-modules loads the target module
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `BIT'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `panic'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `early_pfn_to_nid'
Boris Burkov <boris@bur.io>
btrfs: always clear PERTRANS metadata during commit
Boris Burkov <boris@bur.io>
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
Len Brown <len.brown@intel.com>
tools/power turbostat: Fix warning upon failed /dev/cpu_dma_latency read
Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com>
tools/power turbostat: Print ucode revision only if valid
Peng Liu <liupeng17@lenovo.com>
tools/power turbostat: Fix Bzy_MHz documentation typo
Wyes Karny <wyes.karny@amd.com>
tools/power turbostat: Increase the limit for fd opened
Doug Smythies <dsmythies@telus.net>
tools/power turbostat: Fix added raw MSR output
Adam Goldman <adamg@pobox.com>
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Chen Ni <nichen@iscas.ac.cn>
ata: sata_gemini: Check clk_enable() result
Jeff Layton <jlayton@kernel.org>
vboxsf: explicitly deny setlease attempts
Phil Elwell <phil@raspberrypi.com>
net: bcmgenet: Reset RBUF on first open
Li Nan <linan122@huawei.com>
block: fix overflow in blk_ioctl_discard()
Takashi Iwai <tiwai@suse.de>
ALSA: line6: Zero-initialize message buffers
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: Fix MCQ mode dev command timeout
Yihang Li <liyihang9@huawei.com>
scsi: libsas: Align SMP request allocation to ARCH_DMA_MINALIGN
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: WLUN suspend dev/link state error recovery
André Apitzsch <git@apitzsch.eu>
regulator: tps65132: Add of_match table
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
ASoC: SOF: Intel: hda-dsp: Skip IMR boot on ACE platforms in case of S3 suspend
Borislav Petkov (AMD) <bp@alien8.de>
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Mark Rutland <mark.rutland@arm.com>
selftests/ftrace: Fix event filter target_func selection
Andrei Matei <andreimatei1@gmail.com>
bpf: Check bloom filter map value size
Jonathan Kim <Jonathan.Kim@amd.com>
drm/amdkfd: range check cp bad op exception interrupts
Mukul Joshi <mukul.joshi@amd.com>
drm/amdkfd: Check cgroup when returning DMABuf info
Anand Jain <anand.jain@oracle.com>
btrfs: return accurate error code on open failure in open_fs_devices()
Saurav Kashyap <skashyap@marvell.com>
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
scsi: mpi3mr: Avoid memcpy field-spanning write WARNING
linke li <lilinke99@qq.com>
net: mark racy access on sk->sk_rcvbuf
Benjamin Berg <benjamin.berg@intel.com>
wifi: iwlwifi: mvm: guard against invalid STA ID on removal
Johannes Berg <johannes.berg@intel.com>
wifi: iwlwifi: read txq->read_ptr under lock
Johannes Berg <johannes.berg@intel.com>
wifi: mac80211: fix prep_connection error path
Igor Artemiev <Igor.A.Artemiev@mcst.ru>
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jeff Johnson <quic_jjohnson@quicinc.com>
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Andrew Price <anprice@redhat.com>
gfs2: Fix invalid metadata access in punch_hole
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Use a dedicated lock for ras_fwlog state
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Release hbalock before calling lpfc_worker_wake_up()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Remove IRQF_ONESHOT flag from threaded IRQ handling
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
Rohit Ner <rohitner@google.com>
scsi: ufs: core: Fix MCQ MAC configuration
Oliver Upton <oliver.upton@linux.dev>
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Marc Zyngier <maz@kernel.org>
KVM: arm64: vgic-v2: Use cpuid from userspace as vcpu_id
Will Deacon <will@kernel.org>
swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y
Gaurav Batra <gbatra@linux.ibm.com>
powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: make max polling consistent for longer H_CALLs
Jernej Skrabec <jernej.skrabec@gmail.com>
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Adam Skladowski <a39.skl@gmail.com>
clk: qcom: smd-rpm: Restore msm8976 num_clk
Richard Gobert <richardbgobert@gmail.com>
net: gro: add flush check in udp_gro_receive_segment
Richard Gobert <richardbgobert@gmail.com>
net: gro: fix udp bad offset in socket lookup by adding {inner_}network_offset to napi_gro_cb
Richard Gobert <richardbgobert@gmail.com>
net: gro: parse ipv6 ext headers without frag0 invalidation
Shigeru Yoshida <syoshida@redhat.com>
ipv4: Fix uninit-value access in __ip_make_skb()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Use predefined error codes
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Respect deferred probe
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Correct use of device property APIs
Alexandra Winter <wintera@linux.ibm.com>
s390/qeth: Fix kernel panic after setting hsuid
Guillaume Nault <gnault@redhat.com>
vxlan: Pull inner IP header in vxlan_rcv().
Xin Long <lucien.xin@gmail.com>
tipc: fix a possible memleak in tipc_buf_append
Jeffrey Altman <jaltman@auristor.com>
rxrpc: Clients must accept conn from any address
Felix Fietkau <nbd@nbd.name>
net: core: reject skb_copy(_expand) for fraglist GSO skbs
Felix Fietkau <nbd@nbd.name>
net: bridge: fix multicast-to-unicast with fraglist GSO
Mans Rullgard <mans@mansr.com>
spi: fix null pointer dereference within spi_sync
Shashank Sharma <shashank.sharma@amd.com>
drm/amdgpu: fix doorbell regression
Marek Behún <kabel@kernel.org>
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
cxgb4: Properly lock TX queue for the selftest.
Bui Quang Minh <minhquangbui99@gmail.com>
s390/cio: Ensure the copied buf is NUL terminated
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: cards: select SND_DYNAMIC_MINORS
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-tdm-interface: manage formatters in trigger
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-card: make links nonatomic
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use threaded irq to check periods
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use FIELD helpers
Guillaume Nault <gnault@redhat.com>
vxlan: Add missing VNI filter counter update in arp_reduce().
Guillaume Nault <gnault@redhat.com>
vxlan: Fix racy device stats updates.
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_actions()
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flow_spec
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flower
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: fix E-MU dock initialization
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: move the whole GPIO event handling to the workqueue
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: factor out snd_emu1010_load_dock_firmware()
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: fix E-MU card dock presence monitoring
David Howells <dhowells@redhat.com>
Fix a potential infinite loop in extract_user_to_sg()
Jens Remus <jremus@linux.ibm.com>
s390/vdso: Add CFI for RA register to asm macro vdso_func
David Bauer <mail@david-bauer.net>
net l2tp: drop flow hash on forward
Kuniyuki Iwashima <kuniyu@amazon.com>
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
Bui Quang Minh <minhquangbui99@gmail.com>
octeontx2-af: avoid off-by-one read from userspace
Bui Quang Minh <minhquangbui99@gmail.com>
bna: ensure the copied buf is NUL terminated
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: use flags field to disambiguate broadcast redirect
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix clearing storage keys for huge pages
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix storage key clearing for guest huge pages
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
ASoC: codecs: wsa881x: set clk_stop_mode1 flag
Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
ASoC: Intel: avs: Set name of control as in topology
Xu Kuohai <xukuohai@huawei.com>
riscv, bpf: Fix incorrect runtime stats
Xu Kuohai <xukuohai@huawei.com>
bpf, arm64: Fix incorrect runtime stats
Devyn Liu <liudingyuan@huawei.com>
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: fix version format string
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use common AXI macros
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: move msg state to new struct
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use devm_spi_alloc_host()
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: simplify driver data allocation
Li Zetao <lizetao1@huawei.com>
spi: spi-axi-spi-engine: Use helper function devm_clk_get_enabled()
Anton Protopopov <aspsk@isovalent.com>
bpf: Fix a verifier verbose message
Yi Zhang <yi.zhang@redhat.com>
nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ASoC: SOF: Intel: add default firmware library path for LNL
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
ASoC: SOF: Introduce generic names for IPC types
Richard Fitzgerald <rf@opensource.cirrus.com>
regmap: Add regmap_read_bypassed()
Jason Xing <kernelxing@tencent.com>
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Andrii Nakryiko <andrii@kernel.org>
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change devm_regulator_get_enable_optional() stub to return Ok
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change stubbed devm_regulator_get_enable to return Ok
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
regulator: mt6360: De-capitalize devicetree regulator subnodes
Zeng Heng <zengheng4@huawei.com>
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
Arnd Bergmann <arnd@arndb.de>
power: rt9455: hide unused rt9455_boost_voltage_values
Hans de Goede <hdegoede@redhat.com>
pinctrl: baytrail: Fix selecting gpio pinctrl state
Kuniyuki Iwashima <kuniyu@amazon.com>
nfs: Handle error of rpc_proc_register() in nfs_net_init().
Josef Bacik <josef@toxicpanda.com>
nfs: make the rpc_stat per net namespace
Josef Bacik <josef@toxicpanda.com>
nfs: expose /proc/net/sunrpc/nfs in net namespaces
Josef Bacik <josef@toxicpanda.com>
sunrpc: add a struct rpc_stats arg to rpc_create_args
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
Dan Carpenter <dan.carpenter@linaro.org>
pinctrl: core: delete incorrect free in pinctrl_enable()
Jan Dakinevich <jan.dakinevich@salutedevices.com>
pinctrl/meson: fix typo in PDM's pin name
Billy Tsai <billy_tsai@aspeedtech.com>
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Tim Jiang <quic_tjiang@quicinc.com>
Bluetooth: qca: add support for QCA2066
Daniel Okazaki <dtokazaki@google.com>
eeprom: at24: fix memory corruption race condition
Heiner Kallweit <hkallweit1@gmail.com>
eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
Wedson Almeida Filho <walmeida@microsoft.com>
rust: kernel: require `Send` for `Module` implementations
Johannes Berg <johannes.berg@intel.com>
wifi: nl80211: don't free NULL coalescing rule
Benno Lossin <benno.lossin@proton.me>
rust: macros: fix soundness issue in `module!` macro
Thomas Bertschinger <tahbertschinger@gmail.com>
rust: module: place generated init_module() function in .init.text
Christian Marangi <ansuelsmth@gmail.com>
mtd: limit OTP NVMEM cell parse to non-NAND devices
Rafał Miłecki <rafal@milecki.pl>
nvmem: add explicit config option to read old syntax fixed OF cells
Vinod Koul <vkoul@kernel.org>
dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
Bumyong Lee <bumyong.lee@samsung.com>
dmaengine: pl330: issue_pending waits until WFP state
-------------
Diffstat:
.../bindings/iio/health/maxim,max30102.yaml | 2 +-
.../devicetree/bindings/net/mediatek,net.yaml | 22 +-
Makefile | 4 +-
arch/arm/kernel/sleep.S | 4 +
arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 30 +-
arch/arm64/kvm/vgic/vgic-kvm-device.c | 12 +-
arch/arm64/net/bpf_jit_comp.c | 6 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/kernel/asm-offsets.c | 1 +
arch/mips/kernel/ptrace.c | 15 +-
arch/mips/kernel/scall32-o32.S | 23 +-
arch/mips/kernel/scall64-n32.S | 3 +-
arch/mips/kernel/scall64-n64.S | 3 +-
arch/mips/kernel/scall64-o32.S | 33 +-
arch/powerpc/crypto/chacha-p10-glue.c | 8 +-
arch/powerpc/include/asm/plpks.h | 5 +-
arch/powerpc/platforms/pseries/iommu.c | 8 +
arch/powerpc/platforms/pseries/plpks.c | 10 +-
arch/riscv/net/bpf_jit_comp64.c | 6 +-
arch/s390/include/asm/dwarf.h | 1 +
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2 +
arch/s390/mm/gmap.c | 2 +-
arch/s390/mm/hugetlbpage.c | 2 +-
arch/x86/kernel/apic/apic.c | 16 +-
arch/xtensa/include/asm/processor.h | 8 +-
arch/xtensa/include/asm/ptrace.h | 2 +-
arch/xtensa/kernel/process.c | 5 +-
arch/xtensa/kernel/stacktrace.c | 3 +-
block/blk-iocost.c | 14 +-
block/ioctl.c | 5 +-
drivers/ata/sata_gemini.c | 5 +-
drivers/base/regmap/regmap.c | 37 +++
drivers/bluetooth/btqca.c | 208 ++++++++++++-
drivers/bluetooth/btqca.h | 8 +-
drivers/bluetooth/hci_qca.c | 13 +-
drivers/clk/clk.c | 12 +-
drivers/clk/qcom/clk-smd-rpm.c | 1 +
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 2 +
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 +-
drivers/clk/sunxi-ng/ccu_common.c | 19 ++
drivers/clk/sunxi-ng/ccu_common.h | 3 +
drivers/dma/idxd/cdev.c | 77 +++++
drivers/dma/idxd/idxd.h | 3 +
drivers/dma/idxd/init.c | 4 +
drivers/dma/idxd/registers.h | 3 -
drivers/dma/idxd/sysfs.c | 27 +-
drivers/firewire/nosy.c | 6 +-
drivers/firewire/ohci.c | 14 +-
drivers/gpio/gpio-crystalcove.c | 2 +-
drivers/gpio/gpio-lpc32xx.c | 1 +
drivers/gpio/gpio-wcove.c | 2 +-
drivers/gpio/gpiolib-cdev.c | 181 +++++++++--
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 56 ++--
drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 15 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 16 +-
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 11 +-
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +
.../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 48 ++-
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 +
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6 +
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2 +-
drivers/gpu/drm/drm_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_audio.c | 113 +------
drivers/gpu/drm/i915/display/intel_bios.c | 19 +-
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5 -
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c | 6 +-
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.h | 2 +-
drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +-
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 ++---
drivers/gpu/drm/nouveau/nouveau_dp.c | 13 +-
drivers/gpu/drm/panel/Kconfig | 2 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 13 +-
drivers/gpu/drm/qxl/qxl_release.c | 50 +---
drivers/gpu/drm/radeon/pptable.h | 10 +-
drivers/gpu/drm/ttm/ttm_tt.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
drivers/gpu/host1x/bus.c | 8 -
drivers/hv/channel.c | 29 +-
drivers/hv/connection.c | 29 +-
drivers/hwmon/corsair-cpro.c | 43 ++-
drivers/hwmon/pmbus/ucd9000.c | 6 +-
drivers/iio/accel/mxc4005.c | 24 +-
drivers/iio/imu/adis16475.c | 4 +-
drivers/iio/pressure/bmp280-spi.c | 4 +-
drivers/infiniband/hw/qib/qib_fs.c | 1 +
drivers/iommu/mtk_iommu.c | 1 +
drivers/iommu/mtk_iommu_v1.c | 1 +
drivers/md/md.c | 1 +
drivers/misc/eeprom/at24.c | 47 ++-
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/mtd/mtdcore.c | 2 +
drivers/net/dsa/mv88e6xxx/chip.c | 20 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 32 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8 +-
drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +-
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 52 ++--
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 20 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +-
drivers/net/ethernet/intel/e1000e/phy.c | 8 +-
.../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +-
drivers/net/ethernet/micrel/ks8851_common.c | 16 +-
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14 +-
drivers/net/hyperv/netvsc.c | 7 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/vxlan/vxlan_core.c | 49 ++-
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 7 +-
drivers/net/wireless/intel/iwlwifi/queue/tx.c | 2 +-
drivers/nvme/host/core.c | 2 +-
drivers/nvme/host/nvme.h | 5 +
drivers/nvme/host/pci.c | 14 +-
drivers/nvmem/apple-efuses.c | 1 +
drivers/nvmem/core.c | 8 +-
drivers/nvmem/imx-ocotp-scu.c | 1 +
drivers/nvmem/imx-ocotp.c | 1 +
drivers/nvmem/meson-efuse.c | 1 +
drivers/nvmem/meson-mx-efuse.c | 1 +
drivers/nvmem/microchip-otpc.c | 1 +
drivers/nvmem/mtk-efuse.c | 1 +
drivers/nvmem/qcom-spmi-sdam.c | 1 +
drivers/nvmem/qfprom.c | 1 +
drivers/nvmem/rave-sp-eeprom.c | 1 +
drivers/nvmem/rockchip-efuse.c | 1 +
drivers/nvmem/sc27xx-efuse.c | 1 +
drivers/nvmem/sec-qfprom.c | 1 +
drivers/nvmem/sprd-efuse.c | 1 +
drivers/nvmem/stm32-romem.c | 1 +
drivers/nvmem/sunplus-ocotp.c | 1 +
drivers/nvmem/sunxi_sid.c | 1 +
drivers/nvmem/uniphier-efuse.c | 1 +
drivers/nvmem/zynqmp_nvmem.c | 1 +
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 +--
drivers/pinctrl/core.c | 8 +-
drivers/pinctrl/devicetree.c | 10 +-
drivers/pinctrl/intel/pinctrl-baytrail.c | 74 ++---
drivers/pinctrl/intel/pinctrl-intel.h | 4 +
drivers/pinctrl/mediatek/pinctrl-paris.c | 40 +--
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +-
.../x86/intel/speed_select_if/isst_if_common.c | 1 +
drivers/power/supply/mt6360_charger.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +
drivers/regulator/core.c | 27 +-
drivers/regulator/mt6360-regulator.c | 32 +-
drivers/regulator/tps65132-regulator.c | 7 +
drivers/rtc/nvmem.c | 1 +
drivers/s390/cio/cio_inject.c | 2 +-
drivers/s390/net/qeth_core_main.c | 69 ++---
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 -
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 +-
drivers/scsi/libsas/sas_expander.c | 2 +-
drivers/scsi/lpfc/lpfc.h | 2 +-
drivers/scsi/lpfc/lpfc_attr.c | 4 +-
drivers/scsi/lpfc/lpfc_bsg.c | 20 +-
drivers/scsi/lpfc/lpfc_debugfs.c | 12 +-
drivers/scsi/lpfc/lpfc_els.c | 20 +-
drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +-
drivers/scsi/lpfc/lpfc_init.c | 5 +-
drivers/scsi/lpfc/lpfc_nvme.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 13 +-
drivers/scsi/lpfc/lpfc_sli.c | 34 +--
drivers/scsi/lpfc/lpfc_vport.c | 8 +-
drivers/scsi/mpi3mr/mpi3mr_app.c | 2 +-
drivers/slimbus/qcom-ngd-ctrl.c | 6 +-
drivers/spi/spi-axi-spi-engine.c | 229 +++++++-------
drivers/spi/spi-hisi-kunpeng.c | 2 -
drivers/spi/spi-microchip-core-qspi.c | 1 +
drivers/spi/spi.c | 1 +
drivers/target/target_core_configfs.c | 12 +
drivers/ufs/core/ufs-mcq.c | 2 +-
drivers/ufs/core/ufshcd.c | 9 +-
drivers/uio/uio_hv_generic.c | 12 +-
drivers/usb/core/hub.c | 5 +-
drivers/usb/core/port.c | 8 +-
drivers/usb/dwc3/core.c | 90 +++---
drivers/usb/dwc3/core.h | 1 +
drivers/usb/dwc3/gadget.c | 2 +
drivers/usb/dwc3/host.c | 27 ++
drivers/usb/gadget/composite.c | 6 +-
drivers/usb/gadget/function/f_fs.c | 9 +-
drivers/usb/gadget/function/uvc_configfs.c | 4 +-
drivers/usb/host/ohci-hcd.c | 8 +
drivers/usb/host/xhci-plat.h | 4 +-
drivers/usb/host/xhci-rzv2m.c | 1 +
drivers/usb/typec/tcpm/tcpm.c | 36 ++-
drivers/usb/typec/ucsi/ucsi.c | 12 +-
drivers/vfio/pci/vfio_pci.c | 2 +
drivers/w1/slaves/w1_ds250x.c | 1 +
fs/9p/fid.h | 3 -
fs/9p/vfs_file.c | 2 +
fs/9p/vfs_inode.c | 5 +-
fs/9p/vfs_super.c | 1 +
fs/btrfs/extent_io.c | 14 +-
fs/btrfs/inode.c | 2 +-
fs/btrfs/ordered-data.c | 1 +
fs/btrfs/send.c | 4 +-
fs/btrfs/transaction.c | 2 +-
fs/btrfs/volumes.c | 18 +-
fs/gfs2/bmap.c | 5 +-
fs/nfs/client.c | 5 +-
fs/nfs/inode.c | 13 +-
fs/nfs/internal.h | 2 -
fs/nfs/netns.h | 2 +
fs/smb/client/cifsglob.h | 1 +
fs/smb/client/connect.c | 8 +
fs/smb/client/fs_context.c | 21 ++
fs/smb/client/fs_context.h | 2 +
fs/smb/client/misc.c | 1 +
fs/smb/client/smb2pdu.c | 11 +
fs/smb/server/oplock.c | 35 ++-
fs/smb/server/transport_tcp.c | 4 +
fs/tracefs/event_inode.c | 74 ++---
fs/tracefs/inode.c | 92 +++++-
fs/tracefs/internal.h | 14 +-
fs/userfaultfd.c | 4 +
fs/vboxsf/file.c | 1 +
include/linux/compiler_types.h | 11 +
include/linux/dma-fence.h | 7 -
include/linux/gfp_types.h | 2 +
include/linux/hyperv.h | 1 +
include/linux/nvmem-provider.h | 2 +
include/linux/pci_ids.h | 2 +
include/linux/regmap.h | 8 +
include/linux/regulator/consumer.h | 4 +-
include/linux/skbuff.h | 15 +
include/linux/skmsg.h | 2 +
include/linux/slab.h | 2 +-
include/linux/sunrpc/clnt.h | 1 +
include/net/gro.h | 9 +
include/net/xfrm.h | 3 +
include/sound/emu10k1.h | 3 +-
include/sound/sof.h | 7 +-
include/trace/events/rxrpc.h | 2 +-
include/uapi/linux/kfd_ioctl.h | 17 +-
include/uapi/scsi/scsi_bsg_mpi3mr.h | 2 +-
kernel/bpf/bloom_filter.c | 13 +
kernel/bpf/verifier.c | 3 +-
kernel/dma/swiotlb.c | 1 +
kernel/workqueue.c | 8 +-
lib/Kconfig.debug | 5 +-
lib/dynamic_debug.c | 6 +-
lib/maple_tree.c | 16 +-
lib/scatterlist.c | 2 +-
mm/hugetlb.c | 4 +-
mm/readahead.c | 4 +
net/8021q/vlan_core.c | 2 +
net/bluetooth/hci_core.c | 3 +-
net/bluetooth/hci_event.c | 2 +
net/bluetooth/l2cap_core.c | 3 +
net/bluetooth/msft.c | 2 +-
net/bluetooth/msft.h | 4 +-
net/bluetooth/sco.c | 4 +
net/bridge/br_forward.c | 9 +-
net/bridge/br_netlink.c | 3 +-
net/core/filter.c | 42 ++-
net/core/gro.c | 1 +
net/core/link_watch.c | 4 +-
net/core/net-sysfs.c | 4 +-
net/core/net_namespace.c | 13 +-
net/core/rtnetlink.c | 6 +-
net/core/skbuff.c | 27 +-
net/core/skmsg.c | 5 +-
net/core/sock.c | 4 +-
net/hsr/hsr_device.c | 31 +-
net/ipv4/af_inet.c | 1 +
net/ipv4/ip_output.c | 2 +-
net/ipv4/raw.c | 3 +
net/ipv4/tcp.c | 4 +-
net/ipv4/tcp_input.c | 2 +
net/ipv4/tcp_ipv4.c | 8 +-
net/ipv4/tcp_output.c | 4 +-
net/ipv4/udp.c | 3 +-
net/ipv4/udp_offload.c | 15 +-
net/ipv4/xfrm4_input.c | 6 +-
net/ipv6/addrconf.c | 11 +-
net/ipv6/fib6_rules.c | 6 +-
net/ipv6/ip6_input.c | 4 +-
net/ipv6/ip6_offload.c | 52 +++-
net/ipv6/ip6_output.c | 4 +-
net/ipv6/udp.c | 3 +-
net/ipv6/udp_offload.c | 3 +-
net/ipv6/xfrm6_input.c | 6 +-
net/l2tp/l2tp_eth.c | 3 +
net/mac80211/ieee80211_i.h | 4 +-
net/mac80211/mlme.c | 5 +-
net/mptcp/ctrl.c | 39 ++-
net/mptcp/protocol.c | 3 +
net/nfc/nci/core.c | 1 +
net/nsh/nsh.c | 14 +-
net/phonet/pn_netlink.c | 2 +-
net/rxrpc/ar-internal.h | 2 +-
net/rxrpc/call_object.c | 7 +-
net/rxrpc/conn_event.c | 16 +-
net/rxrpc/conn_object.c | 9 +-
net/rxrpc/input.c | 71 +++--
net/rxrpc/output.c | 14 +-
net/rxrpc/protocol.h | 6 +-
net/smc/smc_ib.c | 19 +-
net/sunrpc/clnt.c | 5 +-
net/sunrpc/xprtsock.c | 1 +
net/tipc/msg.c | 8 +-
net/wireless/nl80211.c | 2 +
net/wireless/trace.h | 2 +-
net/xfrm/xfrm_input.c | 8 +
rust/kernel/lib.rs | 2 +-
rust/macros/module.rs | 185 +++++++-----
scripts/Makefile.modfinal | 2 +-
security/keys/key.c | 3 +-
sound/hda/intel-sdw-acpi.c | 2 +
sound/pci/emu10k1/emu10k1.c | 3 +-
sound/pci/emu10k1/emu10k1_main.c | 139 +++++----
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/codecs/wsa881x.c | 1 +
sound/soc/intel/avs/topology.c | 2 +
sound/soc/meson/Kconfig | 1 +
sound/soc/meson/axg-card.c | 1 +
sound/soc/meson/axg-fifo.c | 56 ++--
sound/soc/meson/axg-fifo.h | 12 +-
sound/soc/meson/axg-frddr.c | 5 +-
sound/soc/meson/axg-tdm-interface.c | 34 ++-
sound/soc/meson/axg-toddr.c | 22 +-
sound/soc/sof/intel/hda-dsp.c | 20 +-
sound/soc/sof/intel/pci-lnl.c | 3 +
sound/soc/tegra/tegra186_dspk.c | 7 +-
sound/soc/ti/davinci-mcasp.c | 12 +-
sound/usb/line6/driver.c | 6 +-
tools/include/linux/kernel.h | 1 +
tools/include/linux/mm.h | 5 +
tools/include/linux/panic.h | 19 ++
tools/power/x86/turbostat/turbostat.8 | 2 +-
tools/power/x86/turbostat/turbostat.c | 45 ++-
.../selftests/bpf/prog_tests/bloom_filter_map.c | 6 +
.../testing/selftests/bpf/prog_tests/tc_redirect.c | 52 ----
.../ftrace/test.d/filter/event-filter-function.tc | 2 +-
tools/testing/selftests/mm/Makefile | 6 +-
.../selftests/net/test_bridge_neigh_suppress.sh | 333 ++++++++++-----------
tools/testing/selftests/timers/valid-adjtimex.c | 73 +++--
350 files changed, 3162 insertions(+), 1871 deletions(-)
^ permalink raw reply [relevance 2%]
* linux-next: Tree for May 15
@ 2024-05-15 6:41 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-15 6:41 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 41029 bytes --]
Hi all,
Do not add any work intended for v6.11 to your linux-next included
branches until after v6.10-rc1 has been released.
Changes since 20240514:
The ftrace tree gained a conflict against the mm-nonmm-stable tree.
It also gained a build failure so I used the version from next-20240514.
The kvm tree gained a conflict against the loongarch tree.
The refactor-heap tree still had its conflicts against the block tree
for which I dropped the refactor-heap tree.
Non-merge commits (relative to Linus' tree): 9471
9564 files changed, 686632 insertions(+), 235610 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (1b10b390d945 Merge tag 'efi-next-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (9ff3ffc369ed mm/vmalloc: fix vmalloc which may return null if called with __GFP_NOFAIL)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (5549d1e39989 Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (7bbe449d0bdb s390/paes: Reestablish retry loop in paes)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (aea27a92a41d net: micrel: Fix receiving the timestamp in the frame for lan8841)
Merging bpf/master (aea27a92a41d net: micrel: Fix receiving the timestamp in the frame for lan8841)
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging ipvs/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging wireless/for-next (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (d731b1ed1505 ALSA: hda/realtek: Drop doubly quirk entry for 103c:8a2e)
Merging sound-asoc-fixes/for-linus (c277ee8f90ab Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (2a4b49bb5812 regulator: core: fix debugfs creation regression)
Merging spi-fixes/for-linus (ef13561d2b16 spi: microchip-core-qspi: fix setting spi bus clock rate)
Merging pci-current/for-linus (f3d049b35b01 PCI/ASPM: Restore parent state to parent, child state to child)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler)
Merging usb.current/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging usb-serial-fixes/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (bb198e29fe75 iio: dac: ad5592r: fix temperature channel scaling value)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (008ab3c53bc4 speakup: Fix sizeof() vs ARRAY_SIZE() bug)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (a38297e3fb01 Linux 6.9)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (0a9c28bec202 Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (26e8383b116d hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (cbf613cd4d3c Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (a38297e3fb01 Linux 6.9)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so)
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (a38297e3fb01 Linux 6.9)
Merging drm-intel-fixes/for-linux-next-fixes (43b26bdd2ee5 drm/i915/bios: Fix parsing backlight BDB data)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (a38297e3fb01 Linux 6.9)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (a38297e3fb01 Linux 6.9)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (55750148e559 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe())
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (aed9a1a4f710 drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations)
Merging mm-stable/mm-stable (76edc534cc28 memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging mm-nonmm-stable/mm-nonmm-stable (5cbcb62dddf5 fs/proc: fix softlockup in __read_vmcore)
Merging mm/mm-everything (529891be5997 foo)
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h
Merging kbuild/for-next (bfb57ef0544a rapidio: remove choice for enumeration)
CONFLICT (content): Merge conflict in drivers/misc/lkdtm/Makefile
CONFLICT (content): Merge conflict in rust/Makefile
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (ea558c86248b tools lib subcmd: Show parent options in help)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a6016aac5252 dma: fix DMA sync for drivers not calling dma_set_mask*())
Merging asm-generic/master (02af68767d27 Merge branch 'alpha-cleanup-6.9' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (b7e329ac0464 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (f0cc697f9f65 Merge branch 'for-next/errata' into for-next/core)
Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support)
Merging arm-soc/for-next (1e3dd71e2587 Merge branch 'soc/defconfig' into for-next)
Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (4cece7649650 Linux 6.9-rc1)
Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (7468eb6710ce Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-clk/next' into for-next)
Merging samsung-krzk/for-next (a9c32618cd2a Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (02ba7b5a731a Merge branch 'for-next/vexpress/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (3bdc4c661d47 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (429fe5372451 Merge branch 'clk-microchip' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (9f4047a4c9ca LoongArch: Update Loongson-3 default config file)
Merging m68k/for-next (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging m68knommu/for-next (a5044ce7d1d9 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (0ca4f51fa522 parisc/math-emu: Remove unused struct 'exc_reg')
Merging powerpc/next (e789d4499abd Merge branch 'topic/kdump-hotplug' into next)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree())
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (92cce91949a4 riscv: defconfig: Enable CONFIG_CLK_SOPHGO_CV1800)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
CONFLICT (content): Merge conflict in arch/riscv/Makefile
CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
CONFLICT (content): Merge conflict in kernel/sys.c
Merging riscv-dt/riscv-dt-for-next (1c80d50bb697 riscv: dts: microchip: add pac1934 power-monitor to icicle)
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (a99fb341e8d2 Merge branch 'features' into for-next)
CONFLICT (content): Merge conflict in scripts/Makefile.vdsoinst
Merging sh/for-next (efe976b7eecf sh: setup: Add missing forward declaration for sh_fdt_init())
Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask var)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (07f9a27f1969 bcachefs: add no_invalid_checks flag)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (55b52af44d50 Merge branch 'for-next-next-v6.9-20240508' into for-next-20240508)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (edfc6481faf8 smb3: fix perf regression with cached writes with netfs conversion)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (7c35de4df105 erofs: Zstandard compression support)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (82172cca18b2 Merge isofs Makefile cleanup.)
Merging ext4/dev (26770a717cac jbd2: add prefix 'jbd2' for 'shrink_type')
CONFLICT (content): Merge conflict in fs/ext4/file.c
Merging f2fs/dev (991b6bdf1b00 f2fs: fix some ambiguous comments)
Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning)
Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support)
Merging gfs2/for-next (c1c53c26e338 gfs2: make timeout values more explicit)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (c91ecba9e421 ksmbd: avoid to send duplicate oplock break notifications)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (8d915bbf3926 NFSD: Force all NFSv4.2 COPY requests to be synchronous)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access)
Merging overlayfs/overlayfs-next (e9229c18dae3 ovl: remove duplicate included header)
Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address access in jffs2_free_inode)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (a38297e3fb01 Linux 6.9)
Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (584bbf439d0f Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in include/linux/fs.h
Merging vfs/for-next (4faeedb807f8 Merge branch 'work.bd_inode' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
CONFLICT (content): Merge conflict in block/ioctl.c
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flags"
Merging printk/for-next (596ffa476e20 Merge branch 'for-6.10' into for-next)
Merging pci/next (a38bebb28682 Merge branch 'pci/misc')
8b77e887b96c ("dt-bindings: gpio: mpfs: Add coreGPIO support")
8c24b6f1709f ("dt-bindings: gpio: mpfs: Allow gpio-line-names")
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (14ee3d12f37b Merge branch 'for-6.10/hid-bpf' into for-next)
Merging i2c/i2c/for-next (24a9d78e808c Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE())
Merging i3c/i3c/next (acec16dbb338 i3c: dw: Add hot-join support.)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (5fbf8734fb36 hwmon: (nzxt-kraken3) Bail out for unsupported device variants)
Merging jc_docs/docs-next (955e15969c1d Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (4a7d735191de media: dw2102: fix coding style issues)
Merging v4l-dvb-next/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK)
Merging pm/linux-next (9b0087147da0 Merge branch 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (ccad360a2d41 PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions)
Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (69b08420b697 thermal: renesas: rcar: Add dependency on OF)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (49ca2b2ef3d0 RDMA/IPoIB: Fix format truncation compilation errors)
Merging net-next/main (654de42f3fc6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/Makefile
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in net/core/page_pool.c
Merging bpf-next/for-next (5c1672705a1a net: revert partially applied PHY topology series)
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (5c1672705a1a net: revert partially applied PHY topology series)
Merging ipvs-next/main (fa23e0d4b756 netfilter: nf_tables: allow clone callbacks to sleep)
Merging bluetooth/master (6a486c1361ea Bluetooth: btintel_pcie: Refactor and code cleanup)
Merging wireless-next/for-next (1d60eabb8269 wifi: mwl8k: initialize cmd->addr[] properly)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content)
Merging drm/drm-next (275654c02f0b Merge tag 'drm-xe-next-fixes-2024-05-09-1' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c
Merging drm-exynos/for-linux-next (7a5bdb7ca1b4 drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found)
Merging drm-misc/for-linux-next (959314c438ca drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations)
Merging amdgpu/drm-next (a83048bfa402 drm/amd/amdgpu: Add ISP support to amdgpu_discovery)
Merging drm-intel/for-linux-next (ce698dcf10d5 Documentation/i915: remove kernel-doc for DMC wakelocks)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vbt_defs.h
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (b587f413ca47 drm/msm/gen_header: allow skipping the validation)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (b31cfb47b27a drm/xe/xe_guc_submit: Declare reset if banned or killed or wedged)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (9b1fe0510494 regmap: Reorder fields in 'struct regmap_config' to save some memory)
Merging sound/for-next (d731b1ed1505 ALSA: hda/realtek: Drop doubly quirk entry for 103c:8a2e)
Merging ieee1394/for-next (21151fd8f0ea firewire: obsolete usage of *-objs in Makefile for KUnit test)
Merging sound-asoc/for-next (c277ee8f90ab Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus)
Merging modules/modules-next (2c9e5d4a0082 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (5852f2afcdd9 Input: drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging block/for-next (ba94750e4f90 Merge branch 'block-6.10' into for-next)
Merging device-mapper/for-next (8b21ac87d550 dm-delay: remove timer_lock)
Merging libata/for-next (d4a89339f17c ata: pata_legacy: make legacy_exit() work again)
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs)
Merging mfd/for-mfd-next (1482489b5196 dt-bindings: mfd: Use full path to other schemas)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (1fd949f653ee backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (00d1d63ef2da Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (dd80c7465029 MAINTAINERS: repair file entry in SECURITY SUBSYSTEM)
Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL pointer dereference)
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (f4e8d8029285 Merge tag 'vfs-6.10.rw' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs)
Merging watchdog/master (c45b8cfc6d5c watchdog: LENOVO_SE10_WDT should depend on X86 && DMI)
Merging iommu/next (2bd5059c6cc0 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (d976c6f4b32c of: property: Add fw_devlink support for interrupt-map property)
15be4f7ce5de ("dt-bindings: Drop unnecessary quotes on keys")
28081ebd17fb ("dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema")
649bad67d4b1 ("dt-bindings: PCI: microchip: increase number of items in ranges property")
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (e958cffa42df Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (346ec194187e Merge branch into tip/master: 'x86/timers')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/arm_arch_timer: Mark hisi_161010101_oem_info const)
Merging edac/edac-for-next (ab80b31cd7b2 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (ced352104e68 Merge user-events/for-next)
CONFLICT (content): Merge conflict in init/main.c
$ git reset --hard HEAD^
Merging next-20240514 version of ftrace
Merging rcu/rcu/next (0e9b1d2b0560 Merge branches 'cmpxchg.2024.05.11a', 'kcsan.2024.05.07a', 'lkmm.2024.05.06a', 'rcu-merge.2024.05.01a' and 'tsc.2024.04.09c' into HEAD)
Merging kvm/next (4aad0b1893a1 Merge branch 'kvm-queue-snp' into HEAD)
CONFLICT (content): Merge conflict in arch/loongarch/kernel/irq.c
Applying: fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code"
Merging kvm-arm/next (eaa46a28d596 Merge branch kvm-arm64/mpidr-reset into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (b52e8cd3f835 KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info())
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
Merging xen-tip/linux-next (d4c16b4755de xen/xenbus: Use *-y instead of *-objs in Makefile)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (d41393f6c605 platform/x86: Add new MeeGoPad ANX7428 Type-C Cross Switch driver)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (880a746fa3ea device property: Fix a typo in the description of device_get_child_node_count())
Merging usb/usb-next (51474ab44abf drm/bridge: aux-hpd-bridge: correct devm_drm_dp_hpd_bridge_add() stub)
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (e21de1455a72 serial: Clear UPF_DEAD before calling tty_port_register_device_attr_serdev())
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (979987371739 spmi: pmic-arb: Add multi bus support)
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x)
Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property)
Merging extcon/extcon-next (3e8e45b65d9f extcon: adc-jack: Document missing struct members)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (dda057ad8c9c vfio: remove an extra semicolon)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (4cece7649650 Linux 6.9-rc1)
Merging staging/staging-next (eb563dc752d3 staging: pi433: Remove unused driver)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (28059ddbee0e MAINTAINERS: Update role for IDXD driver)
Merging cgroup/for-next (8f6d24a5db2a selftests/cgroup: fix uninitialized variables in test_zswap.c)
Merging scsi/for-next (9ba1fbe2ed0c Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (3668651def2c scsi: mpi3mr: Sanitise num_phys)
Merging vhost/linux-next (0b8dbbdcf2e4 Merge tag 'for_linus' into vhost)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_ring.c
Merging rpmsg/for-next (c8d8f841e95b Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (7f45fe2ea3b8 gpio: nuvoton: Fix sgpio irq handle error)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (9429f847dd72 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (4817118f257e pwm: pca9685: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (2c3b8f8f37c6 selftests/sgx: Include KHDR_INCLUDES in Makefile)
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (5496b9b77d74 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (73a98bc5a947 Merge branch 'for-6.10' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (e406737b1110 seccomp: Constify sysctl subhelpers)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (4cece7649650 Linux 6.9-rc1)
Merging nvmem/for-next (4cece7649650 Linux 6.9-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (5bf9e57e634b MAINTAINERS: Add Günther Noack as Landlock reviewer)
Merging rust/rust-next (97ab3e8eec0c rust: alloc: fix dangling pointer in VecExt<T>::reserve())
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (4bbf9c3b53e6 fs/coredump: Enable dynamic configuration of max file note size)
Merging bitmap/bitmap-for-next (c3052c2f53d3 usercopy: Don't use "proxy" headers)
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (5a1f2a9c4236 ubsan: Restore dependency on ARCH_HAS_UBSAN)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (dedcf3a8e704 tools/power turbostat: version 2024.05.10)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.c
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.h
CONFLICT (content): Merge conflict in drivers/md/bcache/btree.c
CONFLICT (content): Merge conflict in drivers/md/bcache/writeback.c
$ git merge --abort
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* [PATCH 5.15 006/168] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
2024-05-14 10:18 4% [PATCH 5.15 000/168] 5.15.159-rc1 review Greg Kroah-Hartman
2024-05-14 10:18 14% ` [PATCH 5.15 004/168] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
2024-05-14 10:18 15% ` [PATCH 5.15 005/168] ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
@ 2024-05-14 10:18 15% ` Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:18 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, Marios Makassikis, Namjae Jeon,
Steve French, Sasha Levin
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marios Makassikis <mmakassikis@freebox.fr>
[ Upstream commit 4973b04d3ea577db80c501c5f14e68ec69fe1794 ]
File overwrite case is explicitly handled, so it is not necessary to
pass RENAME_NOREPLACE to vfs_rename.
Clearing the flag fixes rename operations when the share is a ntfs-3g
mount. The latter uses an older version of fuse with no support for
flags in the ->rename op.
Cc: stable@vger.kernel.org
Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/ksmbd/vfs.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/fs/ksmbd/vfs.c b/fs/ksmbd/vfs.c
index 173a488bfeee4..7afb2412c4d43 100644
--- a/fs/ksmbd/vfs.c
+++ b/fs/ksmbd/vfs.c
@@ -745,10 +745,15 @@ int ksmbd_vfs_rename(struct ksmbd_work *work, const struct path *old_path,
goto out4;
}
+ /*
+ * explicitly handle file overwrite case, for compatibility with
+ * filesystems that may not support rename flags (e.g: fuse)
+ */
if ((flags & RENAME_NOREPLACE) && d_is_positive(new_dentry)) {
err = -EEXIST;
goto out4;
}
+ flags &= ~(RENAME_NOREPLACE);
if (old_child == trap) {
err = -EINVAL;
--
2.43.0
^ permalink raw reply related [relevance 15%]
* [PATCH 5.15 000/168] 5.15.159-rc1 review
@ 2024-05-14 10:18 4% Greg Kroah-Hartman
2024-05-14 10:18 14% ` [PATCH 5.15 004/168] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
` (2 more replies)
0 siblings, 3 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:18 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 5.15.159 release.
There are 168 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Thu, 16 May 2024 10:09:32 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.159-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 5.15.159-rc1
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix firmware check error path
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix NVM configuration parsing
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: add missing firmware sanity checks
Johan Hovold <johan+linaro@kernel.org>
regulator: core: fix debugfs creation regression
Lakshmi Yadlapati <lakshmiy@us.ibm.com>
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
net: fix out-of-bounds access in ops_init
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix invalid reads in fence signaled events
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: add lunar lake point M DID
Viken Dadhaniya <quic_vdadhani@quicinc.com>
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Jim Cromie <jim.cromie@gmail.com>
dyndbg: fix old BUG_ON in >control parser
Joao Paulo Goncalves <joao.goncalves@toradex.com>
ASoC: ti: davinci-mcasp: Fix race condition during probe
Sameer Pujar <spujar@nvidia.com>
ASoC: tegra: Fix DSPK 16-bit playback
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
Paolo Abeni <pabeni@redhat.com>
tipc: fix UAF in error path
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Interrupt handling fixes
Ramona Gradinariu <ramona.bolboaca13@gmail.com>
iio:imu: adis16475: Fix sync mode setting
Javier Carrasco <javier.carrasco.cruz@gmail.com>
dt-bindings: iio: health: maxim,max30102: fix compatible check
Paolo Abeni <pabeni@redhat.com>
mptcp: ensure snd_nxt is properly initialized on connect
Dominique Martinet <dominique.martinet@atmark-techno.com>
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Aman Dhoot <amandhoot12@gmail.com>
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: dwc3: core: Prevent phy suspend during init
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: xhci-plat: Don't include xhci.h
Chris Wulff <Chris.Wulff@biamp.com>
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Peter Korsgaard <peter@korsgaard.com>
usb: gadget: composite: fix OS descriptors w_value logic
Guenter Roeck <linux@roeck-us.net>
usb: ohci: Prevent missed ohci interrupts
Alan Stern <stern@rowland.harvard.edu>
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Fix connector check on init
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Check for notifications after init
Rob Herring <robh@kernel.org>
arm64: dts: qcom: Fix 'interrupt-map' parent address cells
Linus Torvalds <torvalds@linux-foundation.org>
Reapply "drm/qxl: simplify qxl_fence_wait"
Thanassis Avgerinos <thanassis.avgerinos@gmail.com>
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Dmitry Antipov <dmantipov@yandex.ru>
btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send()
Vanshidhar Konda <vanshikonda@os.amperecomputing.com>
ACPI: CPPC: Fix access width used for PCC registers
Jarred White <jarredwhite@linux.microsoft.com>
ACPI: CPPC: Fix bit_offset shift in MASK_VAL() macro
Easwar Hariharan <eahariha@linux.microsoft.com>
Revert "Revert "ACPI: CPPC: Use access_width over bit_width for system memory accesses""
Gabe Teeger <gabe.teeger@amd.com>
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Douglas Anderson <dianders@chromium.org>
drm/connector: Add \n to message about demoting connector force-probes
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: add bandgap setting for g12
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: power up phy on device init
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix port vlan filter not disabled issue
Jian Shen <shenjian15@huawei.com>
net: hns3: split function hclge_init_vlan_config()
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: use appropriate barrier function after setting a bit value
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: change type of numa_node_mask as nodemask_t
Jie Wang <wangjie125@huawei.com>
net: hns3: refactor hclge_cmd_send with new hclge_comm_cmd_send API
Jie Wang <wangjie125@huawei.com>
net: hns3: create new set of unified hclge_comm_cmd_send APIs
Jie Wang <wangjie125@huawei.com>
net: hns3: create new cmdq hardware description structure hclge_comm_hw
Jie Wang <wangjie125@huawei.com>
net: hns3: refactor hns3 makefile to support hns3_common module
Jian Shen <shenjian15@huawei.com>
net: hns3: direct return when receive a unknown mailbox message
Hao Lan <lanhao@huawei.com>
net: hns3: refactor function hclge_mbx_handler()
Guangbin Huang <huangguangbin2@huawei.com>
net: hns3: add query vf ring and vector map relation
Yufeng Mo <moyufeng@huawei.com>
net: hns3: add log for workqueue scheduled late
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: using user configure after hardware reset
Guangbin Huang <huangguangbin2@huawei.com>
net: hns3: PF support get unicast MAC address space assigned by firmware
Eric Dumazet <edumazet@google.com>
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
Felix Fietkau <nbd@nbd.name>
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Eric Dumazet <edumazet@google.com>
phonet: fix rtm_phonet_notify() skb allocation
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use a separate buffer for sending commands
Roded Zats <rzats@paloaltonetworks.com>
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Kuniyuki Iwashima <kuniyu@amazon.com>
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Eric Dumazet <edumazet@google.com>
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
Boy.Wu <boy.wu@mediatek.com>
ARM: 9381/1: kasan: clear stale stack poison
Paul Davey <paul.davey@alliedtelesis.co.nz>
xfrm: Preserve vlan tags for transport mode software GRO
Al Viro <viro@zeniv.linux.org.uk>
qibfs: fix dentry leak
Neil Armstrong <narmstrong@baylibre.com>
ASoC: meson: axg-tdm-interface: Fix formatters in trigger"
Neil Armstrong <narmstrong@baylibre.com>
ASoC: meson: axg-card: Fix nonatomic links
John Fastabend <john.fastabend@gmail.com>
bpf, sockmap: Improved check for empty queue
John Fastabend <john.fastabend@gmail.com>
bpf, sockmap: Reschedule is now done through backlog
John Fastabend <john.fastabend@gmail.com>
bpf, sockmap: Convert schedule_work into delayed_work
John Fastabend <john.fastabend@gmail.com>
bpf, sockmap: Handle fin correctly
John Fastabend <john.fastabend@gmail.com>
bpf, sockmap: TCP data stall on recv before accept
Vanillan Wang <vanillanwang@163.com>
net:usb:qmi_wwan: support Rolling modules
Lyude Paul <lyude@redhat.com>
drm/nouveau/dp: Don't probe eDP ports twice harder
Joakim Sindholt <opensource@zhasha.com>
fs/9p: drop inodes immediately on non-.L too
Stephen Boyd <sboyd@kernel.org>
clk: Don't hold prepare_lock when calling kref_put()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: crystalcove: Use -ENOTSUPP consistently
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: wcove: Use -ENOTSUPP consistently
Jeff Layton <jlayton@kernel.org>
9p: explicitly deny setlease attempts
Joakim Sindholt <opensource@zhasha.com>
fs/9p: translate O_TRUNC into OTRUNC
Joakim Sindholt <opensource@zhasha.com>
fs/9p: only translate RWX permissions for plain 9P2000
Krzysztof Kozlowski <krzk@kernel.org>
iommu: mtk: fix module autoloading
John Stultz <jstultz@google.com>
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Jiaxun Yang <jiaxun.yang@flygoat.com>
MIPS: scall: Save thread_info.syscall unconditionally on entry
Thierry Reding <treding@nvidia.com>
gpu: host1x: Do not setup DMA for virtual devices
Rik van Riel <riel@surriel.com>
blk-iocost: avoid out of bounds shift
Maurizio Lombardi <mlombard@redhat.com>
scsi: target: Fix SELinux error when systemd-modules loads the target module
Boris Burkov <boris@bur.io>
btrfs: always clear PERTRANS metadata during commit
Boris Burkov <boris@bur.io>
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
Peng Liu <liupeng17@lenovo.com>
tools/power turbostat: Fix Bzy_MHz documentation typo
Doug Smythies <dsmythies@telus.net>
tools/power turbostat: Fix added raw MSR output
Adam Goldman <adamg@pobox.com>
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Chen Ni <nichen@iscas.ac.cn>
ata: sata_gemini: Check clk_enable() result
Phil Elwell <phil@raspberrypi.com>
net: bcmgenet: Reset RBUF on first open
Takashi Iwai <tiwai@suse.de>
ALSA: line6: Zero-initialize message buffers
Borislav Petkov (AMD) <bp@alien8.de>
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Anand Jain <anand.jain@oracle.com>
btrfs: return accurate error code on open failure in open_fs_devices()
Saurav Kashyap <skashyap@marvell.com>
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
linke li <lilinke99@qq.com>
net: mark racy access on sk->sk_rcvbuf
Igor Artemiev <Igor.A.Artemiev@mcst.ru>
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jeff Johnson <quic_jjohnson@quicinc.com>
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Andrew Price <anprice@redhat.com>
gfs2: Fix invalid metadata access in punch_hole
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
Oliver Upton <oliver.upton@linux.dev>
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Marc Zyngier <maz@kernel.org>
KVM: arm64: vgic-v2: Use cpuid from userspace as vcpu_id
Jernej Skrabec <jernej.skrabec@gmail.com>
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Richard Gobert <richardbgobert@gmail.com>
net: gro: add flush check in udp_gro_receive_segment
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Use predefined error codes
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Respect deferred probe
Alexandra Winter <wintera@linux.ibm.com>
s390/qeth: Fix kernel panic after setting hsuid
Julian Wiedmann <jwi@linux.ibm.com>
s390/qeth: don't keep track of Input Queue count
Xin Long <lucien.xin@gmail.com>
tipc: fix a possible memleak in tipc_buf_append
Felix Fietkau <nbd@nbd.name>
net: core: reject skb_copy(_expand) for fraglist GSO skbs
Felix Fietkau <nbd@nbd.name>
net: bridge: fix multicast-to-unicast with fraglist GSO
Marek Behún <kabel@kernel.org>
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
cxgb4: Properly lock TX queue for the selftest.
Bui Quang Minh <minhquangbui99@gmail.com>
s390/cio: Ensure the copied buf is NUL terminated
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: cards: select SND_DYNAMIC_MINORS
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-tdm-interface: manage formatters in trigger
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-card: make links nonatomic
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use threaded irq to check periods
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use FIELD helpers
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_actions()
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flow_spec
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flower
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
Jens Remus <jremus@linux.ibm.com>
s390/vdso: Add CFI for RA register to asm macro vdso_func
David Bauer <mail@david-bauer.net>
net l2tp: drop flow hash on forward
Kuniyuki Iwashima <kuniyu@amazon.com>
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
Bui Quang Minh <minhquangbui99@gmail.com>
octeontx2-af: avoid off-by-one read from userspace
Bui Quang Minh <minhquangbui99@gmail.com>
bna: ensure the copied buf is NUL terminated
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: use flags field to disambiguate broadcast redirect
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: Add xdp_do_redirect_frame() for pre-computed xdp_frames
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: Move conversion to xdp_frame out of map functions
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix clearing storage keys for huge pages
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix storage key clearing for guest huge pages
Devyn Liu <liudingyuan@huawei.com>
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
Anton Protopopov <aspsk@isovalent.com>
bpf: Fix a verifier verbose message
Jason Xing <kernelxing@tencent.com>
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Andrii Nakryiko <andrii@kernel.org>
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
regulator: mt6360: De-capitalize devicetree regulator subnodes
Zeng Heng <zengheng4@huawei.com>
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
Arnd Bergmann <arnd@arndb.de>
power: rt9455: hide unused rt9455_boost_voltage_values
Kuniyuki Iwashima <kuniyu@amazon.com>
nfs: Handle error of rpc_proc_register() in nfs_net_init().
Josef Bacik <josef@toxicpanda.com>
nfs: make the rpc_stat per net namespace
Josef Bacik <josef@toxicpanda.com>
nfs: expose /proc/net/sunrpc/nfs in net namespaces
Josef Bacik <josef@toxicpanda.com>
sunrpc: add a struct rpc_stats arg to rpc_create_args
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework mtk_pinconf_{get,set} switch/case logic
Dan Carpenter <dan.carpenter@linaro.org>
pinctrl: core: delete incorrect free in pinctrl_enable()
Jan Dakinevich <jan.dakinevich@salutedevices.com>
pinctrl/meson: fix typo in PDM's pin name
Billy Tsai <billy_tsai@aspeedtech.com>
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Daniel Okazaki <dtokazaki@google.com>
eeprom: at24: fix memory corruption race condition
Heiner Kallweit <hkallweit1@gmail.com>
eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
Alexander Stein <alexander.stein@ew.tq-group.com>
eeprom: at24: Use dev_err_probe for nvmem register failure
Marios Makassikis <mmakassikis@freebox.fr>
ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
Johannes Berg <johannes.berg@intel.com>
wifi: nl80211: don't free NULL coalescing rule
Vinod Koul <vkoul@kernel.org>
dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
Bumyong Lee <bumyong.lee@samsung.com>
dmaengine: pl330: issue_pending waits until WFP state
-------------
Diffstat:
.../bindings/iio/health/maxim,max30102.yaml | 2 +-
Makefile | 4 +-
arch/arm/kernel/sleep.S | 4 +
arch/arm64/boot/dts/qcom/msm8998.dtsi | 8 +-
arch/arm64/boot/dts/qcom/sdm845.dtsi | 16 +-
arch/arm64/kvm/vgic/vgic-kvm-device.c | 12 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/kernel/asm-offsets.c | 1 +
arch/mips/kernel/ptrace.c | 15 +-
arch/mips/kernel/scall32-o32.S | 23 +-
arch/mips/kernel/scall64-n32.S | 3 +-
arch/mips/kernel/scall64-n64.S | 3 +-
arch/mips/kernel/scall64-o32.S | 33 +-
arch/s390/include/asm/dwarf.h | 1 +
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2 +
arch/s390/mm/gmap.c | 2 +-
arch/s390/mm/hugetlbpage.c | 2 +-
block/blk-iocost.c | 7 +-
drivers/acpi/cppc_acpi.c | 67 ++-
drivers/ata/sata_gemini.c | 5 +-
drivers/bluetooth/btqca.c | 62 ++-
drivers/clk/clk.c | 12 +-
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 +-
drivers/firewire/nosy.c | 6 +-
drivers/firewire/ohci.c | 6 +-
drivers/gpio/gpio-crystalcove.c | 2 +-
drivers/gpio/gpio-wcove.c | 2 +-
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 +
drivers/gpu/drm/drm_connector.c | 2 +-
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 ++-
drivers/gpu/drm/nouveau/nouveau_dp.c | 13 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 8 +-
drivers/gpu/drm/qxl/qxl_release.c | 50 +--
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
drivers/gpu/host1x/bus.c | 8 -
drivers/hwmon/corsair-cpro.c | 43 +-
drivers/hwmon/pmbus/ucd9000.c | 6 +-
drivers/iio/accel/mxc4005.c | 24 +-
drivers/iio/imu/adis16475.c | 4 +-
drivers/infiniband/hw/qib/qib_fs.c | 1 +
drivers/iommu/mtk_iommu.c | 1 +
drivers/iommu/mtk_iommu_v1.c | 1 +
drivers/misc/eeprom/at24.c | 46 +-
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/net/dsa/mv88e6xxx/chip.c | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 20 +-
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
drivers/net/ethernet/hisilicon/hns3/Makefile | 18 +-
drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 15 +
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 +-
.../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 259 +++++++++++
.../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 121 +++++
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2 +
.../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 12 -
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 311 ++-----------
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 85 +---
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 221 +++++----
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 17 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 494 +++++++++++++++------
.../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 4 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 2 +-
.../net/ethernet/hisilicon/hns3/hns3vf/Makefile | 10 -
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 10 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +-
.../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +-
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 +-
drivers/pinctrl/core.c | 8 +-
drivers/pinctrl/devicetree.c | 10 +-
drivers/pinctrl/mediatek/pinctrl-paris.c | 180 +++-----
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +-
drivers/power/supply/mt6360_charger.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +
drivers/regulator/core.c | 27 +-
drivers/regulator/mt6360-regulator.c | 32 +-
drivers/s390/cio/cio_inject.c | 2 +-
drivers/s390/net/qeth_core.h | 1 -
drivers/s390/net/qeth_core_main.c | 78 ++--
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 -
drivers/scsi/lpfc/lpfc.h | 1 -
drivers/scsi/lpfc/lpfc_nvme.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 13 +-
drivers/scsi/lpfc/lpfc_vport.c | 8 +-
drivers/slimbus/qcom-ngd-ctrl.c | 6 +-
drivers/spi/spi-hisi-kunpeng.c | 2 -
drivers/target/target_core_configfs.c | 12 +
drivers/usb/core/hub.c | 5 +-
drivers/usb/dwc3/core.c | 90 ++--
drivers/usb/dwc3/core.h | 1 +
drivers/usb/dwc3/gadget.c | 2 +
drivers/usb/dwc3/host.c | 27 ++
drivers/usb/gadget/composite.c | 6 +-
drivers/usb/gadget/function/f_fs.c | 2 +-
drivers/usb/host/ohci-hcd.c | 8 +
drivers/usb/host/xhci-plat.h | 4 +-
drivers/usb/typec/ucsi/ucsi.c | 12 +-
fs/9p/vfs_file.c | 2 +
fs/9p/vfs_inode.c | 5 +-
fs/9p/vfs_super.c | 1 +
fs/btrfs/inode.c | 2 +-
fs/btrfs/send.c | 4 +-
fs/btrfs/transaction.c | 2 +-
fs/btrfs/volumes.c | 18 +-
fs/gfs2/bmap.c | 5 +-
fs/ksmbd/server.c | 13 +-
fs/ksmbd/smb2pdu.c | 4 +
fs/ksmbd/vfs.c | 5 +
fs/nfs/client.c | 5 +-
fs/nfs/inode.c | 13 +-
fs/nfs/internal.h | 2 -
fs/nfs/netns.h | 2 +
include/linux/bpf.h | 20 +-
include/linux/dma-fence.h | 7 -
include/linux/filter.h | 4 +
include/linux/skbuff.h | 15 +
include/linux/skmsg.h | 5 +-
include/linux/sunrpc/clnt.h | 1 +
include/net/xfrm.h | 3 +
kernel/bpf/cpumap.c | 8 +-
kernel/bpf/devmap.c | 32 +-
kernel/bpf/verifier.c | 3 +-
lib/Kconfig.debug | 5 +-
lib/dynamic_debug.c | 6 +-
net/bluetooth/l2cap_core.c | 3 +
net/bluetooth/sco.c | 4 +
net/bridge/br_forward.c | 9 +-
net/core/filter.c | 117 ++++-
net/core/net_namespace.c | 13 +-
net/core/rtnetlink.c | 2 +-
net/core/skbuff.c | 27 +-
net/core/skmsg.c | 53 +--
net/core/sock.c | 4 +-
net/core/sock_map.c | 3 +-
net/ipv4/tcp.c | 4 +-
net/ipv4/tcp_bpf.c | 51 +++
net/ipv4/tcp_input.c | 2 +
net/ipv4/tcp_ipv4.c | 8 +-
net/ipv4/tcp_output.c | 4 +-
net/ipv4/udp_offload.c | 12 +-
net/ipv4/xfrm4_input.c | 6 +-
net/ipv6/fib6_rules.c | 6 +-
net/ipv6/xfrm6_input.c | 6 +-
net/l2tp/l2tp_eth.c | 3 +
net/mac80211/ieee80211_i.h | 4 +-
net/mptcp/protocol.c | 3 +
net/nsh/nsh.c | 14 +-
net/phonet/pn_netlink.c | 2 +-
net/sunrpc/clnt.c | 5 +-
net/tipc/msg.c | 8 +-
net/wireless/nl80211.c | 2 +
net/wireless/trace.h | 2 +-
net/xfrm/xfrm_input.c | 8 +
scripts/Makefile.modfinal | 2 +-
sound/hda/intel-sdw-acpi.c | 2 +
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/meson/Kconfig | 1 +
sound/soc/meson/axg-fifo.c | 56 ++-
sound/soc/meson/axg-fifo.h | 12 +-
sound/soc/meson/axg-frddr.c | 5 +-
sound/soc/meson/axg-toddr.c | 22 +-
sound/soc/tegra/tegra186_dspk.c | 7 +-
sound/soc/ti/davinci-mcasp.c | 12 +-
sound/usb/line6/driver.c | 6 +-
tools/power/x86/turbostat/turbostat.8 | 2 +-
tools/power/x86/turbostat/turbostat.c | 7 +-
tools/testing/selftests/timers/valid-adjtimex.c | 73 ++-
169 files changed, 2199 insertions(+), 1417 deletions(-)
^ permalink raw reply [relevance 4%]
* [PATCH 5.15 005/168] ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
2024-05-14 10:18 4% [PATCH 5.15 000/168] 5.15.159-rc1 review Greg Kroah-Hartman
2024-05-14 10:18 14% ` [PATCH 5.15 004/168] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
@ 2024-05-14 10:18 15% ` Greg Kroah-Hartman
2024-05-14 10:18 15% ` [PATCH 5.15 006/168] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:18 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French, Sasha Levin
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
[ Upstream commit 17cf0c2794bdb6f39671265aa18aea5c22ee8c4a ]
The response buffer should be allocated in smb2_allocate_rsp_buf
before validating request. But the fields in payload as well as smb2 header
is used in smb2_allocate_rsp_buf(). This patch add simple buffer size
validation to avoid potencial out-of-bounds in request buffer.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/ksmbd/smb2pdu.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index 86b1fb43104e9..57f59172d8212 100644
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -536,6 +536,10 @@ int smb2_allocate_rsp_buf(struct ksmbd_work *work)
if (cmd == SMB2_QUERY_INFO_HE) {
struct smb2_query_info_req *req;
+ if (get_rfc1002_len(work->request_buf) <
+ offsetof(struct smb2_query_info_req, OutputBufferLength))
+ return -EINVAL;
+
req = smb2_get_msg(work->request_buf);
if ((req->InfoType == SMB2_O_INFO_FILE &&
(req->FileInfoClass == FILE_FULL_EA_INFORMATION ||
--
2.43.0
^ permalink raw reply related [relevance 15%]
* [PATCH 5.15 004/168] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
2024-05-14 10:18 4% [PATCH 5.15 000/168] 5.15.159-rc1 review Greg Kroah-Hartman
@ 2024-05-14 10:18 14% ` Greg Kroah-Hartman
2024-05-14 10:18 15% ` [PATCH 5.15 005/168] ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
2024-05-14 10:18 15% ` [PATCH 5.15 006/168] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:18 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, Norbert Szetei, Namjae Jeon,
Steve French, Sasha Levin
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
[ Upstream commit c119f4ede3fa90a9463f50831761c28f989bfb20 ]
If ->ProtocolId is SMB2_TRANSFORM_PROTO_NUM, smb2 request size
validation could be skipped. if request size is smaller than
sizeof(struct smb2_query_info_req), slab-out-of-bounds read can happen in
smb2_allocate_rsp_buf(). This patch allocate response buffer after
decrypting transform request. smb3_decrypt_req() will validate transform
request size and avoid slab-out-of-bound in smb2_allocate_rsp_buf().
Reported-by: Norbert Szetei <norbert@doyensec.com>
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/ksmbd/server.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/fs/ksmbd/server.c b/fs/ksmbd/server.c
index 11b201e6ee44b..63b01f7d97031 100644
--- a/fs/ksmbd/server.c
+++ b/fs/ksmbd/server.c
@@ -167,20 +167,17 @@ static void __handle_ksmbd_work(struct ksmbd_work *work,
int rc;
bool is_chained = false;
- if (conn->ops->allocate_rsp_buf(work))
- return;
-
if (conn->ops->is_transform_hdr &&
conn->ops->is_transform_hdr(work->request_buf)) {
rc = conn->ops->decrypt_req(work);
- if (rc < 0) {
- conn->ops->set_rsp_status(work, STATUS_DATA_ERROR);
- goto send;
- }
-
+ if (rc < 0)
+ return;
work->encrypted = true;
}
+ if (conn->ops->allocate_rsp_buf(work))
+ return;
+
rc = conn->ops->init_rsp_hdr(work);
if (rc) {
/* either uid or tid is not correct */
--
2.43.0
^ permalink raw reply related [relevance 14%]
* [PATCH 6.1 231/236] ksmbd: do not grant v2 lease if parent lease key and epoch are not set
2024-05-14 10:16 2% [PATCH 6.1 000/236] 6.1.91-rc1 review Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.1 229/236] ksmbd: off ipv6only for both ipv4/ipv6 binding Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.1 230/236] ksmbd: avoid to send duplicate lease break notifications Greg Kroah-Hartman
@ 2024-05-14 10:19 9% ` Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:19 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French
6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit 691aae4f36f9825df6781da4399a1e718951085a upstream.
This patch fix xfstests generic/070 test with smb2 leases = yes.
cifs.ko doesn't set parent lease key and epoch in create context v2 lease.
ksmbd suppose that parent lease and epoch are vaild if data length is
v2 lease context size and handle directory lease using this values.
ksmbd should hanle it as v1 lease not v2 lease if parent lease key and
epoch are not set in create context v2 lease.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/oplock.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -1208,7 +1208,9 @@ int smb_grant_oplock(struct ksmbd_work *
/* Only v2 leases handle the directory */
if (S_ISDIR(file_inode(fp->filp)->i_mode)) {
- if (!lctx || lctx->version != 2)
+ if (!lctx || lctx->version != 2 ||
+ (lctx->flags != SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET_LE &&
+ !lctx->epoch))
return 0;
}
@@ -1470,8 +1472,9 @@ void create_lease_buf(u8 *rbuf, struct l
buf->lcontext.LeaseFlags = lease->flags;
buf->lcontext.Epoch = cpu_to_le16(lease->epoch);
buf->lcontext.LeaseState = lease->state;
- memcpy(buf->lcontext.ParentLeaseKey, lease->parent_lease_key,
- SMB2_LEASE_KEY_SIZE);
+ if (lease->flags == SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET_LE)
+ memcpy(buf->lcontext.ParentLeaseKey, lease->parent_lease_key,
+ SMB2_LEASE_KEY_SIZE);
buf->ccontext.DataOffset = cpu_to_le16(offsetof
(struct create_lease_v2, lcontext));
buf->ccontext.DataLength = cpu_to_le32(sizeof(struct lease_context_v2));
@@ -1536,8 +1539,9 @@ struct lease_ctx_info *parse_lease_state
lreq->flags = lc->lcontext.LeaseFlags;
lreq->epoch = lc->lcontext.Epoch;
lreq->duration = lc->lcontext.LeaseDuration;
- memcpy(lreq->parent_lease_key, lc->lcontext.ParentLeaseKey,
- SMB2_LEASE_KEY_SIZE);
+ if (lreq->flags == SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET_LE)
+ memcpy(lreq->parent_lease_key, lc->lcontext.ParentLeaseKey,
+ SMB2_LEASE_KEY_SIZE);
lreq->version = 2;
} else {
struct create_lease *lc = (struct create_lease *)cc;
^ permalink raw reply [relevance 9%]
* [PATCH 6.1 230/236] ksmbd: avoid to send duplicate lease break notifications
2024-05-14 10:16 2% [PATCH 6.1 000/236] 6.1.91-rc1 review Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.1 229/236] ksmbd: off ipv6only for both ipv4/ipv6 binding Greg Kroah-Hartman
@ 2024-05-14 10:19 8% ` Greg Kroah-Hartman
2024-05-14 10:19 9% ` [PATCH 6.1 231/236] ksmbd: do not grant v2 lease if parent lease key and epoch are not set Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:19 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French
6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit 97c2ec64667bacc49881d2b2dd9afd4d1c3fbaeb upstream.
This patch fixes generic/011 when enable smb2 leases.
if ksmbd sends multiple notifications for a file, cifs increments
the reference count of the file but it does not decrement the count by
the failure of queue_work.
So even if the file is closed, cifs does not send a SMB2_CLOSE request.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/oplock.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -612,13 +612,23 @@ static int oplock_break_pending(struct o
if (opinfo->op_state == OPLOCK_CLOSING)
return -ENOENT;
- else if (!opinfo->is_lease && opinfo->level <= req_op_level)
- return 1;
+ else if (opinfo->level <= req_op_level) {
+ if (opinfo->is_lease &&
+ opinfo->o_lease->state !=
+ (SMB2_LEASE_HANDLE_CACHING_LE |
+ SMB2_LEASE_READ_CACHING_LE))
+ return 1;
+ }
}
- if (!opinfo->is_lease && opinfo->level <= req_op_level) {
- wake_up_oplock_break(opinfo);
- return 1;
+ if (opinfo->level <= req_op_level) {
+ if (opinfo->is_lease &&
+ opinfo->o_lease->state !=
+ (SMB2_LEASE_HANDLE_CACHING_LE |
+ SMB2_LEASE_READ_CACHING_LE)) {
+ wake_up_oplock_break(opinfo);
+ return 1;
+ }
}
return 0;
}
@@ -886,7 +896,6 @@ static int oplock_break(struct oplock_in
struct lease *lease = brk_opinfo->o_lease;
atomic_inc(&brk_opinfo->breaking_cnt);
-
err = oplock_break_pending(brk_opinfo, req_op_level);
if (err)
return err < 0 ? err : 0;
^ permalink raw reply [relevance 8%]
* [PATCH 6.1 229/236] ksmbd: off ipv6only for both ipv4/ipv6 binding
2024-05-14 10:16 2% [PATCH 6.1 000/236] 6.1.91-rc1 review Greg Kroah-Hartman
@ 2024-05-14 10:19 8% ` Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.1 230/236] ksmbd: avoid to send duplicate lease break notifications Greg Kroah-Hartman
2024-05-14 10:19 9% ` [PATCH 6.1 231/236] ksmbd: do not grant v2 lease if parent lease key and epoch are not set Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:19 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches,
ΕΛΕΝΗ
ΤΖΑΒΕΛΛΑ,
Namjae Jeon, Steve French
6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit cc00bc83f26eb8f2d8d9f56b949b62fd774d8432 upstream.
ΕΛΕΝΗ reported that ksmbd binds to the IPV6 wildcard (::) by default for
ipv4 and ipv6 binding. So IPV4 connections are successful only when
the Linux system parameter bindv6only is set to 0 [default value].
If this parameter is set to 1, then the ipv6 wildcard only represents
any IPV6 address. Samba creates different sockets for ipv4 and ipv6
by default. This patch off sk_ipv6only to support IPV4/IPV6 connections
without creating two sockets.
Cc: stable@vger.kernel.org
Reported-by: ΕΛΕΝΗ ΤΖΑΒΕΛΛΑ <helentzavellas@yahoo.gr>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/transport_tcp.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/fs/smb/server/transport_tcp.c
+++ b/fs/smb/server/transport_tcp.c
@@ -446,6 +446,10 @@ static int create_socket(struct interfac
sin6.sin6_family = PF_INET6;
sin6.sin6_addr = in6addr_any;
sin6.sin6_port = htons(server_conf.tcp_port);
+
+ lock_sock(ksmbd_socket->sk);
+ ksmbd_socket->sk->sk_ipv6only = false;
+ release_sock(ksmbd_socket->sk);
}
ksmbd_tcp_nodelay(ksmbd_socket);
^ permalink raw reply [relevance 8%]
* [PATCH 6.1 000/236] 6.1.91-rc1 review
@ 2024-05-14 10:16 2% Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.1 229/236] ksmbd: off ipv6only for both ipv4/ipv6 binding Greg Kroah-Hartman
` (2 more replies)
0 siblings, 3 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:16 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 6.1.91 release.
There are 236 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Thu, 16 May 2024 10:09:32 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.91-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 6.1.91-rc1
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix firmware check error path
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching fw build id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching board id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix NVM configuration parsing
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: add missing firmware sanity checks
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: avoid to send duplicate lease break notifications
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: off ipv6only for both ipv4/ipv6 binding
Conor Dooley <conor.dooley@microchip.com>
spi: microchip-core-qspi: fix setting spi bus clock rate
Johan Hovold <johan+linaro@kernel.org>
regulator: core: fix debugfs creation regression
Kefeng Wang <wangkefeng.wang@huawei.com>
mm: use memalloc_nofs_save() in page_cache_ra_order()
Lakshmi Yadlapati <lakshmiy@us.ibm.com>
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
net: fix out-of-bounds access in ops_init
George Shen <george.shen@amd.com>
drm/amd/display: Handle Y carry-over in VCP X.Y calculation
Karthikeyan Ramasubramanian <kramasub@chromium.org>
drm/i915/bios: Fix parsing backlight BDB data
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix invalid reads in fence signaled events
Alex Deucher <alexander.deucher@amd.com>
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: add lunar lake point M DID
Viken Dadhaniya <quic_vdadhani@quicinc.com>
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Jim Cromie <jim.cromie@gmail.com>
dyndbg: fix old BUG_ON in >control parser
Joao Paulo Goncalves <joao.goncalves@toradex.com>
ASoC: ti: davinci-mcasp: Fix race condition during probe
Sameer Pujar <spujar@nvidia.com>
ASoC: tegra: Fix DSPK 16-bit playback
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize UMAC_CMD access
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
Paolo Abeni <pabeni@redhat.com>
tipc: fix UAF in error path
Alexander Potapenko <glider@google.com>
kmsan: compiler_types: declare __no_sanitize_or_inline
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Interrupt handling fixes
Ramona Gradinariu <ramona.bolboaca13@gmail.com>
iio:imu: adis16475: Fix sync mode setting
Javier Carrasco <javier.carrasco.cruz@gmail.com>
dt-bindings: iio: health: maxim,max30102: fix compatible check
Paolo Abeni <pabeni@redhat.com>
mptcp: ensure snd_nxt is properly initialized on connect
Dan Carpenter <dan.carpenter@linaro.org>
mm/slab: make __free(kfree) accept error pointers
Dominique Martinet <dominique.martinet@atmark-techno.com>
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Aman Dhoot <amandhoot12@gmail.com>
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Badhri Jagan Sridharan <badhri@google.com>
usb: typec: tcpm: Check for port partner validity before consuming it
Amit Sunil Dhamne <amitsd@google.com>
usb: typec: tcpm: unregister existing source caps before re-registration
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: dwc3: core: Prevent phy suspend during init
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: xhci-plat: Don't include xhci.h
Chris Wulff <Chris.Wulff@biamp.com>
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Peter Korsgaard <peter@korsgaard.com>
usb: gadget: composite: fix OS descriptors w_value logic
Alan Stern <stern@rowland.harvard.edu>
USB: core: Fix access violation during port device removal
Guenter Roeck <linux@roeck-us.net>
usb: ohci: Prevent missed ohci interrupts
Alan Stern <stern@rowland.harvard.edu>
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Fix connector check on init
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Check for notifications after init
Benno Lossin <benno.lossin@proton.me>
rust: macros: fix soundness issue in `module!` macro
Thomas Bertschinger <tahbertschinger@gmail.com>
rust: module: place generated init_module() function in .init.text
Andrea Righi <andrea.righi@canonical.com>
btf, scripts: rust: drop is_rust_module.sh
Andrea Righi <andrea.righi@canonical.com>
rust: fix regexp in scripts/is_rust_module.sh
Asahi Lina <lina@asahilina.net>
rust: error: Rename to_kernel_errno() -> to_errno()
Linus Torvalds <torvalds@linux-foundation.org>
Reapply "drm/qxl: simplify qxl_fence_wait"
Thanassis Avgerinos <thanassis.avgerinos@gmail.com>
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Dmitry Antipov <dmantipov@yandex.ru>
btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send()
Christian König <christian.koenig@amd.com>
drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2
Leah Rumancik <leah.rumancik@gmail.com>
MAINTAINERS: add leah to 6.1 MAINTAINERS file
Gabe Teeger <gabe.teeger@amd.com>
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: fix uninitialised kfifo
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: relocate debounce_period_us from struct gpio_desc
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpiolib: cdev: Add missing header(s)
Mario Limonciello <mario.limonciello@amd.com>
dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
Douglas Anderson <dianders@chromium.org>
drm/connector: Add \n to message about demoting connector force-probes
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: add bandgap setting for g12
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: power up phy on device init
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix kernel crash when devlink reload during initialization
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix port vlan filter not disabled issue
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: use appropriate barrier function after setting a bit value
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: release PTP resources if pf initialization failed
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: change type of numa_node_mask as nodemask_t
Jian Shen <shenjian15@huawei.com>
net: hns3: direct return when receive a unknown mailbox message
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: using user configure after hardware reset
Wen Gu <guwen@linux.alibaba.com>
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Eric Dumazet <edumazet@google.com>
ipv6: prevent NULL dereference in ip6_output()
Eric Dumazet <edumazet@google.com>
ipv6: annotate data-races around cnf.disable_ipv6
Lukasz Majewski <lukma@denx.de>
hsr: Simplify code for announcing HSR nodes timer setup
Eric Dumazet <edumazet@google.com>
net-sysfs: convert dev->operstate reads to lockless ones
Thomas Gleixner <tglx@linutronix.de>
timers: Rename del_timer() to timer_delete()
Thomas Gleixner <tglx@linutronix.de>
timers: Get rid of del_singleshot_timer_sync()
Eric Dumazet <edumazet@google.com>
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
Felix Fietkau <nbd@nbd.name>
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Eric Dumazet <edumazet@google.com>
phonet: fix rtm_phonet_notify() skb allocation
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use a separate buffer for sending commands
Roded Zats <rzats@paloaltonetworks.com>
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Marek Vasut <marex@denx.de>
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Kuniyuki Iwashima <kuniyu@amazon.com>
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Eric Dumazet <edumazet@google.com>
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
Boy.Wu <boy.wu@mediatek.com>
ARM: 9381/1: kasan: clear stale stack poison
Paul Davey <paul.davey@alliedtelesis.co.nz>
xfrm: Preserve vlan tags for transport mode software GRO
Al Viro <viro@zeniv.linux.org.uk>
qibfs: fix dentry leak
Namhyung Kim <namhyung@kernel.org>
perf unwind-libdw: Handle JIT-generated DSOs properly
Namhyung Kim <namhyung@kernel.org>
perf unwind-libunwind: Fix base address for .eh_frame
Geert Uytterhoeven <geert+renesas@glider.be>
spi: Merge spi_controller.{slave,target}_abort()
Miguel Ojeda <ojeda@kernel.org>
kbuild: rust: avoid creating temporary files
Vanillan Wang <vanillanwang@163.com>
net:usb:qmi_wwan: support Rolling modules
Lyude Paul <lyude@redhat.com>
drm/nouveau/dp: Don't probe eDP ports twice harder
Joakim Sindholt <opensource@zhasha.com>
fs/9p: drop inodes immediately on non-.L too
Stephen Boyd <sboyd@kernel.org>
clk: Don't hold prepare_lock when calling kref_put()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: crystalcove: Use -ENOTSUPP consistently
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: wcove: Use -ENOTSUPP consistently
Jeff Layton <jlayton@kernel.org>
9p: explicitly deny setlease attempts
Joakim Sindholt <opensource@zhasha.com>
fs/9p: translate O_TRUNC into OTRUNC
Joakim Sindholt <opensource@zhasha.com>
fs/9p: only translate RWX permissions for plain 9P2000
Krzysztof Kozlowski <krzk@kernel.org>
iommu: mtk: fix module autoloading
Michael Kelley <mhklinux@outlook.com>
Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted
Rick Edgecombe <rick.p.edgecombe@intel.com>
uio_hv_generic: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
John Stultz <jstultz@google.com>
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Refine IB schedule error logging
Justin Ernst <justin.ernst@hpe.com>
tools/power/turbostat: Fix uncore frequency file string
Jiaxun Yang <jiaxun.yang@flygoat.com>
MIPS: scall: Save thread_info.syscall unconditionally on entry
Thierry Reding <treding@nvidia.com>
gpu: host1x: Do not setup DMA for virtual devices
Rik van Riel <riel@surriel.com>
blk-iocost: avoid out of bounds shift
Maurizio Lombardi <mlombard@redhat.com>
scsi: target: Fix SELinux error when systemd-modules loads the target module
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `BIT'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `panic'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `early_pfn_to_nid'
Boris Burkov <boris@bur.io>
btrfs: always clear PERTRANS metadata during commit
Boris Burkov <boris@bur.io>
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
Peng Liu <liupeng17@lenovo.com>
tools/power turbostat: Fix Bzy_MHz documentation typo
Wyes Karny <wyes.karny@amd.com>
tools/power turbostat: Increase the limit for fd opened
Doug Smythies <dsmythies@telus.net>
tools/power turbostat: Fix added raw MSR output
Adam Goldman <adamg@pobox.com>
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Chen Ni <nichen@iscas.ac.cn>
ata: sata_gemini: Check clk_enable() result
Phil Elwell <phil@raspberrypi.com>
net: bcmgenet: Reset RBUF on first open
Li Nan <linan122@huawei.com>
block: fix overflow in blk_ioctl_discard()
Takashi Iwai <tiwai@suse.de>
ALSA: line6: Zero-initialize message buffers
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: WLUN suspend dev/link state error recovery
Borislav Petkov (AMD) <bp@alien8.de>
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Andrei Matei <andreimatei1@gmail.com>
bpf: Check bloom filter map value size
Anand Jain <anand.jain@oracle.com>
btrfs: return accurate error code on open failure in open_fs_devices()
Saurav Kashyap <skashyap@marvell.com>
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
scsi: mpi3mr: Avoid memcpy field-spanning write WARNING
linke li <lilinke99@qq.com>
net: mark racy access on sk->sk_rcvbuf
Igor Artemiev <Igor.A.Artemiev@mcst.ru>
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jeff Johnson <quic_jjohnson@quicinc.com>
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Andrew Price <anprice@redhat.com>
gfs2: Fix invalid metadata access in punch_hole
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Release hbalock before calling lpfc_worker_wake_up()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
Oliver Upton <oliver.upton@linux.dev>
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Marc Zyngier <maz@kernel.org>
KVM: arm64: vgic-v2: Use cpuid from userspace as vcpu_id
Gaurav Batra <gbatra@linux.ibm.com>
powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: make max polling consistent for longer H_CALLs
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: Implement signed update for PLPKS objects
Russell Currey <ruscur@russell.cc>
powerpc/pseries: Move PLPKS constants to header file
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: replace kmalloc with kzalloc in PLPKS driver
Jernej Skrabec <jernej.skrabec@gmail.com>
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Richard Gobert <richardbgobert@gmail.com>
net: gro: add flush check in udp_gro_receive_segment
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Use predefined error codes
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Respect deferred probe
Alexandra Winter <wintera@linux.ibm.com>
s390/qeth: Fix kernel panic after setting hsuid
Guillaume Nault <gnault@redhat.com>
vxlan: Pull inner IP header in vxlan_rcv().
Xin Long <lucien.xin@gmail.com>
tipc: fix a possible memleak in tipc_buf_append
Felix Fietkau <nbd@nbd.name>
net: core: reject skb_copy(_expand) for fraglist GSO skbs
Felix Fietkau <nbd@nbd.name>
net: bridge: fix multicast-to-unicast with fraglist GSO
Mans Rullgard <mans@mansr.com>
spi: fix null pointer dereference within spi_sync
Marek Behún <kabel@kernel.org>
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
cxgb4: Properly lock TX queue for the selftest.
Bui Quang Minh <minhquangbui99@gmail.com>
s390/cio: Ensure the copied buf is NUL terminated
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: cards: select SND_DYNAMIC_MINORS
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-tdm-interface: manage formatters in trigger
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-card: make links nonatomic
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use threaded irq to check periods
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use FIELD helpers
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_actions()
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flow_spec
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flower
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
Jens Remus <jremus@linux.ibm.com>
s390/vdso: Add CFI for RA register to asm macro vdso_func
David Bauer <mail@david-bauer.net>
net l2tp: drop flow hash on forward
Kuniyuki Iwashima <kuniyu@amazon.com>
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
Bui Quang Minh <minhquangbui99@gmail.com>
octeontx2-af: avoid off-by-one read from userspace
Bui Quang Minh <minhquangbui99@gmail.com>
bna: ensure the copied buf is NUL terminated
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: use flags field to disambiguate broadcast redirect
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix clearing storage keys for huge pages
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix storage key clearing for guest huge pages
Xu Kuohai <xukuohai@huawei.com>
bpf, arm64: Fix incorrect runtime stats
Devyn Liu <liudingyuan@huawei.com>
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: fix version format string
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use common AXI macros
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: move msg state to new struct
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use devm_spi_alloc_host()
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: simplify driver data allocation
Li Zetao <lizetao1@huawei.com>
spi: spi-axi-spi-engine: Use helper function devm_clk_get_enabled()
Yang Yingliang <yangyingliang@huawei.com>
spi: spi-axi-spi-engine: switch to use modern name
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
spi: axi-spi-engine: Convert to platform remove callback returning void
Yang Yingliang <yangyingliang@huawei.com>
spi: introduce new helpers with using modern naming
Anton Protopopov <aspsk@isovalent.com>
bpf: Fix a verifier verbose message
Yi Zhang <yi.zhang@redhat.com>
nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
Jason Xing <kernelxing@tencent.com>
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Andrii Nakryiko <andrii@kernel.org>
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change devm_regulator_get_enable_optional() stub to return Ok
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change stubbed devm_regulator_get_enable to return Ok
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
regulator: mt6360: De-capitalize devicetree regulator subnodes
Zeng Heng <zengheng4@huawei.com>
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
Arnd Bergmann <arnd@arndb.de>
power: rt9455: hide unused rt9455_boost_voltage_values
Hans de Goede <hdegoede@redhat.com>
pinctrl: baytrail: Fix selecting gpio pinctrl state
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
pinctrl: intel: Make use of struct pinfunction and PINCTRL_PINFUNCTION()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
pinctrl: Introduce struct pinfunction and PINCTRL_PINFUNCTION() macro
Kuniyuki Iwashima <kuniyu@amazon.com>
nfs: Handle error of rpc_proc_register() in nfs_net_init().
Josef Bacik <josef@toxicpanda.com>
nfs: make the rpc_stat per net namespace
Josef Bacik <josef@toxicpanda.com>
nfs: expose /proc/net/sunrpc/nfs in net namespaces
Josef Bacik <josef@toxicpanda.com>
sunrpc: add a struct rpc_stats arg to rpc_create_args
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
Dan Carpenter <dan.carpenter@linaro.org>
pinctrl: core: delete incorrect free in pinctrl_enable()
Jan Dakinevich <jan.dakinevich@salutedevices.com>
pinctrl/meson: fix typo in PDM's pin name
Billy Tsai <billy_tsai@aspeedtech.com>
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Steve French <stfrench@microsoft.com>
smb3: missing lock when picking channel
Shyam Prasad N <sprasad@microsoft.com>
cifs: use the least loaded channel for sending requests
Masahiro Yamada <masahiroy@kernel.org>
kbuild: specify output names separately for each emission type from rustc
Masahiro Yamada <masahiroy@kernel.org>
kbuild: refactor host*_flags
Peter Xu <peterx@redhat.com>
mm/hugetlb: fix missing hugetlb_lock for resv uncharge
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb_cgroup: convert hugetlb_cgroup_uncharge_page() to folios
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb: convert free_huge_page to folios
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb_cgroup: convert hugetlb_cgroup_from_page() to folios
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb_cgroup: convert __set_hugetlb_cgroup() to folios
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb: add folio_hstate()
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb: add hugetlb_folio_subpool() helpers
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm: add private field of first tail to struct page and struct folio
Sidhartha Kumar <sidhartha.kumar@oracle.com>
mm/hugetlb: add folio support to hugetlb specific flag macros
Tim Jiang <quic_tjiang@quicinc.com>
Bluetooth: qca: add support for QCA2066
Daniel Okazaki <dtokazaki@google.com>
eeprom: at24: fix memory corruption race condition
Heiner Kallweit <hkallweit1@gmail.com>
eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
Alexander Stein <alexander.stein@ew.tq-group.com>
eeprom: at24: Use dev_err_probe for nvmem register failure
Wedson Almeida Filho <walmeida@microsoft.com>
rust: kernel: require `Send` for `Module` implementations
Johannes Berg <johannes.berg@intel.com>
wifi: nl80211: don't free NULL coalescing rule
Vinod Koul <vkoul@kernel.org>
dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
Bumyong Lee <bumyong.lee@samsung.com>
dmaengine: pl330: issue_pending waits until WFP state
-------------
Diffstat:
.../bindings/iio/health/maxim,max30102.yaml | 2 +-
MAINTAINERS | 1 +
Makefile | 4 +-
arch/arm/kernel/sleep.S | 4 +
arch/arm64/kvm/vgic/vgic-kvm-device.c | 12 +-
arch/arm64/net/bpf_jit_comp.c | 6 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/kernel/asm-offsets.c | 1 +
arch/mips/kernel/ptrace.c | 15 +-
arch/mips/kernel/scall32-o32.S | 23 +-
arch/mips/kernel/scall64-n32.S | 3 +-
arch/mips/kernel/scall64-n64.S | 3 +-
arch/mips/kernel/scall64-o32.S | 33 +--
arch/powerpc/include/asm/hvcall.h | 1 +
arch/powerpc/platforms/pseries/iommu.c | 8 +
arch/powerpc/platforms/pseries/plpks.c | 135 ++++++----
arch/powerpc/platforms/pseries/plpks.h | 40 ++-
arch/s390/include/asm/dwarf.h | 1 +
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2 +
arch/s390/mm/gmap.c | 2 +-
arch/s390/mm/hugetlbpage.c | 2 +-
block/blk-iocost.c | 7 +-
block/ioctl.c | 5 +-
drivers/ata/sata_gemini.c | 5 +-
drivers/bluetooth/btqca.c | 162 +++++++++++-
drivers/bluetooth/btqca.h | 6 +-
drivers/bluetooth/hci_qca.c | 11 +
drivers/char/tpm/tpm-dev-common.c | 4 +-
drivers/clk/clk.c | 12 +-
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 +-
drivers/firewire/nosy.c | 6 +-
drivers/firewire/ohci.c | 6 +-
drivers/gpio/gpio-crystalcove.c | 2 +-
drivers/gpio/gpio-wcove.c | 2 +-
drivers/gpio/gpiolib-cdev.c | 183 ++++++++++++--
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 52 ++--
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 7 +-
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 +
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6 +
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2 +-
drivers/gpu/drm/drm_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_bios.c | 19 +-
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5 -
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 +++---
drivers/gpu/drm/nouveau/nouveau_dp.c | 13 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 8 +-
drivers/gpu/drm/qxl/qxl_release.c | 50 +---
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
drivers/gpu/host1x/bus.c | 8 -
drivers/hv/channel.c | 29 ++-
drivers/hwmon/corsair-cpro.c | 43 +++-
drivers/hwmon/pmbus/ucd9000.c | 6 +-
drivers/iio/accel/mxc4005.c | 24 +-
drivers/iio/imu/adis16475.c | 4 +-
drivers/infiniband/hw/qib/qib_fs.c | 1 +
drivers/iommu/mtk_iommu.c | 1 +
drivers/iommu/mtk_iommu_v1.c | 1 +
drivers/misc/eeprom/at24.c | 46 +++-
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/net/dsa/mv88e6xxx/chip.c | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 32 ++-
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8 +-
drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +-
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 52 ++--
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 20 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +-
.../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +-
drivers/net/ethernet/micrel/ks8851_common.c | 16 +-
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/vxlan/vxlan_core.c | 19 +-
drivers/nvme/host/core.c | 2 +-
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 +--
drivers/pinctrl/core.c | 8 +-
drivers/pinctrl/devicetree.c | 10 +-
drivers/pinctrl/intel/pinctrl-baytrail.c | 74 +++---
drivers/pinctrl/intel/pinctrl-intel.c | 6 +-
drivers/pinctrl/intel/pinctrl-intel.h | 17 +-
drivers/pinctrl/mediatek/pinctrl-paris.c | 40 +--
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +-
drivers/power/supply/mt6360_charger.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +
drivers/regulator/core.c | 27 +-
drivers/regulator/mt6360-regulator.c | 32 ++-
drivers/s390/cio/cio_inject.c | 2 +-
drivers/s390/net/qeth_core_main.c | 69 +++---
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 -
drivers/scsi/lpfc/lpfc.h | 1 -
drivers/scsi/lpfc/lpfc_els.c | 20 +-
drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +-
drivers/scsi/lpfc/lpfc_nvme.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 13 +-
drivers/scsi/lpfc/lpfc_sli.c | 14 +-
drivers/scsi/lpfc/lpfc_vport.c | 8 +-
drivers/scsi/mpi3mr/mpi3mr_app.c | 2 +-
drivers/slimbus/qcom-ngd-ctrl.c | 6 +-
drivers/spi/spi-axi-spi-engine.c | 275 +++++++++++----------
drivers/spi/spi-hisi-kunpeng.c | 2 -
drivers/spi/spi-microchip-core-qspi.c | 1 +
drivers/spi/spi.c | 12 +
drivers/staging/wlan-ng/hfa384x_usb.c | 4 +-
drivers/staging/wlan-ng/prism2usb.c | 6 +-
drivers/target/target_core_configfs.c | 12 +
drivers/ufs/core/ufshcd.c | 5 +-
drivers/uio/uio_hv_generic.c | 12 +-
drivers/usb/core/hub.c | 5 +-
drivers/usb/core/port.c | 8 +-
drivers/usb/dwc3/core.c | 90 +++----
drivers/usb/dwc3/core.h | 1 +
drivers/usb/dwc3/gadget.c | 2 +
drivers/usb/dwc3/host.c | 27 ++
drivers/usb/gadget/composite.c | 6 +-
drivers/usb/gadget/function/f_fs.c | 2 +-
drivers/usb/host/ohci-hcd.c | 8 +
drivers/usb/host/xhci-plat.h | 4 +-
drivers/usb/typec/tcpm/tcpm.c | 35 ++-
drivers/usb/typec/ucsi/ucsi.c | 12 +-
fs/9p/vfs_file.c | 2 +
fs/9p/vfs_inode.c | 5 +-
fs/9p/vfs_super.c | 1 +
fs/btrfs/inode.c | 2 +-
fs/btrfs/send.c | 4 +-
fs/btrfs/transaction.c | 2 +-
fs/btrfs/volumes.c | 18 +-
fs/gfs2/bmap.c | 5 +-
fs/hugetlbfs/inode.c | 8 +-
fs/nfs/client.c | 5 +-
fs/nfs/inode.c | 13 +-
fs/nfs/internal.h | 2 -
fs/nfs/netns.h | 2 +
fs/smb/client/transport.c | 37 ++-
fs/smb/server/oplock.c | 35 ++-
fs/smb/server/transport_tcp.c | 4 +
include/linux/compiler_types.h | 11 +
include/linux/dma-fence.h | 7 -
include/linux/gfp_types.h | 2 +
include/linux/hugetlb.h | 53 +++-
include/linux/hugetlb_cgroup.h | 69 +++---
include/linux/hyperv.h | 1 +
include/linux/mm_types.h | 14 ++
include/linux/pinctrl/pinctrl.h | 20 ++
include/linux/regulator/consumer.h | 4 +-
include/linux/skbuff.h | 15 ++
include/linux/skmsg.h | 2 +
include/linux/slab.h | 2 +-
include/linux/spi/spi.h | 51 +++-
include/linux/sunrpc/clnt.h | 1 +
include/linux/timer.h | 15 +-
include/net/xfrm.h | 3 +
include/uapi/scsi/scsi_bsg_mpi3mr.h | 2 +-
kernel/bpf/bloom_filter.c | 13 +
kernel/bpf/verifier.c | 3 +-
kernel/time/timer.c | 8 +-
lib/Kconfig.debug | 5 +-
lib/dynamic_debug.c | 6 +-
mm/hugetlb.c | 52 ++--
mm/hugetlb_cgroup.c | 34 +--
mm/migrate.c | 2 +-
mm/readahead.c | 4 +
net/bluetooth/hci_core.c | 3 +-
net/bluetooth/l2cap_core.c | 3 +
net/bluetooth/msft.c | 2 +-
net/bluetooth/msft.h | 4 +-
net/bluetooth/sco.c | 4 +
net/bridge/br_forward.c | 9 +-
net/bridge/br_netlink.c | 3 +-
net/core/filter.c | 42 +++-
net/core/link_watch.c | 4 +-
net/core/net-sysfs.c | 4 +-
net/core/net_namespace.c | 13 +-
net/core/rtnetlink.c | 6 +-
net/core/skbuff.c | 27 +-
net/core/skmsg.c | 5 +-
net/core/sock.c | 4 +-
net/hsr/hsr_device.c | 31 ++-
net/ipv4/tcp.c | 4 +-
net/ipv4/tcp_input.c | 2 +
net/ipv4/tcp_ipv4.c | 8 +-
net/ipv4/tcp_output.c | 4 +-
net/ipv4/udp_offload.c | 12 +-
net/ipv4/xfrm4_input.c | 6 +-
net/ipv6/addrconf.c | 11 +-
net/ipv6/fib6_rules.c | 6 +-
net/ipv6/ip6_input.c | 4 +-
net/ipv6/ip6_output.c | 2 +-
net/ipv6/xfrm6_input.c | 6 +-
net/l2tp/l2tp_eth.c | 3 +
net/mac80211/ieee80211_i.h | 4 +-
net/mptcp/protocol.c | 3 +
net/nsh/nsh.c | 14 +-
net/phonet/pn_netlink.c | 2 +-
net/smc/smc_ib.c | 19 +-
net/sunrpc/clnt.c | 5 +-
net/sunrpc/xprt.c | 2 +-
net/tipc/msg.c | 8 +-
net/wireless/nl80211.c | 2 +
net/wireless/trace.h | 2 +-
net/xfrm/xfrm_input.c | 8 +
rust/Makefile | 11 +-
rust/kernel/error.rs | 2 +-
rust/kernel/lib.rs | 2 +-
rust/macros/module.rs | 185 ++++++++------
scripts/Makefile.build | 17 +-
scripts/Makefile.host | 27 +-
scripts/Makefile.modfinal | 4 +-
scripts/is_rust_module.sh | 16 --
sound/hda/intel-sdw-acpi.c | 2 +
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/meson/Kconfig | 1 +
sound/soc/meson/axg-card.c | 1 +
sound/soc/meson/axg-fifo.c | 56 +++--
sound/soc/meson/axg-fifo.h | 12 +-
sound/soc/meson/axg-frddr.c | 5 +-
sound/soc/meson/axg-tdm-interface.c | 34 +--
sound/soc/meson/axg-toddr.c | 22 +-
sound/soc/tegra/tegra186_dspk.c | 7 +-
sound/soc/ti/davinci-mcasp.c | 12 +-
sound/usb/line6/driver.c | 6 +-
tools/include/linux/kernel.h | 1 +
tools/include/linux/mm.h | 5 +
tools/include/linux/panic.h | 19 ++
tools/perf/util/unwind-libdw.c | 21 +-
tools/perf/util/unwind-libunwind-local.c | 2 +-
tools/power/x86/turbostat/turbostat.8 | 2 +-
tools/power/x86/turbostat/turbostat.c | 30 ++-
.../selftests/bpf/prog_tests/bloom_filter_map.c | 6 +
tools/testing/selftests/timers/valid-adjtimex.c | 73 +++---
237 files changed, 2399 insertions(+), 1328 deletions(-)
^ permalink raw reply [relevance 2%]
* [PATCH 6.6 289/301] ksmbd: do not grant v2 lease if parent lease key and epoch are not set
2024-05-14 10:14 2% [PATCH 6.6 000/301] 6.6.31-rc1 review Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.6 287/301] ksmbd: off ipv6only for both ipv4/ipv6 binding Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.6 288/301] ksmbd: avoid to send duplicate lease break notifications Greg Kroah-Hartman
@ 2024-05-14 10:19 9% ` Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:19 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit 691aae4f36f9825df6781da4399a1e718951085a upstream.
This patch fix xfstests generic/070 test with smb2 leases = yes.
cifs.ko doesn't set parent lease key and epoch in create context v2 lease.
ksmbd suppose that parent lease and epoch are vaild if data length is
v2 lease context size and handle directory lease using this values.
ksmbd should hanle it as v1 lease not v2 lease if parent lease key and
epoch are not set in create context v2 lease.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/oplock.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -1208,7 +1208,9 @@ int smb_grant_oplock(struct ksmbd_work *
/* Only v2 leases handle the directory */
if (S_ISDIR(file_inode(fp->filp)->i_mode)) {
- if (!lctx || lctx->version != 2)
+ if (!lctx || lctx->version != 2 ||
+ (lctx->flags != SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET_LE &&
+ !lctx->epoch))
return 0;
}
@@ -1470,8 +1472,9 @@ void create_lease_buf(u8 *rbuf, struct l
buf->lcontext.LeaseFlags = lease->flags;
buf->lcontext.Epoch = cpu_to_le16(lease->epoch);
buf->lcontext.LeaseState = lease->state;
- memcpy(buf->lcontext.ParentLeaseKey, lease->parent_lease_key,
- SMB2_LEASE_KEY_SIZE);
+ if (lease->flags == SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET_LE)
+ memcpy(buf->lcontext.ParentLeaseKey, lease->parent_lease_key,
+ SMB2_LEASE_KEY_SIZE);
buf->ccontext.DataOffset = cpu_to_le16(offsetof
(struct create_lease_v2, lcontext));
buf->ccontext.DataLength = cpu_to_le32(sizeof(struct lease_context_v2));
@@ -1536,8 +1539,9 @@ struct lease_ctx_info *parse_lease_state
lreq->flags = lc->lcontext.LeaseFlags;
lreq->epoch = lc->lcontext.Epoch;
lreq->duration = lc->lcontext.LeaseDuration;
- memcpy(lreq->parent_lease_key, lc->lcontext.ParentLeaseKey,
- SMB2_LEASE_KEY_SIZE);
+ if (lreq->flags == SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET_LE)
+ memcpy(lreq->parent_lease_key, lc->lcontext.ParentLeaseKey,
+ SMB2_LEASE_KEY_SIZE);
lreq->version = 2;
} else {
struct create_lease *lc = (struct create_lease *)cc;
^ permalink raw reply [relevance 9%]
* [PATCH 6.6 288/301] ksmbd: avoid to send duplicate lease break notifications
2024-05-14 10:14 2% [PATCH 6.6 000/301] 6.6.31-rc1 review Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.6 287/301] ksmbd: off ipv6only for both ipv4/ipv6 binding Greg Kroah-Hartman
@ 2024-05-14 10:19 8% ` Greg Kroah-Hartman
2024-05-14 10:19 9% ` [PATCH 6.6 289/301] ksmbd: do not grant v2 lease if parent lease key and epoch are not set Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:19 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit 97c2ec64667bacc49881d2b2dd9afd4d1c3fbaeb upstream.
This patch fixes generic/011 when enable smb2 leases.
if ksmbd sends multiple notifications for a file, cifs increments
the reference count of the file but it does not decrement the count by
the failure of queue_work.
So even if the file is closed, cifs does not send a SMB2_CLOSE request.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/oplock.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -612,13 +612,23 @@ static int oplock_break_pending(struct o
if (opinfo->op_state == OPLOCK_CLOSING)
return -ENOENT;
- else if (!opinfo->is_lease && opinfo->level <= req_op_level)
- return 1;
+ else if (opinfo->level <= req_op_level) {
+ if (opinfo->is_lease &&
+ opinfo->o_lease->state !=
+ (SMB2_LEASE_HANDLE_CACHING_LE |
+ SMB2_LEASE_READ_CACHING_LE))
+ return 1;
+ }
}
- if (!opinfo->is_lease && opinfo->level <= req_op_level) {
- wake_up_oplock_break(opinfo);
- return 1;
+ if (opinfo->level <= req_op_level) {
+ if (opinfo->is_lease &&
+ opinfo->o_lease->state !=
+ (SMB2_LEASE_HANDLE_CACHING_LE |
+ SMB2_LEASE_READ_CACHING_LE)) {
+ wake_up_oplock_break(opinfo);
+ return 1;
+ }
}
return 0;
}
@@ -886,7 +896,6 @@ static int oplock_break(struct oplock_in
struct lease *lease = brk_opinfo->o_lease;
atomic_inc(&brk_opinfo->breaking_cnt);
-
err = oplock_break_pending(brk_opinfo, req_op_level);
if (err)
return err < 0 ? err : 0;
^ permalink raw reply [relevance 8%]
* [PATCH 6.6 287/301] ksmbd: off ipv6only for both ipv4/ipv6 binding
2024-05-14 10:14 2% [PATCH 6.6 000/301] 6.6.31-rc1 review Greg Kroah-Hartman
@ 2024-05-14 10:19 8% ` Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.6 288/301] ksmbd: avoid to send duplicate lease break notifications Greg Kroah-Hartman
2024-05-14 10:19 9% ` [PATCH 6.6 289/301] ksmbd: do not grant v2 lease if parent lease key and epoch are not set Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:19 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches,
ΕΛΕΝΗ
ΤΖΑΒΕΛΛΑ,
Namjae Jeon, Steve French
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit cc00bc83f26eb8f2d8d9f56b949b62fd774d8432 upstream.
ΕΛΕΝΗ reported that ksmbd binds to the IPV6 wildcard (::) by default for
ipv4 and ipv6 binding. So IPV4 connections are successful only when
the Linux system parameter bindv6only is set to 0 [default value].
If this parameter is set to 1, then the ipv6 wildcard only represents
any IPV6 address. Samba creates different sockets for ipv4 and ipv6
by default. This patch off sk_ipv6only to support IPV4/IPV6 connections
without creating two sockets.
Cc: stable@vger.kernel.org
Reported-by: ΕΛΕΝΗ ΤΖΑΒΕΛΛΑ <helentzavellas@yahoo.gr>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/transport_tcp.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/fs/smb/server/transport_tcp.c
+++ b/fs/smb/server/transport_tcp.c
@@ -446,6 +446,10 @@ static int create_socket(struct interfac
sin6.sin6_family = PF_INET6;
sin6.sin6_addr = in6addr_any;
sin6.sin6_port = htons(server_conf.tcp_port);
+
+ lock_sock(ksmbd_socket->sk);
+ ksmbd_socket->sk->sk_ipv6only = false;
+ release_sock(ksmbd_socket->sk);
}
ksmbd_tcp_nodelay(ksmbd_socket);
^ permalink raw reply [relevance 8%]
* [PATCH 6.6 000/301] 6.6.31-rc1 review
@ 2024-05-14 10:14 2% Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.6 287/301] ksmbd: off ipv6only for both ipv4/ipv6 binding Greg Kroah-Hartman
` (2 more replies)
0 siblings, 3 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:14 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 6.6.31 release.
There are 301 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Thu, 16 May 2024 10:09:32 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.31-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 6.6.31-rc1
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix firmware check error path
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching fw build id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching board id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: generalise device address check
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix NVM configuration parsing
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: add missing firmware sanity checks
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix wcn3991 device address check
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix invalid device address check
Steven Rostedt (Google) <rostedt@goodmis.org>
eventfs: Do not treat events directory different than other directories
Steven Rostedt (Google) <rostedt@goodmis.org>
eventfs: Do not differentiate the toplevel events directory
Steven Rostedt (Google) <rostedt@goodmis.org>
tracefs: Still use mount point as default permissions for instances
Steven Rostedt (Google) <rostedt@goodmis.org>
tracefs: Reset permissions on remount if permissions are options
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: avoid to send duplicate lease break notifications
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: off ipv6only for both ipv4/ipv6 binding
Conor Dooley <conor.dooley@microchip.com>
spi: microchip-core-qspi: fix setting spi bus clock rate
Johan Hovold <johan+linaro@kernel.org>
regulator: core: fix debugfs creation regression
Sean Anderson <sean.anderson@linux.dev>
nvme-pci: Add quirk for broken MSIs
Peter Xu <peterx@redhat.com>
mm/userfaultfd: reset ptes when close() for wr-protected ones
Kefeng Wang <wangkefeng.wang@huawei.com>
mm: use memalloc_nofs_save() in page_cache_ra_order()
Michael Ellerman <mpe@ellerman.id.au>
selftests/mm: fix powerpc ARCH check
Thomas Gleixner <tglx@linutronix.de>
x86/apic: Don't access the APIC when disabling x2APIC
Lakshmi Yadlapati <lakshmiy@us.ibm.com>
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
net: fix out-of-bounds access in ops_init
Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
arm64: dts: qcom: sa8155p-adp: fix SDHC2 CD pin configuration
Hersen Wu <hersenxs.wu@amd.com>
drm/amd/display: Fix incorrect DSC instance for MST
George Shen <george.shen@amd.com>
drm/amd/display: Handle Y carry-over in VCP X.Y calculation
Karthikeyan Ramasubramanian <kramasub@chromium.org>
drm/i915/bios: Fix parsing backlight BDB data
Andi Shyti <andi.shyti@linux.intel.com>
drm/i915/gt: Automate CCS Mode setting during engine resets
Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
drm/i915/audio: Fix audio time stamp programming for DP
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix invalid reads in fence signaled events
Ian Forbes <ian.forbes@broadcom.com>
drm/vmwgfx: Fix Legacy Display Unit
Zack Rusin <zack.rusin@broadcom.com>
drm/ttm: Print the memory decryption status just once
Alex Deucher <alexander.deucher@amd.com>
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Dave Airlie <airlied@redhat.com>
Revert "drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()"
Lyude Paul <lyude@redhat.com>
drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: add lunar lake point M DID
Frank Oltmanns <frank@oltmanns.dev>
clk: sunxi-ng: a64: Set minimum and maximum rate for PLL-MIPI
Frank Oltmanns <frank@oltmanns.dev>
clk: sunxi-ng: common: Support minimum and maximum rate
Viken Dadhaniya <quic_vdadhani@quicinc.com>
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Jim Cromie <jim.cromie@gmail.com>
dyndbg: fix old BUG_ON in >control parser
Joao Paulo Goncalves <joao.goncalves@toradex.com>
ASoC: ti: davinci-mcasp: Fix race condition during probe
Sameer Pujar <spujar@nvidia.com>
ASoC: tegra: Fix DSPK 16-bit playback
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize UMAC_CMD access
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
Max Filippov <jcmvbkbc@gmail.com>
xtensa: fix MAKE_PC_FROM_RA second argument
Paolo Abeni <pabeni@redhat.com>
tipc: fix UAF in error path
Vitaly Lifshits <vitaly.lifshits@intel.com>
e1000e: change usleep_range to udelay in PHY mdic access
Alexander Potapenko <glider@google.com>
kmsan: compiler_types: declare __no_sanitize_or_inline
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Interrupt handling fixes
Vasileios Amoiridis <vassilisamir@gmail.com>
iio: pressure: Fixes BME280 SPI driver data
Ramona Gradinariu <ramona.bolboaca13@gmail.com>
iio:imu: adis16475: Fix sync mode setting
Javier Carrasco <javier.carrasco.cruz@gmail.com>
dt-bindings: iio: health: maxim,max30102: fix compatible check
Sven Schnelle <svens@linux.ibm.com>
workqueue: Fix selection of wake_cpu in kick_pool()
Gregory Detal <gregory.detal@gmail.com>
mptcp: only allow set existing scheduler for net.mptcp.scheduler
Paolo Abeni <pabeni@redhat.com>
mptcp: ensure snd_nxt is properly initialized on connect
Dan Carpenter <dan.carpenter@linaro.org>
mm/slab: make __free(kfree) accept error pointers
Liam R. Howlett <Liam.Howlett@oracle.com>
maple_tree: fix mas_empty_area_rev() null pointer dereference
Qu Wenruo <wqu@suse.com>
btrfs: set correct ram_bytes when splitting ordered extent
Dominique Martinet <dominique.martinet@atmark-techno.com>
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Takashi Sakamoto <o-takashi@sakamocchi.jp>
firewire: ohci: fulfill timestamp for some local asynchronous transaction
Aman Dhoot <amandhoot12@gmail.com>
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Badhri Jagan Sridharan <badhri@google.com>
usb: typec: tcpm: Check for port partner validity before consuming it
Amit Sunil Dhamne <amitsd@google.com>
usb: typec: tcpm: unregister existing source caps before re-registration
RD Babiera <rdbabiera@google.com>
usb: typec: tcpm: clear pd_event queue in PORT_RESET
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: dwc3: core: Prevent phy suspend during init
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: xhci-plat: Don't include xhci.h
Chris Wulff <Chris.Wulff@biamp.com>
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Wesley Cheng <quic_wcheng@quicinc.com>
usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete
Ivan Avdeev <me@provod.works>
usb: gadget: uvc: use correct buffer size when parsing configfs lists
Peter Korsgaard <peter@korsgaard.com>
usb: gadget: composite: fix OS descriptors w_value logic
Alan Stern <stern@rowland.harvard.edu>
USB: core: Fix access violation during port device removal
Guenter Roeck <linux@roeck-us.net>
usb: ohci: Prevent missed ohci interrupts
Alan Stern <stern@rowland.harvard.edu>
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Fix connector check on init
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Check for notifications after init
Linus Torvalds <torvalds@linux-foundation.org>
Reapply "drm/qxl: simplify qxl_fence_wait"
Thanassis Avgerinos <thanassis.avgerinos@gmail.com>
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Dmitry Antipov <dmantipov@yandex.ru>
btrfs: fix kvcalloc() arguments order in btrfs_ioctl_send()
Christian König <christian.koenig@amd.com>
drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2
Michel Dänzer <mdaenzer@redhat.com>
drm/amdgpu: Fix comparison in amdgpu_res_cpu_visible
Gabe Teeger <gabe.teeger@amd.com>
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: fix uninitialised kfifo
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: relocate debounce_period_us from struct gpio_desc
Zhongqiu Han <quic_zhonhan@quicinc.com>
gpiolib: cdev: Fix use after free in lineinfo_changed_notify
Mario Limonciello <mario.limonciello@amd.com>
dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
Douglas Anderson <dianders@chromium.org>
drm/connector: Add \n to message about demoting connector force-probes
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: add bandgap setting for g12
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: power up phy on device init
Steffen Bätz <steffen@innosonix.de>
net: dsa: mv88e6xxx: add phylink_get_caps for the mv88e6320/21 family
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix kernel crash when devlink reload during initialization
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix port vlan filter not disabled issue
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: use appropriate barrier function after setting a bit value
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: release PTP resources if pf initialization failed
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: change type of numa_node_mask as nodemask_t
Jian Shen <shenjian15@huawei.com>
net: hns3: direct return when receive a unknown mailbox message
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: using user configure after hardware reset
Wen Gu <guwen@linux.alibaba.com>
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Eric Dumazet <edumazet@google.com>
ipv6: prevent NULL dereference in ip6_output()
Eric Dumazet <edumazet@google.com>
ipv6: annotate data-races around cnf.disable_ipv6
Lukasz Majewski <lukma@denx.de>
hsr: Simplify code for announcing HSR nodes timer setup
Eric Dumazet <edumazet@google.com>
net-sysfs: convert dev->operstate reads to lockless ones
Eric Dumazet <edumazet@google.com>
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
Daniel Golle <daniel@makrotopia.org>
dt-bindings: net: mediatek: remove wrongly added clocks and SerDes
David Howells <dhowells@redhat.com>
rxrpc: Only transmit one ACK per jumbo packet received
David Howells <dhowells@redhat.com>
rxrpc: Fix congestion control algorithm
David Howells <dhowells@redhat.com>
rxrpc: Fix the names of the fields in the ACK trailer struct
Ido Schimmel <idosch@nvidia.com>
selftests: test_bridge_neigh_suppress.sh: Fix failures due to duplicate MAC
Hangbin Liu <liuhangbin@gmail.com>
selftests/net: convert test_bridge_neigh_suppress.sh to run it in unique namespace
Shigeru Yoshida <syoshida@redhat.com>
ipv6: Fix potential uninit-value access in __ip6_make_skb()
Felix Fietkau <nbd@nbd.name>
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
nfc: nci: Fix kcov check in nci_rx_work()
Eric Dumazet <edumazet@google.com>
phonet: fix rtm_phonet_notify() skb allocation
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use a separate buffer for sending commands
Roded Zats <rzats@paloaltonetworks.com>
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Marek Vasut <marex@denx.de>
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: HCI: Fix potential null-ptr-deref
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Kuniyuki Iwashima <kuniyu@amazon.com>
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Eric Dumazet <edumazet@google.com>
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
Boy.Wu <boy.wu@mediatek.com>
ARM: 9381/1: kasan: clear stale stack poison
Paul Davey <paul.davey@alliedtelesis.co.nz>
xfrm: Preserve vlan tags for transport mode software GRO
Al Viro <viro@zeniv.linux.org.uk>
qibfs: fix dentry leak
Olga Kornievskaia <kolga@netapp.com>
SUNRPC: add a missing rpc_stat for TCP TLS
Li Nan <linan122@huawei.com>
blk-iocost: do not WARN if iocg was already offlined
Vanillan Wang <vanillanwang@163.com>
net:usb:qmi_wwan: support Rolling modules
Alex Deucher <alexander.deucher@amd.com>
drm/radeon: silence UBSAN warning (v3)
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
platform/x86: ISST: Add Granite Rapids-D to HPM CPU list
Lyude Paul <lyude@redhat.com>
drm/nouveau/dp: Don't probe eDP ports twice harder
Krzysztof Kozlowski <krzk@kernel.org>
gpio: lpc32xx: fix module autoloading
Joakim Sindholt <opensource@zhasha.com>
fs/9p: drop inodes immediately on non-.L too
Stephen Boyd <sboyd@kernel.org>
clk: Don't hold prepare_lock when calling kref_put()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: crystalcove: Use -ENOTSUPP consistently
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: wcove: Use -ENOTSUPP consistently
Michael Ellerman <mpe@ellerman.id.au>
powerpc/crypto/chacha-p10: Fix failure on non Power10
Jeff Layton <jlayton@kernel.org>
9p: explicitly deny setlease attempts
Joakim Sindholt <opensource@zhasha.com>
fs/9p: fix the cache always being enabled on files with qid flags
Joakim Sindholt <opensource@zhasha.com>
fs/9p: translate O_TRUNC into OTRUNC
Joakim Sindholt <opensource@zhasha.com>
fs/9p: only translate RWX permissions for plain 9P2000
Krzysztof Kozlowski <krzk@kernel.org>
iommu: mtk: fix module autoloading
Steve French <stfrench@microsoft.com>
smb3: fix broken reconnect when password changing on the server by allowing password rotation
Michael Kelley <mhklinux@outlook.com>
Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted
Rick Edgecombe <rick.p.edgecombe@intel.com>
uio_hv_generic: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
hv_netvsc: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Leak pages if set_memory_encrypted() fails
John Stultz <jstultz@google.com>
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Zhigang Luo <Zhigang.Luo@amd.com>
amd/amdkfd: sync all devices to wait all processes being evicted
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Fix VCN allocation in CPX partition
Alex Hung <alex.hung@amd.com>
drm/amd/display: Skip on writeback when it's not applicable
Tao Zhou <tao.zhou1@amd.com>
drm/amdgpu: implement IRQ_STATE_ENABLE for SDMA v4.4.2
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Refine IB schedule error logging
Justin Ernst <justin.ernst@hpe.com>
tools/power/turbostat: Fix uncore frequency file string
Jiaxun Yang <jiaxun.yang@flygoat.com>
MIPS: scall: Save thread_info.syscall unconditionally on entry
Thierry Reding <treding@nvidia.com>
gpu: host1x: Do not setup DMA for virtual devices
Rik van Riel <riel@surriel.com>
blk-iocost: avoid out of bounds shift
Xiang Chen <chenxiang66@hisilicon.com>
scsi: hisi_sas: Handle the NCQ error returned by D2H frame
Maurizio Lombardi <mlombard@redhat.com>
scsi: target: Fix SELinux error when systemd-modules loads the target module
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `BIT'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `panic'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `early_pfn_to_nid'
Boris Burkov <boris@bur.io>
btrfs: always clear PERTRANS metadata during commit
Boris Burkov <boris@bur.io>
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
Len Brown <len.brown@intel.com>
tools/power turbostat: Fix warning upon failed /dev/cpu_dma_latency read
Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com>
tools/power turbostat: Print ucode revision only if valid
Peng Liu <liupeng17@lenovo.com>
tools/power turbostat: Fix Bzy_MHz documentation typo
Wyes Karny <wyes.karny@amd.com>
tools/power turbostat: Increase the limit for fd opened
Doug Smythies <dsmythies@telus.net>
tools/power turbostat: Fix added raw MSR output
Adam Goldman <adamg@pobox.com>
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Chen Ni <nichen@iscas.ac.cn>
ata: sata_gemini: Check clk_enable() result
Jeff Layton <jlayton@kernel.org>
vboxsf: explicitly deny setlease attempts
Phil Elwell <phil@raspberrypi.com>
net: bcmgenet: Reset RBUF on first open
Li Nan <linan122@huawei.com>
block: fix overflow in blk_ioctl_discard()
Takashi Iwai <tiwai@suse.de>
ALSA: line6: Zero-initialize message buffers
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: Fix MCQ mode dev command timeout
Yihang Li <liyihang9@huawei.com>
scsi: libsas: Align SMP request allocation to ARCH_DMA_MINALIGN
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: WLUN suspend dev/link state error recovery
André Apitzsch <git@apitzsch.eu>
regulator: tps65132: Add of_match table
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
ASoC: SOF: Intel: hda-dsp: Skip IMR boot on ACE platforms in case of S3 suspend
Borislav Petkov (AMD) <bp@alien8.de>
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Mark Rutland <mark.rutland@arm.com>
selftests/ftrace: Fix event filter target_func selection
Andrei Matei <andreimatei1@gmail.com>
bpf: Check bloom filter map value size
Jonathan Kim <Jonathan.Kim@amd.com>
drm/amdkfd: range check cp bad op exception interrupts
Mukul Joshi <mukul.joshi@amd.com>
drm/amdkfd: Check cgroup when returning DMABuf info
Anand Jain <anand.jain@oracle.com>
btrfs: return accurate error code on open failure in open_fs_devices()
Saurav Kashyap <skashyap@marvell.com>
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
scsi: mpi3mr: Avoid memcpy field-spanning write WARNING
linke li <lilinke99@qq.com>
net: mark racy access on sk->sk_rcvbuf
Benjamin Berg <benjamin.berg@intel.com>
wifi: iwlwifi: mvm: guard against invalid STA ID on removal
Johannes Berg <johannes.berg@intel.com>
wifi: iwlwifi: read txq->read_ptr under lock
Johannes Berg <johannes.berg@intel.com>
wifi: mac80211: fix prep_connection error path
Igor Artemiev <Igor.A.Artemiev@mcst.ru>
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jeff Johnson <quic_jjohnson@quicinc.com>
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Andrew Price <anprice@redhat.com>
gfs2: Fix invalid metadata access in punch_hole
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Use a dedicated lock for ras_fwlog state
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Release hbalock before calling lpfc_worker_wake_up()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Remove IRQF_ONESHOT flag from threaded IRQ handling
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
Rohit Ner <rohitner@google.com>
scsi: ufs: core: Fix MCQ MAC configuration
Oliver Upton <oliver.upton@linux.dev>
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Marc Zyngier <maz@kernel.org>
KVM: arm64: vgic-v2: Use cpuid from userspace as vcpu_id
Will Deacon <will@kernel.org>
swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y
Gaurav Batra <gbatra@linux.ibm.com>
powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: make max polling consistent for longer H_CALLs
Jernej Skrabec <jernej.skrabec@gmail.com>
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Adam Skladowski <a39.skl@gmail.com>
clk: qcom: smd-rpm: Restore msm8976 num_clk
Richard Gobert <richardbgobert@gmail.com>
net: gro: add flush check in udp_gro_receive_segment
Richard Gobert <richardbgobert@gmail.com>
net: gro: fix udp bad offset in socket lookup by adding {inner_}network_offset to napi_gro_cb
Richard Gobert <richardbgobert@gmail.com>
net: gro: parse ipv6 ext headers without frag0 invalidation
Shigeru Yoshida <syoshida@redhat.com>
ipv4: Fix uninit-value access in __ip_make_skb()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Use predefined error codes
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Respect deferred probe
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Correct use of device property APIs
Alexandra Winter <wintera@linux.ibm.com>
s390/qeth: Fix kernel panic after setting hsuid
Guillaume Nault <gnault@redhat.com>
vxlan: Pull inner IP header in vxlan_rcv().
Xin Long <lucien.xin@gmail.com>
tipc: fix a possible memleak in tipc_buf_append
Jeffrey Altman <jaltman@auristor.com>
rxrpc: Clients must accept conn from any address
Felix Fietkau <nbd@nbd.name>
net: core: reject skb_copy(_expand) for fraglist GSO skbs
Felix Fietkau <nbd@nbd.name>
net: bridge: fix multicast-to-unicast with fraglist GSO
Mans Rullgard <mans@mansr.com>
spi: fix null pointer dereference within spi_sync
Shashank Sharma <shashank.sharma@amd.com>
drm/amdgpu: fix doorbell regression
Marek Behún <kabel@kernel.org>
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
cxgb4: Properly lock TX queue for the selftest.
Bui Quang Minh <minhquangbui99@gmail.com>
s390/cio: Ensure the copied buf is NUL terminated
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: cards: select SND_DYNAMIC_MINORS
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-tdm-interface: manage formatters in trigger
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-card: make links nonatomic
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use threaded irq to check periods
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use FIELD helpers
Guillaume Nault <gnault@redhat.com>
vxlan: Add missing VNI filter counter update in arp_reduce().
Guillaume Nault <gnault@redhat.com>
vxlan: Fix racy device stats updates.
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_actions()
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flow_spec
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flower
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: fix E-MU dock initialization
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: move the whole GPIO event handling to the workqueue
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: factor out snd_emu1010_load_dock_firmware()
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: fix E-MU card dock presence monitoring
David Howells <dhowells@redhat.com>
Fix a potential infinite loop in extract_user_to_sg()
Jens Remus <jremus@linux.ibm.com>
s390/vdso: Add CFI for RA register to asm macro vdso_func
David Bauer <mail@david-bauer.net>
net l2tp: drop flow hash on forward
Kuniyuki Iwashima <kuniyu@amazon.com>
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
Bui Quang Minh <minhquangbui99@gmail.com>
octeontx2-af: avoid off-by-one read from userspace
Bui Quang Minh <minhquangbui99@gmail.com>
bna: ensure the copied buf is NUL terminated
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: use flags field to disambiguate broadcast redirect
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix clearing storage keys for huge pages
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix storage key clearing for guest huge pages
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
ASoC: codecs: wsa881x: set clk_stop_mode1 flag
Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
ASoC: Intel: avs: Set name of control as in topology
Xu Kuohai <xukuohai@huawei.com>
riscv, bpf: Fix incorrect runtime stats
Xu Kuohai <xukuohai@huawei.com>
bpf, arm64: Fix incorrect runtime stats
Devyn Liu <liudingyuan@huawei.com>
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: fix version format string
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use common AXI macros
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: move msg state to new struct
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use devm_spi_alloc_host()
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: simplify driver data allocation
Li Zetao <lizetao1@huawei.com>
spi: spi-axi-spi-engine: Use helper function devm_clk_get_enabled()
Anton Protopopov <aspsk@isovalent.com>
bpf: Fix a verifier verbose message
Yi Zhang <yi.zhang@redhat.com>
nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ASoC: SOF: Intel: add default firmware library path for LNL
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
ASoC: SOF: Introduce generic names for IPC types
Richard Fitzgerald <rf@opensource.cirrus.com>
regmap: Add regmap_read_bypassed()
Jason Xing <kernelxing@tencent.com>
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Andrii Nakryiko <andrii@kernel.org>
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change devm_regulator_get_enable_optional() stub to return Ok
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change stubbed devm_regulator_get_enable to return Ok
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
regulator: mt6360: De-capitalize devicetree regulator subnodes
Zeng Heng <zengheng4@huawei.com>
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
Arnd Bergmann <arnd@arndb.de>
power: rt9455: hide unused rt9455_boost_voltage_values
Hans de Goede <hdegoede@redhat.com>
pinctrl: baytrail: Fix selecting gpio pinctrl state
Kuniyuki Iwashima <kuniyu@amazon.com>
nfs: Handle error of rpc_proc_register() in nfs_net_init().
Josef Bacik <josef@toxicpanda.com>
nfs: make the rpc_stat per net namespace
Josef Bacik <josef@toxicpanda.com>
nfs: expose /proc/net/sunrpc/nfs in net namespaces
Josef Bacik <josef@toxicpanda.com>
sunrpc: add a struct rpc_stats arg to rpc_create_args
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
Dan Carpenter <dan.carpenter@linaro.org>
pinctrl: core: delete incorrect free in pinctrl_enable()
Jan Dakinevich <jan.dakinevich@salutedevices.com>
pinctrl/meson: fix typo in PDM's pin name
Billy Tsai <billy_tsai@aspeedtech.com>
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Tim Jiang <quic_tjiang@quicinc.com>
Bluetooth: qca: add support for QCA2066
Daniel Okazaki <dtokazaki@google.com>
eeprom: at24: fix memory corruption race condition
Heiner Kallweit <hkallweit1@gmail.com>
eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
Wedson Almeida Filho <walmeida@microsoft.com>
rust: kernel: require `Send` for `Module` implementations
Johannes Berg <johannes.berg@intel.com>
wifi: nl80211: don't free NULL coalescing rule
Benno Lossin <benno.lossin@proton.me>
rust: macros: fix soundness issue in `module!` macro
Thomas Bertschinger <tahbertschinger@gmail.com>
rust: module: place generated init_module() function in .init.text
Christian Marangi <ansuelsmth@gmail.com>
mtd: limit OTP NVMEM cell parse to non-NAND devices
Rafał Miłecki <rafal@milecki.pl>
nvmem: add explicit config option to read old syntax fixed OF cells
Vinod Koul <vkoul@kernel.org>
dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
Bumyong Lee <bumyong.lee@samsung.com>
dmaengine: pl330: issue_pending waits until WFP state
-------------
Diffstat:
.../bindings/iio/health/maxim,max30102.yaml | 2 +-
.../devicetree/bindings/net/mediatek,net.yaml | 22 +-
Makefile | 4 +-
arch/arm/kernel/sleep.S | 4 +
arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 30 +-
arch/arm64/kvm/vgic/vgic-kvm-device.c | 12 +-
arch/arm64/net/bpf_jit_comp.c | 6 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/kernel/asm-offsets.c | 1 +
arch/mips/kernel/ptrace.c | 15 +-
arch/mips/kernel/scall32-o32.S | 23 +-
arch/mips/kernel/scall64-n32.S | 3 +-
arch/mips/kernel/scall64-n64.S | 3 +-
arch/mips/kernel/scall64-o32.S | 33 +-
arch/powerpc/crypto/chacha-p10-glue.c | 8 +-
arch/powerpc/include/asm/plpks.h | 5 +-
arch/powerpc/platforms/pseries/iommu.c | 8 +
arch/powerpc/platforms/pseries/plpks.c | 10 +-
arch/riscv/net/bpf_jit_comp64.c | 6 +-
arch/s390/include/asm/dwarf.h | 1 +
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2 +
arch/s390/mm/gmap.c | 2 +-
arch/s390/mm/hugetlbpage.c | 2 +-
arch/x86/kernel/apic/apic.c | 16 +-
arch/xtensa/include/asm/processor.h | 8 +-
arch/xtensa/include/asm/ptrace.h | 2 +-
arch/xtensa/kernel/process.c | 5 +-
arch/xtensa/kernel/stacktrace.c | 3 +-
block/blk-iocost.c | 14 +-
block/ioctl.c | 5 +-
drivers/ata/sata_gemini.c | 5 +-
drivers/base/regmap/regmap.c | 37 +++
drivers/bluetooth/btqca.c | 208 ++++++++++++-
drivers/bluetooth/btqca.h | 8 +-
drivers/bluetooth/hci_qca.c | 13 +-
drivers/clk/clk.c | 12 +-
drivers/clk/qcom/clk-smd-rpm.c | 1 +
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 2 +
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 +-
drivers/clk/sunxi-ng/ccu_common.c | 19 ++
drivers/clk/sunxi-ng/ccu_common.h | 3 +
drivers/firewire/nosy.c | 6 +-
drivers/firewire/ohci.c | 14 +-
drivers/gpio/gpio-crystalcove.c | 2 +-
drivers/gpio/gpio-lpc32xx.c | 1 +
drivers/gpio/gpio-wcove.c | 2 +-
drivers/gpio/gpiolib-cdev.c | 181 +++++++++--
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 56 ++--
drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 15 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 16 +-
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 11 +-
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +
.../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 48 ++-
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 +
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6 +
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2 +-
drivers/gpu/drm/drm_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_audio.c | 113 +------
drivers/gpu/drm/i915/display/intel_bios.c | 19 +-
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5 -
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c | 6 +-
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.h | 2 +-
drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +-
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 ++---
drivers/gpu/drm/nouveau/nouveau_dp.c | 13 +-
drivers/gpu/drm/panel/Kconfig | 2 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 13 +-
drivers/gpu/drm/qxl/qxl_release.c | 50 +---
drivers/gpu/drm/radeon/pptable.h | 10 +-
drivers/gpu/drm/ttm/ttm_tt.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
drivers/gpu/host1x/bus.c | 8 -
drivers/hv/channel.c | 29 +-
drivers/hv/connection.c | 29 +-
drivers/hwmon/corsair-cpro.c | 43 ++-
drivers/hwmon/pmbus/ucd9000.c | 6 +-
drivers/iio/accel/mxc4005.c | 24 +-
drivers/iio/imu/adis16475.c | 4 +-
drivers/iio/pressure/bmp280-spi.c | 4 +-
drivers/infiniband/hw/qib/qib_fs.c | 1 +
drivers/iommu/mtk_iommu.c | 1 +
drivers/iommu/mtk_iommu_v1.c | 1 +
drivers/misc/eeprom/at24.c | 47 ++-
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/mtd/mtdcore.c | 2 +
drivers/net/dsa/mv88e6xxx/chip.c | 20 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 32 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8 +-
drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +-
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 52 ++--
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 20 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +-
drivers/net/ethernet/intel/e1000e/phy.c | 8 +-
.../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +-
drivers/net/ethernet/micrel/ks8851_common.c | 16 +-
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14 +-
drivers/net/hyperv/netvsc.c | 7 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/vxlan/vxlan_core.c | 49 ++-
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 7 +-
drivers/net/wireless/intel/iwlwifi/queue/tx.c | 2 +-
drivers/nvme/host/core.c | 2 +-
drivers/nvme/host/nvme.h | 5 +
drivers/nvme/host/pci.c | 14 +-
drivers/nvmem/apple-efuses.c | 1 +
drivers/nvmem/core.c | 8 +-
drivers/nvmem/imx-ocotp-scu.c | 1 +
drivers/nvmem/imx-ocotp.c | 1 +
drivers/nvmem/meson-efuse.c | 1 +
drivers/nvmem/meson-mx-efuse.c | 1 +
drivers/nvmem/microchip-otpc.c | 1 +
drivers/nvmem/mtk-efuse.c | 1 +
drivers/nvmem/qcom-spmi-sdam.c | 1 +
drivers/nvmem/qfprom.c | 1 +
drivers/nvmem/rave-sp-eeprom.c | 1 +
drivers/nvmem/rockchip-efuse.c | 1 +
drivers/nvmem/sc27xx-efuse.c | 1 +
drivers/nvmem/sec-qfprom.c | 1 +
drivers/nvmem/sprd-efuse.c | 1 +
drivers/nvmem/stm32-romem.c | 1 +
drivers/nvmem/sunplus-ocotp.c | 1 +
drivers/nvmem/sunxi_sid.c | 1 +
drivers/nvmem/uniphier-efuse.c | 1 +
drivers/nvmem/zynqmp_nvmem.c | 1 +
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 +--
drivers/pinctrl/core.c | 8 +-
drivers/pinctrl/devicetree.c | 10 +-
drivers/pinctrl/intel/pinctrl-baytrail.c | 74 ++---
drivers/pinctrl/intel/pinctrl-intel.h | 4 +
drivers/pinctrl/mediatek/pinctrl-paris.c | 40 +--
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +-
.../x86/intel/speed_select_if/isst_if_common.c | 1 +
drivers/power/supply/mt6360_charger.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +
drivers/regulator/core.c | 27 +-
drivers/regulator/mt6360-regulator.c | 32 +-
drivers/regulator/tps65132-regulator.c | 7 +
drivers/rtc/nvmem.c | 1 +
drivers/s390/cio/cio_inject.c | 2 +-
drivers/s390/net/qeth_core_main.c | 69 ++---
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 -
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 +-
drivers/scsi/libsas/sas_expander.c | 2 +-
drivers/scsi/lpfc/lpfc.h | 2 +-
drivers/scsi/lpfc/lpfc_attr.c | 4 +-
drivers/scsi/lpfc/lpfc_bsg.c | 20 +-
drivers/scsi/lpfc/lpfc_debugfs.c | 12 +-
drivers/scsi/lpfc/lpfc_els.c | 20 +-
drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +-
drivers/scsi/lpfc/lpfc_init.c | 5 +-
drivers/scsi/lpfc/lpfc_nvme.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 13 +-
drivers/scsi/lpfc/lpfc_sli.c | 34 +--
drivers/scsi/lpfc/lpfc_vport.c | 8 +-
drivers/scsi/mpi3mr/mpi3mr_app.c | 2 +-
drivers/slimbus/qcom-ngd-ctrl.c | 6 +-
drivers/spi/spi-axi-spi-engine.c | 229 +++++++-------
drivers/spi/spi-hisi-kunpeng.c | 2 -
drivers/spi/spi-microchip-core-qspi.c | 1 +
drivers/spi/spi.c | 1 +
drivers/target/target_core_configfs.c | 12 +
drivers/ufs/core/ufs-mcq.c | 2 +-
drivers/ufs/core/ufshcd.c | 9 +-
drivers/uio/uio_hv_generic.c | 12 +-
drivers/usb/core/hub.c | 5 +-
drivers/usb/core/port.c | 8 +-
drivers/usb/dwc3/core.c | 90 +++---
drivers/usb/dwc3/core.h | 1 +
drivers/usb/dwc3/gadget.c | 2 +
drivers/usb/dwc3/host.c | 27 ++
drivers/usb/gadget/composite.c | 6 +-
drivers/usb/gadget/function/f_fs.c | 9 +-
drivers/usb/gadget/function/uvc_configfs.c | 4 +-
drivers/usb/host/ohci-hcd.c | 8 +
drivers/usb/host/xhci-plat.h | 4 +-
drivers/usb/host/xhci-rzv2m.c | 1 +
drivers/usb/typec/tcpm/tcpm.c | 36 ++-
drivers/usb/typec/ucsi/ucsi.c | 12 +-
drivers/w1/slaves/w1_ds250x.c | 1 +
fs/9p/fid.h | 3 -
fs/9p/vfs_file.c | 2 +
fs/9p/vfs_inode.c | 5 +-
fs/9p/vfs_super.c | 1 +
fs/btrfs/inode.c | 2 +-
fs/btrfs/ordered-data.c | 1 +
fs/btrfs/send.c | 4 +-
fs/btrfs/transaction.c | 2 +-
fs/btrfs/volumes.c | 18 +-
fs/gfs2/bmap.c | 5 +-
fs/nfs/client.c | 5 +-
fs/nfs/inode.c | 13 +-
fs/nfs/internal.h | 2 -
fs/nfs/netns.h | 2 +
fs/smb/client/cifsglob.h | 1 +
fs/smb/client/connect.c | 8 +
fs/smb/client/fs_context.c | 21 ++
fs/smb/client/fs_context.h | 2 +
fs/smb/client/misc.c | 1 +
fs/smb/client/smb2pdu.c | 11 +
fs/smb/server/oplock.c | 35 ++-
fs/smb/server/transport_tcp.c | 4 +
fs/tracefs/event_inode.c | 74 ++---
fs/tracefs/inode.c | 92 +++++-
fs/tracefs/internal.h | 14 +-
fs/userfaultfd.c | 4 +
fs/vboxsf/file.c | 1 +
include/linux/compiler_types.h | 11 +
include/linux/dma-fence.h | 7 -
include/linux/gfp_types.h | 2 +
include/linux/hyperv.h | 1 +
include/linux/nvmem-provider.h | 2 +
include/linux/regmap.h | 8 +
include/linux/regulator/consumer.h | 4 +-
include/linux/skbuff.h | 15 +
include/linux/skmsg.h | 2 +
include/linux/slab.h | 2 +-
include/linux/sunrpc/clnt.h | 1 +
include/net/gro.h | 9 +
include/net/xfrm.h | 3 +
include/sound/emu10k1.h | 3 +-
include/sound/sof.h | 7 +-
include/trace/events/rxrpc.h | 2 +-
include/uapi/linux/kfd_ioctl.h | 17 +-
include/uapi/scsi/scsi_bsg_mpi3mr.h | 2 +-
kernel/bpf/bloom_filter.c | 13 +
kernel/bpf/verifier.c | 3 +-
kernel/dma/swiotlb.c | 1 +
kernel/workqueue.c | 8 +-
lib/Kconfig.debug | 5 +-
lib/dynamic_debug.c | 6 +-
lib/maple_tree.c | 16 +-
lib/scatterlist.c | 2 +-
mm/readahead.c | 4 +
net/8021q/vlan_core.c | 2 +
net/bluetooth/hci_core.c | 3 +-
net/bluetooth/hci_event.c | 2 +
net/bluetooth/l2cap_core.c | 3 +
net/bluetooth/msft.c | 2 +-
net/bluetooth/msft.h | 4 +-
net/bluetooth/sco.c | 4 +
net/bridge/br_forward.c | 9 +-
net/bridge/br_netlink.c | 3 +-
net/core/filter.c | 42 ++-
net/core/gro.c | 1 +
net/core/link_watch.c | 4 +-
net/core/net-sysfs.c | 4 +-
net/core/net_namespace.c | 13 +-
net/core/rtnetlink.c | 6 +-
net/core/skbuff.c | 27 +-
net/core/skmsg.c | 5 +-
net/core/sock.c | 4 +-
net/hsr/hsr_device.c | 31 +-
net/ipv4/af_inet.c | 1 +
net/ipv4/ip_output.c | 2 +-
net/ipv4/raw.c | 3 +
net/ipv4/tcp.c | 4 +-
net/ipv4/tcp_input.c | 2 +
net/ipv4/tcp_ipv4.c | 8 +-
net/ipv4/tcp_output.c | 4 +-
net/ipv4/udp.c | 3 +-
net/ipv4/udp_offload.c | 15 +-
net/ipv4/xfrm4_input.c | 6 +-
net/ipv6/addrconf.c | 11 +-
net/ipv6/fib6_rules.c | 6 +-
net/ipv6/ip6_input.c | 4 +-
net/ipv6/ip6_offload.c | 52 +++-
net/ipv6/ip6_output.c | 4 +-
net/ipv6/udp.c | 3 +-
net/ipv6/udp_offload.c | 3 +-
net/ipv6/xfrm6_input.c | 6 +-
net/l2tp/l2tp_eth.c | 3 +
net/mac80211/ieee80211_i.h | 4 +-
net/mac80211/mlme.c | 5 +-
net/mptcp/ctrl.c | 39 ++-
net/mptcp/protocol.c | 3 +
net/nfc/nci/core.c | 1 +
net/nsh/nsh.c | 14 +-
net/phonet/pn_netlink.c | 2 +-
net/rxrpc/ar-internal.h | 2 +-
net/rxrpc/call_object.c | 7 +-
net/rxrpc/conn_event.c | 16 +-
net/rxrpc/conn_object.c | 9 +-
net/rxrpc/input.c | 71 +++--
net/rxrpc/output.c | 14 +-
net/rxrpc/protocol.h | 6 +-
net/smc/smc_ib.c | 19 +-
net/sunrpc/clnt.c | 5 +-
net/sunrpc/xprtsock.c | 1 +
net/tipc/msg.c | 8 +-
net/wireless/nl80211.c | 2 +
net/wireless/trace.h | 2 +-
net/xfrm/xfrm_input.c | 8 +
rust/kernel/lib.rs | 2 +-
rust/macros/module.rs | 185 +++++++-----
scripts/Makefile.modfinal | 2 +-
sound/hda/intel-sdw-acpi.c | 2 +
sound/pci/emu10k1/emu10k1.c | 3 +-
sound/pci/emu10k1/emu10k1_main.c | 139 +++++----
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/codecs/wsa881x.c | 1 +
sound/soc/intel/avs/topology.c | 2 +
sound/soc/meson/Kconfig | 1 +
sound/soc/meson/axg-card.c | 1 +
sound/soc/meson/axg-fifo.c | 56 ++--
sound/soc/meson/axg-fifo.h | 12 +-
sound/soc/meson/axg-frddr.c | 5 +-
sound/soc/meson/axg-tdm-interface.c | 34 ++-
sound/soc/meson/axg-toddr.c | 22 +-
sound/soc/sof/intel/hda-dsp.c | 20 +-
sound/soc/sof/intel/pci-lnl.c | 3 +
sound/soc/tegra/tegra186_dspk.c | 7 +-
sound/soc/ti/davinci-mcasp.c | 12 +-
sound/usb/line6/driver.c | 6 +-
tools/include/linux/kernel.h | 1 +
tools/include/linux/mm.h | 5 +
tools/include/linux/panic.h | 19 ++
tools/power/x86/turbostat/turbostat.8 | 2 +-
tools/power/x86/turbostat/turbostat.c | 45 ++-
.../selftests/bpf/prog_tests/bloom_filter_map.c | 6 +
.../ftrace/test.d/filter/event-filter-function.tc | 2 +-
tools/testing/selftests/mm/Makefile | 6 +-
.../selftests/net/test_bridge_neigh_suppress.sh | 333 ++++++++++-----------
tools/testing/selftests/timers/valid-adjtimex.c | 73 +++--
338 files changed, 3043 insertions(+), 1798 deletions(-)
^ permalink raw reply [relevance 2%]
* [PATCH 6.8 324/336] ksmbd: do not grant v2 lease if parent lease key and epoch are not set
2024-05-14 10:13 1% [PATCH 6.8 000/336] 6.8.10-rc1 review Greg Kroah-Hartman
2024-05-14 10:18 8% ` [PATCH 6.8 322/336] ksmbd: off ipv6only for both ipv4/ipv6 binding Greg Kroah-Hartman
2024-05-14 10:18 8% ` [PATCH 6.8 323/336] ksmbd: avoid to send duplicate lease break notifications Greg Kroah-Hartman
@ 2024-05-14 10:18 9% ` Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:18 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French
6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit 691aae4f36f9825df6781da4399a1e718951085a upstream.
This patch fix xfstests generic/070 test with smb2 leases = yes.
cifs.ko doesn't set parent lease key and epoch in create context v2 lease.
ksmbd suppose that parent lease and epoch are vaild if data length is
v2 lease context size and handle directory lease using this values.
ksmbd should hanle it as v1 lease not v2 lease if parent lease key and
epoch are not set in create context v2 lease.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/oplock.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -1208,7 +1208,9 @@ int smb_grant_oplock(struct ksmbd_work *
/* Only v2 leases handle the directory */
if (S_ISDIR(file_inode(fp->filp)->i_mode)) {
- if (!lctx || lctx->version != 2)
+ if (!lctx || lctx->version != 2 ||
+ (lctx->flags != SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET_LE &&
+ !lctx->epoch))
return 0;
}
@@ -1470,8 +1472,9 @@ void create_lease_buf(u8 *rbuf, struct l
buf->lcontext.LeaseFlags = lease->flags;
buf->lcontext.Epoch = cpu_to_le16(lease->epoch);
buf->lcontext.LeaseState = lease->state;
- memcpy(buf->lcontext.ParentLeaseKey, lease->parent_lease_key,
- SMB2_LEASE_KEY_SIZE);
+ if (lease->flags == SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET_LE)
+ memcpy(buf->lcontext.ParentLeaseKey, lease->parent_lease_key,
+ SMB2_LEASE_KEY_SIZE);
buf->ccontext.DataOffset = cpu_to_le16(offsetof
(struct create_lease_v2, lcontext));
buf->ccontext.DataLength = cpu_to_le32(sizeof(struct lease_context_v2));
@@ -1536,8 +1539,9 @@ struct lease_ctx_info *parse_lease_state
lreq->flags = lc->lcontext.LeaseFlags;
lreq->epoch = lc->lcontext.Epoch;
lreq->duration = lc->lcontext.LeaseDuration;
- memcpy(lreq->parent_lease_key, lc->lcontext.ParentLeaseKey,
- SMB2_LEASE_KEY_SIZE);
+ if (lreq->flags == SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET_LE)
+ memcpy(lreq->parent_lease_key, lc->lcontext.ParentLeaseKey,
+ SMB2_LEASE_KEY_SIZE);
lreq->version = 2;
} else {
struct create_lease *lc = (struct create_lease *)cc;
^ permalink raw reply [relevance 9%]
* [PATCH 6.8 323/336] ksmbd: avoid to send duplicate lease break notifications
2024-05-14 10:13 1% [PATCH 6.8 000/336] 6.8.10-rc1 review Greg Kroah-Hartman
2024-05-14 10:18 8% ` [PATCH 6.8 322/336] ksmbd: off ipv6only for both ipv4/ipv6 binding Greg Kroah-Hartman
@ 2024-05-14 10:18 8% ` Greg Kroah-Hartman
2024-05-14 10:18 9% ` [PATCH 6.8 324/336] ksmbd: do not grant v2 lease if parent lease key and epoch are not set Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:18 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French
6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit 97c2ec64667bacc49881d2b2dd9afd4d1c3fbaeb upstream.
This patch fixes generic/011 when enable smb2 leases.
if ksmbd sends multiple notifications for a file, cifs increments
the reference count of the file but it does not decrement the count by
the failure of queue_work.
So even if the file is closed, cifs does not send a SMB2_CLOSE request.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/oplock.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -612,13 +612,23 @@ static int oplock_break_pending(struct o
if (opinfo->op_state == OPLOCK_CLOSING)
return -ENOENT;
- else if (!opinfo->is_lease && opinfo->level <= req_op_level)
- return 1;
+ else if (opinfo->level <= req_op_level) {
+ if (opinfo->is_lease &&
+ opinfo->o_lease->state !=
+ (SMB2_LEASE_HANDLE_CACHING_LE |
+ SMB2_LEASE_READ_CACHING_LE))
+ return 1;
+ }
}
- if (!opinfo->is_lease && opinfo->level <= req_op_level) {
- wake_up_oplock_break(opinfo);
- return 1;
+ if (opinfo->level <= req_op_level) {
+ if (opinfo->is_lease &&
+ opinfo->o_lease->state !=
+ (SMB2_LEASE_HANDLE_CACHING_LE |
+ SMB2_LEASE_READ_CACHING_LE)) {
+ wake_up_oplock_break(opinfo);
+ return 1;
+ }
}
return 0;
}
@@ -886,7 +896,6 @@ static int oplock_break(struct oplock_in
struct lease *lease = brk_opinfo->o_lease;
atomic_inc(&brk_opinfo->breaking_cnt);
-
err = oplock_break_pending(brk_opinfo, req_op_level);
if (err)
return err < 0 ? err : 0;
^ permalink raw reply [relevance 8%]
* [PATCH 6.8 322/336] ksmbd: off ipv6only for both ipv4/ipv6 binding
2024-05-14 10:13 1% [PATCH 6.8 000/336] 6.8.10-rc1 review Greg Kroah-Hartman
@ 2024-05-14 10:18 8% ` Greg Kroah-Hartman
2024-05-14 10:18 8% ` [PATCH 6.8 323/336] ksmbd: avoid to send duplicate lease break notifications Greg Kroah-Hartman
2024-05-14 10:18 9% ` [PATCH 6.8 324/336] ksmbd: do not grant v2 lease if parent lease key and epoch are not set Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:18 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches,
ΕΛΕΝΗ
ΤΖΑΒΕΛΛΑ,
Namjae Jeon, Steve French
6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit cc00bc83f26eb8f2d8d9f56b949b62fd774d8432 upstream.
ΕΛΕΝΗ reported that ksmbd binds to the IPV6 wildcard (::) by default for
ipv4 and ipv6 binding. So IPV4 connections are successful only when
the Linux system parameter bindv6only is set to 0 [default value].
If this parameter is set to 1, then the ipv6 wildcard only represents
any IPV6 address. Samba creates different sockets for ipv4 and ipv6
by default. This patch off sk_ipv6only to support IPV4/IPV6 connections
without creating two sockets.
Cc: stable@vger.kernel.org
Reported-by: ΕΛΕΝΗ ΤΖΑΒΕΛΛΑ <helentzavellas@yahoo.gr>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/transport_tcp.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/fs/smb/server/transport_tcp.c
+++ b/fs/smb/server/transport_tcp.c
@@ -448,6 +448,10 @@ static int create_socket(struct interfac
sin6.sin6_family = PF_INET6;
sin6.sin6_addr = in6addr_any;
sin6.sin6_port = htons(server_conf.tcp_port);
+
+ lock_sock(ksmbd_socket->sk);
+ ksmbd_socket->sk->sk_ipv6only = false;
+ release_sock(ksmbd_socket->sk);
}
ksmbd_tcp_nodelay(ksmbd_socket);
^ permalink raw reply [relevance 8%]
* [PATCH 6.8 000/336] 6.8.10-rc1 review
@ 2024-05-14 10:13 1% Greg Kroah-Hartman
2024-05-14 10:18 8% ` [PATCH 6.8 322/336] ksmbd: off ipv6only for both ipv4/ipv6 binding Greg Kroah-Hartman
` (2 more replies)
0 siblings, 3 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-14 10:13 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 6.8.10 release.
There are 336 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Thu, 16 May 2024 10:09:32 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.8.10-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.8.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 6.8.10-rc1
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix firmware check error path
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching fw build id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix info leak when fetching board id
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: generalise device address check
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix NVM configuration parsing
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: add missing firmware sanity checks
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix wcn3991 device address check
Johan Hovold <johan+linaro@kernel.org>
Bluetooth: qca: fix invalid device address check
Steven Rostedt (Google) <rostedt@goodmis.org>
eventfs: Do not treat events directory different than other directories
Steven Rostedt (Google) <rostedt@goodmis.org>
eventfs: Do not differentiate the toplevel events directory
Steven Rostedt (Google) <rostedt@goodmis.org>
tracefs: Still use mount point as default permissions for instances
Steven Rostedt (Google) <rostedt@goodmis.org>
tracefs: Reset permissions on remount if permissions are options
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: avoid to send duplicate lease break notifications
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: off ipv6only for both ipv4/ipv6 binding
Conor Dooley <conor.dooley@microchip.com>
spi: microchip-core-qspi: fix setting spi bus clock rate
Johan Hovold <johan+linaro@kernel.org>
regulator: core: fix debugfs creation regression
Sean Anderson <sean.anderson@linux.dev>
nvme-pci: Add quirk for broken MSIs
Ryan Roberts <ryan.roberts@arm.com>
fs/proc/task_mmu: fix uffd-wp confusion in pagemap_scan_pmd_entry()
Ryan Roberts <ryan.roberts@arm.com>
fs/proc/task_mmu: fix loss of young/dirty bits during pagemap scan
Vasant Hegde <vasant.hegde@amd.com>
iommu/amd: Enhance def_domain_type to handle untrusted device
Peter Xu <peterx@redhat.com>
mm/userfaultfd: reset ptes when close() for wr-protected ones
Kefeng Wang <wangkefeng.wang@huawei.com>
mm: use memalloc_nofs_save() in page_cache_ra_order()
Michael Ellerman <mpe@ellerman.id.au>
selftests/mm: fix powerpc ARCH check
Thomas Gleixner <tglx@linutronix.de>
x86/apic: Don't access the APIC when disabling x2APIC
Thomas Weißschuh <linux@weissschuh.net>
misc/pvpanic-pci: register attributes via pci_driver
Lakshmi Yadlapati <lakshmiy@us.ibm.com>
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
net: fix out-of-bounds access in ops_init
Jason Gunthorpe <jgg@ziepe.ca>
iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault()
Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
arm64: dts: qcom: sa8155p-adp: fix SDHC2 CD pin configuration
Hersen Wu <hersenxs.wu@amd.com>
drm/amd/display: Fix incorrect DSC instance for MST
George Shen <george.shen@amd.com>
drm/amd/display: Handle Y carry-over in VCP X.Y calculation
Karthikeyan Ramasubramanian <kramasub@chromium.org>
drm/i915/bios: Fix parsing backlight BDB data
Andi Shyti <andi.shyti@linux.intel.com>
drm/i915/gt: Automate CCS Mode setting during engine resets
Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
drm/i915/audio: Fix audio time stamp programming for DP
Lyude Paul <lyude@redhat.com>
drm/nouveau/gsp: Use the sg allocator for level 2 of radix3
Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
drm/amd/display: Fix idle optimization checks for multi-display and dual eDP
Matt Coster <matt.coster@imgtec.com>
drm/imagination: Ensure PVR_MIPS_PT_PAGE_COUNT is never zero
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix invalid reads in fence signaled events
Ian Forbes <ian.forbes@broadcom.com>
drm/vmwgfx: Fix Legacy Display Unit
Zack Rusin <zack.rusin@broadcom.com>
drm/ttm: Print the memory decryption status just once
Alex Deucher <alexander.deucher@amd.com>
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Dave Airlie <airlied@redhat.com>
Revert "drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()"
Lyude Paul <lyude@redhat.com>
drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: add lunar lake point M DID
Frank Oltmanns <frank@oltmanns.dev>
clk: sunxi-ng: a64: Set minimum and maximum rate for PLL-MIPI
Frank Oltmanns <frank@oltmanns.dev>
clk: sunxi-ng: common: Support minimum and maximum rate
Marek Szyprowski <m.szyprowski@samsung.com>
clk: samsung: Revert "clk: Use device_get_match_data()"
Viken Dadhaniya <quic_vdadhani@quicinc.com>
slimbus: qcom-ngd-ctrl: Add timeout for wait operation
Jim Cromie <jim.cromie@gmail.com>
dyndbg: fix old BUG_ON in >control parser
Joao Paulo Goncalves <joao.goncalves@toradex.com>
ASoC: ti: davinci-mcasp: Fix race condition during probe
Sameer Pujar <spujar@nvidia.com>
ASoC: tegra: Fix DSPK 16-bit playback
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize UMAC_CMD access
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
Doug Berger <opendmb@gmail.com>
net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
Max Filippov <jcmvbkbc@gmail.com>
xtensa: fix MAKE_PC_FROM_RA second argument
Paolo Abeni <pabeni@redhat.com>
tipc: fix UAF in error path
Vitaly Lifshits <vitaly.lifshits@intel.com>
e1000e: change usleep_range to udelay in PHY mdic access
Alexander Potapenko <glider@google.com>
kmsan: compiler_types: declare __no_sanitize_or_inline
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Reset chip on probe() and resume()
Hans de Goede <hdegoede@redhat.com>
iio: accel: mxc4005: Interrupt handling fixes
Vasileios Amoiridis <vassilisamir@gmail.com>
iio: pressure: Fixes SPI support for BMP3xx devices
Vasileios Amoiridis <vassilisamir@gmail.com>
iio: pressure: Fixes BME280 SPI driver data
Ramona Gradinariu <ramona.bolboaca13@gmail.com>
iio:imu: adis16475: Fix sync mode setting
Javier Carrasco <javier.carrasco.cruz@gmail.com>
dt-bindings: iio: health: maxim,max30102: fix compatible check
Sven Schnelle <svens@linux.ibm.com>
workqueue: Fix selection of wake_cpu in kick_pool()
Gregory Detal <gregory.detal@gmail.com>
mptcp: only allow set existing scheduler for net.mptcp.scheduler
Paolo Abeni <pabeni@redhat.com>
mptcp: ensure snd_nxt is properly initialized on connect
Dan Carpenter <dan.carpenter@linaro.org>
mm/slab: make __free(kfree) accept error pointers
Liam R. Howlett <Liam.Howlett@oracle.com>
maple_tree: fix mas_empty_area_rev() null pointer dereference
Josef Bacik <josef@toxicpanda.com>
btrfs: make sure that WRITTEN is set on all metadata blocks
Qu Wenruo <wqu@suse.com>
btrfs: qgroup: do not check qgroup inherit if qgroup is disabled
Qu Wenruo <wqu@suse.com>
btrfs: set correct ram_bytes when splitting ordered extent
Dominique Martinet <dominique.martinet@atmark-techno.com>
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Nicolas Bouchinet <nicolas.bouchinet@ssi.gouv.fr>
mm/slub: avoid zeroing outside-object freepointer for single free
Takashi Sakamoto <o-takashi@sakamocchi.jp>
firewire: ohci: fulfill timestamp for some local asynchronous transaction
Takashi Iwai <tiwai@suse.de>
ALSA: hda/realtek: Fix conflicting PCI SSID 17aa:386f for Lenovo Legion models
Aman Dhoot <amandhoot12@gmail.com>
ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
Badhri Jagan Sridharan <badhri@google.com>
usb: typec: tcpm: Check for port partner validity before consuming it
Amit Sunil Dhamne <amitsd@google.com>
usb: typec: tcpm: unregister existing source caps before re-registration
RD Babiera <rdbabiera@google.com>
usb: typec: tcpm: clear pd_event queue in PORT_RESET
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: dwc3: core: Prevent phy suspend during init
Thinh Nguyen <Thinh.Nguyen@synopsys.com>
usb: xhci-plat: Don't include xhci.h
Chris Wulff <Chris.Wulff@biamp.com>
usb: gadget: f_fs: Fix a race condition when processing setup packets.
Wesley Cheng <quic_wcheng@quicinc.com>
usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete
Ivan Avdeev <me@provod.works>
usb: gadget: uvc: use correct buffer size when parsing configfs lists
Peter Korsgaard <peter@korsgaard.com>
usb: gadget: composite: fix OS descriptors w_value logic
Alan Stern <stern@rowland.harvard.edu>
USB: core: Fix access violation during port device removal
Guenter Roeck <linux@roeck-us.net>
usb: ohci: Prevent missed ohci interrupts
Alan Stern <stern@rowland.harvard.edu>
usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Fix connector check on init
Christian A. Ehrhardt <lk@c--e.de>
usb: typec: ucsi: Check for notifications after init
Linus Torvalds <torvalds@linux-foundation.org>
Reapply "drm/qxl: simplify qxl_fence_wait"
Thanassis Avgerinos <thanassis.avgerinos@gmail.com>
firewire: nosy: ensure user_length is taken into account when fetching packet contents
Christian König <christian.koenig@amd.com>
drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2
Michel Dänzer <mdaenzer@redhat.com>
drm/amdgpu: Fix comparison in amdgpu_res_cpu_visible
Gabe Teeger <gabe.teeger@amd.com>
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
Kent Gibson <warthog618@gmail.com>
gpiolib: cdev: fix uninitialised kfifo
Zhongqiu Han <quic_zhonhan@quicinc.com>
gpiolib: cdev: Fix use after free in lineinfo_changed_notify
Mario Limonciello <mario.limonciello@amd.com>
dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
Douglas Anderson <dianders@chromium.org>
drm/connector: Add \n to message about demoting connector force-probes
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: add bandgap setting for g12
Jerome Brunet <jbrunet@baylibre.com>
drm/meson: dw-hdmi: power up phy on device init
Steffen Bätz <steffen@innosonix.de>
net: dsa: mv88e6xxx: add phylink_get_caps for the mv88e6320/21 family
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix kernel crash when devlink reload during initialization
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix port vlan filter not disabled issue
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: use appropriate barrier function after setting a bit value
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: release PTP resources if pf initialization failed
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: change type of numa_node_mask as nodemask_t
Jian Shen <shenjian15@huawei.com>
net: hns3: direct return when receive a unknown mailbox message
Peiyang Wang <wangpeiyang1@huawei.com>
net: hns3: using user configure after hardware reset
Wen Gu <guwen@linux.alibaba.com>
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Eric Dumazet <edumazet@google.com>
ipv6: prevent NULL dereference in ip6_output()
Eric Dumazet <edumazet@google.com>
ipv6: annotate data-races around cnf.disable_ipv6
Lukasz Majewski <lukma@denx.de>
hsr: Simplify code for announcing HSR nodes timer setup
Eric Dumazet <edumazet@google.com>
net-sysfs: convert dev->operstate reads to lockless ones
Eric Dumazet <edumazet@google.com>
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
Daniel Golle <daniel@makrotopia.org>
dt-bindings: net: mediatek: remove wrongly added clocks and SerDes
David Howells <dhowells@redhat.com>
rxrpc: Only transmit one ACK per jumbo packet received
David Howells <dhowells@redhat.com>
rxrpc: Fix congestion control algorithm
David Howells <dhowells@redhat.com>
rxrpc: Fix the names of the fields in the ACK trailer struct
Ido Schimmel <idosch@nvidia.com>
selftests: test_bridge_neigh_suppress.sh: Fix failures due to duplicate MAC
Shigeru Yoshida <syoshida@redhat.com>
ipv6: Fix potential uninit-value access in __ip6_make_skb()
Felix Fietkau <nbd@nbd.name>
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
nfc: nci: Fix kcov check in nci_rx_work()
Donald Hunter <donald.hunter@gmail.com>
netlink: specs: Add missing bridge linkinfo attrs
Eric Dumazet <edumazet@google.com>
phonet: fix rtm_phonet_notify() skb allocation
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use complete_all() instead of complete() in ccp_raw_event()
Aleksa Savic <savicaleksa83@gmail.com>
hwmon: (corsair-cpro) Use a separate buffer for sending commands
Roded Zats <rzats@paloaltonetworks.com>
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Marek Vasut <marex@denx.de>
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: HCI: Fix potential null-ptr-deref
Chen-Yu Tsai <wenst@chromium.org>
arm64: dts: mediatek: mt8183-pico6: Fix bluetooth node
Sungwoo Kim <iam@sung-woo.kim>
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Duoming Zhou <duoming@zju.edu.cn>
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Kuniyuki Iwashima <kuniyu@amazon.com>
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Eric Dumazet <edumazet@google.com>
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
Boy.Wu <boy.wu@mediatek.com>
ARM: 9381/1: kasan: clear stale stack poison
Paul Davey <paul.davey@alliedtelesis.co.nz>
xfrm: Preserve vlan tags for transport mode software GRO
Al Viro <viro@zeniv.linux.org.uk>
qibfs: fix dentry leak
Olga Kornievskaia <kolga@netapp.com>
SUNRPC: add a missing rpc_stat for TCP TLS
Li Nan <linan122@huawei.com>
blk-iocost: do not WARN if iocg was already offlined
Vanillan Wang <vanillanwang@163.com>
net:usb:qmi_wwan: support Rolling modules
Alex Deucher <alexander.deucher@amd.com>
drm/radeon: silence UBSAN warning (v3)
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
platform/x86: ISST: Add Granite Rapids-D to HPM CPU list
Mario Limonciello <mario.limonciello@amd.com>
platform/x86/amd: pmf: Decrease error message to debug
Lyude Paul <lyude@redhat.com>
drm/nouveau/dp: Don't probe eDP ports twice harder
Krzysztof Kozlowski <krzk@kernel.org>
gpio: lpc32xx: fix module autoloading
Joakim Sindholt <opensource@zhasha.com>
fs/9p: drop inodes immediately on non-.L too
Eric Van Hensbergen <ericvh@kernel.org>
fs/9p: remove erroneous nlink init from legacy stat2inode
Stephen Boyd <sboyd@kernel.org>
clk: Don't hold prepare_lock when calling kref_put()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: crystalcove: Use -ENOTSUPP consistently
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpio: wcove: Use -ENOTSUPP consistently
Michael Ellerman <mpe@ellerman.id.au>
powerpc/crypto/chacha-p10: Fix failure on non Power10
Jeff Layton <jlayton@kernel.org>
9p: explicitly deny setlease attempts
Joakim Sindholt <opensource@zhasha.com>
fs/9p: fix the cache always being enabled on files with qid flags
Joakim Sindholt <opensource@zhasha.com>
fs/9p: translate O_TRUNC into OTRUNC
Joakim Sindholt <opensource@zhasha.com>
fs/9p: only translate RWX permissions for plain 9P2000
Krzysztof Kozlowski <krzk@kernel.org>
iommu: mtk: fix module autoloading
Steve French <stfrench@microsoft.com>
smb3: fix broken reconnect when password changing on the server by allowing password rotation
Ashutosh Dixit <ashutosh.dixit@intel.com>
drm/xe: Label RING_CONTEXT_CONTROL as masked
Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
drm/xe/xe_migrate: Cast to output precision before multiplying operands
Michael Kelley <mhklinux@outlook.com>
Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted
Rick Edgecombe <rick.p.edgecombe@intel.com>
uio_hv_generic: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
hv_netvsc: Don't free decrypted memory
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl
Rick Edgecombe <rick.p.edgecombe@intel.com>
Drivers: hv: vmbus: Leak pages if set_memory_encrypted() fails
John Stultz <jstultz@google.com>
selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
Zhigang Luo <Zhigang.Luo@amd.com>
amd/amdkfd: sync all devices to wait all processes being evicted
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Fix VCN allocation in CPX partition
Kenneth Feng <kenneth.feng@amd.com>
drm/amd/pm: fix the high voltage issue after unload
Alex Hung <alex.hung@amd.com>
drm/amd/display: Skip on writeback when it's not applicable
Tao Zhou <tao.zhou1@amd.com>
drm/amdgpu: implement IRQ_STATE_ENABLE for SDMA v4.4.2
Yifan Zhang <yifan1.zhang@amd.com>
drm/amdgpu: add smu 14.0.1 discovery support
Li Ma <li.ma@amd.com>
drm/amd/display: add DCN 351 version for microcode load
Lijo Lazar <lijo.lazar@amd.com>
drm/amdgpu: Refine IB schedule error logging
Eric Dumazet <edumazet@google.com>
nfc: llcp: fix nfc_llcp_setsockopt() unsafe copies
Eric Dumazet <edumazet@google.com>
net: add copy_safe_from_sockptr() helper
Justin Ernst <justin.ernst@hpe.com>
tools/power/turbostat: Fix uncore frequency file string
Jiaxun Yang <jiaxun.yang@flygoat.com>
MIPS: scall: Save thread_info.syscall unconditionally on entry
Thierry Reding <treding@nvidia.com>
gpu: host1x: Do not setup DMA for virtual devices
Bernhard Rosenkränzer <bero@baylibre.com>
platform/x86: acer-wmi: Add support for Acer PH18-71
Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
accel/ivpu: Fix missed error message after VPU rename
Wachowski, Karol <karol.wachowski@intel.com>
accel/ivpu: Improve clarity of MMU error messages
Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
accel/ivpu: Remove d3hot_after_power_off WA
Rik van Riel <riel@surriel.com>
blk-iocost: avoid out of bounds shift
Xiang Chen <chenxiang66@hisilicon.com>
scsi: hisi_sas: Handle the NCQ error returned by D2H frame
Maurizio Lombardi <mlombard@redhat.com>
scsi: target: Fix SELinux error when systemd-modules loads the target module
Kees Cook <keescook@chromium.org>
nouveau/gsp: Avoid addressing beyond end of rpc->entries
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `BIT'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `panic'
Wei Yang <richard.weiyang@gmail.com>
memblock tests: fix undefined reference to `early_pfn_to_nid'
Boris Burkov <boris@bur.io>
btrfs: always clear PERTRANS metadata during commit
Boris Burkov <boris@bur.io>
btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
Len Brown <len.brown@intel.com>
tools/power turbostat: Fix warning upon failed /dev/cpu_dma_latency read
Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com>
tools/power turbostat: Print ucode revision only if valid
Len Brown <len.brown@intel.com>
tools/power turbostat: Expand probe_intel_uncore_frequency()
Chen Yu <yu.c.chen@intel.com>
tools/power turbostat: Do not print negative LPI residency
Peng Liu <liupeng17@lenovo.com>
tools/power turbostat: Fix Bzy_MHz documentation typo
Wyes Karny <wyes.karny@amd.com>
tools/power turbostat: Increase the limit for fd opened
Doug Smythies <dsmythies@telus.net>
tools/power turbostat: Fix added raw MSR output
Adam Goldman <adamg@pobox.com>
firewire: ohci: mask bus reset interrupts between ISR and bottom half
Chen Ni <nichen@iscas.ac.cn>
ata: sata_gemini: Check clk_enable() result
Jeff Layton <jlayton@kernel.org>
vboxsf: explicitly deny setlease attempts
Phil Elwell <phil@raspberrypi.com>
net: bcmgenet: Reset RBUF on first open
Zhang Yi <zhangyi@everest-semi.com>
ASoC: codecs: ES8326: modify clock table
Zhang Yi <zhangyi@everest-semi.com>
ASoC: codecs: ES8326: Solve error interruption issue
Li Nan <linan122@huawei.com>
block: fix overflow in blk_ioctl_discard()
Takashi Iwai <tiwai@suse.de>
ALSA: line6: Zero-initialize message buffers
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: Fix MCQ mode dev command timeout
Yihang Li <liyihang9@huawei.com>
scsi: libsas: Align SMP request allocation to ARCH_DMA_MINALIGN
Peter Wang <peter.wang@mediatek.com>
scsi: ufs: core: WLUN suspend dev/link state error recovery
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
OSS: dmasound/paula: Mark driver struct with __refdata to prevent section mismatch
André Apitzsch <git@apitzsch.eu>
regulator: tps65132: Add of_match table
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
ASoC: SOF: Intel: hda-dsp: Skip IMR boot on ACE platforms in case of S3 suspend
Borislav Petkov (AMD) <bp@alien8.de>
kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
Mark Rutland <mark.rutland@arm.com>
selftests/ftrace: Fix event filter target_func selection
Andrei Matei <andreimatei1@gmail.com>
bpf: Check bloom filter map value size
Jonathan Kim <Jonathan.Kim@amd.com>
drm/amdkfd: range check cp bad op exception interrupts
Mukul Joshi <mukul.joshi@amd.com>
drm/amdkfd: Check cgroup when returning DMABuf info
Anand Jain <anand.jain@oracle.com>
btrfs: return accurate error code on open failure in open_fs_devices()
Saurav Kashyap <skashyap@marvell.com>
scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
scsi: mpi3mr: Avoid memcpy field-spanning write WARNING
Lucas De Marchi <lucas.demarchi@intel.com>
drm/xe: Fix END redefinition
linke li <lilinke99@qq.com>
net: mark racy access on sk->sk_rcvbuf
Benjamin Berg <benjamin.berg@intel.com>
wifi: iwlwifi: mvm: guard against invalid STA ID on removal
Johannes Berg <johannes.berg@intel.com>
wifi: iwlwifi: read txq->read_ptr under lock
Johannes Berg <johannes.berg@intel.com>
wifi: mac80211: fix prep_connection error path
Igor Artemiev <Igor.A.Artemiev@mcst.ru>
wifi: cfg80211: fix rdev_dump_mpp() arguments order
Jeff Johnson <quic_jjohnson@quicinc.com>
wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
Eric Van Hensbergen <ericvh@kernel.org>
fs/9p: fix uninitialized values during inode evict
Andrew Price <anprice@redhat.com>
gfs2: Fix invalid metadata access in punch_hole
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Use a dedicated lock for ras_fwlog state
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Release hbalock before calling lpfc_worker_wake_up()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port()
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Remove IRQF_ONESHOT flag from threaded IRQ handling
Justin Tee <justin.tee@broadcom.com>
scsi: lpfc: Move NPIV's transport unregistration to after resource clean up
Rohit Ner <rohitner@google.com>
scsi: ufs: core: Fix MCQ MAC configuration
Conor Dooley <conor.dooley@microchip.com>
firmware: microchip: don't unconditionally print validation success
Yuezhang Mo <Yuezhang.Mo@sony.com>
exfat: fix timing of synchronizing bitmap and inode
Oliver Upton <oliver.upton@linux.dev>
KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr()
Will Deacon <will@kernel.org>
swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y
Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
EDAC/versal: Do not log total error counts
Gaurav Batra <gbatra@linux.ibm.com>
powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE
Nayna Jain <nayna@linux.ibm.com>
powerpc/pseries: make max polling consistent for longer H_CALLs
Jernej Skrabec <jernej.skrabec@gmail.com>
clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
Adam Skladowski <a39.skl@gmail.com>
clk: qcom: smd-rpm: Restore msm8976 num_clk
Lucas De Marchi <lucas.demarchi@intel.com>
drm/xe/display: Fix ADL-N detection
Richard Gobert <richardbgobert@gmail.com>
net: gro: add flush check in udp_gro_receive_segment
Richard Gobert <richardbgobert@gmail.com>
net: gro: fix udp bad offset in socket lookup by adding {inner_}network_offset to napi_gro_cb
Shigeru Yoshida <syoshida@redhat.com>
ipv4: Fix uninit-value access in __ip_make_skb()
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Use predefined error codes
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Respect deferred probe
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drm/panel: ili9341: Correct use of device property APIs
Alexandra Winter <wintera@linux.ibm.com>
s390/qeth: Fix kernel panic after setting hsuid
Guillaume Nault <gnault@redhat.com>
vxlan: Pull inner IP header in vxlan_rcv().
Xin Long <lucien.xin@gmail.com>
tipc: fix a possible memleak in tipc_buf_append
Jeffrey Altman <jaltman@auristor.com>
rxrpc: Clients must accept conn from any address
Felix Fietkau <nbd@nbd.name>
net: core: reject skb_copy(_expand) for fraglist GSO skbs
Felix Fietkau <nbd@nbd.name>
net: bridge: fix multicast-to-unicast with fraglist GSO
Mans Rullgard <mans@mansr.com>
spi: fix null pointer dereference within spi_sync
Shashank Sharma <shashank.sharma@amd.com>
drm/amdgpu: fix doorbell regression
Marek Behún <kabel@kernel.org>
net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
cxgb4: Properly lock TX queue for the selftest.
Bui Quang Minh <minhquangbui99@gmail.com>
s390/cio: Ensure the copied buf is NUL terminated
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: cards: select SND_DYNAMIC_MINORS
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-tdm-interface: manage formatters in trigger
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-card: make links nonatomic
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use threaded irq to check periods
Jerome Brunet <jbrunet@baylibre.com>
ASoC: meson: axg-fifo: use FIELD helpers
Guillaume Nault <gnault@redhat.com>
vxlan: Add missing VNI filter counter update in arp_reduce().
Guillaume Nault <gnault@redhat.com>
vxlan: Fix racy device stats updates.
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_actions()
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flow_spec
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: use return from qede_parse_flow_attr() for flower
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: fix E-MU dock initialization
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: move the whole GPIO event handling to the workqueue
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: factor out snd_emu1010_load_dock_firmware()
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
ALSA: emu10k1: fix E-MU card dock presence monitoring
David Howells <dhowells@redhat.com>
Fix a potential infinite loop in extract_user_to_sg()
Jens Remus <jremus@linux.ibm.com>
s390/vdso: Add CFI for RA register to asm macro vdso_func
Rafael J. Wysocki <rafael.j.wysocki@intel.com>
thermal/debugfs: Prevent use-after-free from occurring after cdev removal
David Bauer <mail@david-bauer.net>
net l2tp: drop flow hash on forward
Kuniyuki Iwashima <kuniyu@amazon.com>
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
Rafael J. Wysocki <rafael.j.wysocki@intel.com>
thermal/debugfs: Fix two locking issues with thermal zone debug
Rafael J. Wysocki <rafael.j.wysocki@intel.com>
thermal/debugfs: Free all thermal zone debug memory on zone removal
Bui Quang Minh <minhquangbui99@gmail.com>
octeontx2-af: avoid off-by-one read from userspace
Bui Quang Minh <minhquangbui99@gmail.com>
bna: ensure the copied buf is NUL terminated
Bui Quang Minh <minhquangbui99@gmail.com>
ice: ensure the copied buf is NUL terminated
Chen Yu <yu.c.chen@intel.com>
efi/unaccepted: touch soft lockup during memory accept
Toke Høiland-Jørgensen <toke@redhat.com>
xdp: use flags field to disambiguate broadcast redirect
Puranjay Mohan <puranjay@kernel.org>
arm32, bpf: Reimplement sign-extension mov instruction
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix clearing storage keys for huge pages
Claudio Imbrenda <imbrenda@linux.ibm.com>
s390/mm: Fix storage key clearing for guest huge pages
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
ASoC: codecs: wsa881x: set clk_stop_mode1 flag
Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
ASoC: Intel: avs: Set name of control as in topology
Xu Kuohai <xukuohai@huawei.com>
riscv, bpf: Fix incorrect runtime stats
Xu Kuohai <xukuohai@huawei.com>
bpf, arm64: Fix incorrect runtime stats
Devyn Liu <liudingyuan@huawei.com>
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: fix version format string
David Lechner <dlechner@baylibre.com>
spi: axi-spi-engine: use common AXI macros
Anton Protopopov <aspsk@isovalent.com>
bpf: Fix a verifier verbose message
Yi Zhang <yi.zhang@redhat.com>
nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
ASoC: SOF: Intel: add default firmware library path for LNL
Richard Fitzgerald <rf@opensource.cirrus.com>
regmap: Add regmap_read_bypassed()
Jason Xing <kernelxing@tencent.com>
bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue
Andrii Nakryiko <andrii@kernel.org>
bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change devm_regulator_get_enable_optional() stub to return Ok
Matti Vaittinen <mazziesaccount@gmail.com>
regulator: change stubbed devm_regulator_get_enable to return Ok
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
regulator: mt6360: De-capitalize devicetree regulator subnodes
Chuck Lever <chuck.lever@oracle.com>
NFSD: Fix nfsd4_encode_fattr4() crasher
Dai Ngo <dai.ngo@oracle.com>
NFSD: add support for CB_GETATTR callback
Josef Bacik <josef@toxicpanda.com>
nfsd: make all of the nfsd stats per-network namespace
Josef Bacik <josef@toxicpanda.com>
nfsd: expose /proc/net/sunrpc/nfsd in net namespaces
Josef Bacik <josef@toxicpanda.com>
nfsd: rename NFSD_NET_* to NFSD_STATS_*
Zeng Heng <zengheng4@huawei.com>
pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
Arnd Bergmann <arnd@arndb.de>
power: rt9455: hide unused rt9455_boost_voltage_values
Hans de Goede <hdegoede@redhat.com>
pinctrl: baytrail: Fix selecting gpio pinctrl state
Kuniyuki Iwashima <kuniyu@amazon.com>
nfs: Handle error of rpc_proc_register() in nfs_net_init().
Josef Bacik <josef@toxicpanda.com>
nfs: make the rpc_stat per net namespace
Josef Bacik <josef@toxicpanda.com>
nfs: expose /proc/net/sunrpc/nfs in net namespaces
Josef Bacik <josef@toxicpanda.com>
sunrpc: add a struct rpc_stats arg to rpc_create_args
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
Chen-Yu Tsai <wenst@chromium.org>
pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
Dan Carpenter <dan.carpenter@linaro.org>
pinctrl: core: delete incorrect free in pinctrl_enable()
Jan Dakinevich <jan.dakinevich@salutedevices.com>
pinctrl/meson: fix typo in PDM's pin name
Billy Tsai <billy_tsai@aspeedtech.com>
pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
Johannes Berg <johannes.berg@intel.com>
wifi: nl80211: don't free NULL coalescing rule
Benno Lossin <benno.lossin@proton.me>
rust: macros: fix soundness issue in `module!` macro
Thomas Bertschinger <tahbertschinger@gmail.com>
rust: module: place generated init_module() function in .init.text
-------------
Diffstat:
.../bindings/iio/health/maxim,max30102.yaml | 2 +-
.../devicetree/bindings/net/mediatek,net.yaml | 22 +--
Documentation/netlink/specs/rt_link.yaml | 6 +
Makefile | 4 +-
arch/arm/kernel/sleep.S | 4 +
arch/arm/net/bpf_jit_32.c | 56 +++++--
.../dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 3 +-
arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 30 ++--
arch/arm64/kvm/vgic/vgic-kvm-device.c | 8 +-
arch/arm64/net/bpf_jit_comp.c | 6 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/kernel/asm-offsets.c | 1 +
arch/mips/kernel/ptrace.c | 15 +-
arch/mips/kernel/scall32-o32.S | 23 +--
arch/mips/kernel/scall64-n32.S | 3 +-
arch/mips/kernel/scall64-n64.S | 3 +-
arch/mips/kernel/scall64-o32.S | 33 ++--
arch/powerpc/crypto/chacha-p10-glue.c | 8 +-
arch/powerpc/include/asm/plpks.h | 5 +-
arch/powerpc/platforms/pseries/iommu.c | 8 +
arch/powerpc/platforms/pseries/plpks.c | 10 +-
arch/riscv/net/bpf_jit_comp64.c | 6 +-
arch/s390/include/asm/dwarf.h | 1 +
arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2 +
arch/s390/mm/gmap.c | 2 +-
arch/s390/mm/hugetlbpage.c | 2 +-
arch/x86/kernel/apic/apic.c | 16 +-
arch/xtensa/include/asm/processor.h | 8 +-
arch/xtensa/include/asm/ptrace.h | 2 +-
arch/xtensa/kernel/process.c | 5 +-
arch/xtensa/kernel/stacktrace.c | 3 +-
block/blk-iocost.c | 14 +-
block/ioctl.c | 5 +-
drivers/accel/ivpu/ivpu_drv.c | 20 +--
drivers/accel/ivpu/ivpu_drv.h | 3 +-
drivers/accel/ivpu/ivpu_hw_37xx.c | 4 +-
drivers/accel/ivpu/ivpu_mmu.c | 8 +-
drivers/accel/ivpu/ivpu_pm.c | 9 +-
drivers/ata/sata_gemini.c | 5 +-
drivers/base/regmap/regmap.c | 37 +++++
drivers/bluetooth/btqca.c | 140 ++++++++++++++--
drivers/bluetooth/btqca.h | 3 +-
drivers/bluetooth/hci_qca.c | 2 -
drivers/clk/clk.c | 12 +-
drivers/clk/qcom/clk-smd-rpm.c | 1 +
drivers/clk/samsung/clk-exynos-clkout.c | 13 +-
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 2 +
drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 ++-
drivers/clk/sunxi-ng/ccu_common.c | 19 +++
drivers/clk/sunxi-ng/ccu_common.h | 3 +
drivers/edac/versal_edac.c | 4 +-
drivers/firewire/nosy.c | 6 +-
drivers/firewire/ohci.c | 14 +-
drivers/firmware/efi/unaccepted_memory.c | 4 +
drivers/firmware/microchip/mpfs-auto-update.c | 2 +
drivers/gpio/gpio-crystalcove.c | 2 +-
drivers/gpio/gpio-lpc32xx.c | 1 +
drivers/gpio/gpio-wcove.c | 2 +-
drivers/gpio/gpiolib-cdev.c | 16 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 56 ++++---
drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 15 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 16 +-
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 11 +-
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 3 +-
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +-
.../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 48 ++++--
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 +
.../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6 +
.../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 33 +++-
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 27 ++-
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 +
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8 +-
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2 +-
drivers/gpu/drm/drm_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_audio.c | 113 +------------
drivers/gpu/drm/i915/display/intel_bios.c | 19 +--
drivers/gpu/drm/i915/display/intel_vbt_defs.h | 5 -
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c | 6 +-
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.h | 2 +-
drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +-
drivers/gpu/drm/imagination/pvr_fw_mips.h | 5 +-
drivers/gpu/drm/meson/meson_dw_hdmi.c | 70 ++++----
drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 4 +-
drivers/gpu/drm/nouveau/nouveau_dp.c | 13 +-
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 81 +++++----
drivers/gpu/drm/panel/Kconfig | 2 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 13 +-
drivers/gpu/drm/qxl/qxl_release.c | 50 +-----
drivers/gpu/drm/radeon/pptable.h | 10 +-
drivers/gpu/drm/ttm/ttm_tt.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 3 +-
drivers/gpu/drm/xe/regs/xe_engine_regs.h | 2 +-
drivers/gpu/drm/xe/xe_lrc.c | 25 ++-
drivers/gpu/drm/xe/xe_migrate.c | 8 +-
drivers/gpu/host1x/bus.c | 8 -
drivers/hv/channel.c | 29 +++-
drivers/hv/connection.c | 29 +++-
drivers/hwmon/corsair-cpro.c | 43 +++--
drivers/hwmon/pmbus/ucd9000.c | 6 +-
drivers/iio/accel/mxc4005.c | 92 +++++++++-
drivers/iio/imu/adis16475.c | 4 +-
drivers/iio/pressure/bmp280-core.c | 1 +
drivers/iio/pressure/bmp280-spi.c | 13 +-
drivers/iio/pressure/bmp280.h | 1 +
drivers/infiniband/hw/qib/qib_fs.c | 1 +
drivers/iommu/amd/iommu.c | 4 +
drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 4 +-
drivers/iommu/mtk_iommu.c | 1 +
drivers/iommu/mtk_iommu_v1.c | 1 +
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/misc/pvpanic/pvpanic-pci.c | 4 +-
drivers/net/dsa/mv88e6xxx/chip.c | 20 ++-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 32 +++-
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8 +-
drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +-
drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 52 +++---
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +-
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 20 +--
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +-
drivers/net/ethernet/intel/e1000e/phy.c | 8 +-
drivers/net/ethernet/intel/ice/ice_debugfs.c | 8 +-
.../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +-
drivers/net/ethernet/micrel/ks8851_common.c | 16 +-
drivers/net/ethernet/qlogic/qede/qede_filter.c | 14 +-
drivers/net/hyperv/netvsc.c | 7 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/vxlan/vxlan_core.c | 49 ++++--
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 7 +-
drivers/net/wireless/intel/iwlwifi/queue/tx.c | 2 +-
drivers/nvme/host/core.c | 2 +-
drivers/nvme/host/nvme.h | 5 +
drivers/nvme/host/pci.c | 14 +-
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 ++--
drivers/pinctrl/core.c | 8 +-
drivers/pinctrl/devicetree.c | 10 +-
drivers/pinctrl/intel/pinctrl-baytrail.c | 74 +++++----
drivers/pinctrl/intel/pinctrl-intel.h | 4 +
drivers/pinctrl/mediatek/pinctrl-paris.c | 40 ++---
drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +-
drivers/platform/x86/acer-wmi.c | 9 +
drivers/platform/x86/amd/pmf/acpi.c | 2 +-
.../x86/intel/speed_select_if/isst_if_common.c | 1 +
drivers/power/supply/mt6360_charger.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +
drivers/regulator/core.c | 27 +--
drivers/regulator/mt6360-regulator.c | 32 ++--
drivers/regulator/tps65132-regulator.c | 7 +
drivers/s390/cio/cio_inject.c | 2 +-
drivers/s390/net/qeth_core_main.c | 69 ++++----
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 -
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 +-
drivers/scsi/libsas/sas_expander.c | 2 +-
drivers/scsi/lpfc/lpfc.h | 2 +-
drivers/scsi/lpfc/lpfc_attr.c | 4 +-
drivers/scsi/lpfc/lpfc_bsg.c | 20 +--
drivers/scsi/lpfc/lpfc_debugfs.c | 12 +-
drivers/scsi/lpfc/lpfc_els.c | 20 +--
drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +-
drivers/scsi/lpfc/lpfc_init.c | 5 +-
drivers/scsi/lpfc/lpfc_nvme.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 13 +-
drivers/scsi/lpfc/lpfc_sli.c | 34 ++--
drivers/scsi/lpfc/lpfc_vport.c | 8 +-
drivers/scsi/mpi3mr/mpi3mr_app.c | 2 +-
drivers/slimbus/qcom-ngd-ctrl.c | 6 +-
drivers/spi/spi-axi-spi-engine.c | 19 +--
drivers/spi/spi-hisi-kunpeng.c | 2 -
drivers/spi/spi-microchip-core-qspi.c | 1 +
drivers/spi/spi.c | 1 +
drivers/target/target_core_configfs.c | 12 ++
drivers/thermal/thermal_debugfs.c | 59 +++++--
drivers/ufs/core/ufs-mcq.c | 2 +-
drivers/ufs/core/ufshcd.c | 9 +-
drivers/uio/uio_hv_generic.c | 12 +-
drivers/usb/core/hub.c | 5 +-
drivers/usb/core/port.c | 8 +-
drivers/usb/dwc3/core.c | 90 +++++-----
drivers/usb/dwc3/core.h | 1 +
drivers/usb/dwc3/gadget.c | 2 +
drivers/usb/dwc3/host.c | 27 +++
drivers/usb/gadget/composite.c | 6 +-
drivers/usb/gadget/function/f_fs.c | 9 +-
drivers/usb/gadget/function/uvc_configfs.c | 4 +-
drivers/usb/host/ohci-hcd.c | 8 +
drivers/usb/host/xhci-plat.h | 4 +-
drivers/usb/host/xhci-rzv2m.c | 1 +
drivers/usb/typec/tcpm/tcpm.c | 36 +++-
drivers/usb/typec/ucsi/ucsi.c | 12 +-
fs/9p/fid.h | 3 -
fs/9p/vfs_file.c | 2 +
fs/9p/vfs_inode.c | 23 ++-
fs/9p/vfs_super.c | 1 +
fs/btrfs/inode.c | 2 +-
fs/btrfs/ordered-data.c | 1 +
fs/btrfs/qgroup.c | 2 +
fs/btrfs/transaction.c | 2 +-
fs/btrfs/tree-checker.c | 30 ++--
fs/btrfs/tree-checker.h | 1 +
fs/btrfs/volumes.c | 18 +-
fs/exfat/file.c | 9 +-
fs/gfs2/bmap.c | 5 +-
fs/nfs/client.c | 5 +-
fs/nfs/inode.c | 13 +-
fs/nfs/internal.h | 2 -
fs/nfs/netns.h | 2 +
fs/nfsd/cache.h | 2 -
fs/nfsd/netns.h | 21 ++-
fs/nfsd/nfs4callback.c | 97 ++++++++++-
fs/nfsd/nfs4proc.c | 6 +-
fs/nfsd/nfs4state.c | 3 +-
fs/nfsd/nfs4xdr.c | 2 +-
fs/nfsd/nfscache.c | 40 +----
fs/nfsd/nfsctl.c | 14 +-
fs/nfsd/nfsfh.c | 3 +-
fs/nfsd/state.h | 14 ++
fs/nfsd/stats.c | 43 ++---
fs/nfsd/stats.h | 62 +++----
fs/nfsd/vfs.c | 6 +-
fs/nfsd/xdr4cb.h | 18 ++
fs/proc/task_mmu.c | 24 +--
fs/smb/client/cifsglob.h | 1 +
fs/smb/client/connect.c | 8 +
fs/smb/client/fs_context.c | 21 +++
fs/smb/client/fs_context.h | 2 +
fs/smb/client/misc.c | 1 +
fs/smb/client/smb2pdu.c | 11 ++
fs/smb/server/oplock.c | 35 ++--
fs/smb/server/transport_tcp.c | 4 +
fs/tracefs/event_inode.c | 74 +++++----
fs/tracefs/inode.c | 92 +++++++++-
fs/tracefs/internal.h | 14 +-
fs/userfaultfd.c | 4 +
fs/vboxsf/file.c | 1 +
include/linux/compiler_types.h | 11 ++
include/linux/dma-fence.h | 7 -
include/linux/gfp_types.h | 2 +
include/linux/hyperv.h | 1 +
include/linux/regmap.h | 8 +
include/linux/regulator/consumer.h | 4 +-
include/linux/skbuff.h | 15 ++
include/linux/skmsg.h | 2 +
include/linux/slab.h | 4 +-
include/linux/sockptr.h | 25 +++
include/linux/sunrpc/clnt.h | 1 +
include/net/gro.h | 9 +
include/net/xfrm.h | 3 +
include/sound/emu10k1.h | 3 +-
include/trace/events/rxrpc.h | 2 +-
include/uapi/linux/kfd_ioctl.h | 17 +-
include/uapi/scsi/scsi_bsg_mpi3mr.h | 2 +-
kernel/bpf/bloom_filter.c | 13 ++
kernel/bpf/verifier.c | 3 +-
kernel/dma/swiotlb.c | 1 +
kernel/workqueue.c | 8 +-
lib/Kconfig.debug | 5 +-
lib/dynamic_debug.c | 6 +-
lib/maple_tree.c | 16 +-
lib/scatterlist.c | 2 +-
mm/readahead.c | 4 +
mm/slub.c | 52 +++---
net/8021q/vlan_core.c | 2 +
net/bluetooth/hci_core.c | 3 +-
net/bluetooth/hci_event.c | 2 +
net/bluetooth/l2cap_core.c | 3 +
net/bluetooth/msft.c | 2 +-
net/bluetooth/msft.h | 4 +-
net/bluetooth/sco.c | 4 +
net/bridge/br_forward.c | 9 +-
net/bridge/br_netlink.c | 3 +-
net/core/filter.c | 42 +++--
net/core/gro.c | 1 +
net/core/link_watch.c | 4 +-
net/core/net-sysfs.c | 4 +-
net/core/net_namespace.c | 13 +-
net/core/rtnetlink.c | 6 +-
net/core/skbuff.c | 27 ++-
net/core/skmsg.c | 5 +-
net/core/sock.c | 4 +-
net/hsr/hsr_device.c | 31 ++--
net/ipv4/af_inet.c | 1 +
net/ipv4/ip_output.c | 2 +-
net/ipv4/raw.c | 3 +
net/ipv4/tcp.c | 4 +-
net/ipv4/tcp_input.c | 2 +
net/ipv4/tcp_ipv4.c | 8 +-
net/ipv4/tcp_output.c | 4 +-
net/ipv4/udp.c | 3 +-
net/ipv4/udp_offload.c | 15 +-
net/ipv4/xfrm4_input.c | 6 +-
net/ipv6/addrconf.c | 11 +-
net/ipv6/fib6_rules.c | 6 +-
net/ipv6/ip6_input.c | 4 +-
net/ipv6/ip6_offload.c | 1 +
net/ipv6/ip6_output.c | 4 +-
net/ipv6/udp.c | 3 +-
net/ipv6/udp_offload.c | 3 +-
net/ipv6/xfrm6_input.c | 6 +-
net/l2tp/l2tp_eth.c | 3 +
net/mac80211/ieee80211_i.h | 4 +-
net/mac80211/mlme.c | 5 +-
net/mptcp/ctrl.c | 39 ++++-
net/mptcp/protocol.c | 3 +
net/nfc/llcp_sock.c | 12 +-
net/nfc/nci/core.c | 1 +
net/nsh/nsh.c | 14 +-
net/phonet/pn_netlink.c | 2 +-
net/rxrpc/ar-internal.h | 2 +-
net/rxrpc/call_object.c | 7 +-
net/rxrpc/conn_event.c | 16 +-
net/rxrpc/conn_object.c | 9 +-
net/rxrpc/input.c | 71 +++++---
net/rxrpc/output.c | 14 +-
net/rxrpc/protocol.h | 6 +-
net/smc/smc_ib.c | 19 ++-
net/sunrpc/clnt.c | 5 +-
net/sunrpc/xprtsock.c | 1 +
net/tipc/msg.c | 8 +-
net/wireless/nl80211.c | 2 +
net/wireless/trace.h | 2 +-
net/xfrm/xfrm_input.c | 8 +
rust/macros/module.rs | 185 +++++++++++++--------
scripts/Makefile.modfinal | 2 +-
sound/hda/intel-sdw-acpi.c | 2 +
sound/oss/dmasound/dmasound_paula.c | 8 +-
sound/pci/emu10k1/emu10k1.c | 3 +-
sound/pci/emu10k1/emu10k1_main.c | 139 +++++++++-------
sound/pci/hda/patch_realtek.c | 25 ++-
sound/soc/codecs/es8326.c | 30 ++--
sound/soc/codecs/es8326.h | 2 +-
sound/soc/codecs/wsa881x.c | 1 +
sound/soc/intel/avs/topology.c | 2 +
sound/soc/meson/Kconfig | 1 +
sound/soc/meson/axg-card.c | 1 +
sound/soc/meson/axg-fifo.c | 56 ++++---
sound/soc/meson/axg-fifo.h | 12 +-
sound/soc/meson/axg-frddr.c | 5 +-
sound/soc/meson/axg-tdm-interface.c | 34 ++--
sound/soc/meson/axg-toddr.c | 22 ++-
sound/soc/sof/intel/hda-dsp.c | 20 ++-
sound/soc/sof/intel/pci-lnl.c | 3 +
sound/soc/tegra/tegra186_dspk.c | 7 +-
sound/soc/ti/davinci-mcasp.c | 12 +-
sound/usb/line6/driver.c | 6 +-
tools/include/linux/kernel.h | 1 +
tools/include/linux/mm.h | 5 +
tools/include/linux/panic.h | 19 +++
tools/power/x86/turbostat/turbostat.8 | 2 +-
tools/power/x86/turbostat/turbostat.c | 163 +++++++++++++-----
.../selftests/bpf/prog_tests/bloom_filter_map.c | 6 +
.../ftrace/test.d/filter/event-filter-function.tc | 2 +-
tools/testing/selftests/mm/Makefile | 6 +-
.../selftests/net/test_bridge_neigh_suppress.sh | 14 +-
tools/testing/selftests/timers/valid-adjtimex.c | 73 ++++----
369 files changed, 3269 insertions(+), 1864 deletions(-)
^ permalink raw reply [relevance 1%]
* linux-next: Tree for May 14
@ 2024-05-14 7:22 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-14 7:22 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 40598 bytes --]
Hi all,
Do not add any work intended for v6.11 to your linux-next included
branches until after v6.10-rc1 has been released.
Changes since 20240513:
Tthe vfs tree gained conflicts against Linus' tree.
The sound-asoc tree lost its build failure.
The devicetree tree gained conflicts against the drm tree.
The refactor-heap tree still had its conflicts against the block tree
for which I dropped the refactor-heap tree.
Non-merge commits (relative to Linus' tree): 10363
10437 files changed, 714873 insertions(+), 244943 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (8f5b5f78113e Merge tag 'rust-6.10' of https://github.com/Rust-for-Linux/linux)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (13266018ecac mm/vmalloc: fix vmalloc which may return null if called with __GFP_NOFAIL)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (5549d1e39989 Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (7bbe449d0bdb s390/paes: Reestablish retry loop in paes)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (ecf848eb934b net: usb: ax88179_178a: fix link status when link is set to down/up)
Merging bpf/master (3e9bc0472b91 Merge branch 'bpf: Add BPF_PROG_TYPE_CGROUP_SKB attach type enforcement in BPF_LINK_CREATE')
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging ipvs/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging wireless/for-next (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (d731b1ed1505 ALSA: hda/realtek: Drop doubly quirk entry for 103c:8a2e)
Merging sound-asoc-fixes/for-linus (e54f128b0c2f ASoC: audio-graph-card2: call of_node_get() before of_get_next_child())
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (2a4b49bb5812 regulator: core: fix debugfs creation regression)
Merging spi-fixes/for-linus (ef13561d2b16 spi: microchip-core-qspi: fix setting spi bus clock rate)
Merging pci-current/for-linus (f3d049b35b01 PCI/ASPM: Restore parent state to parent, child state to child)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler)
Merging usb.current/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging usb-serial-fixes/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (bb198e29fe75 iio: dac: ad5592r: fix temperature channel scaling value)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (008ab3c53bc4 speakup: Fix sizeof() vs ARRAY_SIZE() bug)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (a38297e3fb01 Linux 6.9)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (0a9c28bec202 Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (26e8383b116d hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (cbf613cd4d3c Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (a38297e3fb01 Linux 6.9)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so)
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (a38297e3fb01 Linux 6.9)
Merging drm-intel-fixes/for-linux-next-fixes (43b26bdd2ee5 drm/i915/bios: Fix parsing backlight BDB data)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (a38297e3fb01 Linux 6.9)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (a38297e3fb01 Linux 6.9)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (55750148e559 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe())
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (aed9a1a4f710 drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations)
Merging mm-stable/mm-stable (76edc534cc28 memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging mm-nonmm-stable/mm-nonmm-stable (5cbcb62dddf5 fs/proc: fix softlockup in __read_vmcore)
Merging mm/mm-everything (1ebf942a37ea foo)
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h
Merging kbuild/for-next (14da55bdea6b kconfig: gconf: show checkbox for choice correctly)
CONFLICT (content): Merge conflict in drivers/misc/lkdtm/Makefile
CONFLICT (content): Merge conflict in rust/Makefile
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (ea558c86248b tools lib subcmd: Show parent options in help)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a6016aac5252 dma: fix DMA sync for drivers not calling dma_set_mask*())
Merging asm-generic/master (02af68767d27 Merge branch 'alpha-cleanup-6.9' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (b7e329ac0464 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (f0cc697f9f65 Merge branch 'for-next/errata' into for-next/core)
Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support)
Merging arm-soc/for-next (1e3dd71e2587 Merge branch 'soc/defconfig' into for-next)
Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (4cece7649650 Linux 6.9-rc1)
Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (7468eb6710ce Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-clk/next' into for-next)
Merging samsung-krzk/for-next (a9c32618cd2a Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (3bdc4c661d47 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (429fe5372451 Merge branch 'clk-microchip' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (e58ccb4888e0 LoongArch: Update Loongson-3 default config file)
Merging m68k/for-next (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging m68knommu/for-next (a5044ce7d1d9 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (0ca4f51fa522 parisc/math-emu: Remove unused struct 'exc_reg')
Merging powerpc/next (e789d4499abd Merge branch 'topic/kdump-hotplug' into next)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree())
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
CONFLICT (content): Merge conflict in arch/riscv/Makefile
CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
CONFLICT (content): Merge conflict in kernel/sys.c
Merging riscv-dt/riscv-dt-for-next (1c80d50bb697 riscv: dts: microchip: add pac1934 power-monitor to icicle)
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (a1bca25da366 Merge branch 'features' into for-next)
Merging sh/for-next (efe976b7eecf sh: setup: Add missing forward declaration for sh_fdt_init())
Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask var)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (07f9a27f1969 bcachefs: add no_invalid_checks flag)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (55b52af44d50 Merge branch 'for-next-next-v6.9-20240508' into for-next-20240508)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (14b1cd25346b cifs: Fix locking in cifs_strict_readv())
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (7c35de4df105 erofs: Zstandard compression support)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (82172cca18b2 Merge isofs Makefile cleanup.)
Merging ext4/dev (26770a717cac jbd2: add prefix 'jbd2' for 'shrink_type')
CONFLICT (content): Merge conflict in fs/ext4/file.c
Merging f2fs/dev (991b6bdf1b00 f2fs: fix some ambiguous comments)
Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning)
Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support)
Merging gfs2/for-next (c1c53c26e338 gfs2: make timeout values more explicit)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (c91ecba9e421 ksmbd: avoid to send duplicate oplock break notifications)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (8d915bbf3926 NFSD: Force all NFSv4.2 COPY requests to be synchronous)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access)
Merging overlayfs/overlayfs-next (e9229c18dae3 ovl: remove duplicate included header)
Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address access in jffs2_free_inode)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (a38297e3fb01 Linux 6.9)
Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (584bbf439d0f Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in include/linux/fs.h
Merging vfs/for-next (4faeedb807f8 Merge branch 'work.bd_inode' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
CONFLICT (content): Merge conflict in block/ioctl.c
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flags"
Merging printk/for-next (596ffa476e20 Merge branch 'for-6.10' into for-next)
Merging pci/next (484af35f7e65 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (14ee3d12f37b Merge branch 'for-6.10/hid-bpf' into for-next)
Merging i2c/i2c/for-next (e1734eb57f03 power: supply: sbs-manager: Remove class argument from i2c_mux_add_adapter())
Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE())
Merging i3c/i3c/next (acec16dbb338 i3c: dw: Add hot-join support.)
Merging dmi/dmi-for-next (7d5019435585 firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (5fbf8734fb36 hwmon: (nzxt-kraken3) Bail out for unsupported device variants)
Merging jc_docs/docs-next (955e15969c1d Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (4a7d735191de media: dw2102: fix coding style issues)
Merging v4l-dvb-next/master (48259b909737 media: media: intel/ipu6: Fix spelling mistake "remappinp" -> "remapping")
Merging pm/linux-next (9b0087147da0 Merge branch 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (ccad360a2d41 PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions)
Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (69b08420b697 thermal: renesas: rcar: Add dependency on OF)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (49ca2b2ef3d0 RDMA/IPoIB: Fix format truncation compilation errors)
Merging net-next/main (5c1672705a1a net: revert partially applied PHY topology series)
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/Makefile
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in net/core/page_pool.c
Merging bpf-next/for-next (ba39486d2c43 bpf: make list_for_each_entry portable)
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (fa23e0d4b756 netfilter: nf_tables: allow clone callbacks to sleep)
Merging ipvs-next/main (fa23e0d4b756 netfilter: nf_tables: allow clone callbacks to sleep)
Merging bluetooth/master (75f819bdf9ca Bluetooth: btintel: Fix compiler warning for multi_v7_defconfig config)
Merging wireless-next/for-next (1d60eabb8269 wifi: mwl8k: initialize cmd->addr[] properly)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content)
Merging drm/drm-next (275654c02f0b Merge tag 'drm-xe-next-fixes-2024-05-09-1' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c
Merging drm-exynos/for-linux-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging drm-misc/for-linux-next (959314c438ca drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations)
959314c438ca ("drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations")
Merging amdgpu/drm-next (a83048bfa402 drm/amd/amdgpu: Add ISP support to amdgpu_discovery)
Merging drm-intel/for-linux-next (8a5fc5f0031e drm/xe/display: remove unused xe->sb_lock)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vbt_defs.h
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (b587f413ca47 drm/msm/gen_header: allow skipping the validation)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (664de50cbfae drm/xe: Fix xe_reg_sr.h)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (9b1fe0510494 regmap: Reorder fields in 'struct regmap_config' to save some memory)
Merging sound/for-next (d731b1ed1505 ALSA: hda/realtek: Drop doubly quirk entry for 103c:8a2e)
Merging ieee1394/for-next (21151fd8f0ea firewire: obsolete usage of *-objs in Makefile for KUnit test)
Merging sound-asoc/for-next (ad2ecebd93b7 Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (da3fe9d0be5b bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (5852f2afcdd9 Input: drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging block/for-next (b9efc18bb96c Merge branch 'net-accept-more' into for-next)
Merging device-mapper/for-next (8b21ac87d550 dm-delay: remove timer_lock)
Merging libata/for-next (d4a89339f17c ata: pata_legacy: make legacy_exit() work again)
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs)
Merging mfd/for-mfd-next (1482489b5196 dt-bindings: mfd: Use full path to other schemas)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (1fd949f653ee backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (00d1d63ef2da Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (dd80c7465029 MAINTAINERS: repair file entry in SECURITY SUBSYSTEM)
Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL pointer dereference)
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (40120763d00b certs: Add ECDSA signature verification self-test)
Merging watchdog/master (c45b8cfc6d5c watchdog: LENOVO_SE10_WDT should depend on X86 && DMI)
Merging iommu/next (2bd5059c6cc0 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (d976c6f4b32c of: property: Add fw_devlink support for interrupt-map property)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (e958cffa42df Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (16ae3bebb76c Merge branch into tip/master: 'x86/timers')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/arm_arch_timer: Mark hisi_161010101_oem_info const)
Merging edac/edac-for-next (ab80b31cd7b2 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (0e9b1d2b0560 Merge branches 'cmpxchg.2024.05.11a', 'kcsan.2024.05.07a', 'lkmm.2024.05.06a', 'rcu-merge.2024.05.01a' and 'tsc.2024.04.09c' into HEAD)
Merging kvm/next (4aad0b1893a1 Merge branch 'kvm-queue-snp' into HEAD)
Applying: fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code"
Merging kvm-arm/next (eaa46a28d596 Merge branch kvm-arm64/mpidr-reset into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (b52e8cd3f835 KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info())
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
Merging xen-tip/linux-next (d4c16b4755de xen/xenbus: Use *-y instead of *-objs in Makefile)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (76f09e22027f platform/x86: ISST: Support SST-BF and SST-TF per level)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (880a746fa3ea device property: Fix a typo in the description of device_get_child_node_count())
Merging usb/usb-next (51474ab44abf drm/bridge: aux-hpd-bridge: correct devm_drm_dp_hpd_bridge_add() stub)
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (e21de1455a72 serial: Clear UPF_DEAD before calling tty_port_register_device_attr_serdev())
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (979987371739 spmi: pmic-arb: Add multi bus support)
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x)
Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property)
Merging extcon/extcon-next (3e8e45b65d9f extcon: adc-jack: Document missing struct members)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (dda057ad8c9c vfio: remove an extra semicolon)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (4cece7649650 Linux 6.9-rc1)
Merging staging/staging-next (eb563dc752d3 staging: pi433: Remove unused driver)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (28059ddbee0e MAINTAINERS: Update role for IDXD driver)
Merging cgroup/for-next (8f6d24a5db2a selftests/cgroup: fix uninitialized variables in test_zswap.c)
Merging scsi/for-next (9ba1fbe2ed0c Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (3668651def2c scsi: mpi3mr: Sanitise num_phys)
Merging vhost/linux-next (0b8dbbdcf2e4 Merge tag 'for_linus' into vhost)
a2205e1e9603 ("virtio_net: remove the misleading comment")
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_ring.c
Merging rpmsg/for-next (c8d8f841e95b Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (7f45fe2ea3b8 gpio: nuvoton: Fix sgpio irq handle error)
CONFLICT (content): Merge conflict in drivers/gpio/gpiolib.h
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (9429f847dd72 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (4817118f257e pwm: pca9685: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (2c3b8f8f37c6 selftests/sgx: Include KHDR_INCLUDES in Makefile)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (5496b9b77d74 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (73a98bc5a947 Merge branch 'for-6.10' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (e406737b1110 seccomp: Constify sysctl subhelpers)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (4cece7649650 Linux 6.9-rc1)
Merging nvmem/for-next (4cece7649650 Linux 6.9-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (5bf9e57e634b MAINTAINERS: Add Günther Noack as Landlock reviewer)
Merging rust/rust-next (97ab3e8eec0c rust: alloc: fix dangling pointer in VecExt<T>::reserve())
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (4bbf9c3b53e6 fs/coredump: Enable dynamic configuration of max file note size)
Merging bitmap/bitmap-for-next (c3052c2f53d3 usercopy: Don't use "proxy" headers)
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (6d305cbef1aa uapi: stddef.h: Provide UAPI macros for __counted_by_{le, be})
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (dedcf3a8e704 tools/power turbostat: version 2024.05.10)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.c
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.h
CONFLICT (content): Merge conflict in drivers/md/bcache/btree.c
CONFLICT (content): Merge conflict in drivers/md/bcache/writeback.c
$ git merge --abort
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* [syzbot] [net?] [nfc?] KMSAN: uninit-value in nci_rsp_packet (2)
@ 2024-05-14 5:53 3% syzbot
0 siblings, 0 replies; 200+ results
From: syzbot @ 2024-05-14 5:53 UTC (permalink / raw)
To: davem, edumazet, krzk, kuba, linux-kernel, netdev, pabeni,
syzkaller-bugs
Hello,
syzbot found the following issue on:
HEAD commit: 45db3ab70092 Merge tag '6.9-rc7-ksmbd-fixes' of git://git...
git tree: upstream
console output: https://syzkaller.appspot.com/x/log.txt?x=1350fb70980000
kernel config: https://syzkaller.appspot.com/x/.config?x=617171361dd3cd47
dashboard link: https://syzkaller.appspot.com/bug?extid=cb0a0caa117154656cf8
compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40
Unfortunately, I don't have any reproducer for this issue yet.
Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/232e7c2a73a5/disk-45db3ab7.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/7e9bf7c936ab/vmlinux-45db3ab7.xz
kernel image: https://storage.googleapis.com/syzbot-assets/5e8f98ee02d8/bzImage-45db3ab7.xz
IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+cb0a0caa117154656cf8@syzkaller.appspotmail.com
=====================================================
BUG: KMSAN: uninit-value in nci_core_init_rsp_packet_v2 net/nfc/nci/rsp.c:107 [inline]
BUG: KMSAN: uninit-value in nci_core_init_rsp_packet net/nfc/nci/rsp.c:131 [inline]
BUG: KMSAN: uninit-value in nci_rsp_packet+0x2b4f/0x2c00 net/nfc/nci/rsp.c:376
nci_core_init_rsp_packet_v2 net/nfc/nci/rsp.c:107 [inline]
nci_core_init_rsp_packet net/nfc/nci/rsp.c:131 [inline]
nci_rsp_packet+0x2b4f/0x2c00 net/nfc/nci/rsp.c:376
nci_rx_work+0x268/0x5d0 net/nfc/nci/core.c:1527
process_one_work kernel/workqueue.c:3267 [inline]
process_scheduled_works+0xa81/0x1bd0 kernel/workqueue.c:3348
worker_thread+0xea5/0x1560 kernel/workqueue.c:3429
kthread+0x3e2/0x540 kernel/kthread.c:388
ret_from_fork+0x6d/0x90 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
Uninit was created at:
slab_post_alloc_hook mm/slub.c:3810 [inline]
slab_alloc_node mm/slub.c:3851 [inline]
kmem_cache_alloc_node+0x622/0xc90 mm/slub.c:3894
kmalloc_reserve+0x13d/0x4a0 net/core/skbuff.c:577
__alloc_skb+0x35b/0x7a0 net/core/skbuff.c:668
alloc_skb include/linux/skbuff.h:1313 [inline]
virtual_ncidev_write+0x6d/0x290 drivers/nfc/virtual_ncidev.c:120
vfs_write+0x49b/0x1520 fs/read_write.c:588
ksys_write+0x20f/0x4c0 fs/read_write.c:643
__do_sys_write fs/read_write.c:655 [inline]
__se_sys_write fs/read_write.c:652 [inline]
__x64_sys_write+0x93/0xe0 fs/read_write.c:652
x64_sys_call+0x3062/0x3b50 arch/x86/include/generated/asm/syscalls_64.h:2
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xcf/0x1e0 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
CPU: 0 PID: 57 Comm: kworker/u8:3 Not tainted 6.9.0-rc7-syzkaller-00056-g45db3ab70092 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024
Workqueue: nfc2_nci_rx_wq nci_rx_work
=====================================================
---
This report is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller@googlegroups.com.
syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
If the report is already addressed, let syzbot know by replying with:
#syz fix: exact-commit-title
If you want to overwrite report's subsystems, reply with:
#syz set subsystems: new-subsystem
(See the list of subsystem names on the web dashboard)
If the report is a duplicate of another one, reply with:
#syz dup: exact-subject-of-another-report
If you want to undo deduplication, reply with:
#syz undup
^ permalink raw reply [relevance 3%]
* [syzbot] [bcachefs?] KMSAN: uninit-value in bch2_dirent_invalid
@ 2024-05-14 1:10 3% syzbot
0 siblings, 0 replies; 200+ results
From: syzbot @ 2024-05-14 1:10 UTC (permalink / raw)
To: bfoster, kent.overstreet, linux-bcachefs, linux-kernel, syzkaller-bugs
Hello,
syzbot found the following issue on:
HEAD commit: 45db3ab70092 Merge tag '6.9-rc7-ksmbd-fixes' of git://git...
git tree: upstream
console+strace: https://syzkaller.appspot.com/x/log.txt?x=131d2c00980000
kernel config: https://syzkaller.appspot.com/x/.config?x=617171361dd3cd47
dashboard link: https://syzkaller.appspot.com/bug?extid=84fa6fb8c7f98b93cdea
compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=152df3bc980000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=130d8f88980000
Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/232e7c2a73a5/disk-45db3ab7.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/7e9bf7c936ab/vmlinux-45db3ab7.xz
kernel image: https://storage.googleapis.com/syzbot-assets/5e8f98ee02d8/bzImage-45db3ab7.xz
mounted in repro: https://storage.googleapis.com/syzbot-assets/ec73bbe3e40c/mount_2.gz
IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+84fa6fb8c7f98b93cdea@syzkaller.appspotmail.com
=====================================================
BUG: KMSAN: uninit-value in bch2_dirent_name_bytes fs/bcachefs/dirent.c:24 [inline]
BUG: KMSAN: uninit-value in bch2_dirent_get_name fs/bcachefs/dirent.c:34 [inline]
BUG: KMSAN: uninit-value in bch2_dirent_invalid+0x1ea/0xa30 fs/bcachefs/dirent.c:105
bch2_dirent_name_bytes fs/bcachefs/dirent.c:24 [inline]
bch2_dirent_get_name fs/bcachefs/dirent.c:34 [inline]
bch2_dirent_invalid+0x1ea/0xa30 fs/bcachefs/dirent.c:105
bch2_bkey_val_invalid+0x24f/0x380 fs/bcachefs/bkey_methods.c:140
bset_key_invalid fs/bcachefs/btree_io.c:831 [inline]
validate_bset_keys+0x12d8/0x25d0 fs/bcachefs/btree_io.c:904
validate_bset_for_write+0x1dd/0x340 fs/bcachefs/btree_io.c:1945
__bch2_btree_node_write+0x5383/0x67c0 fs/bcachefs/btree_io.c:2155
bch2_btree_node_write+0xa5/0x2e0 fs/bcachefs/btree_io.c:2288
btree_node_write_if_need fs/bcachefs/btree_io.h:153 [inline]
__btree_node_flush+0x4d0/0x640 fs/bcachefs/btree_trans_commit.c:229
bch2_btree_node_flush0+0x35/0x60 fs/bcachefs/btree_trans_commit.c:238
journal_flush_pins+0xce6/0x1780 fs/bcachefs/journal_reclaim.c:553
__bch2_journal_reclaim+0xd88/0x1610 fs/bcachefs/journal_reclaim.c:685
bch2_journal_reclaim_thread+0x18e/0x760 fs/bcachefs/journal_reclaim.c:727
kthread+0x3e2/0x540 kernel/kthread.c:388
ret_from_fork+0x6d/0x90 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
Uninit was stored to memory at:
memcpy_u64s_small fs/bcachefs/util.h:511 [inline]
bkey_p_copy fs/bcachefs/bkey.h:46 [inline]
bch2_sort_keys+0x2051/0x2cb0 fs/bcachefs/bkey_sort.c:194
__bch2_btree_node_write+0x3acd/0x67c0 fs/bcachefs/btree_io.c:2100
bch2_btree_node_write+0xa5/0x2e0 fs/bcachefs/btree_io.c:2288
btree_node_write_if_need fs/bcachefs/btree_io.h:153 [inline]
__btree_node_flush+0x4d0/0x640 fs/bcachefs/btree_trans_commit.c:229
bch2_btree_node_flush0+0x35/0x60 fs/bcachefs/btree_trans_commit.c:238
journal_flush_pins+0xce6/0x1780 fs/bcachefs/journal_reclaim.c:553
__bch2_journal_reclaim+0xd88/0x1610 fs/bcachefs/journal_reclaim.c:685
bch2_journal_reclaim_thread+0x18e/0x760 fs/bcachefs/journal_reclaim.c:727
kthread+0x3e2/0x540 kernel/kthread.c:388
ret_from_fork+0x6d/0x90 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
Uninit was created at:
__kmalloc_large_node+0x231/0x370 mm/slub.c:3927
__do_kmalloc_node mm/slub.c:3960 [inline]
__kmalloc_node+0xb10/0x10c0 mm/slub.c:3979
kmalloc_node include/linux/slab.h:648 [inline]
kvmalloc_node+0xc0/0x2d0 mm/util.c:634
kvmalloc include/linux/slab.h:766 [inline]
btree_bounce_alloc fs/bcachefs/btree_io.c:118 [inline]
bch2_btree_node_read_done+0x4e68/0x75e0 fs/bcachefs/btree_io.c:1185
btree_node_read_work+0x8a5/0x1eb0 fs/bcachefs/btree_io.c:1324
bch2_btree_node_read+0x3d42/0x4b50
__bch2_btree_root_read fs/bcachefs/btree_io.c:1748 [inline]
bch2_btree_root_read+0xa6c/0x13d0 fs/bcachefs/btree_io.c:1772
read_btree_roots+0x454/0xee0 fs/bcachefs/recovery.c:457
bch2_fs_recovery+0x7b6a/0x93e0 fs/bcachefs/recovery.c:785
bch2_fs_start+0x7b2/0xbd0 fs/bcachefs/super.c:1043
bch2_fs_open+0x152a/0x15f0 fs/bcachefs/super.c:2105
bch2_mount+0x90d/0x1d90 fs/bcachefs/fs.c:1903
legacy_get_tree+0x114/0x290 fs/fs_context.c:662
vfs_get_tree+0xa7/0x570 fs/super.c:1779
do_new_mount+0x71f/0x15e0 fs/namespace.c:3352
path_mount+0x742/0x1f20 fs/namespace.c:3679
do_mount fs/namespace.c:3692 [inline]
__do_sys_mount fs/namespace.c:3898 [inline]
__se_sys_mount+0x725/0x810 fs/namespace.c:3875
__x64_sys_mount+0xe4/0x150 fs/namespace.c:3875
x64_sys_call+0x2bf4/0x3b50 arch/x86/include/generated/asm/syscalls_64.h:166
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xcf/0x1e0 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
CPU: 0 PID: 5037 Comm: bch-reclaim/loo Not tainted 6.9.0-rc7-syzkaller-00056-g45db3ab70092 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024
=====================================================
---
This report is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller@googlegroups.com.
syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
If the report is already addressed, let syzbot know by replying with:
#syz fix: exact-commit-title
If you want syzbot to run the reproducer, reply with:
#syz test: git://repo/address.git branch-or-commit-hash
If you attach or paste a git patch, syzbot will apply it before testing.
If you want to overwrite report's subsystems, reply with:
#syz set subsystems: new-subsystem
(See the list of subsystem names on the web dashboard)
If the report is a duplicate of another one, reply with:
#syz dup: exact-subject-of-another-report
If you want to undo deduplication, reply with:
#syz undup
^ permalink raw reply [relevance 3%]
* [syzbot] [overlayfs?] WARNING in ovl_workdir_create (3)
@ 2024-05-13 18:28 3% syzbot
2024-05-17 15:40 0% ` Miklos Szeredi
0 siblings, 1 reply; 200+ results
From: syzbot @ 2024-05-13 18:28 UTC (permalink / raw)
To: amir73il, linux-kernel, linux-unionfs, miklos, syzkaller-bugs
Hello,
syzbot found the following issue on:
HEAD commit: 45db3ab70092 Merge tag '6.9-rc7-ksmbd-fixes' of git://git...
git tree: upstream
console output: https://syzkaller.appspot.com/x/log.txt?x=169b934c980000
kernel config: https://syzkaller.appspot.com/x/.config?x=2f7a2b43b9e58995
dashboard link: https://syzkaller.appspot.com/bug?extid=8aa3f99a6acb9f8fd429
compiler: gcc (Debian 12.2.0-14) 12.2.0, GNU ld (GNU Binutils for Debian) 2.40
Unfortunately, I don't have any reproducer for this issue yet.
Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/0c2a8034002c/disk-45db3ab7.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/807e35e2b3a9/vmlinux-45db3ab7.xz
kernel image: https://storage.googleapis.com/syzbot-assets/4868b2eab91a/bzImage-45db3ab7.xz
IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+8aa3f99a6acb9f8fd429@syzkaller.appspotmail.com
------------[ cut here ]------------
DEBUG_RWSEMS_WARN_ON((rwsem_owner(sem) != current) && !rwsem_test_oflags(sem, RWSEM_NONSPINNABLE)): count = 0x0, magic = 0xffff888077f311f0, owner = 0x0, curr 0xffff8880787ebc00, list empty
WARNING: CPU: 1 PID: 8339 at kernel/locking/rwsem.c:1369 __up_write kernel/locking/rwsem.c:1369 [inline]
WARNING: CPU: 1 PID: 8339 at kernel/locking/rwsem.c:1369 up_write+0x469/0x520 kernel/locking/rwsem.c:1632
Modules linked in:
CPU: 1 PID: 8339 Comm: syz-executor.2 Not tainted 6.9.0-rc7-syzkaller-00056-g45db3ab70092 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024
RIP: 0010:__up_write kernel/locking/rwsem.c:1369 [inline]
RIP: 0010:up_write+0x469/0x520 kernel/locking/rwsem.c:1632
Code: ea 03 80 3c 02 00 75 53 48 8b 13 4d 89 f1 41 55 4d 89 f8 4c 89 e1 48 c7 c6 40 b7 2c 8b 48 c7 c7 60 b6 2c 8b e8 08 91 e5 ff 90 <0f> 0b 90 90 5a e9 96 fc ff ff 48 89 ef e8 e5 26 7f 00 e9 03 fd ff
RSP: 0018:ffffc90010ac7928 EFLAGS: 00010286
RAX: 0000000000000000 RBX: ffff888077f311f0 RCX: ffffc9000baa6000
RDX: 0000000000040000 RSI: ffffffff81517126 RDI: 0000000000000001
RBP: ffff888077f311f8 R08: 0000000000000001 R09: 0000000000000000
R10: 0000000000000001 R11: 0000000000000002 R12: ffff888077f311f0
R13: ffffffff8b2cb5a0 R14: ffff8880787ebc00 R15: 0000000000000000
FS: 00007f0eebfff6c0(0000) GS:ffff8880b9500000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000020098000 CR3: 0000000021f12000 CR4: 0000000000350ef0
Call Trace:
<TASK>
inode_unlock include/linux/fs.h:800 [inline]
ovl_workdir_create+0x33e/0x820 fs/overlayfs/super.c:359
ovl_make_workdir fs/overlayfs/super.c:656 [inline]
ovl_get_workdir fs/overlayfs/super.c:814 [inline]
ovl_fill_super+0xe6b/0x6720 fs/overlayfs/super.c:1382
vfs_get_super fs/super.c:1268 [inline]
get_tree_nodev+0xdd/0x190 fs/super.c:1287
vfs_get_tree+0x92/0x380 fs/super.c:1779
do_new_mount fs/namespace.c:3352 [inline]
path_mount+0x14e6/0x1f20 fs/namespace.c:3679
do_mount fs/namespace.c:3692 [inline]
__do_sys_mount fs/namespace.c:3898 [inline]
__se_sys_mount fs/namespace.c:3875 [inline]
__x64_sys_mount+0x297/0x320 fs/namespace.c:3875
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xcf/0x260 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7f0eec47dd69
Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 e1 20 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f0eebfff0c8 EFLAGS: 00000246 ORIG_RAX: 00000000000000a5
RAX: ffffffffffffffda RBX: 00007f0eec5ac050 RCX: 00007f0eec47dd69
RDX: 0000000020000080 RSI: 00000000200000c0 RDI: 0000000000000000
RBP: 00007f0eec4ca49e R08: 0000000020000200 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
R13: 000000000000006e R14: 00007f0eec5ac050 R15: 00007ffe9e328388
</TASK>
---
This report is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller@googlegroups.com.
syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
If the report is already addressed, let syzbot know by replying with:
#syz fix: exact-commit-title
If you want to overwrite report's subsystems, reply with:
#syz set subsystems: new-subsystem
(See the list of subsystem names on the web dashboard)
If the report is a duplicate of another one, reply with:
#syz dup: exact-subject-of-another-report
If you want to undo deduplication, reply with:
#syz undup
^ permalink raw reply [relevance 3%]
* [syzbot] [bcachefs?] KASAN: slab-use-after-free Read in evict_inodes
@ 2024-05-13 15:44 2% syzbot
0 siblings, 0 replies; 200+ results
From: syzbot @ 2024-05-13 15:44 UTC (permalink / raw)
To: bfoster, kent.overstreet, linux-bcachefs, linux-kernel, syzkaller-bugs
Hello,
syzbot found the following issue on:
HEAD commit: 45db3ab70092 Merge tag '6.9-rc7-ksmbd-fixes' of git://git...
git tree: upstream
console output: https://syzkaller.appspot.com/x/log.txt?x=10a6583f180000
kernel config: https://syzkaller.appspot.com/x/.config?x=9d7ea7de0cb32587
dashboard link: https://syzkaller.appspot.com/bug?extid=a0ddc9873c280a4cb18f
compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=134a63bc980000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=151501b8980000
Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/c89213fc1e8d/disk-45db3ab7.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/b52e3a7a65ea/vmlinux-45db3ab7.xz
kernel image: https://storage.googleapis.com/syzbot-assets/a871fa10f977/bzImage-45db3ab7.xz
mounted in repro: https://storage.googleapis.com/syzbot-assets/1b9088f19946/mount_0.gz
The issue was bisected to:
commit 0e42f381193d7f9b47922f1c4308e7729a45ba13
Author: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sun Apr 21 02:26:47 2024 +0000
bcachefs: Fix inode early destruction path
bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=16cdf3bc980000
final oops: https://syzkaller.appspot.com/x/report.txt?x=15cdf3bc980000
console output: https://syzkaller.appspot.com/x/log.txt?x=11cdf3bc980000
IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+a0ddc9873c280a4cb18f@syzkaller.appspotmail.com
Fixes: 0e42f381193d ("bcachefs: Fix inode early destruction path")
==================================================================
BUG: KASAN: slab-use-after-free in evict_inodes+0x111/0x690
Read of size 8 at addr ffff888075cc70e0 by task syz-executor647/5099
CPU: 0 PID: 5099 Comm: syz-executor647 Not tainted 6.9.0-rc7-syzkaller-00056-g45db3ab70092 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024
Call Trace:
<TASK>
__dump_stack lib/dump_stack.c:88 [inline]
dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114
print_address_description mm/kasan/report.c:377 [inline]
print_report+0x169/0x550 mm/kasan/report.c:488
kasan_report+0x143/0x180 mm/kasan/report.c:601
evict_inodes+0x111/0x690
generic_shutdown_super+0x9d/0x2d0 fs/super.c:626
bch2_kill_sb+0x41/0x50 fs/bcachefs/fs.c:2012
deactivate_locked_super+0xc4/0x130 fs/super.c:472
cleanup_mnt+0x426/0x4c0 fs/namespace.c:1267
task_work_run+0x24f/0x310 kernel/task_work.c:180
resume_user_mode_work include/linux/resume_user_mode.h:50 [inline]
exit_to_user_mode_loop kernel/entry/common.c:114 [inline]
exit_to_user_mode_prepare include/linux/entry-common.h:328 [inline]
__syscall_exit_to_user_mode_work kernel/entry/common.c:207 [inline]
syscall_exit_to_user_mode+0x168/0x370 kernel/entry/common.c:218
do_syscall_64+0x102/0x240 arch/x86/entry/common.c:89
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7f9d14a95cb7
Code: 09 00 48 83 c4 08 5b 5d c3 66 2e 0f 1f 84 00 00 00 00 00 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 b8 a6 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 01 c3 48 c7 c2 b0 ff ff ff f7 d8 64 89 02 b8
RSP: 002b:00007ffd534829a8 EFLAGS: 00000202 ORIG_RAX: 00000000000000a6
RAX: 0000000000000000 RBX: 0000000000000000 RCX: 00007f9d14a95cb7
RDX: 0000000000000000 RSI: 0000000000000009 RDI: 00007ffd53482a60
RBP: 00007ffd53482a60 R08: 0000000000000000 R09: 0000000000000000
R10: 00000000ffffffff R11: 0000000000000202 R12: 00007ffd53483b20
R13: 0000555567b26700 R14: 431bde82d7b634db R15: 00007ffd53483ac4
</TASK>
Allocated by task 8194:
kasan_save_stack mm/kasan/common.c:47 [inline]
kasan_save_track+0x3f/0x80 mm/kasan/common.c:68
unpoison_slab_object mm/kasan/common.c:312 [inline]
__kasan_slab_alloc+0x66/0x80 mm/kasan/common.c:338
kasan_slab_alloc include/linux/kasan.h:201 [inline]
slab_post_alloc_hook mm/slub.c:3804 [inline]
slab_alloc_node mm/slub.c:3851 [inline]
kmem_cache_alloc+0x174/0x350 mm/slub.c:3858
bch2_alloc_inode+0x1f/0x130 fs/bcachefs/fs.c:1494
alloc_inode fs/inode.c:261 [inline]
new_inode_pseudo+0x69/0x1e0 fs/inode.c:1007
new_inode+0x22/0x1d0 fs/inode.c:1033
bch2_new_inode+0xa7/0x1a0 fs/bcachefs/fs.c:224
bch2_lookup_trans fs/bcachefs/fs.c:408 [inline]
bch2_lookup+0xc44/0x1330 fs/bcachefs/fs.c:437
lookup_open fs/namei.c:3475 [inline]
open_last_lookups fs/namei.c:3566 [inline]
path_openat+0x1033/0x3240 fs/namei.c:3796
do_filp_open+0x235/0x490 fs/namei.c:3826
do_sys_openat2+0x13e/0x1d0 fs/open.c:1406
do_sys_open fs/open.c:1421 [inline]
__do_sys_openat fs/open.c:1437 [inline]
__se_sys_openat fs/open.c:1432 [inline]
__x64_sys_openat+0x247/0x2a0 fs/open.c:1432
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
Freed by task 8194:
kasan_save_stack mm/kasan/common.c:47 [inline]
kasan_save_track+0x3f/0x80 mm/kasan/common.c:68
kasan_save_free_info+0x40/0x50 mm/kasan/generic.c:579
poison_slab_object+0xa6/0xe0 mm/kasan/common.c:240
__kasan_slab_free+0x37/0x60 mm/kasan/common.c:256
kasan_slab_free include/linux/kasan.h:184 [inline]
slab_free_hook mm/slub.c:2111 [inline]
slab_free mm/slub.c:4286 [inline]
kmem_cache_free+0x10b/0x2d0 mm/slub.c:4350
bch2_inode_insert+0x339/0x3a0 fs/bcachefs/fs.c:192
bch2_lookup_trans fs/bcachefs/fs.c:420 [inline]
bch2_lookup+0xdf0/0x1330 fs/bcachefs/fs.c:437
lookup_open fs/namei.c:3475 [inline]
open_last_lookups fs/namei.c:3566 [inline]
path_openat+0x1033/0x3240 fs/namei.c:3796
do_filp_open+0x235/0x490 fs/namei.c:3826
do_sys_openat2+0x13e/0x1d0 fs/open.c:1406
do_sys_open fs/open.c:1421 [inline]
__do_sys_openat fs/open.c:1437 [inline]
__se_sys_openat fs/open.c:1432 [inline]
__x64_sys_openat+0x247/0x2a0 fs/open.c:1432
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
The buggy address belongs to the object at ffff888075cc6f18
which belongs to the cache bch_inode_info of size 1768
The buggy address is located 456 bytes inside of
freed 1768-byte region [ffff888075cc6f18, ffff888075cc7600)
The buggy address belongs to the physical page:
page: refcount:1 mapcount:0 mapping:0000000000000000 index:0xffff888075cc0768 pfn:0x75cc0
head: order:3 entire_mapcount:0 nr_pages_mapped:0 pincount:0
flags: 0xfff00000000840(slab|head|node=0|zone=1|lastcpupid=0x7ff)
page_type: 0xffffffff()
raw: 00fff00000000840 ffff88801af46c80 ffffea0001da0c00 0000000000000002
raw: ffff888075cc0768 0000000080110010 00000001ffffffff 0000000000000000
head: 00fff00000000840 ffff88801af46c80 ffffea0001da0c00 0000000000000002
head: ffff888075cc0768 0000000080110010 00000001ffffffff 0000000000000000
head: 00fff00000000003 ffffea0001d73001 dead000000000122 00000000ffffffff
head: 0000000800000000 0000000000000000 00000000ffffffff 0000000000000000
page dumped because: kasan: bad access detected
page_owner tracks the page as allocated
page last allocated via order 3, migratetype Reclaimable, gfp_mask 0xd2050(__GFP_IO|__GFP_NOWARN|__GFP_NORETRY|__GFP_COMP|__GFP_NOMEMALLOC|__GFP_RECLAIMABLE), pid 5468, tgid -1659749701 (syz-executor647), ts 5469, free_ts 597295756743
set_page_owner include/linux/page_owner.h:32 [inline]
post_alloc_hook+0x1ea/0x210 mm/page_alloc.c:1534
prep_new_page mm/page_alloc.c:1541 [inline]
get_page_from_freelist+0x3410/0x35b0 mm/page_alloc.c:3317
__alloc_pages+0x256/0x6c0 mm/page_alloc.c:4575
__alloc_pages_node include/linux/gfp.h:238 [inline]
alloc_pages_node include/linux/gfp.h:261 [inline]
alloc_slab_page+0x5f/0x160 mm/slub.c:2180
allocate_slab mm/slub.c:2343 [inline]
new_slab+0x84/0x2f0 mm/slub.c:2396
___slab_alloc+0xc73/0x1260 mm/slub.c:3530
__slab_alloc mm/slub.c:3615 [inline]
__slab_alloc_node mm/slub.c:3668 [inline]
slab_alloc_node mm/slub.c:3841 [inline]
kmem_cache_alloc+0x252/0x350 mm/slub.c:3858
bch2_alloc_inode+0x1f/0x130 fs/bcachefs/fs.c:1494
alloc_inode fs/inode.c:261 [inline]
new_inode_pseudo+0x69/0x1e0 fs/inode.c:1007
new_inode+0x22/0x1d0 fs/inode.c:1033
bch2_new_inode+0xa7/0x1a0 fs/bcachefs/fs.c:224
bch2_lookup_trans fs/bcachefs/fs.c:408 [inline]
bch2_lookup+0xc44/0x1330 fs/bcachefs/fs.c:437
lookup_open fs/namei.c:3475 [inline]
open_last_lookups fs/namei.c:3566 [inline]
path_openat+0x1033/0x3240 fs/namei.c:3796
do_filp_open+0x235/0x490 fs/namei.c:3826
do_sys_openat2+0x13e/0x1d0 fs/open.c:1406
do_sys_open fs/open.c:1421 [inline]
__do_sys_openat fs/open.c:1437 [inline]
__se_sys_openat fs/open.c:1432 [inline]
__x64_sys_openat+0x247/0x2a0 fs/open.c:1432
page last free pid 5099 tgid 5099 stack trace:
reset_page_owner include/linux/page_owner.h:25 [inline]
free_pages_prepare mm/page_alloc.c:1141 [inline]
free_unref_page_prepare+0x97b/0xaa0 mm/page_alloc.c:2347
free_unref_page+0x37/0x3f0 mm/page_alloc.c:2487
vfree+0x186/0x2e0 mm/vmalloc.c:3340
bch2_fs_btree_write_buffer_exit+0x140/0x1b0 fs/bcachefs/btree_write_buffer.c:652
__bch2_fs_free fs/bcachefs/super.c:573 [inline]
bch2_fs_release+0x2c7/0x5a0 fs/bcachefs/super.c:610
kobject_cleanup lib/kobject.c:689 [inline]
kobject_release lib/kobject.c:720 [inline]
kref_put include/linux/kref.h:65 [inline]
kobject_put+0x22f/0x480 lib/kobject.c:737
deactivate_locked_super+0xc4/0x130 fs/super.c:472
cleanup_mnt+0x426/0x4c0 fs/namespace.c:1267
task_work_run+0x24f/0x310 kernel/task_work.c:180
resume_user_mode_work include/linux/resume_user_mode.h:50 [inline]
exit_to_user_mode_loop kernel/entry/common.c:114 [inline]
exit_to_user_mode_prepare include/linux/entry-common.h:328 [inline]
__syscall_exit_to_user_mode_work kernel/entry/common.c:207 [inline]
syscall_exit_to_user_mode+0x168/0x370 kernel/entry/common.c:218
do_syscall_64+0x102/0x240 arch/x86/entry/common.c:89
entry_SYSCALL_64_after_hwframe+0x77/0x7f
Memory state around the buggy address:
ffff888075cc6f80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888075cc7000: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>ffff888075cc7080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff888075cc7100: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888075cc7180: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
==================================================================
---
This report is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller@googlegroups.com.
syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
For information about bisection process see: https://goo.gl/tpsmEJ#bisection
If the report is already addressed, let syzbot know by replying with:
#syz fix: exact-commit-title
If you want syzbot to run the reproducer, reply with:
#syz test: git://repo/address.git branch-or-commit-hash
If you attach or paste a git patch, syzbot will apply it before testing.
If you want to overwrite report's subsystems, reply with:
#syz set subsystems: new-subsystem
(See the list of subsystem names on the web dashboard)
If the report is a duplicate of another one, reply with:
#syz dup: exact-subject-of-another-report
If you want to undo deduplication, reply with:
#syz undup
^ permalink raw reply [relevance 2%]
* FAILED: patch "[PATCH] ksmbd: use rwsem instead of rwlock for lease break" failed to apply to 6.1-stable tree
@ 2024-05-13 15:21 9% gregkh
0 siblings, 0 replies; 200+ results
From: gregkh @ 2024-05-13 15:21 UTC (permalink / raw)
To: linkinjeon, stfrench; +Cc: stable
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x d1c189c6cb8b0fb7b5ee549237d27889c40c2f8b
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024051355-hypnotize-anchor-2de7@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
d1c189c6cb8b ("ksmbd: use rwsem instead of rwlock for lease break")
c8efcc786146 ("ksmbd: add support for durable handles v1/v2")
fa9415d4024f ("ksmbd: mark SMB2_SESSION_EXPIRED to session when destroying previous session")
c2a721eead71 ("ksmbd: lazy v2 lease break on smb2_write()")
d47d9886aeef ("ksmbd: send v2 lease break notification for directory")
eb547407f357 ("ksmbd: downgrade RWH lease caching state to RH for directory")
2e450920d58b ("ksmbd: move oplock handling after unlock parent dir")
4274a9dc6aeb ("ksmbd: separately allocate ci per dentry")
864fb5d37163 ("ksmbd: fix possible deadlock in smb2_open")
5a7ee91d1154 ("ksmbd: fix race condition with fp")
e2b76ab8b5c9 ("ksmbd: add support for read compound")
e202a1e8634b ("ksmbd: no response from compound read")
2b57a4322b1b ("ksmbd: check if a mount point is crossed during path lookup")
7b7d709ef7cf ("ksmbd: add missing compound request handing in some commands")
81a94b27847f ("ksmbd: use kvzalloc instead of kvmalloc")
40b268d384a2 ("ksmbd: add mnt_want_write to ksmbd vfs functions")
fc6c6a3c324c ("ksmbd: fix out-of-bound read in parse_lease_state()")
6fe55c2799bc ("ksmbd: call putname after using the last component")
36322523dddb ("ksmbd: fix UAF issue from opinfo->conn")
df14afeed2e6 ("ksmbd: fix uninitialized pointer read in smb2_create_link()")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d1c189c6cb8b0fb7b5ee549237d27889c40c2f8b Mon Sep 17 00:00:00 2001
From: Namjae Jeon <linkinjeon@kernel.org>
Date: Thu, 2 May 2024 10:07:50 +0900
Subject: [PATCH] ksmbd: use rwsem instead of rwlock for lease break
lease break wait for lease break acknowledgment.
rwsem is more suitable than unlock while traversing the list for parent
lease break in ->m_op_list.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c
index 6fd8cb7064dc..c2abf109010d 100644
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -207,9 +207,9 @@ static void opinfo_add(struct oplock_info *opinfo)
{
struct ksmbd_inode *ci = opinfo->o_fp->f_ci;
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_add_rcu(&opinfo->op_entry, &ci->m_op_list);
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
}
static void opinfo_del(struct oplock_info *opinfo)
@@ -221,9 +221,9 @@ static void opinfo_del(struct oplock_info *opinfo)
lease_del_list(opinfo);
write_unlock(&lease_list_lock);
}
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_del_rcu(&opinfo->op_entry);
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
}
static unsigned long opinfo_count(struct ksmbd_file *fp)
@@ -526,21 +526,18 @@ static struct oplock_info *same_client_has_lease(struct ksmbd_inode *ci,
* Compare lease key and client_guid to know request from same owner
* of same client
*/
- read_lock(&ci->m_lock);
+ down_read(&ci->m_lock);
list_for_each_entry(opinfo, &ci->m_op_list, op_entry) {
if (!opinfo->is_lease || !opinfo->conn)
continue;
- read_unlock(&ci->m_lock);
lease = opinfo->o_lease;
ret = compare_guid_key(opinfo, client_guid, lctx->lease_key);
if (ret) {
m_opinfo = opinfo;
/* skip upgrading lease about breaking lease */
- if (atomic_read(&opinfo->breaking_cnt)) {
- read_lock(&ci->m_lock);
+ if (atomic_read(&opinfo->breaking_cnt))
continue;
- }
/* upgrading lease */
if ((atomic_read(&ci->op_count) +
@@ -570,9 +567,8 @@ static struct oplock_info *same_client_has_lease(struct ksmbd_inode *ci,
lease_none_upgrade(opinfo, lctx->req_state);
}
}
- read_lock(&ci->m_lock);
}
- read_unlock(&ci->m_lock);
+ up_read(&ci->m_lock);
return m_opinfo;
}
@@ -1114,7 +1110,7 @@ void smb_send_parent_lease_break_noti(struct ksmbd_file *fp,
if (!p_ci)
return;
- read_lock(&p_ci->m_lock);
+ down_read(&p_ci->m_lock);
list_for_each_entry(opinfo, &p_ci->m_op_list, op_entry) {
if (opinfo->conn == NULL || !opinfo->is_lease)
continue;
@@ -1132,13 +1128,11 @@ void smb_send_parent_lease_break_noti(struct ksmbd_file *fp,
continue;
}
- read_unlock(&p_ci->m_lock);
oplock_break(opinfo, SMB2_OPLOCK_LEVEL_NONE);
opinfo_conn_put(opinfo);
- read_lock(&p_ci->m_lock);
}
}
- read_unlock(&p_ci->m_lock);
+ up_read(&p_ci->m_lock);
ksmbd_inode_put(p_ci);
}
@@ -1159,7 +1153,7 @@ void smb_lazy_parent_lease_break_close(struct ksmbd_file *fp)
if (!p_ci)
return;
- read_lock(&p_ci->m_lock);
+ down_read(&p_ci->m_lock);
list_for_each_entry(opinfo, &p_ci->m_op_list, op_entry) {
if (opinfo->conn == NULL || !opinfo->is_lease)
continue;
@@ -1173,13 +1167,11 @@ void smb_lazy_parent_lease_break_close(struct ksmbd_file *fp)
atomic_dec(&opinfo->conn->r_count);
continue;
}
- read_unlock(&p_ci->m_lock);
oplock_break(opinfo, SMB2_OPLOCK_LEVEL_NONE);
opinfo_conn_put(opinfo);
- read_lock(&p_ci->m_lock);
}
}
- read_unlock(&p_ci->m_lock);
+ up_read(&p_ci->m_lock);
ksmbd_inode_put(p_ci);
}
diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index 30229161b346..b6c5a8ea3887 100644
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -3376,9 +3376,9 @@ int smb2_open(struct ksmbd_work *work)
* after daccess, saccess, attrib_only, and stream are
* initialized.
*/
- write_lock(&fp->f_ci->m_lock);
+ down_write(&fp->f_ci->m_lock);
list_add(&fp->node, &fp->f_ci->m_fp_list);
- write_unlock(&fp->f_ci->m_lock);
+ up_write(&fp->f_ci->m_lock);
/* Check delete pending among previous fp before oplock break */
if (ksmbd_inode_pending_delete(fp)) {
diff --git a/fs/smb/server/smb_common.c b/fs/smb/server/smb_common.c
index fcaf373cc008..474dadf6b7b8 100644
--- a/fs/smb/server/smb_common.c
+++ b/fs/smb/server/smb_common.c
@@ -646,7 +646,7 @@ int ksmbd_smb_check_shared_mode(struct file *filp, struct ksmbd_file *curr_fp)
* Lookup fp in master fp list, and check desired access and
* shared mode between previous open and current open.
*/
- read_lock(&curr_fp->f_ci->m_lock);
+ down_read(&curr_fp->f_ci->m_lock);
list_for_each_entry(prev_fp, &curr_fp->f_ci->m_fp_list, node) {
if (file_inode(filp) != file_inode(prev_fp->filp))
continue;
@@ -722,7 +722,7 @@ int ksmbd_smb_check_shared_mode(struct file *filp, struct ksmbd_file *curr_fp)
break;
}
}
- read_unlock(&curr_fp->f_ci->m_lock);
+ up_read(&curr_fp->f_ci->m_lock);
return rc;
}
diff --git a/fs/smb/server/vfs_cache.c b/fs/smb/server/vfs_cache.c
index 030f70700036..6cb599cd287e 100644
--- a/fs/smb/server/vfs_cache.c
+++ b/fs/smb/server/vfs_cache.c
@@ -165,7 +165,7 @@ static int ksmbd_inode_init(struct ksmbd_inode *ci, struct ksmbd_file *fp)
ci->m_fattr = 0;
INIT_LIST_HEAD(&ci->m_fp_list);
INIT_LIST_HEAD(&ci->m_op_list);
- rwlock_init(&ci->m_lock);
+ init_rwsem(&ci->m_lock);
ci->m_de = fp->filp->f_path.dentry;
return 0;
}
@@ -261,14 +261,14 @@ static void __ksmbd_inode_close(struct ksmbd_file *fp)
}
if (atomic_dec_and_test(&ci->m_count)) {
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
if (ci->m_flags & (S_DEL_ON_CLS | S_DEL_PENDING)) {
ci->m_flags &= ~(S_DEL_ON_CLS | S_DEL_PENDING);
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
ksmbd_vfs_unlink(filp);
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
}
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
ksmbd_inode_free(ci);
}
@@ -289,9 +289,9 @@ static void __ksmbd_remove_fd(struct ksmbd_file_table *ft, struct ksmbd_file *fp
if (!has_file_id(fp->volatile_id))
return;
- write_lock(&fp->f_ci->m_lock);
+ down_write(&fp->f_ci->m_lock);
list_del_init(&fp->node);
- write_unlock(&fp->f_ci->m_lock);
+ up_write(&fp->f_ci->m_lock);
write_lock(&ft->lock);
idr_remove(ft->idr, fp->volatile_id);
@@ -523,17 +523,17 @@ struct ksmbd_file *ksmbd_lookup_fd_inode(struct dentry *dentry)
if (!ci)
return NULL;
- read_lock(&ci->m_lock);
+ down_read(&ci->m_lock);
list_for_each_entry(lfp, &ci->m_fp_list, node) {
if (inode == file_inode(lfp->filp)) {
atomic_dec(&ci->m_count);
lfp = ksmbd_fp_get(lfp);
- read_unlock(&ci->m_lock);
+ up_read(&ci->m_lock);
return lfp;
}
}
atomic_dec(&ci->m_count);
- read_unlock(&ci->m_lock);
+ up_read(&ci->m_lock);
return NULL;
}
@@ -705,13 +705,13 @@ static bool session_fd_check(struct ksmbd_tree_connect *tcon,
conn = fp->conn;
ci = fp->f_ci;
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_for_each_entry_rcu(op, &ci->m_op_list, op_entry) {
if (op->conn != conn)
continue;
op->conn = NULL;
}
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
fp->conn = NULL;
fp->tcon = NULL;
@@ -801,13 +801,13 @@ int ksmbd_reopen_durable_fd(struct ksmbd_work *work, struct ksmbd_file *fp)
fp->tcon = work->tcon;
ci = fp->f_ci;
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_for_each_entry_rcu(op, &ci->m_op_list, op_entry) {
if (op->conn)
continue;
op->conn = fp->conn;
}
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
__open_id(&work->sess->file_table, fp, OPEN_ID_TYPE_VOLATILE_ID);
if (!has_file_id(fp->volatile_id)) {
diff --git a/fs/smb/server/vfs_cache.h b/fs/smb/server/vfs_cache.h
index ed44fb4e18e7..5a225e7055f1 100644
--- a/fs/smb/server/vfs_cache.h
+++ b/fs/smb/server/vfs_cache.h
@@ -47,7 +47,7 @@ struct stream {
};
struct ksmbd_inode {
- rwlock_t m_lock;
+ struct rw_semaphore m_lock;
atomic_t m_count;
atomic_t op_count;
/* opinfo count for streams */
^ permalink raw reply related [relevance 9%]
* FAILED: patch "[PATCH] ksmbd: use rwsem instead of rwlock for lease break" failed to apply to 6.6-stable tree
@ 2024-05-13 15:21 9% gregkh
0 siblings, 0 replies; 200+ results
From: gregkh @ 2024-05-13 15:21 UTC (permalink / raw)
To: linkinjeon, stfrench; +Cc: stable
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x d1c189c6cb8b0fb7b5ee549237d27889c40c2f8b
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024051354-eastward-undivided-3e1b@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
d1c189c6cb8b ("ksmbd: use rwsem instead of rwlock for lease break")
c8efcc786146 ("ksmbd: add support for durable handles v1/v2")
fa9415d4024f ("ksmbd: mark SMB2_SESSION_EXPIRED to session when destroying previous session")
c2a721eead71 ("ksmbd: lazy v2 lease break on smb2_write()")
d47d9886aeef ("ksmbd: send v2 lease break notification for directory")
eb547407f357 ("ksmbd: downgrade RWH lease caching state to RH for directory")
2e450920d58b ("ksmbd: move oplock handling after unlock parent dir")
4274a9dc6aeb ("ksmbd: separately allocate ci per dentry")
864fb5d37163 ("ksmbd: fix possible deadlock in smb2_open")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d1c189c6cb8b0fb7b5ee549237d27889c40c2f8b Mon Sep 17 00:00:00 2001
From: Namjae Jeon <linkinjeon@kernel.org>
Date: Thu, 2 May 2024 10:07:50 +0900
Subject: [PATCH] ksmbd: use rwsem instead of rwlock for lease break
lease break wait for lease break acknowledgment.
rwsem is more suitable than unlock while traversing the list for parent
lease break in ->m_op_list.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c
index 6fd8cb7064dc..c2abf109010d 100644
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -207,9 +207,9 @@ static void opinfo_add(struct oplock_info *opinfo)
{
struct ksmbd_inode *ci = opinfo->o_fp->f_ci;
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_add_rcu(&opinfo->op_entry, &ci->m_op_list);
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
}
static void opinfo_del(struct oplock_info *opinfo)
@@ -221,9 +221,9 @@ static void opinfo_del(struct oplock_info *opinfo)
lease_del_list(opinfo);
write_unlock(&lease_list_lock);
}
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_del_rcu(&opinfo->op_entry);
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
}
static unsigned long opinfo_count(struct ksmbd_file *fp)
@@ -526,21 +526,18 @@ static struct oplock_info *same_client_has_lease(struct ksmbd_inode *ci,
* Compare lease key and client_guid to know request from same owner
* of same client
*/
- read_lock(&ci->m_lock);
+ down_read(&ci->m_lock);
list_for_each_entry(opinfo, &ci->m_op_list, op_entry) {
if (!opinfo->is_lease || !opinfo->conn)
continue;
- read_unlock(&ci->m_lock);
lease = opinfo->o_lease;
ret = compare_guid_key(opinfo, client_guid, lctx->lease_key);
if (ret) {
m_opinfo = opinfo;
/* skip upgrading lease about breaking lease */
- if (atomic_read(&opinfo->breaking_cnt)) {
- read_lock(&ci->m_lock);
+ if (atomic_read(&opinfo->breaking_cnt))
continue;
- }
/* upgrading lease */
if ((atomic_read(&ci->op_count) +
@@ -570,9 +567,8 @@ static struct oplock_info *same_client_has_lease(struct ksmbd_inode *ci,
lease_none_upgrade(opinfo, lctx->req_state);
}
}
- read_lock(&ci->m_lock);
}
- read_unlock(&ci->m_lock);
+ up_read(&ci->m_lock);
return m_opinfo;
}
@@ -1114,7 +1110,7 @@ void smb_send_parent_lease_break_noti(struct ksmbd_file *fp,
if (!p_ci)
return;
- read_lock(&p_ci->m_lock);
+ down_read(&p_ci->m_lock);
list_for_each_entry(opinfo, &p_ci->m_op_list, op_entry) {
if (opinfo->conn == NULL || !opinfo->is_lease)
continue;
@@ -1132,13 +1128,11 @@ void smb_send_parent_lease_break_noti(struct ksmbd_file *fp,
continue;
}
- read_unlock(&p_ci->m_lock);
oplock_break(opinfo, SMB2_OPLOCK_LEVEL_NONE);
opinfo_conn_put(opinfo);
- read_lock(&p_ci->m_lock);
}
}
- read_unlock(&p_ci->m_lock);
+ up_read(&p_ci->m_lock);
ksmbd_inode_put(p_ci);
}
@@ -1159,7 +1153,7 @@ void smb_lazy_parent_lease_break_close(struct ksmbd_file *fp)
if (!p_ci)
return;
- read_lock(&p_ci->m_lock);
+ down_read(&p_ci->m_lock);
list_for_each_entry(opinfo, &p_ci->m_op_list, op_entry) {
if (opinfo->conn == NULL || !opinfo->is_lease)
continue;
@@ -1173,13 +1167,11 @@ void smb_lazy_parent_lease_break_close(struct ksmbd_file *fp)
atomic_dec(&opinfo->conn->r_count);
continue;
}
- read_unlock(&p_ci->m_lock);
oplock_break(opinfo, SMB2_OPLOCK_LEVEL_NONE);
opinfo_conn_put(opinfo);
- read_lock(&p_ci->m_lock);
}
}
- read_unlock(&p_ci->m_lock);
+ up_read(&p_ci->m_lock);
ksmbd_inode_put(p_ci);
}
diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index 30229161b346..b6c5a8ea3887 100644
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -3376,9 +3376,9 @@ int smb2_open(struct ksmbd_work *work)
* after daccess, saccess, attrib_only, and stream are
* initialized.
*/
- write_lock(&fp->f_ci->m_lock);
+ down_write(&fp->f_ci->m_lock);
list_add(&fp->node, &fp->f_ci->m_fp_list);
- write_unlock(&fp->f_ci->m_lock);
+ up_write(&fp->f_ci->m_lock);
/* Check delete pending among previous fp before oplock break */
if (ksmbd_inode_pending_delete(fp)) {
diff --git a/fs/smb/server/smb_common.c b/fs/smb/server/smb_common.c
index fcaf373cc008..474dadf6b7b8 100644
--- a/fs/smb/server/smb_common.c
+++ b/fs/smb/server/smb_common.c
@@ -646,7 +646,7 @@ int ksmbd_smb_check_shared_mode(struct file *filp, struct ksmbd_file *curr_fp)
* Lookup fp in master fp list, and check desired access and
* shared mode between previous open and current open.
*/
- read_lock(&curr_fp->f_ci->m_lock);
+ down_read(&curr_fp->f_ci->m_lock);
list_for_each_entry(prev_fp, &curr_fp->f_ci->m_fp_list, node) {
if (file_inode(filp) != file_inode(prev_fp->filp))
continue;
@@ -722,7 +722,7 @@ int ksmbd_smb_check_shared_mode(struct file *filp, struct ksmbd_file *curr_fp)
break;
}
}
- read_unlock(&curr_fp->f_ci->m_lock);
+ up_read(&curr_fp->f_ci->m_lock);
return rc;
}
diff --git a/fs/smb/server/vfs_cache.c b/fs/smb/server/vfs_cache.c
index 030f70700036..6cb599cd287e 100644
--- a/fs/smb/server/vfs_cache.c
+++ b/fs/smb/server/vfs_cache.c
@@ -165,7 +165,7 @@ static int ksmbd_inode_init(struct ksmbd_inode *ci, struct ksmbd_file *fp)
ci->m_fattr = 0;
INIT_LIST_HEAD(&ci->m_fp_list);
INIT_LIST_HEAD(&ci->m_op_list);
- rwlock_init(&ci->m_lock);
+ init_rwsem(&ci->m_lock);
ci->m_de = fp->filp->f_path.dentry;
return 0;
}
@@ -261,14 +261,14 @@ static void __ksmbd_inode_close(struct ksmbd_file *fp)
}
if (atomic_dec_and_test(&ci->m_count)) {
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
if (ci->m_flags & (S_DEL_ON_CLS | S_DEL_PENDING)) {
ci->m_flags &= ~(S_DEL_ON_CLS | S_DEL_PENDING);
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
ksmbd_vfs_unlink(filp);
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
}
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
ksmbd_inode_free(ci);
}
@@ -289,9 +289,9 @@ static void __ksmbd_remove_fd(struct ksmbd_file_table *ft, struct ksmbd_file *fp
if (!has_file_id(fp->volatile_id))
return;
- write_lock(&fp->f_ci->m_lock);
+ down_write(&fp->f_ci->m_lock);
list_del_init(&fp->node);
- write_unlock(&fp->f_ci->m_lock);
+ up_write(&fp->f_ci->m_lock);
write_lock(&ft->lock);
idr_remove(ft->idr, fp->volatile_id);
@@ -523,17 +523,17 @@ struct ksmbd_file *ksmbd_lookup_fd_inode(struct dentry *dentry)
if (!ci)
return NULL;
- read_lock(&ci->m_lock);
+ down_read(&ci->m_lock);
list_for_each_entry(lfp, &ci->m_fp_list, node) {
if (inode == file_inode(lfp->filp)) {
atomic_dec(&ci->m_count);
lfp = ksmbd_fp_get(lfp);
- read_unlock(&ci->m_lock);
+ up_read(&ci->m_lock);
return lfp;
}
}
atomic_dec(&ci->m_count);
- read_unlock(&ci->m_lock);
+ up_read(&ci->m_lock);
return NULL;
}
@@ -705,13 +705,13 @@ static bool session_fd_check(struct ksmbd_tree_connect *tcon,
conn = fp->conn;
ci = fp->f_ci;
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_for_each_entry_rcu(op, &ci->m_op_list, op_entry) {
if (op->conn != conn)
continue;
op->conn = NULL;
}
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
fp->conn = NULL;
fp->tcon = NULL;
@@ -801,13 +801,13 @@ int ksmbd_reopen_durable_fd(struct ksmbd_work *work, struct ksmbd_file *fp)
fp->tcon = work->tcon;
ci = fp->f_ci;
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_for_each_entry_rcu(op, &ci->m_op_list, op_entry) {
if (op->conn)
continue;
op->conn = fp->conn;
}
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
__open_id(&work->sess->file_table, fp, OPEN_ID_TYPE_VOLATILE_ID);
if (!has_file_id(fp->volatile_id)) {
diff --git a/fs/smb/server/vfs_cache.h b/fs/smb/server/vfs_cache.h
index ed44fb4e18e7..5a225e7055f1 100644
--- a/fs/smb/server/vfs_cache.h
+++ b/fs/smb/server/vfs_cache.h
@@ -47,7 +47,7 @@ struct stream {
};
struct ksmbd_inode {
- rwlock_t m_lock;
+ struct rw_semaphore m_lock;
atomic_t m_count;
atomic_t op_count;
/* opinfo count for streams */
^ permalink raw reply related [relevance 9%]
* FAILED: patch "[PATCH] ksmbd: use rwsem instead of rwlock for lease break" failed to apply to 6.8-stable tree
@ 2024-05-13 15:21 8% gregkh
0 siblings, 0 replies; 200+ results
From: gregkh @ 2024-05-13 15:21 UTC (permalink / raw)
To: linkinjeon, stfrench; +Cc: stable
The patch below does not apply to the 6.8-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.8.y
git checkout FETCH_HEAD
git cherry-pick -x d1c189c6cb8b0fb7b5ee549237d27889c40c2f8b
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024051354-playmaker-preplan-0d22@gregkh' --subject-prefix 'PATCH 6.8.y' HEAD^..
Possible dependencies:
d1c189c6cb8b ("ksmbd: use rwsem instead of rwlock for lease break")
c8efcc786146 ("ksmbd: add support for durable handles v1/v2")
fa9415d4024f ("ksmbd: mark SMB2_SESSION_EXPIRED to session when destroying previous session")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d1c189c6cb8b0fb7b5ee549237d27889c40c2f8b Mon Sep 17 00:00:00 2001
From: Namjae Jeon <linkinjeon@kernel.org>
Date: Thu, 2 May 2024 10:07:50 +0900
Subject: [PATCH] ksmbd: use rwsem instead of rwlock for lease break
lease break wait for lease break acknowledgment.
rwsem is more suitable than unlock while traversing the list for parent
lease break in ->m_op_list.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c
index 6fd8cb7064dc..c2abf109010d 100644
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -207,9 +207,9 @@ static void opinfo_add(struct oplock_info *opinfo)
{
struct ksmbd_inode *ci = opinfo->o_fp->f_ci;
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_add_rcu(&opinfo->op_entry, &ci->m_op_list);
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
}
static void opinfo_del(struct oplock_info *opinfo)
@@ -221,9 +221,9 @@ static void opinfo_del(struct oplock_info *opinfo)
lease_del_list(opinfo);
write_unlock(&lease_list_lock);
}
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_del_rcu(&opinfo->op_entry);
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
}
static unsigned long opinfo_count(struct ksmbd_file *fp)
@@ -526,21 +526,18 @@ static struct oplock_info *same_client_has_lease(struct ksmbd_inode *ci,
* Compare lease key and client_guid to know request from same owner
* of same client
*/
- read_lock(&ci->m_lock);
+ down_read(&ci->m_lock);
list_for_each_entry(opinfo, &ci->m_op_list, op_entry) {
if (!opinfo->is_lease || !opinfo->conn)
continue;
- read_unlock(&ci->m_lock);
lease = opinfo->o_lease;
ret = compare_guid_key(opinfo, client_guid, lctx->lease_key);
if (ret) {
m_opinfo = opinfo;
/* skip upgrading lease about breaking lease */
- if (atomic_read(&opinfo->breaking_cnt)) {
- read_lock(&ci->m_lock);
+ if (atomic_read(&opinfo->breaking_cnt))
continue;
- }
/* upgrading lease */
if ((atomic_read(&ci->op_count) +
@@ -570,9 +567,8 @@ static struct oplock_info *same_client_has_lease(struct ksmbd_inode *ci,
lease_none_upgrade(opinfo, lctx->req_state);
}
}
- read_lock(&ci->m_lock);
}
- read_unlock(&ci->m_lock);
+ up_read(&ci->m_lock);
return m_opinfo;
}
@@ -1114,7 +1110,7 @@ void smb_send_parent_lease_break_noti(struct ksmbd_file *fp,
if (!p_ci)
return;
- read_lock(&p_ci->m_lock);
+ down_read(&p_ci->m_lock);
list_for_each_entry(opinfo, &p_ci->m_op_list, op_entry) {
if (opinfo->conn == NULL || !opinfo->is_lease)
continue;
@@ -1132,13 +1128,11 @@ void smb_send_parent_lease_break_noti(struct ksmbd_file *fp,
continue;
}
- read_unlock(&p_ci->m_lock);
oplock_break(opinfo, SMB2_OPLOCK_LEVEL_NONE);
opinfo_conn_put(opinfo);
- read_lock(&p_ci->m_lock);
}
}
- read_unlock(&p_ci->m_lock);
+ up_read(&p_ci->m_lock);
ksmbd_inode_put(p_ci);
}
@@ -1159,7 +1153,7 @@ void smb_lazy_parent_lease_break_close(struct ksmbd_file *fp)
if (!p_ci)
return;
- read_lock(&p_ci->m_lock);
+ down_read(&p_ci->m_lock);
list_for_each_entry(opinfo, &p_ci->m_op_list, op_entry) {
if (opinfo->conn == NULL || !opinfo->is_lease)
continue;
@@ -1173,13 +1167,11 @@ void smb_lazy_parent_lease_break_close(struct ksmbd_file *fp)
atomic_dec(&opinfo->conn->r_count);
continue;
}
- read_unlock(&p_ci->m_lock);
oplock_break(opinfo, SMB2_OPLOCK_LEVEL_NONE);
opinfo_conn_put(opinfo);
- read_lock(&p_ci->m_lock);
}
}
- read_unlock(&p_ci->m_lock);
+ up_read(&p_ci->m_lock);
ksmbd_inode_put(p_ci);
}
diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index 30229161b346..b6c5a8ea3887 100644
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -3376,9 +3376,9 @@ int smb2_open(struct ksmbd_work *work)
* after daccess, saccess, attrib_only, and stream are
* initialized.
*/
- write_lock(&fp->f_ci->m_lock);
+ down_write(&fp->f_ci->m_lock);
list_add(&fp->node, &fp->f_ci->m_fp_list);
- write_unlock(&fp->f_ci->m_lock);
+ up_write(&fp->f_ci->m_lock);
/* Check delete pending among previous fp before oplock break */
if (ksmbd_inode_pending_delete(fp)) {
diff --git a/fs/smb/server/smb_common.c b/fs/smb/server/smb_common.c
index fcaf373cc008..474dadf6b7b8 100644
--- a/fs/smb/server/smb_common.c
+++ b/fs/smb/server/smb_common.c
@@ -646,7 +646,7 @@ int ksmbd_smb_check_shared_mode(struct file *filp, struct ksmbd_file *curr_fp)
* Lookup fp in master fp list, and check desired access and
* shared mode between previous open and current open.
*/
- read_lock(&curr_fp->f_ci->m_lock);
+ down_read(&curr_fp->f_ci->m_lock);
list_for_each_entry(prev_fp, &curr_fp->f_ci->m_fp_list, node) {
if (file_inode(filp) != file_inode(prev_fp->filp))
continue;
@@ -722,7 +722,7 @@ int ksmbd_smb_check_shared_mode(struct file *filp, struct ksmbd_file *curr_fp)
break;
}
}
- read_unlock(&curr_fp->f_ci->m_lock);
+ up_read(&curr_fp->f_ci->m_lock);
return rc;
}
diff --git a/fs/smb/server/vfs_cache.c b/fs/smb/server/vfs_cache.c
index 030f70700036..6cb599cd287e 100644
--- a/fs/smb/server/vfs_cache.c
+++ b/fs/smb/server/vfs_cache.c
@@ -165,7 +165,7 @@ static int ksmbd_inode_init(struct ksmbd_inode *ci, struct ksmbd_file *fp)
ci->m_fattr = 0;
INIT_LIST_HEAD(&ci->m_fp_list);
INIT_LIST_HEAD(&ci->m_op_list);
- rwlock_init(&ci->m_lock);
+ init_rwsem(&ci->m_lock);
ci->m_de = fp->filp->f_path.dentry;
return 0;
}
@@ -261,14 +261,14 @@ static void __ksmbd_inode_close(struct ksmbd_file *fp)
}
if (atomic_dec_and_test(&ci->m_count)) {
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
if (ci->m_flags & (S_DEL_ON_CLS | S_DEL_PENDING)) {
ci->m_flags &= ~(S_DEL_ON_CLS | S_DEL_PENDING);
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
ksmbd_vfs_unlink(filp);
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
}
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
ksmbd_inode_free(ci);
}
@@ -289,9 +289,9 @@ static void __ksmbd_remove_fd(struct ksmbd_file_table *ft, struct ksmbd_file *fp
if (!has_file_id(fp->volatile_id))
return;
- write_lock(&fp->f_ci->m_lock);
+ down_write(&fp->f_ci->m_lock);
list_del_init(&fp->node);
- write_unlock(&fp->f_ci->m_lock);
+ up_write(&fp->f_ci->m_lock);
write_lock(&ft->lock);
idr_remove(ft->idr, fp->volatile_id);
@@ -523,17 +523,17 @@ struct ksmbd_file *ksmbd_lookup_fd_inode(struct dentry *dentry)
if (!ci)
return NULL;
- read_lock(&ci->m_lock);
+ down_read(&ci->m_lock);
list_for_each_entry(lfp, &ci->m_fp_list, node) {
if (inode == file_inode(lfp->filp)) {
atomic_dec(&ci->m_count);
lfp = ksmbd_fp_get(lfp);
- read_unlock(&ci->m_lock);
+ up_read(&ci->m_lock);
return lfp;
}
}
atomic_dec(&ci->m_count);
- read_unlock(&ci->m_lock);
+ up_read(&ci->m_lock);
return NULL;
}
@@ -705,13 +705,13 @@ static bool session_fd_check(struct ksmbd_tree_connect *tcon,
conn = fp->conn;
ci = fp->f_ci;
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_for_each_entry_rcu(op, &ci->m_op_list, op_entry) {
if (op->conn != conn)
continue;
op->conn = NULL;
}
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
fp->conn = NULL;
fp->tcon = NULL;
@@ -801,13 +801,13 @@ int ksmbd_reopen_durable_fd(struct ksmbd_work *work, struct ksmbd_file *fp)
fp->tcon = work->tcon;
ci = fp->f_ci;
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_for_each_entry_rcu(op, &ci->m_op_list, op_entry) {
if (op->conn)
continue;
op->conn = fp->conn;
}
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
__open_id(&work->sess->file_table, fp, OPEN_ID_TYPE_VOLATILE_ID);
if (!has_file_id(fp->volatile_id)) {
diff --git a/fs/smb/server/vfs_cache.h b/fs/smb/server/vfs_cache.h
index ed44fb4e18e7..5a225e7055f1 100644
--- a/fs/smb/server/vfs_cache.h
+++ b/fs/smb/server/vfs_cache.h
@@ -47,7 +47,7 @@ struct stream {
};
struct ksmbd_inode {
- rwlock_t m_lock;
+ struct rw_semaphore m_lock;
atomic_t m_count;
atomic_t op_count;
/* opinfo count for streams */
^ permalink raw reply related [relevance 8%]
* [syzbot] [ext4?] possible deadlock in ext4_xattr_set_handle (5)
@ 2024-05-13 11:53 2% syzbot
0 siblings, 0 replies; 200+ results
From: syzbot @ 2024-05-13 11:53 UTC (permalink / raw)
To: adilger.kernel, linux-ext4, linux-kernel, syzkaller-bugs, tytso
Hello,
syzbot found the following issue on:
HEAD commit: 45db3ab70092 Merge tag '6.9-rc7-ksmbd-fixes' of git://git...
git tree: upstream
console output: https://syzkaller.appspot.com/x/log.txt?x=144a905c980000
kernel config: https://syzkaller.appspot.com/x/.config?x=a450595960709c8
dashboard link: https://syzkaller.appspot.com/bug?extid=4247fb9b4517c79e3b57
compiler: gcc (Debian 12.2.0-14) 12.2.0, GNU ld (GNU Binutils for Debian) 2.40
userspace arch: i386
Unfortunately, I don't have any reproducer for this issue yet.
Downloadable assets:
disk image (non-bootable): https://storage.googleapis.com/syzbot-assets/7bc7510fe41f/non_bootable_disk-45db3ab7.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/c94d1aa6cd96/vmlinux-45db3ab7.xz
kernel image: https://storage.googleapis.com/syzbot-assets/f9daddfda2f1/bzImage-45db3ab7.xz
IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+4247fb9b4517c79e3b57@syzkaller.appspotmail.com
EXT4-fs (loop3): mounted filesystem 00000000-0000-0000-0000-000000000000 r/w without journal. Quota mode: none.
======================================================
WARNING: possible circular locking dependency detected
6.9.0-rc7-syzkaller-00056-g45db3ab70092 #0 Not tainted
------------------------------------------------------
syz-executor.3/30481 is trying to acquire lock:
ffffffff8d937180 (fs_reclaim){+.+.}-{0:0}, at: might_alloc include/linux/sched/mm.h:312 [inline]
ffffffff8d937180 (fs_reclaim){+.+.}-{0:0}, at: slab_pre_alloc_hook mm/slub.c:3752 [inline]
ffffffff8d937180 (fs_reclaim){+.+.}-{0:0}, at: slab_alloc_node mm/slub.c:3833 [inline]
ffffffff8d937180 (fs_reclaim){+.+.}-{0:0}, at: __do_kmalloc_node mm/slub.c:3971 [inline]
ffffffff8d937180 (fs_reclaim){+.+.}-{0:0}, at: __kmalloc_node+0xbb/0x480 mm/slub.c:3979
but task is already holding lock:
ffff88802a241ec8 (&ei->xattr_sem){++++}-{3:3}, at: ext4_write_lock_xattr fs/ext4/xattr.h:155 [inline]
ffff88802a241ec8 (&ei->xattr_sem){++++}-{3:3}, at: ext4_xattr_set_handle+0x156/0x16d0 fs/ext4/xattr.c:2358
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #3 (&ei->xattr_sem){++++}-{3:3}:
down_write+0x3a/0x50 kernel/locking/rwsem.c:1579
ext4_write_lock_xattr fs/ext4/xattr.h:155 [inline]
ext4_xattr_set_handle+0x156/0x16d0 fs/ext4/xattr.c:2358
ext4_xattr_set+0x149/0x380 fs/ext4/xattr.c:2545
__vfs_setxattr+0x173/0x1e0 fs/xattr.c:200
__vfs_setxattr_noperm+0x127/0x5e0 fs/xattr.c:234
__vfs_setxattr_locked+0x182/0x260 fs/xattr.c:295
vfs_setxattr+0x146/0x350 fs/xattr.c:321
do_setxattr+0x146/0x170 fs/xattr.c:629
setxattr+0x15d/0x180 fs/xattr.c:652
path_setxattr+0x179/0x1e0 fs/xattr.c:671
__do_sys_lsetxattr fs/xattr.c:694 [inline]
__se_sys_lsetxattr fs/xattr.c:690 [inline]
__ia32_sys_lsetxattr+0xbd/0x160 fs/xattr.c:690
do_syscall_32_irqs_on arch/x86/entry/common.c:165 [inline]
__do_fast_syscall_32+0x75/0x120 arch/x86/entry/common.c:386
do_fast_syscall_32+0x32/0x80 arch/x86/entry/common.c:411
entry_SYSENTER_compat_after_hwframe+0x84/0x8e
-> #2 (jbd2_handle){++++}-{0:0}:
start_this_handle+0x1101/0x15e0 fs/jbd2/transaction.c:463
jbd2__journal_start+0x394/0x6a0 fs/jbd2/transaction.c:520
__ext4_journal_start_sb+0x358/0x660 fs/ext4/ext4_jbd2.c:112
ext4_sample_last_mounted fs/ext4/file.c:837 [inline]
ext4_file_open+0x636/0xc80 fs/ext4/file.c:866
do_dentry_open+0x8da/0x18c0 fs/open.c:955
do_open fs/namei.c:3642 [inline]
path_openat+0x1dfb/0x2990 fs/namei.c:3799
do_filp_open+0x1dc/0x430 fs/namei.c:3826
do_sys_openat2+0x17a/0x1e0 fs/open.c:1406
do_sys_open fs/open.c:1421 [inline]
__do_sys_openat fs/open.c:1437 [inline]
__se_sys_openat fs/open.c:1432 [inline]
__x64_sys_openat+0x175/0x210 fs/open.c:1432
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xcf/0x260 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
-> #1 (sb_internal){.+.+}-{0:0}:
percpu_down_read include/linux/percpu-rwsem.h:51 [inline]
__sb_start_write include/linux/fs.h:1664 [inline]
sb_start_intwrite include/linux/fs.h:1847 [inline]
ext4_evict_inode+0xd7b/0x17d0 fs/ext4/inode.c:212
evict+0x2ed/0x6c0 fs/inode.c:667
iput_final fs/inode.c:1741 [inline]
iput.part.0+0x5a8/0x7f0 fs/inode.c:1767
iput+0x5c/0x80 fs/inode.c:1757
dentry_unlink_inode+0x295/0x440 fs/dcache.c:400
__dentry_kill+0x1d0/0x600 fs/dcache.c:603
shrink_kill fs/dcache.c:1048 [inline]
shrink_dentry_list+0x140/0x5d0 fs/dcache.c:1075
prune_dcache_sb+0xeb/0x150 fs/dcache.c:1156
super_cache_scan+0x32a/0x550 fs/super.c:221
do_shrink_slab+0x44f/0x11c0 mm/shrinker.c:435
shrink_slab_memcg mm/shrinker.c:548 [inline]
shrink_slab+0xa87/0x1310 mm/shrinker.c:626
shrink_one+0x493/0x7c0 mm/vmscan.c:4774
shrink_many mm/vmscan.c:4835 [inline]
lru_gen_shrink_node+0x89f/0x1750 mm/vmscan.c:4935
shrink_node mm/vmscan.c:5894 [inline]
kswapd_shrink_node mm/vmscan.c:6704 [inline]
balance_pgdat+0x10d1/0x1a10 mm/vmscan.c:6895
kswapd+0x5ea/0xbf0 mm/vmscan.c:7164
kthread+0x2c1/0x3a0 kernel/kthread.c:388
ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
-> #0 (fs_reclaim){+.+.}-{0:0}:
check_prev_add kernel/locking/lockdep.c:3134 [inline]
check_prevs_add kernel/locking/lockdep.c:3253 [inline]
validate_chain kernel/locking/lockdep.c:3869 [inline]
__lock_acquire+0x2478/0x3b30 kernel/locking/lockdep.c:5137
lock_acquire kernel/locking/lockdep.c:5754 [inline]
lock_acquire+0x1b1/0x560 kernel/locking/lockdep.c:5719
__fs_reclaim_acquire mm/page_alloc.c:3698 [inline]
fs_reclaim_acquire+0x102/0x160 mm/page_alloc.c:3712
might_alloc include/linux/sched/mm.h:312 [inline]
slab_pre_alloc_hook mm/slub.c:3752 [inline]
slab_alloc_node mm/slub.c:3833 [inline]
__do_kmalloc_node mm/slub.c:3971 [inline]
__kmalloc_node+0xbb/0x480 mm/slub.c:3979
kmalloc_node include/linux/slab.h:648 [inline]
kvmalloc_node+0x9d/0x1a0 mm/util.c:634
kvmalloc include/linux/slab.h:766 [inline]
ext4_xattr_inode_cache_find fs/ext4/xattr.c:1535 [inline]
ext4_xattr_inode_lookup_create fs/ext4/xattr.c:1581 [inline]
ext4_xattr_set_entry+0xdc3/0x3b20 fs/ext4/xattr.c:1718
ext4_xattr_block_set+0xd07/0x3080 fs/ext4/xattr.c:2037
ext4_xattr_set_handle+0xf24/0x16d0 fs/ext4/xattr.c:2443
ext4_xattr_set+0x149/0x380 fs/ext4/xattr.c:2545
__vfs_setxattr+0x173/0x1e0 fs/xattr.c:200
__vfs_setxattr_noperm+0x127/0x5e0 fs/xattr.c:234
__vfs_setxattr_locked+0x182/0x260 fs/xattr.c:295
vfs_setxattr+0x146/0x350 fs/xattr.c:321
do_setxattr+0x146/0x170 fs/xattr.c:629
setxattr+0x15d/0x180 fs/xattr.c:652
path_setxattr+0x179/0x1e0 fs/xattr.c:671
__do_sys_setxattr fs/xattr.c:687 [inline]
__se_sys_setxattr fs/xattr.c:683 [inline]
__ia32_sys_setxattr+0xc0/0x160 fs/xattr.c:683
do_syscall_32_irqs_on arch/x86/entry/common.c:165 [inline]
__do_fast_syscall_32+0x75/0x120 arch/x86/entry/common.c:386
do_fast_syscall_32+0x32/0x80 arch/x86/entry/common.c:411
entry_SYSENTER_compat_after_hwframe+0x84/0x8e
other info that might help us debug this:
Chain exists of:
fs_reclaim --> jbd2_handle --> &ei->xattr_sem
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&ei->xattr_sem);
lock(jbd2_handle);
lock(&ei->xattr_sem);
lock(fs_reclaim);
*** DEADLOCK ***
3 locks held by syz-executor.3/30481:
#0: ffff888076954420 (sb_writers#4){.+.+}-{0:0}, at: path_setxattr+0xc3/0x1e0 fs/xattr.c:669
#1: ffff88802a242200 (&sb->s_type->i_mutex_key#8){++++}-{3:3}, at: inode_lock include/linux/fs.h:795 [inline]
#1: ffff88802a242200 (&sb->s_type->i_mutex_key#8){++++}-{3:3}, at: vfs_setxattr+0x123/0x350 fs/xattr.c:320
#2: ffff88802a241ec8 (&ei->xattr_sem){++++}-{3:3}, at: ext4_write_lock_xattr fs/ext4/xattr.h:155 [inline]
#2: ffff88802a241ec8 (&ei->xattr_sem){++++}-{3:3}, at: ext4_xattr_set_handle+0x156/0x16d0 fs/ext4/xattr.c:2358
stack backtrace:
CPU: 0 PID: 30481 Comm: syz-executor.3 Not tainted 6.9.0-rc7-syzkaller-00056-g45db3ab70092 #0
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014
Call Trace:
<TASK>
__dump_stack lib/dump_stack.c:88 [inline]
dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:114
check_noncircular+0x31a/0x400 kernel/locking/lockdep.c:2187
check_prev_add kernel/locking/lockdep.c:3134 [inline]
check_prevs_add kernel/locking/lockdep.c:3253 [inline]
validate_chain kernel/locking/lockdep.c:3869 [inline]
__lock_acquire+0x2478/0x3b30 kernel/locking/lockdep.c:5137
lock_acquire kernel/locking/lockdep.c:5754 [inline]
lock_acquire+0x1b1/0x560 kernel/locking/lockdep.c:5719
__fs_reclaim_acquire mm/page_alloc.c:3698 [inline]
fs_reclaim_acquire+0x102/0x160 mm/page_alloc.c:3712
might_alloc include/linux/sched/mm.h:312 [inline]
slab_pre_alloc_hook mm/slub.c:3752 [inline]
slab_alloc_node mm/slub.c:3833 [inline]
__do_kmalloc_node mm/slub.c:3971 [inline]
__kmalloc_node+0xbb/0x480 mm/slub.c:3979
kmalloc_node include/linux/slab.h:648 [inline]
kvmalloc_node+0x9d/0x1a0 mm/util.c:634
kvmalloc include/linux/slab.h:766 [inline]
ext4_xattr_inode_cache_find fs/ext4/xattr.c:1535 [inline]
ext4_xattr_inode_lookup_create fs/ext4/xattr.c:1581 [inline]
ext4_xattr_set_entry+0xdc3/0x3b20 fs/ext4/xattr.c:1718
ext4_xattr_block_set+0xd07/0x3080 fs/ext4/xattr.c:2037
ext4_xattr_set_handle+0xf24/0x16d0 fs/ext4/xattr.c:2443
ext4_xattr_set+0x149/0x380 fs/ext4/xattr.c:2545
__vfs_setxattr+0x173/0x1e0 fs/xattr.c:200
__vfs_setxattr_noperm+0x127/0x5e0 fs/xattr.c:234
__vfs_setxattr_locked+0x182/0x260 fs/xattr.c:295
vfs_setxattr+0x146/0x350 fs/xattr.c:321
do_setxattr+0x146/0x170 fs/xattr.c:629
setxattr+0x15d/0x180 fs/xattr.c:652
path_setxattr+0x179/0x1e0 fs/xattr.c:671
__do_sys_setxattr fs/xattr.c:687 [inline]
__se_sys_setxattr fs/xattr.c:683 [inline]
__ia32_sys_setxattr+0xc0/0x160 fs/xattr.c:683
do_syscall_32_irqs_on arch/x86/entry/common.c:165 [inline]
__do_fast_syscall_32+0x75/0x120 arch/x86/entry/common.c:386
do_fast_syscall_32+0x32/0x80 arch/x86/entry/common.c:411
entry_SYSENTER_compat_after_hwframe+0x84/0x8e
RIP: 0023:0xf72c6579
Code: b8 01 10 06 03 74 b4 01 10 07 03 74 b0 01 10 08 03 74 d8 01 00 00 00 00 00 00 00 00 00 00 00 00 00 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 8d b4 26 00 00 00 00 8d b4 26 00 00 00 00
RSP: 002b:00000000f5eb85ac EFLAGS: 00000292 ORIG_RAX: 00000000000000e2
RAX: ffffffffffffffda RBX: 0000000020000200 RCX: 00000000200001c0
RDX: 0000000020001400 RSI: 0000000000000835 RDI: 0000000000000000
RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000292 R12: 0000000000000000
R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
</TASK>
----------------
Code disassembly (best guess), 2 bytes skipped:
0: 10 06 adc %al,(%rsi)
2: 03 74 b4 01 add 0x1(%rsp,%rsi,4),%esi
6: 10 07 adc %al,(%rdi)
8: 03 74 b0 01 add 0x1(%rax,%rsi,4),%esi
c: 10 08 adc %cl,(%rax)
e: 03 74 d8 01 add 0x1(%rax,%rbx,8),%esi
1e: 00 51 52 add %dl,0x52(%rcx)
21: 55 push %rbp
22: 89 e5 mov %esp,%ebp
24: 0f 34 sysenter
26: cd 80 int $0x80
* 28: 5d pop %rbp <-- trapping instruction
29: 5a pop %rdx
2a: 59 pop %rcx
2b: c3 ret
2c: 90 nop
2d: 90 nop
2e: 90 nop
2f: 90 nop
30: 8d b4 26 00 00 00 00 lea 0x0(%rsi,%riz,1),%esi
37: 8d b4 26 00 00 00 00 lea 0x0(%rsi,%riz,1),%esi
---
This report is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller@googlegroups.com.
syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
If the report is already addressed, let syzbot know by replying with:
#syz fix: exact-commit-title
If you want to overwrite report's subsystems, reply with:
#syz set subsystems: new-subsystem
(See the list of subsystem names on the web dashboard)
If the report is a duplicate of another one, reply with:
#syz dup: exact-subject-of-another-report
If you want to undo deduplication, reply with:
#syz undup
^ permalink raw reply [relevance 2%]
* linux-next: Tree for May 13
@ 2024-05-13 7:11 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-13 7:11 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 41479 bytes --]
Hi all,
Do not add any work intended for v6.11 to your linux-next included
branches until after v6.10-rc1 has been released.
Changes since 20240510:
The sound-asoc tree still had its build failure for which I reverted
a commit.
The block tree gained a conflict against Linus' tree.
Tthe kspp tree gained a conflict against the kbuild tree.
The refactor-heap tree still had its conflicts against the block tree
for which I dropped the refactor-heap tree.
Non-merge commits (relative to Linus' tree): 11601
11554 files changed, 764948 insertions(+), 280709 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (a38297e3fb01 Linux 6.9)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (13266018ecac mm/vmalloc: fix vmalloc which may return null if called with __GFP_NOFAIL)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (5549d1e39989 Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (7bbe449d0bdb s390/paes: Reestablish retry loop in paes)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (1164057b3c00 Merge branch 'mlx5-misc-fixes')
Merging bpf/master (3e9bc0472b91 Merge branch 'bpf: Add BPF_PROG_TYPE_CGROUP_SKB attach type enforcement in BPF_LINK_CREATE')
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging ipvs/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging wireless/for-next (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (31469e8b286c Merge tag 'asoc-fix-v6.9-rc7-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc-fixes/for-linus (e54f128b0c2f ASoC: audio-graph-card2: call of_node_get() before of_get_next_child())
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (2a4b49bb5812 regulator: core: fix debugfs creation regression)
Merging spi-fixes/for-linus (ef13561d2b16 spi: microchip-core-qspi: fix setting spi bus clock rate)
Merging pci-current/for-linus (f3d049b35b01 PCI/ASPM: Restore parent state to parent, child state to child)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler)
Merging usb.current/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging usb-serial-fixes/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (bb198e29fe75 iio: dac: ad5592r: fix temperature channel scaling value)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (008ab3c53bc4 speakup: Fix sizeof() vs ARRAY_SIZE() bug)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (dd5a440a31fa Linux 6.9-rc7)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (0a9c28bec202 Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (26e8383b116d hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (cbf613cd4d3c Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (515a3c3a5489 platform/x86: ISST: Add Grand Ridge to HPM CPU list)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so)
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (a222a6470d7e Revert "drm/nouveau/firmware: Fix SG_DEBUG error with nvkm_firmware_ctor()")
Merging drm-intel-fixes/for-linux-next-fixes (43b26bdd2ee5 drm/i915/bios: Fix parsing backlight BDB data)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (ee0166b637a5 gpiolib: cdev: fix uninitialised kfifo)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (55750148e559 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe())
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (6897204ea3df drm/connector: Add
Merging mm-stable/mm-stable (76edc534cc28 memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order)
Merging mm-nonmm-stable/mm-nonmm-stable (5cbcb62dddf5 fs/proc: fix softlockup in __read_vmcore)
Merging mm/mm-everything (1ebf942a37ea foo)
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h
Merging kbuild/for-next (14da55bdea6b kconfig: gconf: show checkbox for choice correctly)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (d9c5f5f94c2d perf pmu: Count sys and cpuid JSON events separately)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a6016aac5252 dma: fix DMA sync for drivers not calling dma_set_mask*())
Merging asm-generic/master (02af68767d27 Merge branch 'alpha-cleanup-6.9' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (b7e329ac0464 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (f0cc697f9f65 Merge branch 'for-next/errata' into for-next/core)
Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support)
Merging arm-soc/for-next (1e3dd71e2587 Merge branch 'soc/defconfig' into for-next)
Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (4cece7649650 Linux 6.9-rc1)
Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (7468eb6710ce Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-clk/next' into for-next)
Merging samsung-krzk/for-next (a9c32618cd2a Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (3bdc4c661d47 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (429fe5372451 Merge branch 'clk-microchip' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (7b7e584f90bf LoongArch: KVM: Add mmio trace events support)
Merging m68k/for-next (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging m68knommu/for-next (a5044ce7d1d9 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (0ca4f51fa522 parisc/math-emu: Remove unused struct 'exc_reg')
Merging powerpc/next (98ec6d38ee57 selftests/powerpc/dexcr: Fix spelling mistake "predicition" -> "prediction")
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree())
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
CONFLICT (content): Merge conflict in arch/riscv/Makefile
CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
CONFLICT (content): Merge conflict in kernel/sys.c
Merging riscv-dt/riscv-dt-for-next (1c80d50bb697 riscv: dts: microchip: add pac1934 power-monitor to icicle)
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (a1bca25da366 Merge branch 'features' into for-next)
Merging sh/for-next (21b8651502d5 sh: boot: Add proper forward declarations)
Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask var)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (07f9a27f1969 bcachefs: add no_invalid_checks flag)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (55b52af44d50 Merge branch 'for-next-next-v6.9-20240508' into for-next-20240508)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (a91d96186bc2 smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (7c35de4df105 erofs: Zstandard compression support)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (82172cca18b2 Merge isofs Makefile cleanup.)
Merging ext4/dev (26770a717cac jbd2: add prefix 'jbd2' for 'shrink_type')
Merging f2fs/dev (991b6bdf1b00 f2fs: fix some ambiguous comments)
Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning)
Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support)
Merging gfs2/for-next (c1c53c26e338 gfs2: make timeout values more explicit)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (c91ecba9e421 ksmbd: avoid to send duplicate oplock break notifications)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (8d915bbf3926 NFSD: Force all NFSv4.2 COPY requests to be synchronous)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access)
Merging overlayfs/overlayfs-next (e9229c18dae3 ovl: remove duplicate included header)
Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address access in jffs2_free_inode)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (a38297e3fb01 Linux 6.9)
Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (f5e217b1e5dc Merge branch 'vfs.super' into vfs.all)
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in fs/ext4/file.c
CONFLICT (content): Merge conflict in fs/tracefs/inode.c
Merging vfs/for-next (4faeedb807f8 Merge branch 'work.bd_inode' into for-next)
Merging printk/for-next (596ffa476e20 Merge branch 'for-6.10' into for-next)
Merging pci/next (484af35f7e65 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (14ee3d12f37b Merge branch 'for-6.10/hid-bpf' into for-next)
Merging i2c/i2c/for-next (20e70be866cc Merge branch 'i2c/for-current' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE())
Merging i3c/i3c/next (acec16dbb338 i3c: dw: Add hot-join support.)
Merging dmi/dmi-for-next (7d5019435585 firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (5fbf8734fb36 hwmon: (nzxt-kraken3) Bail out for unsupported device variants)
Merging jc_docs/docs-next (955e15969c1d Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (4a7d735191de media: dw2102: fix coding style issues)
Merging v4l-dvb-next/master (48259b909737 media: media: intel/ipu6: Fix spelling mistake "remappinp" -> "remapping")
Merging pm/linux-next (9b0087147da0 Merge branch 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (ccad360a2d41 PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions)
Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (69b08420b697 thermal: renesas: rcar: Add dependency on OF)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (49ca2b2ef3d0 RDMA/IPoIB: Fix format truncation compilation errors)
Merging net-next/main (cddd2dc6390b Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue)
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/Makefile
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in net/core/page_pool.c
Merging bpf-next/for-next (ba39486d2c43 bpf: make list_for_each_entry portable)
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (fa23e0d4b756 netfilter: nf_tables: allow clone callbacks to sleep)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (75f819bdf9ca Bluetooth: btintel: Fix compiler warning for multi_v7_defconfig config)
Merging wireless-next/for-next (1d60eabb8269 wifi: mwl8k: initialize cmd->addr[] properly)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content)
Merging drm/drm-next (275654c02f0b Merge tag 'drm-xe-next-fixes-2024-05-09-1' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
b4abeb5545bb ("drm/xe/guc: Check error code when initializing the CT mutex")
b72a7e0fd0f8 ("drm/amd/display: Enabling urgent latency adjustment for DCN35")
d69c3d4b5382 ("drm/xe/ads: Use flexible-array")
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c
Merging drm-exynos/for-linux-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging drm-misc/for-linux-next (713a75079f37 drm: xlnx: zynqmp_dpsub: Fix compilation error)
Merging amdgpu/drm-next (10f624ef239b drm/amdkfd: Reconcile the definition and use of oem_id in struct kfd_topology_device)
24e82654e98e ("drm/amdkfd: don't allow mapping the MMIO HDP page with large pages")
421226e5c998 ("Revert "drm/amdkfd: Add partition id field to location_id"")
5922deae69be ("drm/amd/display: Fix idle optimization checks for multi-display and dual eDP")
b33f1d128cff ("drm/amd/display: MST DSC check for older devices")
b911505e6ba4 ("dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users")
b9b5a82c5321 ("drm/amd/display: Fix DSC-re-computing")
c4dcb47d4614 ("drm/amdgpu: Fix comparison in amdgpu_res_cpu_visible")
d2f751722ac6 ("drm/amd/display: Enable urgent latency adjustments for DCN35")
Merging drm-intel/for-linux-next (56ac367dbf8d drm/i915: Polish types in fb calculations)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vbt_defs.h
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (b587f413ca47 drm/msm/gen_header: allow skipping the validation)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (c3203ca3b8a6 drm/xe: Rename few xe_args.h macros)
50aec9665e0b ("drm/xe: Use ordered WQ for G2H handler")
ee7284230644 ("drm/xe/ads: Use flexible-array")
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (9b1fe0510494 regmap: Reorder fields in 'struct regmap_config' to save some memory)
Merging sound/for-next (762e6af39883 ALSA: scarlett2: Increase mixer range to +12dB)
Merging ieee1394/for-next (21151fd8f0ea firewire: obsolete usage of *-objs in Makefile for KUnit test)
Merging sound-asoc/for-next (ad2ecebd93b7 Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (da3fe9d0be5b bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (5128de84d8fc Input: cros_ec_keyb - remove an unused field in struct cros_ec_keyb)
Merging block/for-next (f7f83daa8ca0 Merge branch 'for-6.10/block' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
CONFLICT (content): Merge conflict in block/ioctl.c
CONFLICT (content): Merge conflict in drivers/block/ublk_drv.c
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Applying: fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flags"
Merging device-mapper/for-next (8b21ac87d550 dm-delay: remove timer_lock)
Merging libata/for-next (d4a89339f17c ata: pata_legacy: make legacy_exit() work again)
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs)
Merging mfd/for-mfd-next (1482489b5196 dt-bindings: mfd: Use full path to other schemas)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (1fd949f653ee backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (00d1d63ef2da Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (dd80c7465029 MAINTAINERS: repair file entry in SECURITY SUBSYSTEM)
Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL pointer dereference)
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (a0b6d1c424c7 Documentation: tpm: Add TPM security docs toctree entry)
Merging watchdog/master (c45b8cfc6d5c watchdog: LENOVO_SE10_WDT should depend on X86 && DMI)
Merging iommu/next (791730454838 Merge branches 'iommu/fixes', 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (49e9d01f669e dt-bindings: Use full path to other schemas)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (e958cffa42df Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (63c0e046aa0a Merge branch into tip/master: 'x86/timers')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/arm_arch_timer: Mark hisi_161010101_oem_info const)
Merging edac/edac-for-next (ab80b31cd7b2 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (0e9b1d2b0560 Merge branches 'cmpxchg.2024.05.11a', 'kcsan.2024.05.07a', 'lkmm.2024.05.06a', 'rcu-merge.2024.05.01a' and 'tsc.2024.04.09c' into HEAD)
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kvm/next (4aad0b1893a1 Merge branch 'kvm-queue-snp' into HEAD)
Applying: fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code"
Merging kvm-arm/next (eaa46a28d596 Merge branch kvm-arm64/mpidr-reset into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (b52e8cd3f835 KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info())
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
Merging xen-tip/linux-next (d4c16b4755de xen/xenbus: Use *-y instead of *-objs in Makefile)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (76f09e22027f platform/x86: ISST: Support SST-BF and SST-TF per level)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (880a746fa3ea device property: Fix a typo in the description of device_get_child_node_count())
Merging usb/usb-next (51474ab44abf drm/bridge: aux-hpd-bridge: correct devm_drm_dp_hpd_bridge_add() stub)
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (e21de1455a72 serial: Clear UPF_DEAD before calling tty_port_register_device_attr_serdev())
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (979987371739 spmi: pmic-arb: Add multi bus support)
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x)
Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property)
Merging extcon/extcon-next (3e8e45b65d9f extcon: adc-jack: Document missing struct members)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (dda057ad8c9c vfio: remove an extra semicolon)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (4cece7649650 Linux 6.9-rc1)
Merging staging/staging-next (eb563dc752d3 staging: pi433: Remove unused driver)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (28059ddbee0e MAINTAINERS: Update role for IDXD driver)
Merging cgroup/for-next (8f6d24a5db2a selftests/cgroup: fix uninitialized variables in test_zswap.c)
Merging scsi/for-next (9ba1fbe2ed0c Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (3668651def2c scsi: mpi3mr: Sanitise num_phys)
Merging vhost/linux-next (0b8dbbdcf2e4 Merge tag 'for_linus' into vhost)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (c8d8f841e95b Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (7f45fe2ea3b8 gpio: nuvoton: Fix sgpio irq handle error)
CONFLICT (content): Merge conflict in drivers/gpio/gpiolib.h
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (9429f847dd72 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (4817118f257e pwm: pca9685: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (2c3b8f8f37c6 selftests/sgx: Include KHDR_INCLUDES in Makefile)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (5496b9b77d74 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (73a98bc5a947 Merge branch 'for-6.10' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (e406737b1110 seccomp: Constify sysctl subhelpers)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (4cece7649650 Linux 6.9-rc1)
Merging nvmem/for-next (4cece7649650 Linux 6.9-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (9d7044fd813c Merge branch 'fix-vfork-test-next' into landlock-next)
Merging rust/rust-next (97ab3e8eec0c rust: alloc: fix dangling pointer in VecExt<T>::reserve())
CONFLICT (content): Merge conflict in rust/Makefile
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (4bbf9c3b53e6 fs/coredump: Enable dynamic configuration of max file note size)
Merging bitmap/bitmap-for-next (c3052c2f53d3 usercopy: Don't use "proxy" headers)
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (6d305cbef1aa uapi: stddef.h: Provide UAPI macros for __counted_by_{le, be})
CONFLICT (content): Merge conflict in drivers/misc/lkdtm/Makefile
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (7d2f064b4414 tools/power turbostat: version 2024.05.10)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.c
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.h
CONFLICT (content): Merge conflict in drivers/md/bcache/btree.c
CONFLICT (content): Merge conflict in drivers/md/bcache/writeback.c
$ git merge --abort
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Applying: Revert "ASoC: SOF: Use *-y instead of *-objs in Makefile"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Linux 6.9
@ 2024-05-12 21:34 5% Linus Torvalds
0 siblings, 0 replies; 200+ results
From: Linus Torvalds @ 2024-05-12 21:34 UTC (permalink / raw)
To: Linux Kernel Mailing List
So Thorsten is still reporting a few regression fixes that haven't
made it to me yet, but none of them look big or worrisome enough to
delay the release for another week. We'll have to backport them when
they get resolved and hit upstream.
So 6.9 is now out, and last week has looked quite stable (and the
whole release has felt pretty normal). Below is the shortlog for the
last week, with the changes mostly being dominated by some driver
updates (gpu and networking being the big ones, but "big" is still
pretty small, and there's various other driver noise in there too).
Outside of drivers, it's some filesystem fixes (bcachefs still stands
out, but ksmbd shows up too), some late selftest fixes, and some core
networking fixes.
And I now have a more powerful arm64 machine (thanks to Ampere), so
the last week I've been doing almost as many arm64 builds as I have
x86-64, and that should obviously continue during the upcoming merge
window too. The M2 laptop I have has been more of a "test builds
weekly" rather than "continuously".
Not that I really expect that to really show any issues - the laptop
builds never did - but I feel happier having a bit more coverage.
Anyway, please keep testing, and obviously this means that tomorrow
the merge window for 6.10 opens. I already have a few dozen pull
requests pending, I appreciate the early birds,
Linus
---
Agustin Gutierrez (2):
drm/amd/display: Fix DSC-re-computing
drm/amd/display: MST DSC check for older devices
Al Viro (1):
qibfs: fix dentry leak
Aleksa Savic (3):
hwmon: (corsair-cpro) Use a separate buffer for sending commands
hwmon: (corsair-cpro) Use complete_all() instead of complete()
in ccp_raw_event()
hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock
Alex Deucher (1):
drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
Alexander Potapenko (1):
kmsan: compiler_types: declare __no_sanitize_or_inline
Alina Yu (1):
regulator: rtq2208: Fix the BUCK ramp_delay range to maximum of
16mVstep/us
Amir Goldstein (1):
fuse: verify zero padding in fuse_backing_map
Andi Shyti (1):
drm/i915/gt: Automate CCS Mode setting during engine resets
Andy Shevchenko (3):
auxdisplay: linedisp: Group display drivers together
auxdisplay: charlcd: Add missing MODULE_DESCRIPTION()
auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y
Antony Antony (2):
xfrm: fix possible derferencing in error path
xfrm: Correct spelling mistake in xfrm.h comment
Barry Song (1):
mailmap: add entry for Barry Song
Bartosz Golaszewski (2):
gpiolib: fix the speed of descriptor label setting with SRCU
gpiolib: use a single SRCU struct for all GPIO descriptors
Ben Wolsieffer (1):
spi: stm32: enable controller before asserting CS
Bjorn Helgaas (1):
PCI/ASPM: Clarify that pcie_aspm=off means leave ASPM untouched
Boy.Wu (1):
ARM: 9381/1: kasan: clear stale stack poison
Brian Foster (1):
virtiofs: include a newline in sysfs tag
Chaitanya Kumar Borah (1):
drm/i915/audio: Fix audio time stamp programming for DP
Chen-Yu Tsai (1):
arm64: dts: mediatek: mt8183-pico6: Fix bluetooth node
Christoph Hellwig (1):
mm,page_owner: don't remove __GFP_NOLOCKDEP in add_stack_record_to_list
Conor Dooley (3):
firmware: microchip: don't unconditionally print validation success
firmware: microchip: clarify that sizes and addresses are in hex
spi: microchip-core-qspi: fix setting spi bus clock rate
Dan Carpenter (2):
mm/slab: make __free(kfree) accept error pointers
nvmet: prevent sprintf() overflow in nvmet_subsys_nsid_exists()
Daniel Golle (1):
dt-bindings: net: mediatek: remove wrongly added clocks and SerDes
Daniele Ceraolo Spurio (1):
drm/xe/guc: Check error code when initializing the CT mutex
Dave Airlie (1):
Revert "drm/nouveau/firmware: Fix SG_DEBUG error with
nvkm_firmware_ctor()"
David Howells (2):
rxrpc: Fix congestion control algorithm
rxrpc: Only transmit one ACK per jumbo packet received
Donald Hunter (1):
netlink: specs: Add missing bridge linkinfo attrs
Douglas Anderson (1):
drm/connector: Add \n to message about demoting connector force-probes
Duoming Zhou (2):
Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
Eric Dumazet (4):
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
phonet: fix rtm_phonet_notify() skb allocation
ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
ipv6: prevent NULL dereference in ip6_output()
Felix Fietkau (1):
net: bridge: fix corrupted ethernet header on multicast-to-unicast
Gregor Herburger (1):
net: phy: marvell-88q2xxx: add support for Rev B1 and B2
Gregory Detal (1):
mptcp: only allow set existing scheduler for net.mptcp.scheduler
Hailong.Liu (1):
mm/vmalloc: fix return value of vb_alloc if size is 0
Ido Schimmel (1):
selftests: test_bridge_neigh_suppress.sh: Fix failures due to
duplicate MAC
Jarkko Sakkinen (1):
MAINTAINERS: update URL's for KEYS/KEYRINGS_INTEGRITY and TPM
DEVICE DRIVER
Jason Gunthorpe (1):
iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault()
Jean-Philippe Brucker (1):
KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M
Jerome Brunet (2):
drm/meson: dw-hdmi: power up phy on device init
drm/meson: dw-hdmi: add bandgap setting for g12
Jian Shen (1):
net: hns3: direct return when receive a unknown mailbox message
Johan Hovold (8):
Bluetooth: qca: fix wcn3991 device address check
Bluetooth: qca: add missing firmware sanity checks
Bluetooth: qca: fix NVM configuration parsing
Bluetooth: qca: generalise device address check
Bluetooth: qca: fix info leak when fetching fw build id
Bluetooth: qca: fix info leak when fetching board id
Bluetooth: qca: fix firmware check error path
regulator: core: fix debugfs creation regression
John Garry (1):
mailmap: add entry for John Garry
Josef Bacik (1):
btrfs: make sure that WRITTEN is set on all metadata blocks
Kai-Heng Feng (1):
PCI/ASPM: Restore parent state to parent, child state to child
Karthikeyan Ramasubramanian (1):
drm/i915/bios: Fix parsing backlight BDB data
Kefeng Wang (1):
mm: use memalloc_nofs_save() in page_cache_ra_order()
Kent Gibson (1):
gpiolib: cdev: fix uninitialised kfifo
Kent Overstreet (19):
bcachefs: Fix a scheduler splat in
__bch2_next_write_buffer_flush_journal_buf()
bcachefs: don't free error pointers
bcachefs: bucket_pos_to_bp_noerror()
bcachefs: Fix early error path in bch2_fs_btree_key_cache_exit()
bcachefs: Inodes need extra padding for varint_decode_fast()
bcachefs: Fix refcount put in sb_field_resize error path
bcachefs: Initialize bch_write_op->failed in inline data path
bcachefs: Fix bch2_dev_lookup() refcounting
bcachefs: Fix lifetime issue in device iterator helpers
bcachefs: Add a better limit for maximum number of buckets
bcachefs: Fix assert in bch2_alloc_v4_invalid()
bcachefs: Add missing validation for superblock section clean
bcachefs: Guard against unknown k.k->type in __bkey_invalid()
bcachefs: Fix shift-by-64 in bformat_needs_redo()
bcachefs: Fix snapshot_t() usage in bch2_fs_quota_read_inode()
bcachefs: Add missing skcipher_request_set_callback() call
bcachefs: BCH_SB_LAYOUT_SIZE_BITS_MAX
bcachefs: Fix race in bch2_write_super()
bcachefs: Add missing sched_annotate_sleep() in
bch2_journal_flush_seq_async()
Kuniyuki Iwashima (1):
tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
Lakshmi Yadlapati (1):
hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us
Levi Yun (1):
timers/migration: Prevent out of bounds access on failure
Liam R. Howlett (1):
maple_tree: fix mas_empty_area_rev() null pointer dereference
Lijo Lazar (1):
Revert "drm/amdkfd: Add partition id field to location_id"
Linus Torvalds (2):
Reapply "drm/qxl: simplify qxl_fence_wait"
Linux 6.9
Lucas De Marchi (1):
drm/xe/ads: Use flexible-array
Luis Chamberlain (2):
tools: fix userspace compilation with new test_xarray changes
lib/test_xarray.c: fix error assumptions on check_xa_multi_store_adv_add()
Lukasz Majewski (1):
hsr: Simplify code for announcing HSR nodes timer setup
Maninder Singh (1):
mm: page_owner: fix wrong information in dump_page_owner
Marek Vasut (1):
net: ks8851: Queue RX packets in IRQ handler instead of disabling BHs
Mario Limonciello (1):
dm/amd/pm: Fix problems with reboot/shutdown for some SMU
13.0.4/13.0.11 users
Matthew Brost (1):
drm/xe: Use ordered WQ for G2H handler
Matthew Wilcox (Oracle) (1):
XArray: set the marks correctly when splitting an entry
Maurizio Lombardi (1):
nvmet-auth: return the error code to the nvmet_auth_ctrl_hash() callers
Michael Ellerman (1):
selftests/mm: fix powerpc ARCH check
Michel Dänzer (1):
drm/amdgpu: Fix comparison in amdgpu_res_cpu_visible
Mickaël Salaün (10):
selftests/pidfd: Fix config for pidfd_setns_test
selftests/landlock: Fix FS tests when run on a private mount point
selftests/harness: Fix fixture teardown
selftests/harness: Fix interleaved scheduling leading to race conditions
selftests/landlock: Do not allocate memory in fixture data
selftests/harness: Constify fixture variants
selftests/pidfd: Fix wrong expectation
selftests/harness: Share _metadata between forked processes
selftests/harness: Fix vfork() side effects
selftests/harness: Handle TEST_F()'s explicit exit codes
Ming Lei (1):
block: set default max segment size in case of virt_boundary
Namjae Jeon (5):
ksmbd: fix uninitialized symbol 'share' in smb2_tree_connect()
ksmbd: off ipv6only for both ipv4/ipv6 binding
ksmbd: avoid to send duplicate lease break notifications
ksmbd: use rwsem instead of rwlock for lease break
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
Nicholas Kazlauskas (1):
drm/amd/display: Fix idle optimization checks for multi-display
and dual eDP
Nicholas Susanto (1):
drm/amd/display: Enable urgent latency adjustments for DCN35
Nicolas Bouchinet (1):
mm/slub: avoid zeroing outside-object freepointer for single free
Paul Davey (1):
xfrm: Preserve vlan tags for transport mode software GRO
Peiyang Wang (4):
net: hns3: using user configure after hardware reset
net: hns3: change type of numa_node_mask as nodemask_t
net: hns3: release PTP resources if pf initialization failed
net: hns3: use appropriate barrier function after setting a bit value
Peter Xu (1):
mm/userfaultfd: reset ptes when close() for wr-protected ones
Potnuri Bharat Teja (1):
MAINTAINERS: update cxgb4 and cxgb3 network drivers maintainer
Qu Wenruo (1):
btrfs: qgroup: do not check qgroup inherit if qgroup is disabled
Reed Riley (1):
bcachefs: fix overflow in fiemap
Roded Zats (1):
rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
Ryan Roberts (2):
fs/proc/task_mmu: fix loss of young/dirty bits during pagemap scan
fs/proc/task_mmu: fix uffd-wp confusion in pagemap_scan_pmd_entry()
Sagi Grimberg (2):
nvmet: make nvmet_wq unbound
nvmet-rdma: fix possible bad dereference when freeing rsps
Samuel Holland (1):
cache: sifive_ccache: Silence unused variable warning
Sean Anderson (1):
nvme-pci: Add quirk for broken MSIs
Serge Semin (1):
EDAC/synopsys: Fix ECC status and IRQ control race condition
Shigeru Yoshida (1):
ipv6: Fix potential uninit-value access in __ip6_make_skb()
Shyam Sundar S K (1):
x86/amd_nb: Add new PCI IDs for AMD family 0x1a
Steffen Bätz (2):
net: dsa: mv88e6xxx: add phylink_get_caps for the mv88e6320/21 family
net: dsa: mv88e6xxx: read cmode on mv88e6320/21 serdes only ports
Sungwoo Kim (3):
Bluetooth: L2CAP: Fix slab-use-after-free in l2cap_connect()
Bluetooth: msft: fix slab-use-after-free in msft_do_close()
Bluetooth: HCI: Fix potential null-ptr-deref
Tetsuo Handa (1):
nfc: nci: Fix kcov check in nci_rx_work()
Thadeu Lima de Souza Cascardo (1):
net: fix out-of-bounds access in ops_init
Thomas Gleixner (1):
x86/topology/amd: Ensure that LLC ID is initialized
Tiezhu Yang (2):
selftests/vDSO: fix building errors on LoongArch
selftests/vDSO: fix runtime errors on LoongArch
Uwe Kleine-König (1):
auxdisplay: seg-led-gpio: Convert to platform remove callback
returning void
Vasant Hegde (1):
iommu/amd: Enhance def_domain_type to handle untrusted device
Vincent Duvert (1):
appletalk: Improve handling of broadcast packets
Volodymyr Babchuk (1):
arm64: dts: qcom: sa8155p-adp: fix SDHC2 CD pin configuration
Wen Gu (1):
net/smc: fix neighbour and rtable leak in smc_ib_find_route()
Yonglong Liu (2):
net: hns3: fix port vlan filter not disabled issue
net: hns3: fix kernel crash when devlink reload during initialization
Yuezhang Mo (2):
exfat: fix timing of synchronizing bitmap and inode
exfat: zero the reserved fields of file and stream extension dentries
Zhongqiu Han (1):
gpiolib: cdev: Fix use after free in lineinfo_changed_notify
^ permalink raw reply [relevance 5%]
* Re: kdevops BoF at LSFMM
2024-05-08 17:54 0% ` Chuck Lever III
@ 2024-05-12 20:20 0% ` Luis Chamberlain
0 siblings, 0 replies; 200+ results
From: Luis Chamberlain @ 2024-05-12 20:20 UTC (permalink / raw)
To: Chuck Lever III, Kent Overstreet
Cc: Steve French, Amir Goldstein, lsf-pc, kdevops, Linux FS Devel,
linux-mm, linux-cxl, Jan Kara
On Wed, May 08, 2024 at 05:54:50PM +0000, Chuck Lever III wrote:
>
>
> > On May 8, 2024, at 1:45 PM, Steve French <smfrench@gmail.com> wrote:
> >
> > I would be very happy if there were an easy way to do three things
> > faster/easier:
> > 1) make it easier to run a reasonably large set of fs tests automatically
> > on checkin of a commit or set of commits (e.g. to an externally visible
> > github branch) before it goes in linux-next, and a larger set
> > of test automation that is automatically run on P/Rs (I kick these tests
> > off semi-manually for cifs.ko and ksmbd.ko today)
> > 2) make it easier as a maintainer to get reports of automated testing of
> > stable-rc (or automate running of tests against stable-rc by filesystem type
> > and send failures to the specific fs's mailing list). Make the tests run
> > for a particular fs more visible, so maintainers/contributors can note
> > where important tests are left out against a particular fs
>
> In my experience, these require the addition of a CI
> apparatus like BuildBot or Jenkins -- they are not
> directly part of kdevops' mission.
Song Liu and Paul E Luse will have a talk on Wednesday about using a
CI framework for md/raid. The holy grail I think here is that they
have used their experience with eBPF patchwork CI integration, and
I think everyone likely wants something similar:
https://patchwork.kernel.org/project/netdevbpf/list/
The S / W / F is Success / warning/ fail.
I'd like to see how we can do that for kdevops. The work is already
put in place to ramp up complex workflows, now we just have to launch
them and collect information.
> Scott Mayhew and
> I have been playing with BuildBot, and there are some
> areas where integration between kdevops and BuildBot
> could be improved (and could be discussed next week).
Neat!
> > 3) make it easier to auto-bisect what commit regressed when a failing test
> > is spotted
>
> Jeff Layton has mentioned this as well. I don't think
> it would be impossible to get kdevops to orchestrate
> a bisect, as long as it has an automatic way to decide
> when to use "git bisect {good|bad}"
Kent alreeady seems to have this working too, we should try to see what
we can leverage.
Luis
^ permalink raw reply [relevance 0%]
* commits for stable 2024-05-11
@ 2024-05-12 1:13 1% Ronnie Sahlberg
0 siblings, 0 replies; 200+ results
From: Ronnie Sahlberg @ 2024-05-12 1:13 UTC (permalink / raw)
To: stable
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
Please find attached a report generated by keyword matching commits
from upstream that may be suitable for stable and probably as CVEs as
well.
I exclude commits that are already tagged with CC stable in upstream
and also commits already in
stable/linux-rolling-stable.
I can send these type of reports weekly if you want.
I plan to add more keywords to check for. But let's start small.
A question about commits that have a Fixes: tag. There are ~2000 of
them since v6.8.
As these are definitely bugfixes, do you want me to add commits that
include a Fixes: tag in future reports/scans?
Also let me know if/how I can change the format of the scan so that it
is easier for you to parse in your tooling.
regards
ronnie sahlberg
--
Ronnie Sahlberg [Principal Software Engineer, Linux]
P 775 384 8203 | E [email] | W ciq.com
[-- Attachment #2: 2024-05-11 --]
[-- Type: application/octet-stream, Size: 66261 bytes --]
Scanned 13646 commits in upstream range v6.8..HEAD
Found 654 commits that are candidates for stable
and have not yet been added to stable/linux-rolling-stable
The types of issues detected were:
=================
Use after free : 47
Kernel panic : 242
KASAN : 61
NULL pointer : 120
Buffer overflow : 143
Out of bounds : 61
KMSAN : 7
Deadlock : 73
Double free : 6
Divide by zero : 2
The following commits are suggested for stable as they match certain keywords
To get a list of candidate sha1 you can use the command:
cat THIS-MESSAGE | egrep "^C [0-9a-f]{20} " | cut -d ' ' -f 2
==============
C 02f6b0e1ec7e0e7d059d gpiolib: cdev: Fix use after free in lin
Use after free
C 35d92abfbad88cf947c0 net: hns3: fix kernel crash when devlink
Kernel panic
C 4db783d68b9b39a411a9 ipv6: prevent NULL dereference in ip6_ou
KASAN, NULL pointer
C d101291b2681e5ab9385 ipv6: fib6_rules: avoid possible NULL de
Kernel panic, KASAN, NULL pointer
C d15dcd0f1a4753b57e66 nvmet: prevent sprintf() overflow in nvm
Buffer overflow
C d7ad05c86e2191bd66e5 timers/migration: Prevent out of bounds
Out of bounds
C 0ec5b3b7ccfcdca02ab3 bcachefs: Fix shift-by-64 in bformat_nee
Buffer overflow
C f39055220f6f98a180e3 bcachefs: Add missing validation for sup
Buffer overflow
C 9a0ec045110dbaad4b8d bcachefs: fix overflow in fiemap
Buffer overflow
C ac0476e8ca2e4125c088 mm/vmalloc: fix return value of vb_alloc
Kernel panic
C adf0398cee86643b8eac Bluetooth: l2cap: fix null-ptr-deref in
Kernel panic, KASAN, NULL pointer
C 10f9f426ac6e752c8d87 Bluetooth: msft: fix slab-use-after-free
Use after free, KASAN
C 4d7b41c0e43995b0e992 Bluetooth: L2CAP: Fix slab-use-after-fre
Use after free, KASAN
C 483bc08181827fc47564 Bluetooth: Fix use-after-free bugs cause
Use after free, KASAN
C f2db7230f73a80dbb179 tcp: Use refcount_inc_not_zero() in tcp_
Use after free
C 94062790aedb505bdda2 tcp: defer shutdown(SEND_SHUTDOWN) for T
Kernel panic, KASAN
C 75961ffb5cb3e5196f19 swiotlb: initialise restricted pool list
Kernel panic, NULL pointer
C fc1092f5156727750956 ipv4: Fix uninit-value access in __ip_ma
KMSAN
C 8a2e4d37afb8500b276e s390/qeth: Fix kernel panic after settin
Kernel panic
C d091e579b864fa790dd6 net: core: reject skb_copy(_expand) for
Kernel panic
C 4756fa529b2f12b7cb8f spi: fix null pointer dereference within
NULL pointer
C 9a35d205f466501dcfe5 drm/amd/display: Atom Integrated System
NULL pointer
C da7c622cddd4fe36be69 s390/cio: Ensure the copied buf is NUL t
Out of bounds
C 5d211c70905900335811 cxl: Fix cxl_endpoint_get_perf_coordinat
NULL pointer
C c4238686f9093b98bd62 ARM: 9381/1: kasan: clear stale stack po
Kernel panic, KASAN, Out of bounds
C 38762a0763c10c24a491 firewire: nosy: ensure user_length is ta
Buffer overflow
C 1dd1eff161bd55968d3d softirq: Fix suspicious RCU usage in __d
KASAN
C 257bf89d841212809048 sched/isolation: Fix boot crash when max
Kernel panic
C 5097cbcb38e6e0d2627c sched/isolation: Prevent boot crash when
Kernel panic
C 91811a31b68d3765b306 i2c: smbus: fix NULL function pointer de
Kernel panic
C 7cd6750d9a560fa69bb6 selftests/bpf: Test PROBE_MEM of VSYSCAL
Kernel panic
C b599d7d26d6ad1fc9975 bpf, x86: Fix PROBE_MEM runtime load che
Kernel panic
C 4b911a9690d72641879e nsh: Restore skb->{protocol,data,mac_hea
KMSAN
C f299ee709fb45036454c octeontx2-af: avoid off-by-one read from
Out of bounds
C 8c34096c7fdf272fd4c0 bna: ensure the copied buf is NUL termin
Out of bounds
C 666854ea9cad844f75a0 ice: ensure the copied buf is NUL termin
Out of bounds
C 18180a4550d08be4eb03 NFSD: Fix nfsd4_encode_fattr4() crasher
Kernel panic
C de87ba848d5e4c861b73 EDAC/versal: Check user-supplied data be
Kernel panic
C 1971d13ffa84a551d29a af_unix: Suppress false-positive lockdep
Out of bounds, Deadlock
C 38d7b94e81d068b8d8c8 dpll: fix dpll_pin_on_pin_register() for
Kernel panic
C 6e965eba43e9724f3e60 octeontx2-af: fix the double free in rvu
Double free
C 96fdd1f6b4ed72a741fb ice: fix LAG and VF lock dependency in i
Deadlock
C 0f2b8098d72a93890e69 btrfs: take the cleaner_mutex earlier in
Deadlock
C c04d1b9ecce565455652 igc: Fix LED-related deadlock on driver
Deadlock
C fb4e2b70a7194b209fc7 mlxsw: spectrum_acl_tcam: Fix memory lea
Use after free
C 743edc8547a92b6192aa mlxsw: spectrum_acl_tcam: Fix warning du
KASAN
C 54225988889931467a9b mlxsw: spectrum_acl_tcam: Fix possible u
Use after free, KASAN
C 79b5b4b18bc85b19d3a5 mlxsw: spectrum_acl_tcam: Fix possible u
Use after free, KASAN
C 5ea7b72d4fac2fdbc042 net: openvswitch: Fix Use-After-Free in
Use after free
C 3d05fc82237aa97162d0 Bluetooth: qca: set power_ctrl_enabled o
NULL pointer
C 18bdb386a1a30e7a3d77 Bluetooth: btusb: mediatek: Fix double f
Double free
C f2a904107ee2b647bb77 net: gtp: Fix Use-After-Free in gtp_dell
Use after free
C 697f3342477170bdf875 LoongArch: Fix Kconfig item and left cod
Kernel panic
C 948255282074d9367e01 drm/amdgpu/mes: fix use-after-free issue
Use after free
C 80e679b352c3ce5158f3 tcp: Fix Use-After-Free in tcp_ao_connec
Use after free
C 58a4c9b1e5a3e53c9148 ipv4: check for NULL idev in ip_route_us
KASAN, NULL pointer
C 24729b307eefcd7c4760 usb: gadget: f_fs: Fix race between aio_
Deadlock
C 467324bcfe1a31ec65d0 ax25: Fix netdev refcount issue
Use after free
C 49a940dbdc3107fecd5e powerpc/pseries/iommu: LPAR panics durin
Kernel panic, NULL pointer
C 5bcf0dcbf9066348058b xdp: use flags field to disambiguate bro
Kernel panic, NULL pointer
C 1560d1f6eb6b398bddd8 sched/eevdf: Prevent vlag from going out
Buffer overflow, NULL pointer, Out of bounds
C c58e88d49097bd12dfcf icmp: prevent possible NULL dereferences
NULL pointer
C e858beeddfa3a400844c bcachefs: If we run merges at a lower wa
Deadlock
C 85ab365f7cdf2b2a7138 bcachefs: Fix deadlock in journal write
Deadlock
C fcdbc1d7a4b638e5d566 bcachefs: Check for journal entries over
Buffer overflow
C 2e36c9fbc476f95a1b19 net: ravb: Fix RX byte accounting for ju
Use after free
C a892493a343494bd6bab net: ravb: Allow RX loop to move past DM
Kernel panic
C 6aff4c26ed677b1f464f drm/gma500: Remove lid code
Kernel panic
C 0f022d32c3eca477fbf7 net/sched: Fix mirred deadlock on device
Kernel panic, Deadlock
C d111855ab7ffffc552f6 s390/mm: Fix NULL pointer dereference
NULL pointer
C f8bbc07ac535593139c8 tun: limit printing rate when illegal pa
Kernel panic
C 79055f50a65fe5eb58e9 bcachefs: make sure to release last jour
Deadlock
C 74017458017127ca6bf1 mm,page_owner: fix printing of stack rec
Buffer overflow
C a0cedbcc8852d6c77b00 pinctrl: devicetree: fix refcount leak i
NULL pointer
C f4626c12e4b538f757a7 ubsan: Add awareness of signed integer o
Buffer overflow
C 7e91ed763dc07437777b clk: sunxi-ng: h6: Reparent CPUX during
Kernel panic
C 7fcb91d94e897413c034 configs/hardening: Disable CONFIG_UBSAN_
Buffer overflow
C 015a12a4a6708d9cadca arm64/hugetlb: Fix page table walk in hu
Kernel panic
C cf92bb778eda7830e794 drm: nv04: Fix out of bounds access
Out of bounds
C 1382e3b6a3500c245e52 net: change maximum number of UDP segmen
Buffer overflow
C 3f10048973c8366e2714 bcachefs: Disable merges from interior u
Deadlock
C 9054ef2ea944528b7935 bcachefs: Run merges at BCH_WATERMARK_bt
Deadlock
C 82cf18f23e1ae1705398 bcachefs: Fix deadlock in journal replay
Deadlock
C 58caa786f1c02fd84919 bcachefs: Fix UAFs of btree_insert_entry
Use after free
C fef965764cf562f28afb net/mlx5e: Prevent deadlock while disabl
Deadlock
C 22dd70eb2c3d75486296 af_unix: Don't peek OOB data without MSG
Out of bounds
C 283454c8a123072e5c38 af_unix: Call manage_oob() for every skb
Out of bounds
C bf6e4ee5c43690e4c5a8 phy: ti: tusb1210: Resolve charger-det c
Kernel panic
C c064b536a8f9ab7c8e20 x86/cpu/amd: Make the NODEID_MSR union a
Kernel panic
C 2b3e79fea66e166622a4 bcachefs: Don't use bch2_btree_node_lock
Deadlock
C 2b8dbf69ec60faf6c7db perf annotate: Make sure to call symbol_
Kernel panic
C 9cb46b31f3d08ed3fce8 drm/xe/xe_migrate: Cast to output precis
Buffer overflow
C a8ad8715472bb8f6a2ea drm/xe/hwmon: Cast result to output prec
Buffer overflow
C 3cfc9ec039af60dbd896 netfilter: nft_set_pipapo: do not free l
Kernel panic, KASAN
C bf02d9fe00632d22fa91 net: ena: Fix incorrect descriptor free
Kernel panic
C 713a85195aad25d8a267 net: ena: Fix potential sign extension i
Buffer overflow
C 2f7b1d8b5505efb0057c clk: mediatek: Do a runtime PM get on co
Deadlock
C fe87922cee6161f066f4 net/mlx5: fix possible stack overflows
Buffer overflow
C 7c6782ad4911cbee874e net/mlx5: Properly link new fs rules int
Kernel panic
C ec4535b2a1d709d3a1fb smb: client: fix NULL ptr deref in cifs_
Kernel panic, NULL pointer
C a97de7bff13b1cc825c1 Bluetooth: RFCOMM: Fix not validating se
KASAN, Out of bounds
C 51eda36d33e43201e7a4 Bluetooth: SCO: Fix not validating setso
KASAN, Out of bounds
C a9025cd1c673a8d6eefc x86/topology: Don't update cpu_possible_
Kernel panic
C 81665adf25d28a00a986 pds_core: Fix pdsc_check_pci_health func
Deadlock
C ecedd99a9369fb5cde60 drm/amd/display: Skip on writeback when
KASAN, Out of bounds
C 7633c4da919ad51164ac ipv6: fix race condition between ipv6_ge
Use after free
C 7a87441c9651ba37842f nfc: llcp: fix nfc_llcp_setsockopt() uns
KASAN, Out of bounds
C 138b787804f4a1041761 mISDN: fix MISDN_TIME_STAMP handling
KASAN, Out of bounds
C 7774c8f32e99b1f314c0 KVM: SVM: Wrap __svm_sev_es_vcpu_run() w
KASAN
C b46f4eaa4f0ec38909fb af_unix: Clear stale u->oob_skb.
Out of bounds, Deadlock
C e71c8481692582c70cdf platform/x86: lg-laptop: fix %s null arg
Buffer overflow
C d8a6213d70accb403b82 geneve: fix header validation in geneve[
KMSAN
C 6648e613226e18897231 bpf, skmsg: Fix NULL pointer dereference
NULL pointer
C 9d1e795f754db1ac3344 clk: Get runtime PM before walking tree
Deadlock
C e581cf5d216289ef292d clk: Get runtime PM before walking tree
Deadlock
C f221033f5c24659dc6ad dmaengine: idxd: Fix oops during rmmod o
Kernel panic
C 6088234ce83acec4aaf5 bcachefs: JOURNAL_SPACE_LOW
Deadlock
C 05801b6526156aefe55c bcachefs: Disable errors=panic for BCH_I
Kernel panic
C 237f3cf13b20db183d37 xsk: validate user input for XDP_{UMEM|C
KASAN, Out of bounds
C beaa51b36012fad5a4d3 blk-iocost: avoid out of bounds shift
Out of bounds
C fc2c22693c608125bbce mm: vmalloc: fix lockdep warning
Deadlock
C d3bbc4dfcc8d436b1e27 drm/msm: fix the `CRASHDUMP_READ` target
Kernel panic
C e4308bc22b9d46cf3316 phy: marvell: a3700-comphy: Fix out of b
Out of bounds
C 838ae9f45c4e43b4633d nouveau/gsp: Avoid addressing beyond end
Buffer overflow
C 9fb3036fe3d9414ae32a bcachefs: Move btree_updates to debugfs
Deadlock
C 8e088a20dbe33919695a SUNRPC: add a missing rpc_stat for TCP T
Kernel panic, NULL pointer
C dda7e89e53d6ebf27c49 xhci: Fix root hub port null pointer der
NULL pointer
C e0f5a8e74be88f2476e5 memblock tests: fix undefined reference
Kernel panic
C 7d8ed162e6a92268d4b2 memblock tests: fix undefined reference
Kernel panic
C de164a7f19248fb03229 nios2: Only use built-in devicetree blob
Kernel panic
C 701b38995e5bdd2a2939 security: Place security_path_post_mknod
Kernel panic
C e6ec07dc6dd498415bc8 s390/mm: fix NULL pointer dereference
NULL pointer
C 1f886a7bfb3faf4c1021 spi: mchp-pci1xxx: Fix a possible null p
NULL pointer
C bff892acf79cec531da6 spi: spi-fsl-lpspi: remove redundant spi
Use after free
C c3eeb1ffc6a88af9b002 x86/resctrl: Fix uninitialized memory re
Kernel panic, Buffer overflow, NULL pointer
C 6677196fb1932e60b88a clk: qcom: gdsc: treat optional supplies
Deadlock
C e8068f2d756d57a5206f swiotlb: fix swiotlb_bounce() to do part
Buffer overflow
C 22d24a544b0d49bbcbd6 block: fix overflow in blk_ioctl_discard
Buffer overflow
C c42cd606e4f004e9ba36 bcachefs: fix nocow lock deadlock
Deadlock
C e2a316b3cc45a1198f3f bcachefs: BCH_WATERMARK_interior_updates
Deadlock
C ba947ecd39ea0e6a6f6f bcachefs: Fix btree node reserve
Kernel panic
C 060ff30a8596b649a80c bcachefs: bch2_run_explicit_recovery_pas
Kernel panic
C dcc1c04587aa9bc35151 bcachefs: Fix use after free in check_ro
Use after free
C 6f5869ffd9f111b81b95 bcachefs: Fix use after free in bch2_che
Use after free
C 52f80bb181a9a1530ade ata: sata_sx4: fix pdc20621_get_from_dim
Buffer overflow
C 5038a66dad0199de60e5 pinctrl: core: delete incorrect free in
Double free
C be141849ec00ef39935b nouveau/uvmm: fix addr/range calcs for r
Kernel panic
C 1102f9f85bf66b1a7bd6 modpost: do not make find_tosym() return
NULL pointer
C ecc6a2101840177e57c9 bpf: Protect against int overflow for st
Buffer overflow, Out of bounds
C a8d89feba7e54e691ca7 bpf: Check bloom filter map value size
Kernel panic, Buffer overflow
C 96b98a6552a90690d7bc bpf: fix warning for crash_kexec
Kernel panic
C 00bb549d7d63a21532e7 regmap: maple: Fix cache corruption in r
Out of bounds
C fe869c2e53484a29ab24 drm/amd/display: fix a dereference of a
NULL pointer
C f7442a634ac06b953fc1 mlxbf_gige: call request_irq() after NAP
Kernel panic, NULL pointer, Out of bounds
C ad14f7ca9f0d9fdf73d1 riscv: hwprobe: do not produce frtace re
Kernel panic
C 30af24facf0aed12dec2 userfaultfd: fix deadlock warning when l
Deadlock
C 9c500835f279e636722b mm: zswap: fix kernel BUG in sg_init_one
Kernel panic
C 93305b77ffcb042f1538 net: hns3: fix kernel crash when devlink
Kernel panic
C 0be3870f7cbbb5db4f06 usb: typec: ucsi: Check capabilities bef
Buffer overflow
C afaaf3a0f647a24a7bf6 media: mediatek: vcodec: adding lock to
NULL pointer
C 6467cda18c9f9b5f2f9a media: mediatek: vcodec: adding lock to
Kernel panic, NULL pointer
C 97c75ee5de060d271d80 media: mediatek: vcodec: Fix oops when H
Kernel panic
C aa43c15a790cf083a6e6 pinctrl: renesas: rzg2l: Execute atomica
Deadlock
C 7d5a7dd5a35876f0ecc2 net: wwan: t7xx: Split 64bit accesses to
Kernel panic
C 4b0e527c9970a15ac9ec RAS/AMD/FMPM: Avoid NULL ptr deref in ge
NULL pointer
C 1cb7fdb1dfde1aab6678 ice: fix memory corruption bug with susp
Kernel panic, NULL pointer
C 17f64517bf5c26af56b6 wifi: iwlwifi: mvm: guard against invali
Out of bounds
C a8b5d4809b503da66896 wifi: iwlwifi: mvm: Configure the link m
Kernel panic
C b6540de9b5c867b4c8bc x86/percpu: Disable named address spaces
KASAN
C 4053caf60bb349ab9ea9 mtd: rawnand: brcmnand: Fix data access
Kernel panic, NULL pointer
C f2e812c1522dab847912 xfs: don't use current->journal_info
Kernel panic, Deadlock
C 11763a8598f888dec631 fs/9p: fix uaf in in v9fs_stat2inode_dot
Use after free
C 62b71cd73d41ddac6b17 efi: fix panic in kdump kernel
Kernel panic
C 9843231c97267d72be38 x86/boot/64: Move 5-level paging global
Kernel panic
C 4d0d7e7852752ea56375 x86/boot/64: Apply encryption mask to 5-
Kernel panic
C 10e4b5166df9ff7a2d53 x86/fpu: Keep xfd_state in sync with MSR
Kernel panic
C 122fdbd2a030a9512873 bpf: verifier: reject addr_space_cast in
Kernel panic
C d8e45f2929b94099913e overflow: Change DEFINE_FLEX to take __c
Buffer overflow
C 9fe6e9e7b58944037714 nfsd: Fix error cleanup path in nfsd_ren
Deadlock
C 4e51653d5d871f40f1bd kprobes/x86: Use copy_from_kernel_nofaul
Kernel panic
C fc7f27cda843ce294c71 x86/kexec: Do not update E820 kexec tabl
Kernel panic
C 92826905ae340b7f2b25 HID: intel-ish-hid: ipc: Fix dev_err usa
Use after free
C a20ad45008a7c82f1184 spi: spi-mt65xx: Fix NULL pointer access
Kernel panic, NULL pointer
C f679fd6057fbf5ab34aa drm/amdgpu: Init zone device and drm cli
Kernel panic
C c6ba60af015a0cc42bec drm/amdgpu: Reset IH OVERFLOW_EN bit for
Buffer overflow
C 6540ff6482c1a5a6890a drm/amdgpu: fix mmhub client id out-of-b
Out of bounds
C 28e4748e5e3d313056ed riscv: Use kcalloc() instead of kzalloc(
Buffer overflow
C 2295bd846765c766701e dma-buf: Fix NULL pointer dereference in
NULL pointer
C 7ded842b356d151ece8a s390/bpf: Fix bpf_plt pointer arithmetic
Kernel panic, NULL pointer
C a23c05fd76cf4ad27e0c tools/rtla: Add -U/--user-load option to
Kernel panic
C 956c0d6191075f059236 tcp: Clear req->syncookie in reqsk_alloc
KMSAN
C d27e2da94a42655861ca net/bnx2x: Prevent access to a freed pag
Kernel panic, NULL pointer
C c2d953276b8b27459bae fbmon: prevent division by zero in fb_vi
Buffer overflow
C a788e53c05aee6e3d607 usb: usb-acpi: Fix oops due to freeing u
Kernel panic
C c502b5b878144f43fd06 bcachefs; Fix deadlock in bch2_btree_upd
Deadlock
C 77fcc34769c8a0a228af ubsan: Disable signed integer overflow s
Buffer overflow
C 23dfd914d2bfc4c9938b modpost: fix null pointer dereference
Kernel panic, NULL pointer
C 7604256cecef34a82333 tracing: Add __string_src() helper to he
NULL pointer
C 19f0423fd55c301c8eda tracing: Support to dump instance traces
Kernel panic
C 946593d1555921720fa6 Revert "firewire: Kill unnecessary buf c
NULL pointer
C b967df6293510b6e1f53 hyperv-tlfs: Rename some HV_REGISTER_* d
Kernel panic
C a0a466ea981ba57426e8 bcachefs: Split out btree_node_rewrite_w
Deadlock
C 62f35024b2b1a301cd26 bcachefs: Change "accounting overran jou
Buffer overflow
C c239c83ed5c558be3b59 s390/entry: add CIF_SIE flag and remove
Kernel panic
C 5c4233cc0920cc90787a powerpc/kdump: Split KEXEC_CORE and CRAS
Kernel panic
C 33f2cc0a2e90f7177c49 powerpc/kexec: split CONFIG_KEXEC_FILE a
Kernel panic
C 56a34d799bfa53064e7b kexec/kdump: make struct crash_mem avail
Kernel panic
C 78cb0945f7141961781f powerpc: Handle error in mark_rodata_ro(
Kernel panic
C 719fcafe07c12646691b nfs: fix panic when nfs4_ff_layout_prepa
Kernel panic, NULL pointer
C a90c5845db958701ddc7 selftests/bpf: Add arena test case for 4
Buffer overflow
C 094d11768f740f11483d ASoC: SOF: amd: Skip IRAM/DRAM size modi
Kernel panic
C 5fb282ba4fef8985a5ac ksmbd: fix possible null-deref in smb_la
NULL pointer
C de105068fead55ed5c07 nvme: fix reconnection fail due to reser
Deadlock
C eb70d5a6c932d9d23f4b f2fs: fix to avoid use-after-free issue
Use after free, KASAN
C ddbec99f58571301679a hsr: Fix uninit-value access in hsr_get_
KMSAN
C 3e48999816b1d1dba3ca bcachefs: Prefer struct_size over open c
Buffer overflow
C 0b5961b0d8a499100bd9 bcachefs: jset_entry for loops declare l
Kernel panic
C 9448e55d032d99af8e23 of: Add cleanup.h based auto release via
Kernel panic
C 9d9539db8638cfe053fc pidfs: remove config option
Buffer overflow
C 343041b59b7810f9cdca net/sched: taprio: proper TCA_TAPRIO_TC_
Out of bounds
C c6c3187d66bc4e870860 lib/firmware_table: Provide buffer lengt
Out of bounds
C 2a750d6a5b365265dbda rds: tcp: Fix use-after-free of net in r
Use after free, KASAN
C 23fb6bc2696119391ec3 ASoC: soc-core.c: Skip dummy codec when
Buffer overflow
C 61609bf2b29dcb07de3a dt-bindings: riscv: Add Andes PMU extens
Buffer overflow
C bc969d6cc96a2d053957 perf: RISC-V: Introduce Andes PMU to sup
Buffer overflow
C 95113bb705157f3518ce riscv: dts: renesas: r9a07g043f: Update
Buffer overflow
C b88727d554f0fb826e06 dt-bindings: riscv: Add Andes interrupt
Buffer overflow
C 2ae0ab0143fcc0619071 spi: lpspi: Avoid potential use-after-fr
Use after free, NULL pointer
C 65e8fbde64520001abf1 dm: call the resume method on internal s
Kernel panic
C 289b950b8e50d2e23120 gpio: nomadik: remove BUG_ON() in nmk_gp
Out of bounds
C 8c9be42172e2a18f39c4 platform/x86/amd/pmf: Fix possible out-o
Out of bounds
C d8a21070b6e168d3800c nexthop: Fix out-of-bounds access during
KASAN, Out of bounds
C 84e95149bd341705f0ec nfp: flower: handle acti_netdevs allocat
NULL pointer
C 457f7308254756b6e4b8 vfio/pds: Make sure migration file isn't
Kernel panic, NULL pointer
C 0c66c6f4e21cb22220cb ARM: 9359/1: flush: check if the folio i
Kernel panic
C 28330ceb953e39880ea7 OPP: debugfs: Fix warning around icc_get
Buffer overflow
C f3dc1bdb6b0b0693562c cifs: Fix writeback data corruption
Buffer overflow
C 2c7d399e551ccfd87bca smb: client: reuse file lease key in com
Deadlock
C ded20192dff31c91cef2 scsi: lpfc: Release hbalock before calli
Deadlock
C f8cdf65b51f036d77ede bcachefs: Fix null-ptr-deref in bch2_fs_
KASAN
C 039741a8d7c9a01c1bc8 PCI: brcmstb: Fix broken brcm_pcie_mdio_
Kernel panic
C 0f28be64d132aaf95d06 erofs: fix lockdep false positives on in
Deadlock
C 606559dc4fa36a954a51 io_uring: Fix sqpoll utilization check r
Kernel panic, NULL pointer
C fd5860ab634150600421 NFS: Fix nfs_netfs_issue_read() xarray l
Deadlock
C 7938e9ce39d6779d2f85 clk: zynq: Prevent null pointer derefere
NULL pointer
C e97fe4901e0f59a0bfd5 clk: Fix clk_core_get NULL dereference
NULL pointer
C 4e2969a0d6a7549bc0bc net: hns3: add checking for vf id of mai
Out of bounds
C 0fbcf2366ba9888cf02e net: hns3: fix kernel crash when 1588 is
Kernel panic, NULL pointer
C ae24a8f88b3fc8ef463e ionic: remove callback pointer from desc
Kernel panic
C babfeb9cbe7ebc657bd5 rtc: nct3018y: fix possible NULL derefer
NULL pointer
C 4469c0c5b14a0919f596 net: phy: fix phy_get_internal_delay acc
Kernel panic, NULL pointer
C b0ec2abf98267f14d032 net: ip_tunnel: make sure to pull inner
KMSAN
C ab63a2387cb906d43b72 netdev: add per-queue statistics
Buffer overflow
C 7a4b21250bf79eef2654 bpf: Fix stackmap overflow check on 32-b
Buffer overflow
C 6787d916c2cf9850c97a bpf: Fix hashtab overflow check on 32-bi
Buffer overflow, NULL pointer
C 281d464a34f540de166c bpf: Fix DEVMAP_HASH overflow check on 3
Kernel panic, Buffer overflow
C a54c1d1b859a57a99d5c sysfs:Addresses documentation in sysfs_m
NULL pointer
C 15d2540e0d626b7960c9 tools: ynl: check for overflow of constr
Buffer overflow
C 8ffc0cd24c2a3ea34074 ext4: alloc test super block from sget
Kernel panic
C fa9e3139e6c5ac756e1a s390/tools: handle rela R_390_GOTPCDBL/R
KASAN
C 66626b15636b5f5cf3d7 firmware: cirrus: cs_dsp: Initialize deb
NULL pointer
C 75bcffbb9e7563259b7a xfs: shrink failure needs to hold AGI bu
Deadlock
C b1ba8bcb2d1ffce11b30 backlight: hx8357: Fix potential NULL po
NULL pointer
C e838a5a110b60b2dad8c leds: trigger: Stop exporting trigger_li
Kernel panic
C 7eef64da0b0ad8e90409 leds: trigger: panic: Simplify led_trigg
Kernel panic
C c2234161985212d28711 mlxbf_gige: add support to display pause
Out of bounds
C e63985ecd22681c7f597 bpf, riscv64/cfi: Support kCFI + BPF on
Kernel panic
C 4f81c16f50baf6d5d8bf bpf: Recognize that two registers are sa
Kernel panic
C 011832b97b311bb9e3c2 bpf: Introduce may_goto instruction
Kernel panic
C 947ec0d002dce8577b65 Bluetooth: fix use-after-free in accessi
Use after free, KASAN
C f7b94bdc1ec107c92262 Bluetooth: af_bluetooth: Fix deadlock
Use after free, Deadlock
C 0f0639b4d6f649338ce2 Bluetooth: bnep: Fix out-of-bound access
Out of bounds
C 81137162bfaa7278785b Bluetooth: hci_core: Fix possible buffer
Buffer overflow
C de4e88ec58c4202efd1f Bluetooth: btrtl: fix out of bounds memo
KASAN, Out of bounds
C 5f641f03abccddd1a372 Bluetooth: hci_conn: Fix UAF Write in __
Use after free
C b6c9d5a93b4ce7ff9828 mm/kasan: use pXd_leaf() in shadow_mappe
KASAN
C 5aa598a72eafcf052395 mm: memory: fix shift-out-of-bounds in f
Out of bounds
C 81e921fd321614c2ad8a iommu/vt-d: Fix NULL domain on device re
Kernel panic, NULL pointer
C 4fc82cd907ac07564878 iommu/vt-d: Don't issue ATS Invalidation
Kernel panic, Buffer overflow
C f98364e926626c678fb4 aoe: fix the potential use-after-free pr
Use after free
C 93f52fbeaf4b676b21ac block: prevent division by zero in blk_r
Buffer overflow
C 8d0d2447394b13fb22a0 nvme: host: fix double-free of struct nv
Double free, KASAN
C ccabbb6768fc72d6cb02 pmdomain: renesas: rcar-gen4-sysc: Reduc
Kernel panic
C 760eac73f9f69aa28fcb fuse: Introduce a new notification type
Kernel panic
C 0b11b1c5c320555483e8 netdev: let netlink core handle -EMSGSIZ
Buffer overflow
C cebaa386d5ee1a44a58c hwspinlock: omap: Use index to get hwspi
Kernel panic
C 297dc37a1e65f2f7378c selftest: gpio: remove obsolete gpio-moc
Buffer overflow
C b4152222e04cb8afeeca wifi: brcm80211: handle pmk_op allocatio
NULL pointer
C 978b63f7464abcfd364a btrfs: fix race when detecting delalloc
Deadlock
C e37db17dae6113f8f0b6 mei: me: remove unnecessary NULL pointer
NULL pointer
C 64386d1588f53ccde07c mei: txe: remove unnecessary NULL pointe
NULL pointer
C d6543805a8ad6ffcddf5 mei: gsc: remove unnecessary NULL pointe
NULL pointer
C d3246b6ee42a155ab57e crash_core: export vmemmap when CONFIG_S
Kernel panic
C 8cc92a67932febc3f84c kasan: fix a2 allocation and remove expl
KASAN
C 7a36d680658ba5a0d350 KVM: x86/xen: fix recursive deadlock in
Deadlock
C 6addfcf27139da135649 KVM: pfncache: simplify locking and make
Kernel panic, Deadlock
C 8ede3db5061bb1fe28e2 io_uring/net: fix overflow check in io_r
Buffer overflow
C 41c58a36e2c0496abebb dm vdo indexer: fix use after free
Use after free
C 36959d18c3cf09b3c121 f2fs: fix to do sanity check in update_s
Kernel panic
C b2324e08b8b3b38bb86b btrfs: raid56: extra debugging for raid6
Use after free, Kernel panic, NULL pointer
C f40a3ea94881f668084f btrfs: delete pointless BUG_ON check on
Kernel panic, NULL pointer
C e84bfffc4bbff4f2cf29 btrfs: hoist fs_info out of loops in end
Kernel panic
C e383e158ed1b6abc2d2d btrfs: preallocate temporary extent buff
Deadlock
C e62d2e00780b4a465c77 drm/xe: Replace 'grouped target' in Make
Out of bounds
C c2b24812f7bc5fbd6f2f perf: starfive: Add StarLink PMU support
Buffer overflow
C 9ad7974856926129f190 wifi: cfg80211: check A-MSDU format more
Out of bounds
C 65e6a2773d655172143c media: usbtv: Remove useless locks in us
Deadlock
C dd6c6d57ab61d496f6ff pwm: imx-tpm: fix probe crash due to acc
Kernel panic
C 056a70924a0272718adf gve: Add header split ethtool stats
Buffer overflow
C 5e37d8254e7f551dda62 gve: Add header split data path
Buffer overflow
C ca3d3aa14e7673f1b15e powerpc: Remove cpu-as-y completely
Kernel panic
C f01dbd73ccf122486ad4 powerpc/fsl: Modernise mt/mfpmr
Kernel panic
C 4e284e38ed586edeb8bd powerpc/64s: Use .machine power4 around
Kernel panic
C 4eb20bf34ea296f64897 powerpc/irq: Allow softirq to hardirq st
Buffer overflow
C 9cbacb834b4afcb55eb8 powerpc: Don't ignore errors from set_me
Kernel panic
C 9f2a3933beeaeead5382 USB: document some API requirements on d
Kernel panic
C e36b70fb8c707a068896 sh: Fix build with CONFIG_UBSAN=y
Out of bounds
C bd1ebf2467f9c5d157be overflow: Allow non-type arg to type_max
Buffer overflow
C 773f6c5b72d96be1f8fc svcrdma: Prevent a UAF in svc_rdma_send(
Use after free
C 84ebf02d75df745fab7d NFSD: Remove BUG_ON in nfsd4_process_cb_
Kernel panic
C 961b4b5e86bf56a2e4b5 NFSD: Reset cb_seq_status after NFS4ERR_
Kernel panic
C 5ff318f645eb6f5d3f93 nfsd: use __fput_sync() to avoid delayed
Deadlock
C def054b01a867822254e iommu/vt-d: Use device rbtree in iopf re
Use after free
C 8379054869a0e8d0ebf8 iommu/vt-d: Use kcalloc() instead of kza
Buffer overflow
C 5d978e72df5f92194312 drm/amd/display: check dc_link before de
NULL pointer
C 1947b92464c326838160 libperf evlist: Avoid out-of-bounds acce
Kernel panic, Out of bounds
C 896880ff30866f386ebe bpf: Replace bpf_lpm_trie_key 0-length a
Out of bounds
C c5e6d3d85efa7451590e overflow: Use POD in check_shl_overflow(
Buffer overflow
C d4be85d068b4418c341f sparc: vdso: Disable UBSAN instrumentati
Out of bounds
C 3d965b33e40d973b450c fortify: Improve buffer overflow reporti
Buffer overflow
C fa4a3f86d4982b603865 fortify: Add KUnit tests for runtime ove
Buffer overflow
C 4ce615e798a752d4431f fortify: Provide KUnit counters for fail
Kernel panic, Buffer overflow
C 475ddf1fce1ec4826c8d fortify: Split reporting and avoid passi
Buffer overflow
C 99db710f768e988e70f1 refcount: Annotated intentional signed i
Buffer overflow
C e7549481255167dcdab3 coccinelle: semantic patch to check for
Buffer overflow
C 08d45ee84bb2650e237e overflow: Introduce wrapping_assign_add(
Buffer overflow
C d70de8054c58d7bd9a46 overflow: Introduce wrapping_add(), wrap
Buffer overflow
C 3e19086fb5a9079611de overflow: Adjust check_*_overflow() kern
Buffer overflow
C 768409cff6cc89fe1194 rust: upgrade to Rust 1.76.0
Kernel panic
C 7d009e048d7cfcc21d40 f2fs: fix to handle segment allocation f
Kernel panic
C f9e28904e6442019043a f2fs: stop checkpoint when get a out-of-
Out of bounds
C c958e86e9cc1b48cac00 drm/mediatek: Fix a null pointer crash i
Kernel panic, NULL pointer
C 2c35f43b5a4b9cdfaa6f SUNRPC: increase size of rpc_wait_queue.
Buffer overflow
C 251a658bbfceafb4d58c NFSv4.2: fix nfs4_listxattr kernel BUG a
Kernel panic
C df621530462c68164142 iio: adc: ti-ads1298: prevent divide by
Divide by zero
C 7a4cf27d1f0538f779bf media: dvb-frontends: avoid stack overfl
KASAN, Buffer overflow
C 0a0b79ea55de8514e175 media: pvrusb2: fix uaf in pvr2_context_
Use after free, KASAN
C 848e34ca203046c9b967 net: wwan: t7xx: Prefer struct_size over
Buffer overflow
C a364c014a2c1ad6e011b kvm/x86: allocate the write-tracking met
Deadlock
C c4b04a802d8e3996e588 bnxt_en: fix accessing vnic_info before
Kernel panic, NULL pointer
C fb687904aae27c8bf5b5 drm/i915/dp: Suspend/resume DP tunnels
Kernel panic
C ec1aae190c7729ffdd36 wifi: brcmfmac: fweh: Fix boot crash on
Kernel panic, Buffer overflow
C da1983355ccefcfb3f8e thermal: core: Move initial num_trips as
Kernel panic, Buffer overflow
C 99b902ac17253ee65d23 md: sync blockdev before stopping raid o
Kernel panic, Deadlock
C 306904db10e1d839b568 ASoC: codecs: Simplify mclk initializati
Kernel panic
C bae4d1f86e4d6750d2fc perf data convert: Fix segfault when con
NULL pointer
C 34b811a281bab42d0959 drm/amd/display: Prevent potential buffe
Buffer overflow, Out of bounds
C fadbbfbf644e467f8775 drm/msm: Import a7xx crashdump register
Kernel panic
C dd61b55d733eee9bbe51 RAS/AMD/ATL: Fix bit overflow in denorm_
Buffer overflow
C b5590270068c4324dac4 netlink: hold nlk->cb_mutex longer in __
KASAN
C e395036504c4e19d15ba mtd: rawnand: Prefer struct_size over op
Buffer overflow
C 96d8dbb6f65041b670a7 mm, slab, kasan: replace kasan_never_mer
KASAN
C e651f2fae33634175fae clocksource/drivers/arm_global_timer: Gu
Buffer overflow
C fed6bf52c86df27ad4f3 clk: imx: composite-8m: Less function ca
NULL pointer
C 9e263c5042d0cb7ed62e accel/habanalabs: use kcalloc() instead
Buffer overflow
C 8c075401f2dbda43600c accel/habanalabs: increase HL_MAX_STR to
Buffer overflow
C 1612160b91272f5b1596 rcu-tasks: Eliminate deadlocks involving
Deadlock
C 6b70399f9ef3809f6e30 rcu-tasks: Maintain lists to eliminate R
Deadlock
C 46faf9d8e1d52e4a91c3 rcu-tasks: Initialize data to eliminate
Deadlock
C bfe93930ea1ea3c6c115 rcu-tasks: Add data to eliminate RCU-tas
Deadlock
C fbed4baed046a2815889 ubi: fix slab-out-of-bounds in ubi_eba_g
KASAN, Out of bounds
C 5affe497c346343ecc42 block: blkdev_issue_secure_erase loop st
Kernel panic
C c034ec84e8795cf379bd KVM: arm64: Introduce new flag for non-c
Kernel panic
C daa559570d4b81e98e5a ARM: 9349/1: unwind: Add missing "Call t
Kernel panic, KASAN, Out of bounds
C 807d1fe36077decf6f4e writeback: simplify the loops in write_c
Kernel panic
C 5267fe5d092e80a83740 mm/page_alloc: remove unused fpi_flags i
KASAN
C 55e78c933d747ed44b2b mm: zswap: increase reject_compress_poor
Buffer overflow
C 199da8714c8f4c45f465 arch, crash: move arch_crash_save_vmcore
Kernel panic
C ea034d0b07441cd4f441 loongarch, crash: wrap crash dumping cod
Kernel panic
C 5057dff3cf80f631ef7c arm, crash: wrap crash dumping code into
Kernel panic
C 0978a63f9c8b807f073d riscv, crash: wrap crash dumping code in
Kernel panic
C d739f190c035230d535e mips, crash: wrap crash dumping code int
Kernel panic
C e389263561d8b57cbefc sh, crash: wrap crash dumping code into
Kernel panic
C 865e2acd3eb971026a29 s390, crash: wrap crash dumping code int
Kernel panic
C 086d67ef33ecd07ef58f ppc, crash: enforce KEXEC and KEXEC_FILE
Kernel panic
C 40254101d87870b2e5ac arm64, crash: wrap crash dumping code in
Kernel panic
C a4eeb2176d89fdf27858 x86, crash: wrap crash dumping code into
Kernel panic
C 75bc255a7444801d64c7 crash: clean up kdump related config ite
Kernel panic
C 02aff8480533817a29e8 crash: split crash dumping code out from
Kernel panic
C 2c44b67e2ef345c44095 crash: remove dependency of FA_DUMP on C
Kernel panic
C 443cbaf9e2fdbef7d7ca crash: split vmcoreinfo exporting code o
Kernel panic
C 85fcde402db191b5f222 kexec: split crashkernel reservation cod
Kernel panic
C 55c49fee57af99f3c663 mm/vmalloc: remove vmap_area_list
Kernel panic
C a24e3b583ea2db3418f0 crypto: rockchip - fix to check return v
NULL pointer
C 03f12122b20b6e6028e9 block: fix deadlock between bd_link_disk
Deadlock
C bf48d9b756b91e3c6565 kbuild: change tool coverage variables t
KASAN
C abb7205794900503d635 irqchip/sifive-plic: Improve locking saf
Deadlock
C a15587277a246c388c83 irqchip/sifive-plic: Cleanup PLIC contex
Kernel panic
C 8ec99b033147ef3bb8f0 irqchip/sifive-plic: Convert PLIC driver
Kernel panic
C cd69fedf58f8ab1ab511 sysfs: Fix crash on empty group attribut
Kernel panic, NULL pointer
C a7a3d73686f5837916eb drm/xe: Prefer struct_size over open cod
Buffer overflow
C 2e3fc6ca521499a985a1 panic: add option to dump blocked tasks
Kernel panic
C 9c1b86f8ce04ec4aa22c kbuild: raise the minimum supported vers
Buffer overflow
C b73aa539a7789d2366aa panic: suppress gnu_printf warning
Kernel panic
C 952237b5a9b79acf1212 kasan: increase the number of bits to sh
KASAN
C f6932a275461e339de69 nvdimm/pmem: fix leak on dax_add_host()
NULL pointer
C 0cf18e839f64fff9a585 mm/memory: handle !page case in zap_pres
NULL pointer
C b93c28ff72d42b09d539 selftests: add zswapin and no zswap test
Kernel panic
C 82ace185017fbbe48342 x86/mm/cpa: Warn for set_memory_XXcrypte
Kernel panic
C 3e0008336ae3153fb89b bpf: Check cfi_stubs before registering
NULL pointer
C 701ab935859fcfd4a8c8 vfio/nvgrace-gpu: Add vfio pci variant m
Kernel panic
C 98bc7e26e14fbb26a6ab pstore/zone: Add a null pointer check to
NULL pointer
C 77a6557d2a58ad9abea0 arm64: defconfig: Enable PSTORE_RAM
Kernel panic
C 12dc54f568d4f589fd49 pstore/ram: Register to module device ta
Kernel panic
C be142b80803049423944 kasan: rename test_kasan_module_init to
KASAN
C d8310914848223de7ec0 kasan: docs: update descriptions about t
KASAN, Out of bounds
C df7a6d1f64056aec5721 mm/hugetlb: restore the reservation if n
KASAN
C 4e76c8cc3378a2092396 kasan: add atomic tests
KASAN
C 6e8f588708971e0626f5 arm64/mm: make set_ptes() robust when OA
Buffer overflow
C a60cc288a1a2604bd86d test_xarray: add tests for advanced mult
Kernel panic
C e477559ca602a033e397 mm: zswap: warn when referencing a dead
Use after free
C 5878303c5353bdd9b794 mm/zswap: fix race between lru writeback
Use after free
C 32ca5ebfde9a0deb50ce drm/i915: Fix possible null pointer dere
NULL pointer
C 1a562c0d44974d3cf89c tools subcmd: Add a no exec function cal
Kernel panic
C 21db6199f201fab18d22 drm/amd/display: fix null-pointer derefe
Kernel panic, NULL pointer
C f634ee1737e7b856bd4c drm/amd/display: Use kcalloc() instead o
Buffer overflow
C 14d68acfd04b39f34eea drm/amd/display: Fix nanosec stat overfl
Buffer overflow
C 1d55183c2cd9a4b0902a drm/amd/display: Fix potential null poin
NULL pointer
C 0cc46f1a52b4220ec11d ACPI: Drop the custom_method debugfs int
Buffer overflow
C a5a5f4413d91f395cb2d wifi: mt76: mt7925e: fix use-after-free
Use after free
C c957280ef6ab6bdf559a wifi: mt76: mt7921e: fix use-after-free
Use after free, KASAN
C a24d9099777d9c314c98 drm/xe: Do not include current dir for g
Out of bounds
C a32e88f2b20259f5fe4f clk: mediatek: mt7622-apmixedsys: Fix an
Double free
C 252c31a90e04dee4d828 clk: hisilicon: Use devm_kcalloc() inste
Buffer overflow
C eefe68280c94adc352c5 kasan: Add documentation for CONFIG_KASA
KASAN
C 0eb2a18a8fad629da859 drm/xe: Implement VM snapshot support fo
Kernel panic, NULL pointer
C bf900c85f8a4ef47b868 ASoC: codecs: rt5660: Simplify mclk init
Kernel panic
C 6413849b678b04e30b5c ASoC: codecs: rt5640: Simplify mclk init
Kernel panic
C f76de61ad1eb725cc057 ASoC: codecs: rt5616: Simplify mclk init
Kernel panic
C 67e9bf093372a070f67f ASoC: codecs: rt5514: Simplify mclk init
Kernel panic
C 71d322fd16a3a62d32a9 ASoC: codecs: nau8825: Simplify mclk ini
Kernel panic
C e2cb72d28740516cb03f ASoC: codecs: da7213: Simplify mclk init
Kernel panic
C 1315848f1f8a0100cb6f firmware: tegra: bpmp: Return directly a
NULL pointer
C aeedaee5ef5468caf59e drm/bridge: adv7511: fix crash on irq du
Kernel panic
C 5f91a62217730910ceb3 ALSA: hda: Downgrade BDL table overflow
Buffer overflow
C 04438a06c43d09486e43 ALSA: hda: Set up BDL table at hw_params
Buffer overflow
C f92e1a829d64dd66fa17 test_maple_tree: testing the cyclic allo
Buffer overflow
C 557f8c582a9ba8abe6aa ubsan: Reintroduce signed overflow sanit
Buffer overflow
C ff9199464886500bd0c3 dm vdo: fix sparse 'warning: Using plain
NULL pointer
C 5c45cd10c085f46148f1 dm vdo index: fix various small nits
Kernel panic
C 4fa98386be2ff32f18b9 dm vdo: add repair of damaged vdo volume
Kernel panic
C 883069e30e0be28d792d dm vdo: add the slab summary
Kernel panic
C 46766d4888ffdfd2bce9 dm vdo: add memory allocation utilities
Deadlock
C 9ea30fd166e9b8695460 s390/boot: add 'alloc' to info.bin .vmli
Kernel panic
C bcb5d6c769039c8358a2 s390/pci: introduce lock to synchronize
Kernel panic
C 5b7236c198a30d736a76 MIPS: Alchemy: Use kcalloc() instead of
Buffer overflow
C 219eee9c0d16f1b754a8 net: skbuff: add overflow debug check to
Use after free, KASAN, Buffer overflow
C 14786d949a3b8cf00cc3 filelock: fix deadlock detection in POSI
Deadlock
C f1d71576d2c9ec8fdb82 firmware: arm_scmi: Fix double free in S
Double free, Kernel panic, NULL pointer
C dea893a66cd5b0cbd2f2 firmware: arm_scmi: Rework clock domain
Out of bounds
C fb700810d30b9eb333a7 x86/resctrl: Separate arch and fs resctr
Buffer overflow
C aaeb9335fb38c8d3f746 drm/mediatek: dsi: Use bitfield macros w
Buffer overflow
C d2570ee67a4719802f7c drm/msm/mdss: generate MDSS data for MDP
Kernel panic
C e8991d1d6498f663889e ALSA: core: fix buffer overflow in test_
KASAN, Buffer overflow, Out of bounds
C 49c379d3a72ab86aafea xfs: use kvfree for buf in xfs_ioc_getbm
Kernel panic
C b3db266fb031fba88c42 usb: typec: ucsi: Limit read size on v1.
Buffer overflow
C f6aed043ee5d75b3d1bf drm/amd/display: Add 'replay' NULL check
NULL pointer
C d1909c0221739356f31c module: Don't ignore errors from set_mem
NULL pointer
C eeff1d4f118bdf087022 x86/resctrl: Move domain helper migratio
Buffer overflow
C 978fcca954cb52249bab x86/resctrl: Allow overflow/limbo handle
Buffer overflow
C 09909e098113bed99c9f x86/resctrl: Queue mon_event_read() inst
Buffer overflow
C a4846aaf39455fe69fce x86/resctrl: Add cpumask_any_housekeepin
Buffer overflow
C b7fac08db5e32a7de8c5 i40e: Add helpers to find VSI and VEB by
Kernel panic
C a74c077b9021b36c7850 iommu: Use refcount for fault data acces
Use after free
C b07cd3b746cfe9a4524a iommu/mtk_iommu: Use devm_kcalloc() inst
Buffer overflow
C 3a74f44de2c901e1536d s390/checksum: provide and use cksm() in
Kernel panic
C 4ce69fcf17d067112f75 s390/checksum: call instrument_read() in
KASAN
C 91510d5959ad9eac4516 gpio: cdev: fix a NULL-pointer dereferen
NULL pointer
C 0383808e4d99ac318926 arm64: kasan: Reduce minimum shadow alig
KASAN
C ba5b0333a847ac026725 arm64: mm: omit redundant remap of kerne
KASAN
C 567a70c181df72f3bb42 arm64: mm: avoid fixmap for early swappe
KASAN
C 82ca151da7d54d7571c5 arm64: mmu: Make __cpu_replace_ttbr1() o
KASAN
C 75a323e604fc77c50c7e evm: Make it independent from 'integrity
NULL pointer
C 06cca5110774f7b59a16 integrity: Move integrity_kernel_module_
Deadlock
C 5c5682b9f87a3b7bd483 x86/cpu: Detect real BSP on crash kernel
Kernel panic
C a626ded4e3088319e3d1 x86/platform/intel-mid: Prepare for sepa
Kernel panic
C 871760eb7af57accc540 io_uring: kill stale comment for io_cqri
Buffer overflow
C cb5942b77c05d54310a0 wifi: wilc1000: prevent use-after-free o
Use after free, KASAN
C efe0f34c2bd037a0b014 drm/amdgpu: Reduce VA_RESERVED_BOTTOM to
NULL pointer
C 10cd2bf92b4cf64a9c04 drm/amd/display: Fix possible NULL deref
Kernel panic, NULL pointer
C 48acf8292280f257fb00 i2c: Remove redundant comparison in npcm
NULL pointer
C 9bf93dcfc453fae192fe Julia Lawall reported this null pointer
NULL pointer
C 600716592a3a6de8bfcf doc: Add EARLY flag to early-parsed kern
KASAN
C 23da2ad64dbe9f3fab10 rcu/exp: Remove rcu_par_gp_wq
Deadlock
C 0875f1ceba974042069f powerpc/smp: Remap boot CPU onto core 0
Kernel panic
C d9e473513930836e617f pmdomain: imx8mp-blk-ctrl: Error out if
NULL pointer
C 5d7f58ee08434a33340f pmdomain: ti: Add a null pointer check t
NULL pointer
C 0bef512012b1cd8820f0 net: add netdev_lockdep_set_classes() to
Deadlock
C 52dbd67dff5d050e9930 bpf: Abstract loop unrolling pragmas in
Kernel panic
C 178c54666f9c4d2f49f2 bpf: Mark bpf_spin_{lock,unlock}() helpe
Deadlock
C ce311df91d73eaddc548 Revert "drm/amd: flush any delayed gfxof
Deadlock
C 94a69db2367efcd7e0ee xfs: use __GFP_NOLOCKDEP instead of GFP_
Deadlock
C 3a86cb16ab329b235ecd drm/i915: Prevent HW access during init
NULL pointer
C e955a71f83598a347eb4 irqchip/irq-bcm7038-l1: Prefer struct_si
Buffer overflow
C 004c7a6bf43edbd4b092 irqchip/bcm-6345-l1: Prefer struct_size)
Buffer overflow
C 6256fbfd651c8b3653b7 net: stmmac: Simplify mtl IRQ status che
Buffer overflow
C 157261c58b283f5c83e3 drm/xe/pt: Allow for stricter type- and
Out of bounds
C 9ab1a996dc7f492d5dea drm/amd/display: Fix possible buffer ove
Buffer overflow
C c37c3bcc0530f40fe1c4 drm/amd/display: Fix && vs || typos
NULL pointer
C 2ea9b94c502f6681a453 Merge patch series "can: m_can: Optimiza
NULL pointer
C 88390dd788db485912ee cpuidle: Avoid potential overflow in int
Buffer overflow
C dbd86e47fd00c01d3444 Merge patch series "can: esd: add suppor
Kernel panic, Buffer overflow
C a898cb621ac589b0b9e9 quota: Detect loops in quota tree
Kernel panic, Deadlock
C 17ef8efc00b34918b966 ipv6: mcast: remove one synchronize_net(
KASAN
C d5e83f97eb5669bfdd89 coresight: Remove the 'enable' field.
Kernel panic
C f68bbe4dcfa303164922 coresight: Fix issue where a source devi
Kernel panic
C d83cee3d2bb131c7fca7 gpio: protect the pointer to gpio_chip i
Kernel panic
C a1083ee717e9bde01226 perf/arm-cmn: Improve debugfs pretty-pri
Buffer overflow
C c3116e62ddeff79cae34 s390/dasd: fix double module refcount de
Kernel panic
C dec529b0b0572b32f9eb PCI: switchtec: Fix an error handling pa
Kernel panic
C 4c98b89175a229a1eb9e io_uring: remove 'loops' argument from t
Kernel panic
C c6c6c69df6598aacf392 s390/dasd: Remove PRINTK_HEADER and KMSG
Kernel panic
C eb538b5574251a449f40 drm/xe/vm: Avoid reserving zero fences
Out of bounds
C e35f316bce9e5733c982 wifi: iwlwifi: mvm: don't set the MFP fl
Kernel panic
C d1256c1546a0e03f103e wifi: mac80211: add and use a link itera
Kernel panic
C 45bf79bc56c4158afb6f selftests: bonding: reduce garp_test/arp
Buffer overflow
C 15dba12c5659772f9a5e drm/amd/display: Implement bounds check
Buffer overflow, Out of bounds
C cdb637d3395723988212 drm/amdgpu: Fix potential out-of-bounds
Out of bounds
C 7412dc6d55eed6b76180 dump_stack: Do not get cpu_sync for pani
Kernel panic, Deadlock
C d988d9a9b9d180bfd5c1 panic: Flush kernel log buffer at the en
Kernel panic
C 779dbc2e78d746250f07 printk: Avoid non-panic CPUs writing to
Kernel panic
C d04d5882cd678b898a9d printk: Disable passing console lock own
Kernel panic, Deadlock
C b1c4c67a5e90db8fbdb5 printk: ringbuffer: Skip non-finalized r
Kernel panic
C 36652d0f3bf34899e82d printk: Add this_cpu_in_panic()
Kernel panic
C 0ab7cdd00491b532591e printk: For @suppress_panic_printk check
Kernel panic
C 3fad1565720ffd8fc944 drm/amdgpu: Only create mes event log de
Kernel panic
C 886571d217d7cc4e0f96 drm/amd/display: Fix 'panel_cntl' could
NULL pointer
C ef8d8df3cb06fb99856b drm: xlnx: zynqmp_dpsub: Filter interrup
NULL pointer
C 8c64f4cdf4e6cc5682c5 media: edia: dvbdev: fix a use-after-fre
Use after free
C 102fb77c2deb0df3683e media: drivers/media/dvb-core: copy user
Buffer overflow
C 92a871ab9fa59a74d013 libbpf: Use OPTS_SET() macro in bpf_xdp_
Out of bounds
C 8087199cd5951c1eba26 drm/xe/vm: don't ignore error when in_kt
Kernel panic
C 21ec68234826b1b54ab9 f2fs: fix to avoid potential panic durin
Kernel panic
C c2034ef6192a65a986a4 f2fs: fix NULL pointer dereference in f2
Kernel panic, NULL pointer
C b896e302f79678451a94 f2fs: fix to remove unnecessary f2fs_bug
Kernel panic
C 21e16fa5dc6c6f69d9f2 Documentation: Fix counter name of mlx5
Buffer overflow
C c8f1140cb82dc843e726 udf: Avoid invalid LVID used on mount
Out of bounds
C d0aa72604fbd80c8aabb quota: Fix potential NULL pointer derefe
NULL pointer
C 5c018e378f916b56503b spi: spi-rockchip: Fix out of bounds arr
Out of bounds
C e8b7d11c7e4b88c4988f mtd: ssfdc: One function call less in ss
NULL pointer
C b6be3714005c3933886b filelock: convert __locks_insert_block,
Deadlock
C 15126b916e39b0cb6702 media: pci: cx23885: check cx23885_vdev_
NULL pointer
C ba535bce57e71463a86f clk: meson: Add missing clocks to axg_cl
Kernel panic, NULL pointer
C 4cb1ef64609f9b025418 workqueue: Implement BH workqueues to ev
Use after free
C c21a8870c98611e8f892 RDMA/srpt: Do not register event handler
Use after free, KASAN
C ae1d892d518af5c092f2 bus: mhi: ep: Use kcalloc() instead of k
Buffer overflow
C 774ef5dfc95578a90794 drm/xe: circumvent bogus stringop-overfl
Buffer overflow
C 2d3a7384b9c8ea0b6407 wifi: ath12k: disable QMI PHY capability
Kernel panic
C 664a1c96b297965c4434 wifi: ath12k: fix firmware assert during
Kernel panic
C 28703381099022e18df1 wifi: ath12k: add support for peer meta
Kernel panic
C 9f06911998cac015e333 wifi: ath12k: fetch correct pdev id from
Kernel panic
C c67ef897fe08effad98f select: Avoid wrap-around instrumentatio
Buffer overflow
C bd8c239c0502e70c92cf iov_iter: Avoid wrap-around instrumentat
Buffer overflow
C f123dc86388cb669c3d6 sysv: don't call sb_bread() with pointer
Deadlock
C 24355fcb0d4cbcb6ddda wifi: ath9k: delay all of ath9k_wmi_even
NULL pointer
C dd1a502cabcaa410c68e crypto: hisilicon/sec2 - fix some cleanu
Kernel panic
C 943b043aeecce9accb6d selftests/bpf: Fix bench runner SIGSEGV
Kernel panic
C 2a00f0855530a8911a91 KVM: arm64: PMU: fix kernel-doc warnings
Buffer overflow
C e5a65d4f723ab9997dea KVM: x86/pmu: Add macros to iterate over
Kernel panic
C f933b88e20150f157873 KVM: x86/pmu: Zero out PMU metadata on A
Kernel panic
C 81b3f0efbbced8dbf4ef soc/tegra: fuse: Fix crash in tegra_fuse
Kernel panic, NULL pointer
C 8263b3382d8c1af0fffa libbpf: Remove unnecessary null check in
NULL pointer
C 5136ea6b109de66b1327 arm64: dts: imx8qm: Correct edma3 power-
Kernel panic
C b03301870d9b5b2e24bb media: atomisp: Replace atomisp_drvfs at
NULL pointer
C e3854253a5f695f06b51 drm/amd/display: Fix buffer overflow in
Buffer overflow
C 1c2806f6be230c33b3f2 drm/amd/display: Add NULL check for kzal
NULL pointer
C 5ca63ffdb94ba2bac4c2 net: stmmac: Report taprio offload statu
Buffer overflow
C 3803584a4e9b65bb5b01 pinctrl: renesas: checker: Limit cfg reg
Buffer overflow, Out of bounds
C 03ee752f00fd0daa082b drm/imx: prefer snprintf over sprintf
Buffer overflow
C 345a36c4f1baa03275d8 drm/amdgpu: prefer snprintf over sprintf
Buffer overflow
C a7b57372e1c5c848cbe9 RAS/AMD/ATL: Fix array overflow in get_l
Buffer overflow
C 82e5d7d793e8aef1275d soc: mediatek: mtk-socinfo: Clean up NVM
Use after free, KASAN
C c5f8cd6c62ce02205ced workqueue: Avoid premature init of wq->n
Kernel panic
C 15930da42f8981dc42c1 workqueue: Don't call cpumask_test_cpu()
Kernel panic
C 4207b556e62f0a8915af kernfs: RCU protect kernfs_nodes and avo
Deadlock
C 9187ebb954ab2afe0e79 clk: qcom: gdsc: Enable supply reglator
Kernel panic
C 1267f7223bec186dc26e mlxsw: Use refcount_t for reference coun
Buffer overflow
C be2f16a994f09b7f95db mlxsw: spectrum: Refactor LAG create and
Buffer overflow
C d1eb913c8df4574df286 ALSA: pcm: Fix snd_pcm_format_name funct
NULL pointer
C bc978cc18d46dd54160f scsi: aacraid: aachba: Replace snprintf(
Buffer overflow
C 2ba36e18566b2c5b77bb drm/amd/display: fix DP audio settings
Divide by zero
C 9ccfe80d022df7c595f1 drm/amd/display: Fix potential NULL poin
NULL pointer
C 8ef979584ea86c247b76 crypto: ccp: Add panic notifier for SEV/
Kernel panic
C 661b1c6169e2b260753b x86/sev: Adjust the directmap to avoid i
Kernel panic
C 5797b1c18919cd9c289d workqueue: Implement system-wide nr_acti
Use after free, Deadlock
C e8bbd303d7de3fb32be1 x86/fault: Dump RMP table information wh
Kernel panic
C 27825593c972abac86b9 soc: qcom: smem: remove hwspinlock from
Kernel panic
C 9e957a155005b16af057 serial: qcom-geni: Don't cancel/abort if
Kernel panic
C f6f62a9a931f54607107 pinctrl: pinctrl-zynqmp: Use devm_kcallo
Buffer overflow
C 5593e9abf1cf2bf09636 batman-adv: Improve exception handling i
NULL pointer
C ffc15626c861f811f977 batman-adv: Return directly after a fail
NULL pointer
C 5642c82b9463c3263c08 bnx2x: Fix firmware version string chara
Buffer overflow
C dfdfe4be183b27b278d7 wifi: iwlwifi: remove retry loops in sta
Kernel panic
C 4da3bc65d21860555769 crypto: qat - use kcalloc_node() instead
Buffer overflow
C 1dc0c1389d6afe4ef3e1 crypto: sun8i-ce - Use kcalloc() instead
Buffer overflow
C 565def1542ab6cbf8a03 crypto: arm64/aes-ccm - Cache round keys
Kernel panic
C 23a22e831ed4e6aa0831 crypto: qat - avoid memcpy() overflow wa
Buffer overflow
C e01966e643c97eb8916b crypto: virtio - Less function calls in
NULL pointer
C 4b09715f1504f1b6e8df drm/amd/display: Fix a potential buffer
Buffer overflow
C 9d5f28c1366f48efae7b wifi: ath11k: fix connection failure due
Kernel panic
C dbd73acb22d85873ecca wifi: ath11k: enable 36 bit mask for str
Kernel panic
C c6878e47431c72168da0 drm/xe: Fix crash in trace_dma_fence_ini
Kernel panic
C 63b21caba17ef2df5982 xfrm: introduce forwarding of ICMP Error
Out of bounds
C 2b9bc9efa815f7264158 Merge patch series "scsi: hisi_sas: Mino
Deadlock
C 3c4f53b2c341ec6428b9 scsi: hisi_sas: Fix a deadlock issue rel
Deadlock
C 5014396af9bbac0f28d9 riscv: blacklist assembly symbols for kp
Kernel panic, Buffer overflow
C 58dc02750fcca1b16b7b staging: rtl8723bs: Use kcalloc() instea
Buffer overflow
C 796cae1a79b192510041 scsi: core: Safe warning about bad dev i
Buffer overflow, NULL pointer
C bbc094b3052647c188d6 bpf: Use r constraint instead of p const
Buffer overflow
C d5b892fd607abec2a1e4 bpf: make infinite loop detection in is_
Kernel panic
C 7c05e7f3e74e7e550534 bpf: Support inlining bpf_kptr_xchg() he
KASAN
C 49527ca264341f9b6278 Documentation/kernel-parameters: Add spe
Buffer overflow
C f44e64990beb41167bd7 sock_diag: remove sock_diag_mutex
Kernel panic
C bc77bde2d3f078c038f6 drm/bridge: sii902x: Fix audio codec unr
Kernel panic
C dffdfb8f5de13a8cacf9 drm/bridge: sii902x: Fix probing race is
Kernel panic, NULL pointer
C acf868ff60b1cd1f2e59 wifi: iwlegacy: Use kcalloc() instead of
Buffer overflow
C 7e11a2966f51695c0af0 wifi: rtw89: fix null pointer access whe
NULL pointer
C 9ac3ebaef3cc43ecd136 Documentation: power: Use kcalloc() inst
Buffer overflow
C f661017e6d326ee187db cpufreq: brcmstb-avs-cpufreq: add check
NULL pointer
C 9bfb1a538a252cc6764d drm/amdgpu: Fix null pointer dereference
NULL pointer
C a499b68cce3c53553143 drm/amd/display: Promote DAL to 3.2.269
NULL pointer
C b8f2234846d7ebd13470 drm/amd/display: Add NULL-checks in dml2
NULL pointer
C 3948abaa4e2be938ccdf do_sys_name_to_handle(): use kzalloc() t
KMSAN
C 8b3d838139bcd1e552f1 fs: improve dump_mapping() robustness
Kernel panic, NULL pointer
C f020c30299323c206b90 wifi: ath10k: Fix enum ath10k_fw_crash_d
Kernel panic
C 7ed97155b25880a78d39 drm/amdgpu: fix UBSAN array-index-out-of
Out of bounds
C 79f8eacbdf9dad7ead39 drm/xe: Use a NULL pointer instead of 0.
NULL pointer
C 05ae67d95bade8b7facd drm/i915: Drop -Wstringop-overflow
Buffer overflow
C 849e133c973ce7a2f217 drm/amdgpu: Fix the null pointer when lo
NULL pointer
C 1213acb478a7181cd73e wifi: rtl8xxxu: add cancel_work_sync() f
Use after free
C cf2df0080bd59cb97a15 wifi: ath11k: fix a possible dead lock c
Deadlock
C 52e3fa3e3ea3ee05e32c drm/xe: Fix bounds checking in __xe_bo_p
Out of bounds
C 1113e52ffee7b45def23 drm/xe: Fix potential deadlock in __fini
Deadlock
C 5ee0d47dcf33efd8950b drm/vc4: don't check if plane->state->fb
Use after free
C a109d19992294736abd4 drm/xe: Fix build bug for GCC 11
Buffer overflow
C a8004af338f6b3319476 drm/xe: Fix modifying exec_queue priorit
Deadlock
C 0e00a8814eec16057e78 drm/i915/guc: Avoid circular locking iss
Deadlock
C 3bb45618061c0e1838e9 drm/sched: One function call less in drm
NULL pointer
C c27f010aa1884276ee5d drm/i915: Disable DSB in Xe KMD
Buffer overflow
C 20277d8c1ff57b575dc2 drm/xe: Fix UBSAN splat in add_preempt_f
Out of bounds
C ad25ee36f00172f7d532 wifi: ath10k: fix NULL pointer dereferen
NULL pointer
C afe6fcb9775882230cd2 drm/tegra: dsi: Add missing check for of
NULL pointer
C 8e5647a723c49d73b9f1 x86/mm: Ensure input to pfn_to_kaddr() i
Kernel panic
C e29aad08b1da7772b362 x86/percpu: Disable named address spaces
KASAN
The directories/modules affected were:
=================
Documentation: 22
Documentation/admin-guide: 6
Documentation/admin-guide/kdump: 2
Documentation/admin-guide/sysctl: 2
Documentation/bpf: 1
Documentation/core-api: 1
Documentation/dev-tools: 3
Documentation/devicetree: 2
Documentation/devicetree/bindings: 2
Documentation/devicetree/bindings/riscv: 2
Documentation/driver-api: 1
Documentation/driver-api/usb: 1
Documentation/firmware-guide: 1
Documentation/firmware-guide/acpi: 1
Documentation/netlink: 1
Documentation/netlink/specs: 1
Documentation/networking: 2
Documentation/networking/devlink: 1
Documentation/power: 1
Documentation/process: 2
Documentation/timers: 1
Documentation/tools: 1
Documentation/tools/rtla: 1
Documentation/translations: 3
Documentation/translations/zh_CN: 3
Documentation/translations/zh_CN/dev-tools: 2
Documentation/translations/zh_CN/power: 1
Documentation/translations/zh_TW: 2
Documentation/translations/zh_TW/dev-tools: 2
arch: 100
arch/arm: 11
arch/arm/boot: 2
arch/arm/boot/compressed: 2
arch/arm/kernel: 8
arch/arm/mm: 1
arch/arm64: 16
arch/arm64/boot: 1
arch/arm64/boot/dts: 1
arch/arm64/boot/dts/freescale: 1
arch/arm64/configs: 1
arch/arm64/crypto: 1
arch/arm64/hyperv: 1
arch/arm64/include: 7
arch/arm64/include/asm: 7
arch/arm64/kernel: 4
arch/arm64/kernel/pi: 1
arch/arm64/kvm: 2
arch/arm64/kvm/hyp: 1
arch/arm64/mm: 6
arch/loongarch: 2
arch/loongarch/include: 1
arch/loongarch/include/asm: 1
arch/loongarch/kernel: 1
arch/mips: 2
arch/mips/alchemy: 1
arch/mips/alchemy/common: 1
arch/mips/kernel: 1
arch/nios2: 1
arch/nios2/kernel: 1
arch/powerpc: 16
arch/powerpc/include: 4
arch/powerpc/include/asm: 4
arch/powerpc/kernel: 4
arch/powerpc/kexec: 3
arch/powerpc/mm: 3
arch/powerpc/mm/book3s32: 1
arch/powerpc/mm/book3s64: 1
arch/powerpc/mm/nohash: 2
arch/powerpc/platforms: 4
arch/powerpc/platforms/powernv: 2
arch/powerpc/platforms/pseries: 2
arch/riscv: 11
arch/riscv/boot: 1
arch/riscv/boot/dts: 1
arch/riscv/boot/dts/renesas: 1
arch/riscv/include: 5
arch/riscv/include/asm: 5
arch/riscv/kernel: 9
arch/riscv/kernel/vdso: 1
arch/riscv/mm: 1
arch/riscv/net: 1
arch/s390: 12
arch/s390/boot: 1
arch/s390/include: 4
arch/s390/include/asm: 4
arch/s390/kernel: 5
arch/s390/mm: 1
arch/s390/net: 2
arch/s390/pci: 1
arch/s390/tools: 1
arch/sh: 3
arch/sh/boot: 1
arch/sh/boot/compressed: 1
arch/sh/kernel: 2
arch/sparc: 1
arch/sparc/vdso: 1
arch/x86: 38
arch/x86/boot: 2
arch/x86/boot/compressed: 2
arch/x86/entry: 1
arch/x86/entry/vdso: 1
arch/x86/include: 4
arch/x86/include/asm: 4
arch/x86/kernel: 20
arch/x86/kernel/cpu: 13
arch/x86/kernel/cpu/resctrl: 8
arch/x86/kernel/fpu: 1
arch/x86/kernel/kprobes: 1
arch/x86/kvm: 6
arch/x86/kvm/mmu: 1
arch/x86/kvm/svm: 1
arch/x86/kvm/vmx: 2
arch/x86/mm: 2
arch/x86/mm/pat: 1
arch/x86/net: 2
arch/x86/platform: 1
arch/x86/platform/intel-mid: 1
arch/x86/virt: 2
arch/x86/virt/svm: 2
arch/x86/xen: 1
block: 5
drivers: 345
drivers/accel: 2
drivers/accel/habanalabs: 2
drivers/accel/habanalabs/common: 2
drivers/accel/habanalabs/common/mmu: 1
drivers/acpi: 2
drivers/ata: 1
drivers/base: 2
drivers/base/regmap: 1
drivers/block: 1
drivers/block/aoe: 1
drivers/bluetooth: 4
drivers/bus: 1
drivers/bus/mhi: 1
drivers/bus/mhi/ep: 1
drivers/clk: 13
drivers/clk/hisilicon: 1
drivers/clk/imx: 1
drivers/clk/mediatek: 2
drivers/clk/meson: 2
drivers/clk/qcom: 2
drivers/clk/sunxi-ng: 1
drivers/clk/zynq: 1
drivers/clocksource: 1
drivers/cpufreq: 1
drivers/cpuidle: 1
drivers/crypto: 7
drivers/crypto/allwinner: 1
drivers/crypto/allwinner/sun8i-ce: 1
drivers/crypto/ccp: 1
drivers/crypto/hisilicon: 1
drivers/crypto/hisilicon/sec2: 1
drivers/crypto/intel: 2
drivers/crypto/intel/qat: 2
drivers/crypto/intel/qat/qat_common: 2
drivers/crypto/rockchip: 1
drivers/crypto/virtio: 1
drivers/cxl: 2
drivers/cxl/core: 2
drivers/dma: 1
drivers/dma-buf: 1
drivers/dma/idxd: 1
drivers/dpll: 1
drivers/edac: 1
drivers/firewire: 2
drivers/firmware: 8
drivers/firmware/arm_scmi: 4
drivers/firmware/cirrus: 1
drivers/firmware/efi: 1
drivers/firmware/tegra: 1
drivers/gpio: 4
drivers/gpu: 82
drivers/gpu/drm: 82
drivers/gpu/drm/amd: 39
drivers/gpu/drm/amd/amdgpu: 11
drivers/gpu/drm/amd/display: 27
drivers/gpu/drm/amd/display/amdgpu_dm: 9
drivers/gpu/drm/amd/display/dc: 17
drivers/gpu/drm/amd/display/dc/bios: 1
drivers/gpu/drm/amd/display/dc/clk_mgr: 1
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301: 1
drivers/gpu/drm/amd/display/dc/core: 1
drivers/gpu/drm/amd/display/dc/dce: 1
drivers/gpu/drm/amd/display/dc/dml2: 3
drivers/gpu/drm/amd/display/dc/hwss: 3
drivers/gpu/drm/amd/display/dc/hwss/dcn10: 1
drivers/gpu/drm/amd/display/dc/hwss/dcn21: 2
drivers/gpu/drm/amd/display/dc/link: 3
drivers/gpu/drm/amd/display/dc/link/protocols: 3
drivers/gpu/drm/amd/display/dc/resource: 2
drivers/gpu/drm/amd/display/dc/resource/dcn301: 2
drivers/gpu/drm/amd/display/modules: 1
drivers/gpu/drm/amd/display/modules/inc: 1
drivers/gpu/drm/amd/include: 1
drivers/gpu/drm/bridge: 4
drivers/gpu/drm/bridge/adv7511: 1
drivers/gpu/drm/gma500: 1
drivers/gpu/drm/i915: 6
drivers/gpu/drm/i915/display: 3
drivers/gpu/drm/i915/gt: 2
drivers/gpu/drm/i915/gt/uc: 1
drivers/gpu/drm/imx: 1
drivers/gpu/drm/imx/ipuv3: 1
drivers/gpu/drm/mediatek: 3
drivers/gpu/drm/msm: 3
drivers/gpu/drm/msm/adreno: 2
drivers/gpu/drm/nouveau: 3
drivers/gpu/drm/nouveau/nvkm: 1
drivers/gpu/drm/nouveau/nvkm/subdev: 1
drivers/gpu/drm/nouveau/nvkm/subdev/gsp: 1
drivers/gpu/drm/scheduler: 1
drivers/gpu/drm/tegra: 1
drivers/gpu/drm/vc4: 1
drivers/gpu/drm/xe: 18
drivers/gpu/drm/xlnx: 1
drivers/hid: 1
drivers/hid/intel-ish-hid: 1
drivers/hid/intel-ish-hid/ipc: 1
drivers/hwspinlock: 1
drivers/hwtracing: 2
drivers/hwtracing/coresight: 2
drivers/i2c: 2
drivers/i2c/busses: 1
drivers/iio: 1
drivers/iio/adc: 1
drivers/infiniband: 2
drivers/infiniband/ulp: 2
drivers/infiniband/ulp/srpt: 2
drivers/iommu: 8
drivers/iommu/intel: 6
drivers/irqchip: 5
drivers/isdn: 2
drivers/isdn/mISDN: 2
drivers/leds: 2
drivers/leds/trigger: 1
drivers/md: 9
drivers/md/dm-vdo: 6
drivers/md/dm-vdo/indexer: 1
drivers/media: 12
drivers/media/dvb-core: 2
drivers/media/dvb-frontends: 2
drivers/media/pci: 1
drivers/media/pci/cx23885: 1
drivers/media/platform: 4
drivers/media/platform/mediatek: 4
drivers/media/platform/mediatek/vcodec: 4
drivers/media/platform/mediatek/vcodec/common: 3
drivers/media/platform/mediatek/vcodec/decoder: 3
drivers/media/platform/mediatek/vcodec/decoder/vdec: 1
drivers/media/platform/mediatek/vcodec/encoder: 1
drivers/media/usb: 3
drivers/media/usb/pvrusb2: 2
drivers/media/usb/usbtv: 1
drivers/misc: 3
drivers/misc/mei: 3
drivers/mtd: 6
drivers/mtd/nand: 3
drivers/mtd/nand/raw: 3
drivers/mtd/nand/raw/brcmnand: 2
drivers/mtd/ubi: 2
drivers/net: 82
drivers/net/can: 3
drivers/net/can/esd: 2
drivers/net/can/m_can: 1
drivers/net/ethernet: 46
drivers/net/ethernet/amazon: 2
drivers/net/ethernet/amazon/ena: 2
drivers/net/ethernet/amd: 1
drivers/net/ethernet/amd/pds_core: 1
drivers/net/ethernet/broadcom: 5
drivers/net/ethernet/broadcom/bnx2x: 3
drivers/net/ethernet/broadcom/bnxt: 2
drivers/net/ethernet/brocade: 1
drivers/net/ethernet/brocade/bna: 1
drivers/net/ethernet/google: 2
drivers/net/ethernet/google/gve: 2
drivers/net/ethernet/hisilicon: 5
drivers/net/ethernet/hisilicon/hns3: 5
drivers/net/ethernet/hisilicon/hns3/hns3pf: 5
drivers/net/ethernet/hisilicon/hns3/hns3vf: 1
drivers/net/ethernet/intel: 7
drivers/net/ethernet/intel/i40e: 1
drivers/net/ethernet/intel/ice: 5
drivers/net/ethernet/intel/igc: 1
drivers/net/ethernet/marvell: 2
drivers/net/ethernet/marvell/octeontx2: 2
drivers/net/ethernet/marvell/octeontx2/af: 2
drivers/net/ethernet/mellanox: 15
drivers/net/ethernet/mellanox/mlx5: 3
drivers/net/ethernet/mellanox/mlx5/core: 3
drivers/net/ethernet/mellanox/mlx5/core/steering: 1
drivers/net/ethernet/mellanox/mlxbf_gige: 4
drivers/net/ethernet/mellanox/mlxsw: 8
drivers/net/ethernet/netronome: 1
drivers/net/ethernet/netronome/nfp: 1
drivers/net/ethernet/netronome/nfp/flower: 1
drivers/net/ethernet/pensando: 1
drivers/net/ethernet/pensando/ionic: 1
drivers/net/ethernet/renesas: 2
drivers/net/ethernet/stmicro: 2
drivers/net/ethernet/stmicro/stmmac: 2
drivers/net/phy: 2
drivers/net/vxlan: 1
drivers/net/wireless: 25
drivers/net/wireless/ath: 10
drivers/net/wireless/ath/ath10k: 2
drivers/net/wireless/ath/ath11k: 3
drivers/net/wireless/ath/ath12k: 4
drivers/net/wireless/ath/ath9k: 1
drivers/net/wireless/broadcom: 3
drivers/net/wireless/broadcom/brcm80211: 3
drivers/net/wireless/broadcom/brcm80211/brcmfmac: 3
drivers/net/wireless/intel: 5
drivers/net/wireless/intel/iwlegacy: 1
drivers/net/wireless/intel/iwlwifi: 4
drivers/net/wireless/intel/iwlwifi/mvm: 4
drivers/net/wireless/mediatek: 3
drivers/net/wireless/mediatek/mt76: 3
drivers/net/wireless/mediatek/mt76/mt7921: 2
drivers/net/wireless/mediatek/mt76/mt7925: 1
drivers/net/wireless/microchip: 2
drivers/net/wireless/microchip/wilc1000: 2
drivers/net/wireless/realtek: 2
drivers/net/wireless/realtek/rtl8xxxu: 1
drivers/net/wireless/realtek/rtw89: 1
drivers/net/wwan: 2
drivers/net/wwan/t7xx: 2
drivers/nvdimm: 1
drivers/nvme: 4
drivers/nvme/host: 3
drivers/nvme/target: 1
drivers/of: 1
drivers/opp: 1
drivers/pci: 3
drivers/pci/controller: 1
drivers/pci/hotplug: 1
drivers/pci/switch: 1
drivers/perf: 3
drivers/phy: 2
drivers/phy/marvell: 1
drivers/phy/ti: 1
drivers/pinctrl: 6
drivers/pinctrl/renesas: 3
drivers/platform: 2
drivers/platform/x86: 2
drivers/platform/x86/amd: 1
drivers/platform/x86/amd/pmf: 1
drivers/pmdomain: 3
drivers/pmdomain/imx: 1
drivers/pmdomain/renesas: 1
drivers/pmdomain/ti: 1
drivers/pwm: 1
drivers/ras: 3
drivers/ras/amd: 3
drivers/ras/amd/atl: 2
drivers/rtc: 1
drivers/s390: 4
drivers/s390/block: 2
drivers/s390/cio: 1
drivers/s390/net: 1
drivers/scsi: 6
drivers/scsi/aacraid: 1
drivers/scsi/hisi_sas: 2
drivers/scsi/lpfc: 1
drivers/soc: 5
drivers/soc/mediatek: 2
drivers/soc/qcom: 1
drivers/soc/tegra: 2
drivers/soc/tegra/fuse: 2
drivers/spi: 8
drivers/staging: 2
drivers/staging/media: 1
drivers/staging/media/atomisp: 1
drivers/staging/media/atomisp/pci: 1
drivers/staging/rtl8723bs: 1
drivers/staging/rtl8723bs/os_dep: 1
drivers/thermal: 2
drivers/tty: 1
drivers/tty/serial: 1
drivers/usb: 6
drivers/usb/core: 2
drivers/usb/gadget: 1
drivers/usb/gadget/function: 1
drivers/usb/host: 1
drivers/usb/typec: 2
drivers/usb/typec/ucsi: 2
drivers/vfio: 3
drivers/vfio/pci: 3
drivers/vfio/pci/nvgrace-gpu: 1
drivers/vfio/pci/pds: 2
drivers/video: 2
drivers/video/backlight: 1
drivers/video/fbdev: 1
drivers/video/fbdev/core: 1
fs: 89
fs/9p: 1
fs/bcachefs: 27
fs/btrfs: 9
fs/erofs: 1
fs/ext4: 1
fs/f2fs: 9
fs/fuse: 1
fs/kernfs: 1
fs/nfs: 4
fs/nfs/flexfilelayout: 2
fs/nfsd: 5
fs/orangefs: 1
fs/proc: 1
fs/pstore: 2
fs/quota: 3
fs/smb: 5
fs/smb/client: 4
fs/smb/server: 1
fs/sysfs: 3
fs/sysv: 1
fs/udf: 1
fs/xfs: 5
fs/xfs/libxfs: 2
fs/xfs/scrub: 2
include: 61
include/asm-generic: 1
include/linux: 46
include/linux/sunrpc: 1
include/net: 11
include/net/bluetooth: 3
include/trace: 2
include/trace/events: 1
include/trace/stages: 1
include/uapi: 4
include/uapi/linux: 4
init: 2
io_uring: 5
kernel: 61
kernel/bpf: 18
kernel/configs: 1
kernel/dma: 3
kernel/module: 1
kernel/printk: 9
kernel/rcu: 5
kernel/sched: 5
kernel/time: 1
kernel/trace: 1
lib: 18
mm: 20
mm/kasan: 6
net: 77
net/ax25: 1
net/batman-adv: 2
net/bluetooth: 20
net/bluetooth/bnep: 1
net/bluetooth/rfcomm: 2
net/core: 9
net/hsr: 1
net/ipv4: 15
net/ipv6: 9
net/mac80211: 1
net/netfilter: 2
net/netlink: 1
net/nfc: 2
net/nsh: 1
net/openvswitch: 1
net/sched: 3
net/sunrpc: 3
net/sunrpc/xprtrdma: 1
net/unix: 6
net/wireless: 1
net/xdp: 2
net/xfrm: 1
rust: 1
rust/alloc: 1
rust/alloc/collections: 1
rust/alloc/vec: 1
samples: 1
samples/bpf: 1
scripts: 8
scripts/coccinelle: 1
scripts/coccinelle/misc: 1
scripts/mod: 3
security: 3
security/integrity: 2
security/integrity/evm: 1
security/integrity/ima: 2
sound: 15
sound/core: 4
sound/hda: 1
sound/pci: 1
sound/pci/hda: 1
sound/soc: 9
sound/soc/codecs: 7
sound/soc/sof: 1
sound/soc/sof/amd: 1
tools: 30
tools/include: 5
tools/include/linux: 2
tools/include/uapi: 3
tools/include/uapi/linux: 3
tools/lib: 5
tools/lib/bpf: 2
tools/lib/perf: 2
tools/lib/perf/include: 2
tools/lib/perf/include/internal: 2
tools/lib/subcmd: 1
tools/net: 1
tools/net/ynl: 1
tools/net/ynl/lib: 1
tools/objtool: 1
tools/perf: 2
tools/perf/ui: 1
tools/perf/ui/browsers: 1
tools/perf/util: 2
tools/testing: 15
tools/testing/cxl: 1
tools/testing/cxl/test: 1
tools/testing/selftests: 14
tools/testing/selftests/bpf: 8
tools/testing/selftests/bpf/bpf_testmod: 1
tools/testing/selftests/bpf/prog_tests: 3
tools/testing/selftests/bpf/progs: 4
tools/testing/selftests/cgroup: 1
tools/testing/selftests/drivers: 1
tools/testing/selftests/drivers/net: 1
tools/testing/selftests/drivers/net/bonding: 1
tools/testing/selftests/gpio: 1
tools/testing/selftests/net: 3
tools/tracing: 1
tools/tracing/rtla: 1
tools/tracing/rtla/sample: 1
tools/tracing/rtla/src: 1
tools/workqueue: 1
virt: 2
virt/kvm: 2
^ permalink raw reply [relevance 1%]
* Re: [PATCH] vfs: move dentry shrinking outside the inode lock in 'rmdir()'
@ 2024-05-11 18:42 4% ` Linus Torvalds
0 siblings, 0 replies; 200+ results
From: Linus Torvalds @ 2024-05-11 18:42 UTC (permalink / raw)
To: torvalds
Cc: brauner, jack, laoar.shao, linux-fsdevel, longman, viro, walters,
wangkai86, willy
On Sat, 11 May 2024 at 11:29, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> Reorganize the code trivially to just have a separate success path,
> which simplifies the code (since 'd_delete_notify()' is only called in
> the success path anyway) and makes it trivial to just move the dentry
> shrinking outside the inode lock.
Bah.
I think this might need more work.
The *caller* of vfs_rmdir() also holds a lock, ie we have do_rmdir() doing
inode_lock_nested(path.dentry->d_inode, I_MUTEX_PARENT);
dentry = lookup_one_qstr_excl(&last, path.dentry, lookup_flags);
...
error = vfs_rmdir(mnt_idmap(path.mnt), path.dentry->d_inode, dentry);
dput(dentry);
inode_unlock(path.dentry->d_inode);
so we have another level of locking going on, and my patch only moved
the dcache pruning outside the lock of the directory we're removing
(not outside the lock of the directory that contains the removed
directory).
And that outside lock is the much more important one, I bet.
So I still think this approach may be the right one, but that patch of
mine didn't go far enough.
Sadly, while do_rmdir() itself is trivial to fix up to do this, we
have several other users of vfs_rmdir() (ecryptfs, devtmpfs, overlayfs
in addition to nfsd and ksmbd), so the more complete patch would be
noticeably bigger.
My bad.
Linus
^ permalink raw reply [relevance 4%]
* Lots of testing progress with ksmbd
@ 2024-05-11 17:32 9% Steve French
0 siblings, 0 replies; 200+ results
From: Steve French @ 2024-05-11 17:32 UTC (permalink / raw)
To: Namjae Jeon, CIFS
Great news. We are now regularly running almost double the number of
functional and regression tests against ksmbd (now up to 275) that we
were running last year:
http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/10
Lots of ksmbd and client fixes, and improved test configs. We also
have increased the number we run against Samba (especially with
vfs_btrfs which supports the most SMB3.1.1 features) by a lot. Very
exciting.
--
Thanks,
Steve
^ permalink raw reply [relevance 9%]
* [syzbot] [lsm?] WARNING in collect_domain_accesses
@ 2024-05-10 13:28 3% syzbot
0 siblings, 0 replies; 200+ results
From: syzbot @ 2024-05-10 13:28 UTC (permalink / raw)
To: gnoack3000, jmorris, linux-kernel, linux-security-module, llvm,
mic, nathan, ndesaulniers, paul, serge, syzkaller-bugs, trix
Hello,
syzbot found the following issue on:
HEAD commit: 45db3ab70092 Merge tag '6.9-rc7-ksmbd-fixes' of git://git...
git tree: upstream
console+strace: https://syzkaller.appspot.com/x/log.txt?x=13b36604980000
kernel config: https://syzkaller.appspot.com/x/.config?x=6d14c12b661fb43
dashboard link: https://syzkaller.appspot.com/bug?extid=bf4903dc7e12b18ebc87
compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=100235b8980000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=10d57c5c980000
Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/580d5c8a46be/disk-45db3ab7.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/9f8c7366d3dc/vmlinux-45db3ab7.xz
kernel image: https://storage.googleapis.com/syzbot-assets/3207c810f03e/bzImage-45db3ab7.xz
The issue was bisected to:
commit 55e55920bbe3ccf516022c51f5527e7d026b8f1d
Author: Mickaël Salaün <mic@digikod.net>
Date: Wed Aug 31 20:38:40 2022 +0000
landlock: Fix file reparenting without explicit LANDLOCK_ACCESS_FS_REFER
bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=109badd4980000
final oops: https://syzkaller.appspot.com/x/report.txt?x=129badd4980000
console output: https://syzkaller.appspot.com/x/log.txt?x=149badd4980000
IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+bf4903dc7e12b18ebc87@syzkaller.appspotmail.com
Fixes: 55e55920bbe3 ("landlock: Fix file reparenting without explicit LANDLOCK_ACCESS_FS_REFER")
------------[ cut here ]------------
WARNING: CPU: 0 PID: 5081 at security/landlock/fs.c:880 collect_domain_accesses+0x251/0x2b0 security/landlock/fs.c:880
Modules linked in:
CPU: 0 PID: 5081 Comm: syz-executor216 Not tainted 6.9.0-rc7-syzkaller-00056-g45db3ab70092 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024
RIP: 0010:collect_domain_accesses+0x251/0x2b0 security/landlock/fs.c:880
Code: e8 b4 e0 a1 fd eb 08 e8 bd c2 25 fd 40 b5 01 89 e8 48 83 c4 08 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc e8 a0 c2 25 fd 90 <0f> 0b 90 31 ed 49 89 df eb c9 e8 90 c2 25 fd 90 0f 0b 90 eb cd 44
RSP: 0018:ffffc900035f7ba0 EFLAGS: 00010293
RAX: ffffffff847045e0 RBX: ffff88801d6be178 RCX: ffff88801fc28000
RDX: 0000000000000000 RSI: 0000000000003fff RDI: ffff88801d6be1c8
RBP: 0000000000000000 R08: ffffffff846fccdb R09: 1ffffffff1f51f15
R10: dffffc0000000000 R11: fffffbfff1f51f16 R12: ffffc900035f7c80
R13: 0000000000003fff R14: ffff88807f4542f0 R15: ffff88801d6be178
FS: 000055555cfaa380(0000) GS:ffff8880b9400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 000000000066c7e0 CR3: 000000002c1b4000 CR4: 00000000003506f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
current_check_refer_path+0x9b6/0xe70 security/landlock/fs.c:1001
security_path_link+0xc5/0x120 security/security.c:1894
do_linkat+0x2db/0x760 fs/namei.c:4673
__do_sys_linkat fs/namei.c:4704 [inline]
__se_sys_linkat fs/namei.c:4701 [inline]
__x64_sys_linkat+0xdd/0xf0 fs/namei.c:4701
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7eff2d2bb329
Code: 48 83 c4 28 c3 e8 37 17 00 00 0f 1f 80 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007fff0aacff18 EFLAGS: 00000246 ORIG_RAX: 0000000000000109
RAX: ffffffffffffffda RBX: 00007fff0aad00e8 RCX: 00007eff2d2bb329
RDX: 00000000ffffff9c RSI: 0000000020000000 RDI: 00000000ffffff9c
RBP: 00007eff2d32e610 R08: 0000000000000000 R09: 00007fff0aad00e8
R10: 0000000020000700 R11: 0000000000000246 R12: 0000000000000001
R13: 00007fff0aad00d8 R14: 0000000000000001 R15: 0000000000000001
</TASK>
---
This report is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller@googlegroups.com.
syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
For information about bisection process see: https://goo.gl/tpsmEJ#bisection
If the report is already addressed, let syzbot know by replying with:
#syz fix: exact-commit-title
If you want syzbot to run the reproducer, reply with:
#syz test: git://repo/address.git branch-or-commit-hash
If you attach or paste a git patch, syzbot will apply it before testing.
If you want to overwrite report's subsystems, reply with:
#syz set subsystems: new-subsystem
(See the list of subsystem names on the web dashboard)
If the report is a duplicate of another one, reply with:
#syz dup: exact-subject-of-another-report
If you want to undo deduplication, reply with:
#syz undup
^ permalink raw reply [relevance 3%]
* [syzbot] [bcachefs?] KMSAN: uninit-value in bch2_checksum_update
@ 2024-05-10 8:45 3% syzbot
0 siblings, 0 replies; 200+ results
From: syzbot @ 2024-05-10 8:45 UTC (permalink / raw)
To: bfoster, kent.overstreet, linux-bcachefs, linux-kernel, syzkaller-bugs
Hello,
syzbot found the following issue on:
HEAD commit: 45db3ab70092 Merge tag '6.9-rc7-ksmbd-fixes' of git://git...
git tree: upstream
console output: https://syzkaller.appspot.com/x/log.txt?x=12bc7d04980000
kernel config: https://syzkaller.appspot.com/x/.config?x=617171361dd3cd47
dashboard link: https://syzkaller.appspot.com/bug?extid=8d0e17030490d2299222
compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=14b58970980000
Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/232e7c2a73a5/disk-45db3ab7.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/7e9bf7c936ab/vmlinux-45db3ab7.xz
kernel image: https://storage.googleapis.com/syzbot-assets/5e8f98ee02d8/bzImage-45db3ab7.xz
mounted in repro: https://storage.googleapis.com/syzbot-assets/3f122e1fb69e/mount_2.gz
IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+8d0e17030490d2299222@syzkaller.appspotmail.com
=====================================================
BUG: KMSAN: uninit-value in crc64_be+0x202/0x310 lib/crc64.c:59
crc64_be+0x202/0x310 lib/crc64.c:59
bch2_checksum_update+0x15e/0x1d0 fs/bcachefs/checksum.c:87
bch2_checksum+0x3c5/0x7c0 fs/bcachefs/checksum.c:216
__bch2_btree_node_write+0x528c/0x67c0 fs/bcachefs/btree_io.c:2151
bch2_btree_node_write+0xa5/0x2e0 fs/bcachefs/btree_io.c:2288
btree_node_write_if_need fs/bcachefs/btree_io.h:153 [inline]
btree_update_nodes_written fs/bcachefs/btree_update_interior.c:829 [inline]
btree_interior_update_work+0x3e09/0x47f0 fs/bcachefs/btree_update_interior.c:857
process_one_work kernel/workqueue.c:3267 [inline]
process_scheduled_works+0xa81/0x1bd0 kernel/workqueue.c:3348
worker_thread+0xea5/0x1560 kernel/workqueue.c:3429
kthread+0x3e2/0x540 kernel/kthread.c:388
ret_from_fork+0x6d/0x90 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
Uninit was stored to memory at:
memcpy_u64s_small fs/bcachefs/util.h:511 [inline]
bkey_p_copy fs/bcachefs/bkey.h:46 [inline]
bch2_sort_keys+0x1b4d/0x2cb0 fs/bcachefs/bkey_sort.c:194
__bch2_btree_node_write+0x3acd/0x67c0 fs/bcachefs/btree_io.c:2100
bch2_btree_node_write+0xa5/0x2e0 fs/bcachefs/btree_io.c:2288
btree_node_write_if_need fs/bcachefs/btree_io.h:153 [inline]
btree_update_nodes_written fs/bcachefs/btree_update_interior.c:829 [inline]
btree_interior_update_work+0x3e09/0x47f0 fs/bcachefs/btree_update_interior.c:857
process_one_work kernel/workqueue.c:3267 [inline]
process_scheduled_works+0xa81/0x1bd0 kernel/workqueue.c:3348
worker_thread+0xea5/0x1560 kernel/workqueue.c:3429
kthread+0x3e2/0x540 kernel/kthread.c:388
ret_from_fork+0x6d/0x90 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
Uninit was created at:
__kmalloc_large_node+0x231/0x370 mm/slub.c:3927
__do_kmalloc_node mm/slub.c:3960 [inline]
__kmalloc_node+0xb10/0x10c0 mm/slub.c:3979
kmalloc_node include/linux/slab.h:648 [inline]
kvmalloc_node+0xc0/0x2d0 mm/util.c:634
kvmalloc include/linux/slab.h:766 [inline]
btree_node_data_alloc fs/bcachefs/btree_cache.c:98 [inline]
__bch2_btree_node_mem_alloc+0x2cf/0x9d0 fs/bcachefs/btree_cache.c:143
bch2_fs_btree_cache_init+0x4d1/0x960 fs/bcachefs/btree_cache.c:479
bch2_fs_alloc+0x33ca/0x4210 fs/bcachefs/super.c:923
bch2_fs_open+0xd9b/0x15f0 fs/bcachefs/super.c:2084
bch2_mount+0x90d/0x1d90 fs/bcachefs/fs.c:1903
legacy_get_tree+0x114/0x290 fs/fs_context.c:662
vfs_get_tree+0xa7/0x570 fs/super.c:1779
do_new_mount+0x71f/0x15e0 fs/namespace.c:3352
path_mount+0x742/0x1f20 fs/namespace.c:3679
do_mount fs/namespace.c:3692 [inline]
__do_sys_mount fs/namespace.c:3898 [inline]
__se_sys_mount+0x725/0x810 fs/namespace.c:3875
__x64_sys_mount+0xe4/0x150 fs/namespace.c:3875
x64_sys_call+0x2bf4/0x3b50 arch/x86/include/generated/asm/syscalls_64.h:166
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xcf/0x1e0 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
CPU: 1 PID: 3712 Comm: kworker/u8:21 Not tainted 6.9.0-rc7-syzkaller-00056-g45db3ab70092 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024
Workqueue: btree_update btree_interior_update_work
=====================================================
---
This report is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller@googlegroups.com.
syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
If the report is already addressed, let syzbot know by replying with:
#syz fix: exact-commit-title
If you want syzbot to run the reproducer, reply with:
#syz test: git://repo/address.git branch-or-commit-hash
If you attach or paste a git patch, syzbot will apply it before testing.
If you want to overwrite report's subsystems, reply with:
#syz set subsystems: new-subsystem
(See the list of subsystem names on the web dashboard)
If the report is a duplicate of another one, reply with:
#syz dup: exact-subject-of-another-report
If you want to undo deduplication, reply with:
#syz undup
^ permalink raw reply [relevance 3%]
* linux-next: Tree for May 10
@ 2024-05-10 7:28 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-10 7:28 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 41148 bytes --]
Hi all,
Note: I had to repush the tree today, so if you fetched it immediately
after the first push, you should probably refetch it.
Changes since 20240509:
The mm tree gained a conflict against Linus' tree.
The sound-asoc tree gained a build failure for which I revreted a commit.
The block tree gained a conflict and a semantic conflict against the
vfs tree.
The gpio-brgl tree gained a conflict against the gpio-brgl-fixes tree.
The bitmap tree lost its build failure.
The refactor-heap tree still had its conflicts against the block tree
for which I dropped the refator-heap tree.
Non-merge commits (relative to Linus' tree): 11262
11317 files changed, 750731 insertions(+), 276886 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (448b3fe5a0ea Merge tag 'hwmon-for-v6.9-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (79d1d116e294 mailmap: add entry for Barry Song)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (5549d1e39989 Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (7bbe449d0bdb s390/paes: Reestablish retry loop in paes)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (8c3b7565f81e Merge tag 'net-6.9-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf/master (3e9bc0472b91 Merge branch 'bpf: Add BPF_PROG_TYPE_CGROUP_SKB attach type enforcement in BPF_LINK_CREATE')
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging ipvs/main (8a2e4d37afb8 s390/qeth: Fix kernel panic after setting hsuid)
Merging wireless/for-next (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (fdb3f29dfe0d ALSA: hda/realtek: Fix build error without CONFIG_PM)
Merging sound-asoc-fixes/for-linus (6490bec6d5bf ASoC: Intel: avs: boards: Properly name input device)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (d1ef160b45a0 regulator: rtq2208: Fix the BUCK ramp_delay range to maximum of 16mVstep/us)
Merging spi-fixes/for-linus (ef13561d2b16 spi: microchip-core-qspi: fix setting spi bus clock rate)
Merging pci-current/for-linus (f3d049b35b01 PCI/ASPM: Restore parent state to parent, child state to child)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler)
Merging usb.current/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (bb198e29fe75 iio: dac: ad5592r: fix temperature channel scaling value)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (008ab3c53bc4 speakup: Fix sizeof() vs ARRAY_SIZE() bug)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (dd5a440a31fa Linux 6.9-rc7)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (0a9c28bec202 Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (26e8383b116d hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (cbf613cd4d3c Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (515a3c3a5489 platform/x86: ISST: Add Grand Ridge to HPM CPU list)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so)
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (dd5a440a31fa Linux 6.9-rc7)
Merging drm-intel-fixes/for-linux-next-fixes (43b26bdd2ee5 drm/i915/bios: Fix parsing backlight BDB data)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (02f6b0e1ec7e gpiolib: cdev: Fix use after free in lineinfo_changed_notify)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (55750148e559 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe())
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (6897204ea3df drm/connector: Add
Merging mm-stable/mm-stable (447bac3d292f thp: remove HPAGE_PMD_ORDER minimum assertion)
Merging mm-nonmm-stable/mm-nonmm-stable (8fcb916cac89 kernel/watchdog_perf.c: tidy up kerneldoc)
Merging mm/mm-everything (2054bf8aca3f foo)
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h
Merging kbuild/for-next (dfff05cc1005 kconfig: use menu_list_for_each_sym() in sym_check_choice_deps())
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (187c219b57ea perf dwarf-aux: Print array type name with "[]")
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a6016aac5252 dma: fix DMA sync for drivers not calling dma_set_mask*())
Merging asm-generic/master (02af68767d27 Merge branch 'alpha-cleanup-6.9' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (b7e329ac0464 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (54e1a2aa61a7 Merge branch 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support)
Merging arm-soc/for-next (9fee410d765a Merge branch 'soc/dt-late' into for-next)
Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (4cece7649650 Linux 6.9-rc1)
Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (7468eb6710ce Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-clk/next' into for-next)
Merging samsung-krzk/for-next (a9c32618cd2a Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (3bdc4c661d47 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (429fe5372451 Merge branch 'clk-microchip' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (7b7e584f90bf LoongArch: KVM: Add mmio trace events support)
Merging m68k/for-next (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging m68knommu/for-next (a5044ce7d1d9 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (487fa28fa8b6 parisc: Define sigset_t in parisc uapi header)
Merging powerpc/next (98ec6d38ee57 selftests/powerpc/dexcr: Fix spelling mistake "predicition" -> "prediction")
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree())
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
CONFLICT (content): Merge conflict in arch/riscv/Makefile
CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
CONFLICT (content): Merge conflict in kernel/sys.c
Merging riscv-dt/riscv-dt-for-next (1c80d50bb697 riscv: dts: microchip: add pac1934 power-monitor to icicle)
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (a1bca25da366 Merge branch 'features' into for-next)
Merging sh/for-next (21b8651502d5 sh: boot: Add proper forward declarations)
Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask var)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (07f9a27f1969 bcachefs: add no_invalid_checks flag)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (55b52af44d50 Merge branch 'for-next-next-v6.9-20240508' into for-next-20240508)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (ae4f73e84cb1 smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (7c35de4df105 erofs: Zstandard compression support)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (82172cca18b2 Merge isofs Makefile cleanup.)
Merging ext4/dev (dc1c4663bc49 ext4: propagate errors from ext4_sb_bread() in ext4_xattr_block_cache_find())
Merging f2fs/dev (3763f9effcdc f2fs: use helper to print zone condition)
Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning)
Merging fuse/for-next (9fe2a036a23c fuse: Add initial support for fs-verity)
Merging gfs2/for-next (c1c53c26e338 gfs2: make timeout values more explicit)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (0d09b911e818 ksmbd: avoid to send duplicate oplock break notifications)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (8d915bbf3926 NFSD: Force all NFSv4.2 COPY requests to be synchronous)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access)
Merging overlayfs/overlayfs-next (096802748ea1 ovl: remove upper umask handling from ovl_create_upper())
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (f5e217b1e5dc Merge branch 'vfs.super' into vfs.all)
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in fs/ext4/file.c
CONFLICT (content): Merge conflict in fs/tracefs/inode.c
Merging vfs/for-next (4faeedb807f8 Merge branch 'work.bd_inode' into for-next)
Merging printk/for-next (596ffa476e20 Merge branch 'for-6.10' into for-next)
Merging pci/next (484af35f7e65 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (14ee3d12f37b Merge branch 'for-6.10/hid-bpf' into for-next)
Merging i2c/i2c/for-next (20e70be866cc Merge branch 'i2c/for-current' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE())
Merging i3c/i3c/next (acec16dbb338 i3c: dw: Add hot-join support.)
Merging dmi/dmi-for-next (7d5019435585 firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (2fa365974c3e hwmon: Drop explicit initialization of struct i2c_device_id::driver_data to 0 (part 2))
Merging jc_docs/docs-next (955e15969c1d Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (4a7d735191de media: dw2102: fix coding style issues)
Merging v4l-dvb-next/master (48259b909737 media: media: intel/ipu6: Fix spelling mistake "remappinp" -> "remapping")
Merging pm/linux-next (15a871c024c3 Merge branch 'pm-devfreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (ccad360a2d41 PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions)
Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (734b5def91b5 thermal/drivers/loongson2: Add Loongson-2K2000 support)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (2b8af5001abd RDMA/efa: Support QP with unsolicited write w/ imm. receive)
Merging net-next/main (60e0f986e89f selftest: epoll_busy_poll: epoll busy poll tests)
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/Makefile
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in net/core/page_pool.c
Merging bpf-next/for-next (fcd1ed89a043 kbuild,bpf: Switch to using --btf_features for pahole v1.26 and later)
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (1f1dda1caac5 Bluetooth: btintel: Fix compiler warning for multi_v7_defconfig config)
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.c
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.h
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
Merging wireless-next/for-next (1d60eabb8269 wifi: mwl8k: initialize cmd->addr[] properly)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (6117af863659 crypto: hisilicon/sec2 - fix for register offset)
Merging drm/drm-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
Merging drm-exynos/for-linux-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging drm-misc/for-linux-next (713a75079f37 drm: xlnx: zynqmp_dpsub: Fix compilation error)
Merging amdgpu/drm-next (10f624ef239b drm/amdkfd: Reconcile the definition and use of oem_id in struct kfd_topology_device)
Merging drm-intel/for-linux-next (6907d4fa5eca drm/xe: Nuke xe's copy of intel_fbdev_fb.h)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vbt_defs.h
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (b587f413ca47 drm/msm/gen_header: allow skipping the validation)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Makefile
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (c3203ca3b8a6 drm/xe: Rename few xe_args.h macros)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (9b1fe0510494 regmap: Reorder fields in 'struct regmap_config' to save some memory)
Merging sound/for-next (ea89a742daf4 ALSA/ASoC: include: clarify Copyright information)
Merging ieee1394/for-next (21151fd8f0ea firewire: obsolete usage of *-objs in Makefile for KUnit test)
Merging sound-asoc/for-next (6bbedd883ce4 Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (da3fe9d0be5b bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (5128de84d8fc Input: cros_ec_keyb - remove an unused field in struct cros_ec_keyb)
Merging block/for-next (d7c9295b12e2 Merge branch 'for-6.10/block' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
CONFLICT (content): Merge conflict in block/ioctl.c
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Applying: fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flags"
Merging device-mapper/for-next (8b21ac87d550 dm-delay: remove timer_lock)
Merging libata/for-next (d4a89339f17c ata: pata_legacy: make legacy_exit() work again)
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs)
Merging mfd/for-mfd-next (7fcb2977c0b5 dt-bindings: mfd: Convert lp873x.txt to json-schema)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (4da294108e38 backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (fd980b3c2af5 Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (dd80c7465029 MAINTAINERS: repair file entry in SECURITY SUBSYSTEM)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (a0b6d1c424c7 Documentation: tpm: Add TPM security docs toctree entry)
Merging watchdog/master (413bf4e857fd watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in sa1100dog_probe())
Merging iommu/next (36bb003ed686 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (49e9d01f669e dt-bindings: Use full path to other schemas)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (bf37a0c1cd50 Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (c064e5cb8336 Merge branch into tip/master: 'x86/timers')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (ab80b31cd7b2 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (2604e6c504cc Merge branches 'cmpxchg.2024.05.01a', 'kcsan.2024.05.07a', 'lkmm.2024.05.06a', 'rcu-merge.2024.05.01a' and 'tsc.2024.04.09c' into HEAD)
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kvm/next (40269c03fdbf KVM: x86: Explicitly zero kvm_caps during vendor module load)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Applying: fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code"
Merging kvm-arm/next (eaa46a28d596 Merge branch kvm-arm64/mpidr-reset into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (b52e8cd3f835 KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info())
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/aarch64/psci_test.c
Merging xen-tip/linux-next (802600ebdf23 x86/xen: return a sane initial apic id when running as PV guest)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (76f09e22027f platform/x86: ISST: Support SST-BF and SST-TF per level)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (880a746fa3ea device property: Fix a typo in the description of device_get_child_node_count())
Merging usb/usb-next (a2cf936ebef2 usb: gadget: u_audio: Clear uac pointer when freed.)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/core.c
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (6bd23e0c2bb6 tty: add the option to have a tty reject a new ldisc)
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (336d8cd99405 Merge tag 'extcon-next-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next)
Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x)
Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property)
Merging extcon/extcon-next (3e8e45b65d9f extcon: adc-jack: Document missing struct members)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (f6944d4a0b87 vfio/pci: Collect hot-reset devices to local buffer)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (4cece7649650 Linux 6.9-rc1)
Merging staging/staging-next (eb563dc752d3 staging: pi433: Remove unused driver)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (28059ddbee0e MAINTAINERS: Update role for IDXD driver)
Merging cgroup/for-next (8f6d24a5db2a selftests/cgroup: fix uninitialized variables in test_zswap.c)
Merging scsi/for-next (9bfaa1936169 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (40ae6a1ee5fd Merge patch series "Update lpfc to revision 14.4.0.2")
Merging vhost/linux-next (88199634e516 vduse: enable Virtio-net device type)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (c8d8f841e95b Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (7f45fe2ea3b8 gpio: nuvoton: Fix sgpio irq handle error)
CONFLICT (content): Merge conflict in drivers/gpio/gpiolib.h
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (9429f847dd72 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (4817118f257e pwm: pca9685: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (2c3b8f8f37c6 selftests/sgx: Include KHDR_INCLUDES in Makefile)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (5496b9b77d74 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (73a98bc5a947 Merge branch 'for-6.10' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (e406737b1110 seccomp: Constify sysctl subhelpers)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (4cece7649650 Linux 6.9-rc1)
Merging nvmem/for-next (4cece7649650 Linux 6.9-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (ba3d5b5d07d6 Merge branch 'fix-vfork-test-next' into landlock-next)
Merging rust/rust-next (97ab3e8eec0c rust: alloc: fix dangling pointer in VecExt<T>::reserve())
CONFLICT (content): Merge conflict in rust/Makefile
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (4bbf9c3b53e6 fs/coredump: Enable dynamic configuration of max file note size)
Merging bitmap/bitmap-for-next (c3052c2f53d3 usercopy: Don't use "proxy" headers)
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (6d305cbef1aa uapi: stddef.h: Provide UAPI macros for __counted_by_{le, be})
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (788c1bf8de9f tools/power turbostat: version 2024.05.07)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.c
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.h
CONFLICT (content): Merge conflict in drivers/md/bcache/btree.c
CONFLICT (content): Merge conflict in drivers/md/bcache/writeback.c
$ git merge --abort
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Applying: Revert "ASoC: SOF: Use *-y instead of *-objs in Makefile"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Re: [syzbot] [bcachefs?] kernel BUG in __journal_res_get
@ 2024-05-10 5:08 4% ` syzbot
0 siblings, 0 replies; 200+ results
From: syzbot @ 2024-05-10 5:08 UTC (permalink / raw)
To: bfoster, kent.overstreet, linux-bcachefs, linux-kernel, syzkaller-bugs
syzbot has bisected this issue to:
commit 2d02bfb01b2743da06748ba396ff7da4425488ef
Author: Kent Overstreet <kent.overstreet@linux.dev>
Date: Fri Jan 5 19:17:57 2024 +0000
bcachefs: improve validate_bset_keys()
bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=1232e998980000
start commit: 45db3ab70092 Merge tag '6.9-rc7-ksmbd-fixes' of git://git...
git tree: upstream
final oops: https://syzkaller.appspot.com/x/report.txt?x=1132e998980000
console output: https://syzkaller.appspot.com/x/log.txt?x=1632e998980000
kernel config: https://syzkaller.appspot.com/x/.config?x=9d7ea7de0cb32587
dashboard link: https://syzkaller.appspot.com/bug?extid=c60cd352aedb109528bf
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=15b795a8980000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=17592c00980000
Reported-by: syzbot+c60cd352aedb109528bf@syzkaller.appspotmail.com
Fixes: 2d02bfb01b27 ("bcachefs: improve validate_bset_keys()")
For information about bisection process see: https://goo.gl/tpsmEJ#bisection
^ permalink raw reply [relevance 4%]
* Re: [syzbot] [crypto?] KMSAN: uninit-value in aes_encrypt (5)
@ 2024-05-10 4:02 3% ` syzbot
0 siblings, 0 replies; 200+ results
From: syzbot @ 2024-05-10 4:02 UTC (permalink / raw)
To: davem, herbert, linux-crypto, linux-kernel, syzkaller-bugs
syzbot has found a reproducer for the following issue on:
HEAD commit: 45db3ab70092 Merge tag '6.9-rc7-ksmbd-fixes' of git://git...
git tree: upstream
console+strace: https://syzkaller.appspot.com/x/log.txt?x=14d9bfdf180000
kernel config: https://syzkaller.appspot.com/x/.config?x=617171361dd3cd47
dashboard link: https://syzkaller.appspot.com/bug?extid=aeb14e2539ffb6d21130
compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1617adb8980000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=112f45d4980000
Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/232e7c2a73a5/disk-45db3ab7.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/7e9bf7c936ab/vmlinux-45db3ab7.xz
kernel image: https://storage.googleapis.com/syzbot-assets/5e8f98ee02d8/bzImage-45db3ab7.xz
mounted in repro: https://storage.googleapis.com/syzbot-assets/fcc88c919ed9/mount_1.gz
IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+aeb14e2539ffb6d21130@syzkaller.appspotmail.com
fscrypt: AES-256-XTS using implementation "xts(ecb(aes-fixed-time))"
=====================================================
BUG: KMSAN: uninit-value in subshift lib/crypto/aes.c:149 [inline]
BUG: KMSAN: uninit-value in aes_encrypt+0x15cc/0x1db0 lib/crypto/aes.c:282
subshift lib/crypto/aes.c:149 [inline]
aes_encrypt+0x15cc/0x1db0 lib/crypto/aes.c:282
aesti_encrypt+0x7d/0xf0 crypto/aes_ti.c:31
crypto_ecb_crypt crypto/ecb.c:23 [inline]
crypto_ecb_encrypt2+0x18a/0x300 crypto/ecb.c:40
crypto_lskcipher_crypt_sg+0x36b/0x7f0 crypto/lskcipher.c:228
crypto_lskcipher_encrypt_sg+0x8a/0xc0 crypto/lskcipher.c:247
crypto_skcipher_encrypt+0x119/0x1e0 crypto/skcipher.c:669
xts_encrypt+0x3c4/0x550 crypto/xts.c:269
crypto_skcipher_encrypt+0x1a0/0x1e0 crypto/skcipher.c:671
fscrypt_crypt_data_unit+0x4ee/0x8f0 fs/crypto/crypto.c:144
fscrypt_encrypt_pagecache_blocks+0x422/0x900 fs/crypto/crypto.c:207
ext4_bio_write_folio+0x13db/0x2e40 fs/ext4/page-io.c:526
mpage_submit_folio+0x351/0x4a0 fs/ext4/inode.c:1869
mpage_process_page_bufs+0xb92/0xe30 fs/ext4/inode.c:1982
mpage_prepare_extent_to_map+0x1702/0x22c0 fs/ext4/inode.c:2490
ext4_do_writepages+0x1117/0x62e0 fs/ext4/inode.c:2632
ext4_writepages+0x312/0x830 fs/ext4/inode.c:2768
do_writepages+0x427/0xc30 mm/page-writeback.c:2612
filemap_fdatawrite_wbc+0x1d8/0x270 mm/filemap.c:397
__filemap_fdatawrite_range mm/filemap.c:430 [inline]
file_write_and_wait_range+0x1bf/0x370 mm/filemap.c:788
generic_buffers_fsync_noflush+0x84/0x3e0 fs/buffer.c:602
ext4_fsync_nojournal fs/ext4/fsync.c:88 [inline]
ext4_sync_file+0x5ba/0x13a0 fs/ext4/fsync.c:151
vfs_fsync_range+0x20d/0x270 fs/sync.c:188
generic_write_sync include/linux/fs.h:2795 [inline]
ext4_buffered_write_iter+0x9ad/0xaa0 fs/ext4/file.c:305
ext4_file_write_iter+0x208/0x3450
call_write_iter include/linux/fs.h:2110 [inline]
new_sync_write fs/read_write.c:497 [inline]
vfs_write+0xb63/0x1520 fs/read_write.c:590
ksys_write+0x20f/0x4c0 fs/read_write.c:643
__do_sys_write fs/read_write.c:655 [inline]
__se_sys_write fs/read_write.c:652 [inline]
__x64_sys_write+0x93/0xe0 fs/read_write.c:652
x64_sys_call+0x3062/0x3b50 arch/x86/include/generated/asm/syscalls_64.h:2
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xcf/0x1e0 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
Uninit was stored to memory at:
le128_xor include/crypto/b128ops.h:69 [inline]
xts_xor_tweak+0x4ae/0xbf0 crypto/xts.c:123
xts_xor_tweak_pre crypto/xts.c:135 [inline]
xts_encrypt+0x296/0x550 crypto/xts.c:268
crypto_skcipher_encrypt+0x1a0/0x1e0 crypto/skcipher.c:671
fscrypt_crypt_data_unit+0x4ee/0x8f0 fs/crypto/crypto.c:144
fscrypt_encrypt_pagecache_blocks+0x422/0x900 fs/crypto/crypto.c:207
ext4_bio_write_folio+0x13db/0x2e40 fs/ext4/page-io.c:526
mpage_submit_folio+0x351/0x4a0 fs/ext4/inode.c:1869
mpage_process_page_bufs+0xb92/0xe30 fs/ext4/inode.c:1982
mpage_prepare_extent_to_map+0x1702/0x22c0 fs/ext4/inode.c:2490
ext4_do_writepages+0x1117/0x62e0 fs/ext4/inode.c:2632
ext4_writepages+0x312/0x830 fs/ext4/inode.c:2768
do_writepages+0x427/0xc30 mm/page-writeback.c:2612
filemap_fdatawrite_wbc+0x1d8/0x270 mm/filemap.c:397
__filemap_fdatawrite_range mm/filemap.c:430 [inline]
file_write_and_wait_range+0x1bf/0x370 mm/filemap.c:788
generic_buffers_fsync_noflush+0x84/0x3e0 fs/buffer.c:602
ext4_fsync_nojournal fs/ext4/fsync.c:88 [inline]
ext4_sync_file+0x5ba/0x13a0 fs/ext4/fsync.c:151
vfs_fsync_range+0x20d/0x270 fs/sync.c:188
generic_write_sync include/linux/fs.h:2795 [inline]
ext4_buffered_write_iter+0x9ad/0xaa0 fs/ext4/file.c:305
ext4_file_write_iter+0x208/0x3450
call_write_iter include/linux/fs.h:2110 [inline]
new_sync_write fs/read_write.c:497 [inline]
vfs_write+0xb63/0x1520 fs/read_write.c:590
ksys_write+0x20f/0x4c0 fs/read_write.c:643
__do_sys_write fs/read_write.c:655 [inline]
__se_sys_write fs/read_write.c:652 [inline]
__x64_sys_write+0x93/0xe0 fs/read_write.c:652
x64_sys_call+0x3062/0x3b50 arch/x86/include/generated/asm/syscalls_64.h:2
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xcf/0x1e0 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
Uninit was created at:
__alloc_pages+0x9d6/0xe70 mm/page_alloc.c:4598
alloc_pages_mpol+0x299/0x990 mm/mempolicy.c:2264
alloc_pages mm/mempolicy.c:2335 [inline]
folio_alloc+0x1d0/0x230 mm/mempolicy.c:2342
filemap_alloc_folio+0xa6/0x440 mm/filemap.c:984
__filemap_get_folio+0xa10/0x14b0 mm/filemap.c:1926
ext4_write_begin+0x3e5/0x2230 fs/ext4/inode.c:1159
generic_perform_write+0x400/0xc60 mm/filemap.c:3974
ext4_buffered_write_iter+0x564/0xaa0 fs/ext4/file.c:299
ext4_file_write_iter+0x208/0x3450
call_write_iter include/linux/fs.h:2110 [inline]
new_sync_write fs/read_write.c:497 [inline]
vfs_write+0xb63/0x1520 fs/read_write.c:590
ksys_write+0x20f/0x4c0 fs/read_write.c:643
__do_sys_write fs/read_write.c:655 [inline]
__se_sys_write fs/read_write.c:652 [inline]
__x64_sys_write+0x93/0xe0 fs/read_write.c:652
x64_sys_call+0x3062/0x3b50 arch/x86/include/generated/asm/syscalls_64.h:2
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xcf/0x1e0 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
CPU: 0 PID: 5048 Comm: syz-executor132 Not tainted 6.9.0-rc7-syzkaller-00056-g45db3ab70092 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024
=====================================================
---
If you want syzbot to run the reproducer, reply with:
#syz test: git://repo/address.git branch-or-commit-hash
If you attach or paste a git patch, syzbot will apply it before testing.
^ permalink raw reply [relevance 3%]
* [GIT PULL] TPM DEVICE DRIVER: tpmdd-next-6.10-rc1
@ 2024-05-09 20:04 4% Jarkko Sakkinen
0 siblings, 0 replies; 200+ results
From: Jarkko Sakkinen @ 2024-05-09 20:04 UTC (permalink / raw)
To: Linus Torvalds
Cc: Peter Huewe, Jason Gunthorpe, David Howells, keyrings,
linux-integrity, linux-kernel
The following changes since commit 45db3ab70092637967967bfd8e6144017638563c:
Merge tag '6.9-rc7-ksmbd-fixes' of git://git.samba.org/ksmbd (2024-05-08 10:39:53 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tags/tpmdd-next-6.10-rc1
for you to fetch changes up to 1d479e3cd6520085832a6b432d521eeead2691ba:
Documentation: tpm: Add TPM security docs toctree entry (2024-05-09 22:30:52 +0300)
----------------------------------------------------------------
Hi,
These are the changes for the TPM driver with a single major new
feature: TPM bus encryption and integrity protection. The key pair
on TPM side is generated from so called null random seed per power
on of the machine [1]. This supports the TPM encryption of the hard
drive by adding layer of protection against bus interposer attacks.
Other than the pull request a few minor fixes and documentation for
tpm_tis to clarify basics of TPM localities for future patch review
discussions (will be extended and refined over times, just a seed).
[1] https://lore.kernel.org/linux-integrity/20240429202811.13643-1-James.Bottomley@HansenPartnership.com/
BR, Jarkko
----------------------------------------------------------------
Ard Biesheuvel (1):
crypto: lib - implement library version of AES in CFB mode
Bagas Sanjaya (1):
Documentation: tpm: Add TPM security docs toctree entry
Colin Ian King (1):
tpm/eventlog: remove redundant assignment to variabel ret
James Bottomley (14):
tpm: Move buffer handling from static inlines to real functions
tpm: add buffer function to point to returned parameters
tpm: export the context save and load commands
tpm: Add NULL primary creation
tpm: Add TCG mandated Key Derivation Functions (KDFs)
tpm: Add HMAC session start and end functions
tpm: Add HMAC session name/handle append
tpm: Add the rest of the session HMAC API
tpm: add hmac checks to tpm2_pcr_extend()
tpm: add session encryption protection to tpm2_get_random()
KEYS: trusted: Add session encryption protection to the seal/unseal path
tpm: add the null key name as a sysfs export
Documentation: add tpm-security.rst
tpm: disable the TPM if NULL name changes
Jarkko Sakkinen (8):
Documentation: tpm_tis
tpm: Remove unused tpm_buf_tag()
tpm: Remove tpm_send()
tpm: Update struct tpm_buf documentation comments
tpm: Store the length of the tpm_buf data separately.
tpm: TPM2B formatted buffers
tpm: Add tpm_buf_read_{u8,u16,u32}
KEYS: trusted: tpm2: Use struct tpm_buf for sized buffers
Michael Haener (1):
dt-bindings: tpm: Add st,st33ktpm2xi2c
Niklas Schnelle (2):
char: tpm: handle HAS_IOPORT dependencies
char: tpm: Keep TPM_INF_IO_PORT define for HAS_IOPORT=n
.../devicetree/bindings/tpm/tcg,tpm-tis-i2c.yaml | 1 +
Documentation/security/tpm/index.rst | 2 +
Documentation/security/tpm/tpm-security.rst | 216 ++++
Documentation/security/tpm/tpm_tis.rst | 46 +
drivers/char/tpm/Kconfig | 17 +-
drivers/char/tpm/Makefile | 2 +
drivers/char/tpm/eventlog/acpi.c | 1 -
drivers/char/tpm/tpm-buf.c | 252 ++++
drivers/char/tpm/tpm-chip.c | 6 +
drivers/char/tpm/tpm-interface.c | 26 +-
drivers/char/tpm/tpm-sysfs.c | 18 +
drivers/char/tpm/tpm.h | 14 +
drivers/char/tpm/tpm2-cmd.c | 53 +-
drivers/char/tpm/tpm2-sessions.c | 1286 ++++++++++++++++++++
drivers/char/tpm/tpm2-space.c | 11 +-
drivers/char/tpm/tpm_infineon.c | 14 +-
drivers/char/tpm/tpm_tis_core.c | 19 +-
include/crypto/aes.h | 5 +
include/keys/trusted_tpm.h | 2 -
include/linux/tpm.h | 316 +++--
lib/crypto/Kconfig | 5 +
lib/crypto/Makefile | 3 +
lib/crypto/aescfb.c | 257 ++++
security/keys/trusted-keys/trusted_tpm1.c | 23 +-
security/keys/trusted-keys/trusted_tpm2.c | 136 ++-
25 files changed, 2519 insertions(+), 212 deletions(-)
create mode 100644 Documentation/security/tpm/tpm-security.rst
create mode 100644 Documentation/security/tpm/tpm_tis.rst
create mode 100644 drivers/char/tpm/tpm-buf.c
create mode 100644 drivers/char/tpm/tpm2-sessions.c
create mode 100644 lib/crypto/aescfb.c
^ permalink raw reply [relevance 4%]
* [GIT PULL] trusted keys changes for v6.10-rc1
@ 2024-05-09 15:47 5% Jarkko Sakkinen
0 siblings, 0 replies; 200+ results
From: Jarkko Sakkinen @ 2024-05-09 15:47 UTC (permalink / raw)
To: Linus Torvalds
Cc: Jarkko Sakkinen, Peter Huewe, Jason Gunthorpe, David Howells,
linux-integrity, linux-kernel, keyrings
Merge tag '6.9-rc7-ksmbd-fixes' of git://git.samba.org/ksmbd (2024-05-08 10:39:53 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tags/keys-trusted-next-6.10-rc1
for you to fetch changes up to 28c5f596ae3d1790cdc96fa5fc7370f934abfb2e:
docs: trusted-encrypted: add DCP as new trust source (2024-05-09 18:29:03 +0300)
----------------------------------------------------------------
Hi,
This is pull request for trusted keys subsystem containing a new key
type for the Data Co-Processor (DCP), which is an IP core built into
many NXP SoCs such as i.mx6ull.
BR, Jarkko
----------------------------------------------------------------
David Gstir (6):
crypto: mxs-dcp: Add support for hardware-bound keys
KEYS: trusted: improve scalability of trust source config
KEYS: trusted: Introduce NXP DCP-backed trusted keys
MAINTAINERS: add entry for DCP-based trusted keys
docs: document DCP-backed trusted keys kernel params
docs: trusted-encrypted: add DCP as new trust source
Documentation/admin-guide/kernel-parameters.txt | 13 +
Documentation/security/keys/trusted-encrypted.rst | 53 ++++
MAINTAINERS | 9 +
drivers/crypto/mxs-dcp.c | 104 ++++++-
include/keys/trusted_dcp.h | 11 +
include/soc/fsl/dcp.h | 20 ++
security/keys/trusted-keys/Kconfig | 18 +-
security/keys/trusted-keys/Makefile | 2 +
security/keys/trusted-keys/trusted_core.c | 6 +-
security/keys/trusted-keys/trusted_dcp.c | 332 ++++++++++++++++++++++
10 files changed, 554 insertions(+), 14 deletions(-)
create mode 100644 include/keys/trusted_dcp.h
create mode 100644 include/soc/fsl/dcp.h
create mode 100644 security/keys/trusted-keys/trusted_dcp.c
^ permalink raw reply [relevance 5%]
* [GIT PULL] keys changes for v6.10-rc1
@ 2024-05-09 14:25 5% Jarkko Sakkinen
0 siblings, 0 replies; 200+ results
From: Jarkko Sakkinen @ 2024-05-09 14:25 UTC (permalink / raw)
To: Linus Torvalds
Cc: Jarkko Sakkinen, Peter Huewe, Jason Gunthorpe, David Howells,
linux-integrity, linux-kernel, keyrings
Merge tag '6.9-rc7-ksmbd-fixes' of git://git.samba.org/ksmbd (2024-05-08 10:39:53 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tags/keys-next-6.10-rc1
for you to fetch changes up to 9da27fb65a14c18efd4473e2e82b76b53ba60252:
keys: Fix overwrite of key expiration on instantiation (2024-05-09 16:28:58 +0300)
----------------------------------------------------------------
Hi
2nd trial of the earlier PR with more appropriate tag:
1. Do no overwrite the key expiration once it is set.
2. Early to quota updates for keys to key_put(), instead of
updating them in key_gc_unused_keys().
[1] Earlier PR:
https://lore.kernel.org/linux-integrity/20240326143838.15076-1-jarkko@kernel.org/
BR, Jarkko
----------------------------------------------------------------
Luis Henriques (1):
keys: update key quotas in key_put()
Silvio Gissi (1):
keys: Fix overwrite of key expiration on instantiation
security/keys/gc.c | 8 --------
security/keys/key.c | 35 ++++++++++++++++++++++++-----------
security/keys/keyctl.c | 11 ++++++-----
3 files changed, 30 insertions(+), 24 deletions(-)
^ permalink raw reply [relevance 5%]
* Re: ksmbd stuck open response
2024-05-08 21:24 11% ksmbd stuck open response Steve French
@ 2024-05-09 12:31 4% ` Namjae Jeon
0 siblings, 0 replies; 200+ results
From: Namjae Jeon @ 2024-05-09 12:31 UTC (permalink / raw)
To: Steve French; +Cc: CIFS
2024년 5월 9일 (목) 오전 6:26, Steve French <smfrench@gmail.com>님이 작성:
>
> I saw an example in 6.9-rc6 where ksmbd was failing to send an open
> response repeatedly (it showed up running test cifs/102
Where is cifs/102 test ? I can not find it in xfstests.
>
> On the client I see the call one stuck SMB3.1.1 open request (never
> returns) and call stack of:
>
> [root@fedora29 ~]# cat /proc/5042/stack
> [<0>] wait_for_response+0xd1/0x130 [cifs]
> [<0>] compound_send_recv+0x68e/0x10b0 [cifs]
> [<0>] cifs_send_recv+0x23/0x30 [cifs]
> [<0>] SMB2_open+0x378/0xbd0 [cifs]
> [<0>] smb2_open_file+0x171/0x560 [cifs]
> [<0>] cifs_do_create.isra.0+0x471/0xd40 [cifs]
> [<0>] cifs_atomic_open+0x382/0x780 [cifs]
> [<0>] lookup_open.isra.0+0x6b0/0x930
> [<0>] path_openat+0x491/0x10d0
> [<0>] do_filp_open+0x144/0x250
> [<0>] do_sys_openat2+0xe0/0x110
> [<0>] __x64_sys_openat+0xc1/0x120
> [<0>] do_syscall_64+0x78/0x180
> [<0>] entry_SYSCALL_64_after_hwframe+0x76/0x7e
>
> on the server I see lots of failure to send a message on the socket
> every five seconds:
> ...
> [Wed May 8 21:13:59 2024] ksmbd: Failed to send message: -11
> [Wed May 8 21:14:04 2024] ksmbd: Failed to send message: -11
> [Wed May 8 21:14:09 2024] ksmbd: Failed to send message: -11
> [Wed May 8 21:14:14 2024] ksmbd: Failed to send message: -11
> [Wed May 8 21:14:20 2024] ksmbd: Failed to send message: -11
> [Wed May 8 21:14:25 2024] ksmbd: Failed to send message: -11
> [Wed May 8 21:14:30 2024] ksmbd: Failed to send message: -11
> [Wed May 8 21:14:35 2024] ksmbd: Failed to send message: -11
> [Wed May 8 21:14:40 2024] ksmbd: Failed to send message: -11
> [Wed May 8 21:14:45 2024] ksmbd: Failed to send message: -11
>
> doing "ksmbd.control -s" did free that request but hangs on the server
> (and subsequent requests on the client fail). Nothing obvious in
> dmesg on client or server, except the following (xfs bug?) which was
> logged after the "ksmbd.control -s" on the server:
>
> [24324.546128] Call Trace:
> [24324.546130] <TASK>
> [24324.546134] dump_stack_lvl+0x76/0xa0
> [24324.546141] dump_stack+0x10/0x20
> [24324.546145] xfs_error_report+0x4a/0x70 [xfs]
> [24324.546298] ? xfs_remove+0x175/0x300 [xfs]
> [24324.546440] xfs_trans_cancel+0x14b/0x170 [xfs]
> [24324.546582] xfs_remove+0x175/0x300 [xfs]
> [24324.546724] xfs_vn_unlink+0x53/0xb0 [xfs]
> [24324.546866] vfs_unlink+0x146/0x2e0
> [24324.546872] ksmbd_vfs_unlink+0xa9/0x140 [ksmbd]
> [24324.546888] ? __pfx_session_fd_check+0x10/0x10 [ksmbd]
> [24324.546902] __ksmbd_close_fd+0x2ba/0x2d0 [ksmbd]
> [24324.546916] ? _raw_spin_unlock+0xe/0x40
> [24324.546920] ? __pfx_session_fd_check+0x10/0x10 [ksmbd]
> [24324.546936] __close_file_table_ids+0x60/0xb0 [ksmbd]
> [24324.546950] ksmbd_destroy_file_table+0x22/0x60 [ksmbd]
> [24324.546966] ksmbd_session_destroy+0x5a/0x1b0 [ksmbd]
> [24324.546984] ksmbd_sessions_deregister+0x24c/0x270 [ksmbd]
> [24324.547001] ksmbd_server_terminate_conn+0x12/0x30 [ksmbd]
> [24324.547016] ksmbd_conn_handler_loop+0x203/0x370 [ksmbd]
> [24324.547034] ? __pfx_ksmbd_conn_handler_loop+0x10/0x10 [ksmbd]
> [24324.547050] kthread+0xe4/0x110
> [24324.547054] ? __pfx_kthread+0x10/0x10
> [24324.547058] ret_from_fork+0x47/0x70
> [24324.547062] ? __pfx_kthread+0x10/0x10
> [24324.547065] ret_from_fork_asm+0x1a/0x30
> [24324.547070] </TASK>
>
>
> Any ideas?
> --
> Thanks,
>
> Steve
>
^ permalink raw reply [relevance 4%]
* [OE-core][kirkstone 18/23] linux-yocto/5.15: update to v5.15.157
2024-05-09 12:04 1% ` [OE-core][kirkstone 14/23] linux-yocto/5.15: update to v5.15.155 Steve Sakoman
@ 2024-05-09 12:04 3% ` Steve Sakoman
1 sibling, 0 replies; 200+ results
From: Steve Sakoman @ 2024-05-09 12:04 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.15 to the latest korg -stable release that comprises
the following commits:
b925f60c6ee7 Linux 5.15.157
d564809f27ea net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
eb6535c6f7c2 net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
63ba7a80d6e2 net: dsa: introduce preferred_default_local_cpu_port and use on MT7530
84b7f50e631a net: dsa: mt7530: set all CPU ports in MT7531_CPU_PMAP
bdbe483da21f nilfs2: fix OOB in nilfs_set_de_type
3ab056814cd8 nouveau: fix instmem race condition around ptr stores
49c9958cf0a2 drm/vmwgfx: Sort primary plane formats by order of preference
8b12fc7b0326 drm/amdgpu: validate the parameters of bo mapping operations more clearly
a2fd6dbc98be binder: check offset alignment in binder_get_object()
0dc727a4e054 init/main.c: Fix potential static_command_line memory overflow
813f5213f2c6 arm64: hibernate: Fix level3 translation fault in swsusp_save()
f5a55db79bf7 KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
7169354120d8 KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
43f00210cb25 fs: sysfs: Fix reference leak in sysfs_break_active_protection()
0d130158db29 speakup: Avoid crash on very long word
d8a2225f7dfa mei: me: disable RPL-S on SPS and IGN firmwares
7f67c2020cb0 usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
75ceeadfab1c usb: Disable USB3 LPM at shutdown
8aa5c28ac65c usb: dwc2: host: Fix dereference issue in DDMA completion flow.
7182175f565f Revert "usb: cdc-wdm: close race between read and workqueue"
def039849617 USB: serial: option: add Telit FN920C04 rmnet compositions
cd27cf1ec66d USB: serial: option: add Rolling RW101-GL and RW135-GL support
c48d624bbbad USB: serial: option: support Quectel EM060K sub-models
3338a967ca08 USB: serial: option: add Lonsung U8300/U9300 product
e94566d88701 USB: serial: option: add support for Fibocom FM650/FG650
6b5043463619 USB: serial: option: add Fibocom FM135-GL variants
7a3bbe41efa5 serial/pmac_zilog: Remove flawed mitigation for rx irq flood
b0b268eeb087 comedi: vmk80xx: fix incomplete endpoint checking
e39fae579d17 thunderbolt: Fix wake configurations after device unplug
62e0a5d4d4de thunderbolt: Avoid notify PM core about runtime PM resume
4291a6233ba8 x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
0be237b6b753 x86/bugs: Fix BHI retpoline check
a29ec0465dce clk: Get runtime PM before walking tree during disable_unused
db7c0ef4afea clk: Initialize struct clk_core kref earlier
bc6d766991e1 clk: Print an info line before disabling unused clocks
f3d89bc7dd65 clk: remove extra empty line
bdd70c8b02e7 clk: Mark 'all_lists' as const
3254a1f27952 clk: Remove prepare_lock hold assertion in __clk_release()
ce77f3beed02 drm/panel: visionox-rm69299: don't unregister DSI device
df0991da7db8 drm: nv04: Fix out of bounds access
3076b3c38a70 s390/cio: fix race condition during online processing
498f7b8037da s390/qdio: handle deferred cc1
45d70025006c RDMA/mlx5: Fix port number for counter query in multi-port configuration
8261489de3af RDMA/cm: Print the old state when cm_destroy_id gets timeout
2973b4a5eae7 RDMA/rxe: Fix the problem "mutex_destroy missing"
831157756e3c net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
9495b7a412e3 net: dsa: mt7530: fix mirroring frames received on local port
a50dbeca28ac tun: limit printing rate when illegal packet received by tun dev
ae3f9e1221b3 af_unix: Don't peek OOB data without MSG_OOB.
1738dfe72c52 af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
e719b52d0c56 netfilter: flowtable: incorrect pppoe tuple
d06977b9a410 netfilter: flowtable: validate pppoe header
5345d78ae64d netfilter: nf_flow_table: count pending offload workqueue tasks
7a1679e2d9bf netfilter: nft_set_pipapo: do not free live element
dceb683ab87c netfilter: br_netfilter: skip conntrack input hook for promisc packets
379bf7257bc5 netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
0b6de00206ad netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
fc1021337e59 Revert "lockd: introduce safe async lock op"
2a3073d58382 Revert "tracing/trigger: Fix to return error if failed to alloc snapshot"
2df2dd27066c kprobes: Fix possible use-after-free issue on kprobe registration
1253e34a548f bpf: Fix ringbuf memory type confusion when passing to helpers
cc9ac419351b bpf: Fix out of bounds access for ringbuf helpers
adc2d11b86ea bpf: Generally fix helper register offset check
0c261cbc29a6 bpf: Generalize check_ctx_reg for reuse with other types
1b661661642d bpf: Extend kfunc with PTR_TO_CTX, PTR_TO_MEM argument support
621bbe924c68 selftests/ftrace: Limit length in subsystem-enable tests
edfaf679b7c3 SUNRPC: Fix rpcgss_context trace event acceptor field
2364d0278fe1 btrfs: record delayed inode root in transaction
747228929b32 ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
88b7f1143b15 ksmbd: validate payload size in ipc response
044b3d6c94c6 ksmbd: don't send oplock break if rename fails
b8086c3c1548 reiserfs: Avoid touching renamed directory if parent does not change
ea091017ef62 ipv6: Fix data races around sk->sk_prot.
ff8710da80ee ipv6: annotate some data-races around sk->sk_prot
e8c2eafaaa6a tcp: Fix data races around icsk->icsk_af_ops.
8d1bab770956 locking/rwsem: Disable preemption while trying for rwsem lock
7c82dac02886 block, loop: support partitions without scanning
45f504f301d4 bpftool: Fix pretty print dump for maps without BTF loaded
1f24338cb789 jbd2: Drop the merge conflicted hunk
e1d0e3c51bde tpm: tis_i2c: Limit write bursts to I2C_SMBUS_BLOCK_MAX (32) bytes
1abe841fe331 tpm: tis_i2c: Limit read bursts to I2C_SMBUS_BLOCK_MAX (32) bytes
6224acfc1d56 tpm: Add flag to use default cancellation policy
1cd19d48fb90 tpm: tis_i2c: Fix sanity check interrupt enable mask
a883da132fa8 tpm: Add tpm_tis_i2c backend for tpm_tis_core
a742ac8a1c51 tpm: Add tpm_tis_verify_crc to the tpm_tis_phy_ops protocol layer
ef495c5f45f2 tpm: Remove read16/read32/write32 calls from tpm_tis_phy_ops
1f3be2e23aa6 gcc-plugins: Reorganize gimple includes for GCC 13
24615a3b932a ata: ahci: fix enum constants for gcc-13
5d6cb145541a net: stmmac: Enable mac_managed_pm phylink config
fd93aabb4287 tools/resolve_btfids: Use pkg-config to locate libelf
130f9da78406 tools/resolve_btfids: Build with host flags
00f2f1a782f9 tools/resolve_btfids: Support cross-building the kernel with clang
17776a4ba9c2 tools/resolve_btfids: Install libbpf headers when building
7c9808380d70 libbpf: Make libbpf_version.h non-auto-generated
37ae1ba791ac libbpf: Add LIBBPF_DEPRECATED_SINCE macro for scheduling API deprecations
a2667e6d7314 drm/radeon: free iio for atombios when driver shutdown
f100c753aa1f powerpc: Fix reschedule bug in KUAP-unlocked user copy
da5513f30187 libbpf: Fix build warning on ref_ctr_off
4c5a089621a8 perf python: Account for multiple words in CC
1c5699ee85d4 fs: move S_ISGID stripping into the vfs_*() helpers
838f5d0701d8 fs: add mode_strip_sgid() helper
d97172683641 squashfs: provide backing_dev_info in order to disable read-ahead
ed037d7be40c irq_work: use kasan_record_aux_stack_noalloc() record callstack
1363bd7dbde3 ixgbevf: add disable link state
e5601ae2bd24 ixgbe: add improvement for MDD response functionality
caa57cd80575 ixgbe: add the ability for the PF to disable VF link state
16a77bfcc7df Check /dev/console using init_stat()
04574fd5579a tracing/arm: Have max stack tracer handle the case of return address after data
0e51e5717018 gpiolib: cdev: Set lineevent_state::irq after IRQ register successfully
1e6b7da6ddba drivers/base: Fix unsigned comparison to -1 in CPUMAP_FILE_MAX_BYTES
493160901320 mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, release} to avoid race condition
04224f725aa3 irqchip/gic-v3-its: Skip HP notifier when no ITS is registered
6f6c2996a81c irqchip/gic-v3-its: Postpone LPI pending table freeing and memreserve
1fa94473423f irqchip/gic-v3-its: Give the percpu rdist struct its own flags field
6013d1ae5feb cert host tools: Stop complaining about deprecated OpenSSL functions
efe20512212b init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash
a40d2daf2795 pnmtologo: use relocatable file name
3b40d5b41155 of: configfs: remove unused variable overlay_lock
6c085baf1838 tools: use basename to identify file in gen-mach-types
2fca0fd71981 lib/build_OID_registry: fix reproducibility issues
0f586f4ee8ad vt/conmakehash: improve reproducibility
a75774679f28 OF: DT-Overlay configfs interface (v8)
d179c639b30b x86/boot: Wrap literal addresses in absolute_pointer()
856ec356cf91 ACPI: thermal: drop an always true check
7614af249993 xfs: Fix -Werror=dangling-pointer work-around for older GCC
41470215f97e xfs: Work around GCC 12 -Werror=dangling-pointer for xfs_attr_remote.o
44a445c1922d virtio-pci: Remove wrong address verification in vp_del_vqs()
77aa9e489eaf bpf: Disallow unprivileged bpf by default
ebfb1822e9f9 fs/aufs: fixup 5.15.36 fixups
4eba9348d3e2 Revert "Revert "fbdev: Hot-unplug firmware fb devices on forced removal""
5df6d1b00f95 jbd2: fix use-after-free of transaction_t race
2d83e8196487 jbd2: refactor wait logic for transaction updates into a common function
07a63f760793 netfilter: conntrack: avoid useless indirection during conntrack destruction
4e7122625996 Revert "fbdev: Hot-unplug firmware fb devices on forced removal"
7ba4cb36fd4f rcu: Avoid alloc_pages() when recording stack
f78574dee71e kasan: test: silence intentional read overflow warnings
d313cb89b6b1 kasan: arm64: fix pcpu_page_first_chunk crash with KASAN_VMALLOC
5e279d5647cc arm64: support page mapping percpu first chunk allocator
e5bf16752dca vmalloc: choose a better start address in vm_area_register_early()
660b3d21b46f kasan: test: bypass __alloc_size checks
00aa7573e53a kasan: test: add memcpy test that avoids out-of-bounds write
67becf0b1bd4 kasan: fix tag for large allocations when using CONFIG_SLAB
bedf1e033213 workqueue, kasan: avoid alloc_pages() when recording stack
7195b67ce69b kasan: generic: introduce kasan_record_aux_stack_noalloc()
bdff763f0e29 kasan: common: provide can_alloc in kasan_save_stack()
51423ebb36ad lib/stackdepot: introduce __stack_depot_save()
85373e66d847 lib/stackdepot: remove unused function argument
5b6cc9b251f3 lib/stackdepot: include gfp.h
c9f3902d8069 aufs: reduce overhead for "code present but disabled" use case.
b98d189df02c aufs: bugfix, umount passes NULL to ->parse_monolithic()
13b883cbbbd9 aufs standalone: cosmetic, missing copyright sentence
21f8b0d81898 aufs: 5.15.5-20220117 ---> 5.15.5-20220221
6199fd896645 aufs: tiny, headers after fs_context
8ddb40e31c29 aufs: fs_context 7/7, finally remount
69035f71c6fd aufs: fs_context 6/7, now mount
bc841b970697 aufs: fs_context 5/7, parse all other mount options
435188053da2 aufs: fs_context 4/7, parse xino options
9af1f1825cbd aufs: fs_context 3/7, parse the branch-management options
1c05eb767f8c aufs: fs_context 2/7, parse "br" mount option
a8488f603134 aufs: fs_context 1/7, skelton of the new shceme
8e32e0015564 aufs: pre fs_context, convert a static flag to a macro
f90cb4144aec aufs: pre fs_context, support the incomplete sb and sbinfo case
948762ef859c aufs: pre fs_context, convert the type of alloc_sbinfo()
77151a08776b aufs: 5.15.5-20211129 ---> 5.15.5-20220117
2539adbbbe1e aufs: 5.14-20211018 ---> 5.15.5-20211129
7d32b25193c4 aufs: for v5.15-rc1, sync_inode() is gone
66ec0c509225 aufs: for v5.15-rc1, new param 'rcu' for ->get_acl()
69709dc518cd aufs: for v5.15-rc1, no mand-lock anymore
ada8fe9543e5 aufs: 5.14-20210906 ---> 5.14-20211018
b77f7f3f394a Revert "aufs: adjust to v5.15 fs changes"
81bdce5b5876 tick/nohz: WARN_ON --> WARN_ON_ONCE to prevent console saturation
97c963889222 sched/isolation: really align nohz_full with rcu_nocbs
871f23ad3627 Revert "ARM: defconfig: Enable ax88796c driver for Exynos boards"
ffad0783dd5b ARM: config: multi v7: Regenerate defconifg
5c1e1a1ff2d3 ARM: config: multi v7: Add renamed symbols
badaf96564fe ARM: config: multi v7: Clean up enabled by default options
34996040fc9b ARM: config: multi v7: Drop unavailable options
7f685244afb3 powerpc/mm: Switch obsolete dssall to .long
20301aeb1a64 riscv: fix build with binutils 2.38
9df58d070506 powerpc/lib/sstep: fix 'ptesync' build error
720b61fc400b x86_64_defconfig: Fix warnings
02bf23d26bc4 arm64: defconfig: cleanup config options
05914e2c87e5 arm: defconfig: drop unused POWER_AVS option
ffb532fa19b9 aufs5: fix build against v5.15.3+
a4b3abf4d96d qemux86: add configuration symbol to select values
fee94ee09154 clear_warn_once: add a clear_warn_once= boot parameter
3d8762d900d9 clear_warn_once: bind a timer to written reset value
95faacac47e8 clear_warn_once: expand debugfs to include read support
de20c4240018 perf: perf can not parser the backtrace of app in the 32bit system and 64bit kernel.
0e4aacead9c1 perf: x86-32: explicitly include <errno.h>
9ad92c11468e perf: mips64: Convert __u64 to unsigned long long
09e7efe3e68a perf: fix bench numa compilation
e79becc44fa6 perf: add SLANG_INC for slang.h
b1033b588681 perf: add sgidefs.h to for mips builds
cf9db484ac0b perf: change --root to --prefix for python install
7fd052c2c562 perf: add 'libperl not found' warning
27a437cdd469 perf: force include of <stdbool.h>
3b99d21bec2f fat: don't use obsolete random32 call in namei_vfat
a7e9293b506b FAT: Added FAT_NO_83NAME
6fd0e71d9e5c FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES option
c379b0d324ae FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES option
538be0fdb124 aufs: adjust to v5.15 fs changes
f45da75c8759 aufs5: core
047f57e07e01 aufs5: standalone
029fc15574c8 aufs5: mmap
610d0192ee94 aufs5: base
d4e428d0ec5f aufs5: kbuild
eb067eca251a yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR and NULL
286af18d0875 yaffs: fix -Wstringop-overread compile warning in yaffs_fix_null_name
24d59a4e26a6 yaffs2: v5.12+ build fixups (not runtime tested)
22c73536d5d7 yaffs: include blkdev.h
506b7251bfb8 yaffs: fix misplaced variable declaration
a0e26ff364dc yaffs2: v5.6 build fixups
b10b1b2d169e yaffs2: fix memory leak when /proc/yaffs is read
ad9adccbb214 yaffs: add strict check when call yaffs_internal_read_super
2e3c3aec8279 yaffs: repair yaffs_get_mtd_device
d662538516a7 yaffs: Fix build failure by handling inode i_version with proper atomic API
70a6113ee2c7 yaffs2: fix memory leak in mount/umount
3378e4a9e404 yaffs: Avoid setting any ACL releated xattr
ec2284edddef Yaffs:check oob size before auto selecting Yaffs1
c2a49874051c fs: yaffs2: replace CURRENT_TIME by other appropriate apis
e9a5105a3e73 yaffs2: adjust to proper location of MS_RDONLY
608807406f13 yaffs2: import git revision b4ce1bb (jan, 2020)
89e660ece42c initramfs: allow an optional wrapper script around initramfs generation
b179dbc9aa10 iwlwifi: select MAC80211_LEDS conditionally
3fd5ca3673d0 net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119)
d1f6edbf0188 arm64/perf: Fix wrong cast that may cause wrong truncation
d202fb2caf33 defconfigs: drop obselete options
9a27e3b5f4e7 arm64/perf: fix backtrace for AAPCS with FP enabled
e20d8cf019b4 linux-yocto: Handle /bin/awk issues
b6d2a3dbbd3a uvesafb: provide option to specify timeout for task completion
adb40f1e6a1a uvesafb: print error message when task timeout occurs
f280a1ed0962 compiler.h: Undef before redefining __attribute_const__
4352732f268c vmware: include jiffies.h
7954a677968d Resolve jiffies wrapping about arp
5f28a1035d95 nfs: Allow default io size to be configured.
0d7260ad7106 check console device file on fs when booting
900a12e37e0a mount_root: clarify error messages for when no rootfs found
7b878cbea726 menuconfig,mconf-cfg: Allow specification of ncurses location
6604fc1763b3 modpost: mask trivial warnings
0d294adb09cb kbuild: exclude meta directory from distclean processing
a097cdd95a9e powerpc: serialize image targets
5db6ec39a0a3 arm: serialize build targets
cbabca27905e crtsavres: fixups for 5.4+
7fc7656ed403 powerpc/ptrace: Disable array-bounds warning with gcc8
a5faac5a19a2 powerpc: Disable attribute-alias warnings from gcc8
186c54665b67 powerpc: add crtsavres.o to archprepare for kbuild
d1ea862964ca powerpc: kexec fix for powerpc64
2ac35b89a0f9 powerpc: Add unwind information for SPE registers of E500 core
2e1c348a28bb mips: vdso: fix 'jalr $t9' crash in vdso code
ec57870b303a mips: Kconfig: add QEMUMIPS64 option
6a81b3c08107 4kc cache tlb hazard: tlbp cache coherency
74e3b2a21e54 malta uhci quirks: make allowance for slow 4k(e)c
22e65b63d3b4 arm/Makefile: Fix systemtap
b7f1ab59f19e vexpress: Pass LOADADDR to Makefile
ce2800c73bf7 arm: ARM EABI socketcall
019d142fd956 ARM: LPAE: Invalidate the TLB for module addresses during translation fault
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../linux/linux-yocto-rt_5.15.bb | 6 ++---
.../linux/linux-yocto-tiny_5.15.bb | 6 ++---
meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++----------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index 426266e9a5..91bf0350d5 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "82bab3e1d1637710832e9fe0a222d876b5f9e9e2"
-SRCREV_meta ?= "1427f4d13f99b5b3811ef5f4207b6ff43cf1771a"
+SRCREV_machine ?= "f8d4297d452f7c832d90bfb992d90db2e30ffc23"
+SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.15.156"
+LINUX_VERSION ?= "5.15.157"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
index 1ea634f2e1..722523ced9 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
@@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.15.156"
+LINUX_VERSION ?= "5.15.157"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "a94a5a767e0b0014c4d1f4ac6587bd30af2b18d5"
-SRCREV_meta ?= "1427f4d13f99b5b3811ef5f4207b6ff43cf1771a"
+SRCREV_machine ?= "7a8fce8cbd9a8a7d68a0c2537141c85d63f6eda3"
+SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
index 0601353e1c..6784703ce2 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
@@ -14,24 +14,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base"
KBRANCH:qemux86-64 ?= "v5.15/standard/base"
KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "7125a4b2f341b906fa6ad96d7b5caab2fe031b40"
-SRCREV_machine:qemuarm64 ?= "a71076982c5b7d5f38a7c00ab4fd6f4f907e267d"
-SRCREV_machine:qemumips ?= "0d5ad939681fe4971f4895b909554d755ba72d66"
-SRCREV_machine:qemuppc ?= "46ff907d522c13b8f6fab5a0da95f7a9807e2595"
-SRCREV_machine:qemuriscv64 ?= "70388803a5a55f986721232d0160381bb8097ba3"
-SRCREV_machine:qemuriscv32 ?= "70388803a5a55f986721232d0160381bb8097ba3"
-SRCREV_machine:qemux86 ?= "70388803a5a55f986721232d0160381bb8097ba3"
-SRCREV_machine:qemux86-64 ?= "70388803a5a55f986721232d0160381bb8097ba3"
-SRCREV_machine:qemumips64 ?= "a1357daf3592cb612b67058e401d5b05aebde45e"
-SRCREV_machine ?= "70388803a5a55f986721232d0160381bb8097ba3"
-SRCREV_meta ?= "1427f4d13f99b5b3811ef5f4207b6ff43cf1771a"
+SRCREV_machine:qemuarm ?= "b844615e2b799c40eac746cd24e009b620114230"
+SRCREV_machine:qemuarm64 ?= "aeb63de10514b28d35049f285ae9a371d6d5ccd2"
+SRCREV_machine:qemumips ?= "3740052e902e15416c22ce7f2544de7afe83a845"
+SRCREV_machine:qemuppc ?= "167c9e8d0e760cfb299408647efe46214fd06ac0"
+SRCREV_machine:qemuriscv64 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
+SRCREV_machine:qemuriscv32 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
+SRCREV_machine:qemux86 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
+SRCREV_machine:qemux86-64 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
+SRCREV_machine:qemumips64 ?= "d34e0789d8d5e0d7ab521889e80967edcac38dc6"
+SRCREV_machine ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
+SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "c52b9710c83d3b8ab63bb217cc7c8b61e13f12cd"
+SRCREV_machine:class-devupstream ?= "b925f60c6ee7ec871d2d48575d0fde3872129c20"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v5.15/base"
@@ -39,7 +39,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.15.156"
+LINUX_VERSION ?= "5.15.157"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.34.1
^ permalink raw reply related [relevance 3%]
* [OE-core][kirkstone 14/23] linux-yocto/5.15: update to v5.15.155
@ 2024-05-09 12:04 1% ` Steve Sakoman
2024-05-09 12:04 3% ` [OE-core][kirkstone 18/23] linux-yocto/5.15: update to v5.15.157 Steve Sakoman
1 sibling, 0 replies; 200+ results
From: Steve Sakoman @ 2024-05-09 12:04 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.15 to the latest korg -stable release that comprises
the following commits:
fa3df276cd36 Linux 5.15.155
b54c4632946a Revert "ACPI: CPPC: Use access_width over bit_width for system memory accesses"
1793e6b2dae0 VMCI: Fix possible memcpy() run-time warning in vmci_datagram_invoke_guest_handler()
dd883e0138f1 Bluetooth: btintel: Fixe build regression
bb6b88270714 platform/x86: intel-vbtn: Update tablet mode switch at end of probe
dfb2ce952143 randomize_kstack: Improve entropy diffusion
7cfee26d1950 x86/mm/pat: fix VM_PAT handling in COW mappings
abfae420789a virtio: reenable config if freezing device failed
5d17986cbfd5 gcc-plugins/stackleak: Avoid .head.text section
7e0bd07ce965 gcc-plugins/stackleak: Ignore .noinstr.text and .entry.text
2d154a54c58f tty: n_gsm: require CAP_NET_ADMIN to attach N_GSM0710 ldisc
6cbbe1ba76ee netfilter: nf_tables: discard table flag update with pending basechain deletion
eb769ff4e281 netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
37fc2cde9d19 netfilter: nf_tables: release batch on table validation from abort path
48d6bcfc3175 fbmon: prevent division by zero in fb_videomode_from_videomode()
e2ce8625c321 drivers/nvme: Add quirks for device 126f:2262
871e695c08a3 fbdev: viafb: fix typo in hw_bitblt_1 and hw_bitblt_2
3beea96d4fc8 ASoC: soc-core.c: Skip dummy codec when adding platforms
eb7e92dbdc78 usb: sl811-hcd: only defined function checkdone if QUIRK2 is defined
e0db818c0871 usb: typec: tcpci: add generic tcpci fallback compatible
b6b12f4577a1 tools: iio: replace seekdir() in iio_generic_buffer
1d5276914eb7 ring-buffer: use READ_ONCE() to read cpu_buffer->commit_page in concurrent environment
39438227f888 ktest: force $buildonly = 1 for 'make_warnings_file' test type
72794acdd16b platform/x86: touchscreen_dmi: Add an extra entry for a variant of the Chuwi Vi8 tablet
18c51d97a242 Input: allocate keycode for Display refresh rate toggle
baf8a6d2cdd1 RDMA/cm: add timeout to cm_destroy_id wait
21e7d72d0cfc block: prevent division by zero in blk_rq_stat_sum()
be113e082b65 libperf evlist: Avoid out-of-bounds access
5dcded25c7e1 Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default"
504eb6b26ce8 SUNRPC: increase size of rpc_wait_queue.qlen from unsigned short to unsigned int
343586deb873 drm/amd/display: Fix nanosec stat overflow
ad207d1ca6d5 ext4: forbid commit inconsistent quota data when errors=remount-ro
19b7a1ff81b7 ext4: add a hint for block bitmap corrupt state in mb_groups
85f315792fac ALSA: firewire-lib: handle quirk to calculate payload quadlets as data block counter
09de9c3614ad media: sta2x11: fix irq handler cast
46e8711231b2 isofs: handle CDs with bad root inode but good Joliet root directory
7849e6f8410d scsi: lpfc: Fix possible memory leak in lpfc_rcv_padisc()
fd203d2c671b sysv: don't call sb_bread() with pointers_lock held
0b75d679e88f pinctrl: renesas: checker: Limit cfg reg enum checks to provided IDs
f917c66b1135 Input: synaptics-rmi4 - fail probing if memory allocation for "phys" fails
006936ecb4ed Bluetooth: btintel: Fix null ptr deref in btintel_read_version
b9117dc783c0 net/smc: reduce rtnl pressure in smc_pnet_create_pnetids_list()
2f6174fd4ccf btrfs: send: handle path ref underflow in header iterate_inode_ref()
a83c1f67a0f7 btrfs: export: handle invalid inode or root reference in btrfs_get_parent()
d1ffa4ae2d59 btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks()
805a1cdde82f wifi: ath11k: decrease MHI channel buffer length to 8KB
0f22f30f79a8 net: pcs: xpcs: Return EINVAL in the internal methods
9a16a0d03305 tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num()
0ff96ec22a84 pstore/zone: Add a null pointer check to the psz_kmsg_read
35f6b46eeb03 ionic: set adminq irq affinity
ba30ee96e87a arm64: dts: rockchip: fix rk3399 hdmi ports node
ba580534db14 arm64: dts: rockchip: fix rk3328 hdmi ports node
64a7694c851c cpuidle: Avoid potential overflow in integer multiplication
f4e70f422b76 panic: Flush kernel log buffer at the end
130b0cd06487 VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host()
9ab8e24e81b9 wifi: ath9k: fix LNA selection in ath_ant_try_scan()
ff45899e732e net: dsa: fix panic when DSA master device unbinds on shutdown
cbac7de1d990 amdkfd: use calloc instead of kzalloc to avoid integer overflow
cdfd0a7f0139 Linux 5.15.154
8d8dc7ee5b98 x86: set SPECTRE_BHI_ON as default
a976b129dc86 KVM: x86: Add BHI_NO
c2b9e038896f x86/bhi: Mitigate KVM by default
f825494f2c6f x86/bhi: Add BHI mitigation knob
aa6247c9da25 x86/bhi: Enumerate Branch History Injection (BHI) bug
a9ca0e34a406 x86/bhi: Define SPEC_CTRL_BHI_DIS_S
bd53ec80f218 x86/bhi: Add support for clearing branch history at syscall entry
55516b355b0c x86/syscall: Don't force use of indirect calls for system calls
276fb9a658d0 x86/bugs: Change commas to semicolons in 'spectre_v2' sysfs file
b9c5f7da76b1 nvme: fix miss command type check
d225b0ac96dc gro: fix ownership transfer
6564b014af92 mm/secretmem: fix GUP-fast succeeding on secretmem folios
a479b4de11dd mptcp: don't account accept() of non-MPC client as fallback to TCP
1f7e13d3e870 x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO
ff137c5c0dcf x86/bugs: Fix the SRSO mitigation on Zen3/4
dff6072124f6 riscv: process: Fix kernel gp leakage
fd9662109deb riscv: Fix spurious errors from __get/put_kernel_nofault
6135537e1e66 s390/entry: align system call table on 8 bytes
f860595512ff x86/mce: Make sure to grab mce_sysfs_mutex in set_bank()
3ee242410754 of: dynamic: Synchronize of_changeset_destroy() with the devlink removals
03c356860b8b driver core: Introduce device_link_wait_removal()
5e32c0cc476d ALSA: hda/realtek: Update Panasonic CF-SZ6 quirk to support headset with microphone
de48795233cc fs/pipe: Fix lockdep false-positive in watchqueue pipe_write()
eaaaa49593e9 openrisc: Fix pagewalk usage in arch_dma_{clear, set}_uncached
58e5349bb4ed HID: uhid: Use READ_ONCE()/WRITE_ONCE() for ->running
f7a3090bfd3b nfsd: hold a lighter-weight client reference over CB_RECALL_ANY
00f7576062a7 ata: sata_mv: Fix PCI device ID table declaration compilation warning
e0ad4c270670 scsi: mylex: Fix sysfs buffer lengths
117d7ef3190c ata: sata_sx4: fix pdc20621_get_from_dimm() on 64-bit
e9b71370cbc7 ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw
562adaf79df4 ASoC: rt711-sdw: fix locking sequence
bcf894d7eebe ASoC: rt711-sdca: fix locking sequence
b53cf951389c ASoC: rt5682-sdw: fix locking sequence
9df33e57f5c9 net: ravb: Always process TX descriptor ring
fcc739d7f034 net: fec: Set mac_managed_pm during probe
498cc233c460 drivers: net: convert to boolean for the mac_managed_pm flag
0985fbfbcb8f net: usb: asix: suspend embedded PHY if external is used
342cb04dcf2a i40e: Enforce software interrupt during busy-poll exit
c9bcd6465538 i40e: Remove _t suffix from enum type names
2a0a64c9d1d5 i40e: Store the irq number in i40e_q_vector
bf7396ec564f Revert "usb: phy: generic: Get the vbus supply"
506a9ec5d3f1 scsi: qla2xxx: Update manufacturer detail
315c4527cdd8 scsi: qla2xxx: Update manufacturer details
951d2748a2a8 i40e: fix vf may be used uninitialized in this function warning
8db472e17dec i40e: fix i40e_count_filters() to count only active/new filters
f53bea1c7971 octeontx2-pf: check negative error code in otx2_open()
ec694ca1567e octeontx2-af: Fix issue with loading coalesced KPU profiles
73a328df2c4a udp: prevent local UDP tunnel packets from being GROed
7223f4ee4f31 udp: do not transition UDP GRO fraglist partial checksums to unnecessary
d49ae15a5767 udp: do not accept non-tunnel GSO skbs landing in a tunnel
63a10b530e22 mlxbf_gige: stop interface during shutdown
40a344b2ddc0 ipv6: Fix infinite recursion in fib6_dump_done().
61f5b43bc04e selftests: reuseaddr_conflict: add missing new line at the end of the output
ee0088101bee erspan: make sure erspan_base_hdr is present in skb->head
3f9a8b794fc9 selftests: net: gro fwd: update vxlan GRO test expectations
457c832a0c5d net: stmmac: fix rx queue priority assignment
a097fc199ab5 net/sched: act_skbmod: prevent kernel-infoleak
d1e73fb19a4c bpf, sockmap: Prevent lock inversion deadlock in map delete elem
465abe8a7af4 vboxsf: Avoid an spurious warning if load_nls_xxx() fails
440e948cf0ef netfilter: validate user input for expected length
2485bcfe05ee netfilter: nf_tables: Fix potential data-race in __nft_flowtable_type_get()
f7e3c88cc2a9 netfilter: nf_tables: flush pending destroy work before exit_net release
8ba81dca416a netfilter: nf_tables: reject new basechain after table flag update
a9bd6bb6f02b KVM: x86: Mark target gfn of emulated atomic instruction as dirty
bd9a25a0228e KVM: x86: Bail to userspace if emulation of atomic user access faults
a7c6a643b25b thermal: devfreq_cooling: Fix perf state when calculate dfc res_util
8d7132a67eeb mm, vmscan: prevent infinite loop for costly GFP_NOIO | __GFP_RETRY_MAYFAIL allocations
b279ddce1030 Revert "x86/mm/ident_map: Use gbpages only where full GB page should be mapped."
a180ca336989 io_uring: ensure '0' is returned on file registration success
fe9df687e74a locking/rwsem: Disable preemption while trying for rwsem lock
d49fac38479b net/rds: fix possible cp null dereference
4143b9479caa xen-netfront: Add missing skb_mark_for_recycle
a8170af8b10e Bluetooth: Fix TOCTOU in HCI debugfs implementation
d6cfb0d7bb2d Bluetooth: hci_event: set the conn encrypted before conn establishes
96bd0de3915f arm64: dts: qcom: sc7180-trogdor: mark bluetooth address as broken
76299c3f11b4 x86/cpufeatures: Add CPUID_LNX_5 to track recently added Linux-defined word
571d80f8a458 x86/cpufeatures: Add new word for scattered features
9956d0504f0b r8169: fix issue caused by buggy BIOS on certain boards with RTL8168d
b8438db83732 dm integrity: fix out-of-range warning
bef3bc962dcc Octeontx2-af: fix pause frame configuration in GMP mode
37dc1718dc0c bpf: Protect against int overflow for stack access size
a583117668dd mlxbf_gige: call request_irq() after NAPI initialized
85c410f65b36 ACPICA: debugger: check status of acpi_evaluate_object() in acpi_db_walk_for_fields()
2e43d8eba6ed tcp: properly terminate timers for kernel sockets
744494dbb058 s390/qeth: handle deferred cc1
2fb283e2f3cc ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa()
28db0ae86cb9 wifi: iwlwifi: mvm: rfi: fix potential response leaks
254f1c252171 iwlwifi: mvm: rfi: use kmemdup() to replace kzalloc + memcpy
d60ff8e04b17 mlxbf_gige: stop PHY during open() error paths
ac68d9fa09e4 nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
5e1984aba37a USB: UAS: return ENODEV when submit urbs fail with device not attached
e38f1ea6cbc5 scsi: usb: Stop using the SCSI pointer
172800c69cd0 scsi: usb: Call scsi_done() directly
1b175bc579f4 USB: core: Fix deadlock in usb_deauthorize_interface()
ea8839e31942 scsi: lpfc: Correct size for wqe for memset()
0f608ce96520 PCI/DPC: Quirk PIO log size for Intel Ice Lake Root Ports
ff5305ec8c0e x86/cpu: Enable STIBP on AMD if Automatic IBRS is enabled
34c0786ef6c7 scsi: qla2xxx: Delay I/O Abort on PCI error
d37f3b14da07 scsi: qla2xxx: Change debug message during driver unload
b03e626bd6d3 scsi: qla2xxx: Fix double free of fcport
a859f6a8f423 scsi: qla2xxx: Fix command flush on cable pull
0bd653100a8e scsi: qla2xxx: NVME|FCP prefer flag not being honored
a139d643c5d6 scsi: qla2xxx: Split FCE|EFT trace control
002caa257783 scsi: qla2xxx: Fix N2N stuck connection
786121320183 scsi: qla2xxx: Prevent command send on chip reset
f18f5fcdaa8c usb: typec: ucsi: Clear UCSI_CCI_RESET_COMPLETE before reset
ad165b37fd4f usb: typec: ucsi: Ack unsupported commands
df5cbb908f16 usb: udc: remove warning when queue disabled ep
7de1df3212d8 usb: dwc2: gadget: LPM flow fix
2cf845a770d6 usb: dwc2: gadget: Fix exiting from clock gating
32d3f2f108eb usb: dwc2: host: Fix ISOC flow in DDMA mode
555be0cc2a2f usb: dwc2: host: Fix hibernation flow
3b1a9f852b4c usb: dwc2: host: Fix remote wakeup from hibernation
489e8064ac00 USB: core: Add hub_get() and hub_put() routines
7094516d7b30 staging: vc04_services: fix information leak in create_component()
77a46fbfe6ae staging: vc04_services: changen strncpy() to strscpy_pad()
cea234bb214b scsi: core: Fix unremoved procfs host directory regression
8c9902216816 ALSA: sh: aica: reorder cleanup operations to avoid UAF bugs
8bf22f8d1d53 drm/amd/display: Preserve original aspect ratio in create stream
9e6bb089649a drm/amdgpu: Use drm_mode_copy()
a86e54a34513 usb: cdc-wdm: close race between read and workqueue
ac9b6b3e8d12 drm/i915/gt: Reset queue_priority_hint on parking
553d294db94b net: ll_temac: platform_get_resource replaced by wrong function
81b8645feca0 mmc: core: Avoid negative index with array access
0ecd5689767b mmc: core: Initialize mmc_blk_ioc_data
f2bbbeb8287f hexagon: vmlinux.lds.S: handle attributes section
818e531cfb1d exec: Fix NOMMU linux_binprm::exec in transfer_args_to_stack()
c8bddbd91bc8 wifi: mac80211: check/clear fast rx for non-4addr sta VLAN changes
56e05d28c39b btrfs: zoned: use zone aware sb location for scrub
3f0cda401d6e init: open /initrd.image with O_LARGEFILE
c612edbc5ec6 mm/migrate: set swap entry values of THP tail pages properly.
e635f652696e serial: sc16is7xx: convert from _raw_ to _noinc_ regmap functions for FIFO
250219c6a556 vfio/fsl-mc: Block calling interrupt handler without trigger
cc5838f19d39 vfio/platform: Create persistent IRQ handlers
4cb0d7532126 vfio/pci: Create persistent INTx handler
26a6a1e0b4ec vfio: Introduce interface to flush virqfd inject workqueue
ec73e0797292 vfio/pci: Lock external INTx masking ops
b7a2f0955ffc vfio/pci: Disable auto-enable of exclusive INTx IRQ
c035ce9feb0c selftests: mptcp: diag: return KSFT_FAIL not test_cnt
dc394fe41d6b powerpc: xor_vmx: Add '-mhard-float' to CFLAGS
9bc9c11c151a efivarfs: Request at most 512 bytes for variable names
36b5c35d43aa perf/core: Fix reentry problem in perf_output_read_group()
ccd9fe71b9ee nfsd: Fix a regression in nfsd_setattr()
e90402fb0697 nfsd: don't call locks_release_private() twice concurrently
8b4fa191deed nfsd: don't take fi_lock in nfsd_break_deleg_cb()
c6f8b3fcc627 nfsd: fix RELEASE_LOCKOWNER
32c2cb2c0d37 nfsd: drop the nfsd_put helper
c52fee7a1f98 nfsd: call nfsd_last_thread() before final nfsd_put()
2267b2e84593 lockd: introduce safe async lock op
6e5fed48d8b7 NFSD: fix possible oops when nfsd/pool_stats is closed.
394d3f294a9a Documentation: Add missing documentation for EXPORT_OP flags
56e5eeff6cfa nfsd: separate nfsd_last_thread() from nfsd_put()
dec6b8bcac73 nfsd: Simplify code around svc_exit_thread() call in nfsd()
05b452e8748b nfsd: Fix creation time serialization order
760a6f755d94 NFSD: Add an nfsd4_encode_nfstime4() helper
663ec8f5ffc4 lockd: drop inappropriate svc_get() from locked_get()
9b405c0f84d9 nfsd: fix double fget() bug in __write_ports_addfd()
645c1b4b139b nfsd: make a copy of struct iattr before calling notify_change
4e6e49829151 NFSD: Fix problem of COMMIT and NFS4ERR_DELAY in infinite loop
786e3248d5ef nfsd: simplify the delayed disposal list code
a53d804930dc NFSD: Convert filecache to rhltable
b27ee0682437 nfsd: allow reaping files still under writeback
12f8f9fe1146 nfsd: update comment over __nfsd_file_cache_purge
ad9cf5b1d017 nfsd: don't take/put an extra reference when putting a file
b5a439e8b087 nfsd: add some comments to nfsd_file_do_acquire
83a019b049db nfsd: don't kill nfsd_files because of lease break error
55e429715edc nfsd: simplify test_bit return in NFSD_FILE_KEY_FULL comparator
9fff2daca45a nfsd: NFSD_FILE_KEY_INODE only needs to find GC'ed entries
bfa4a3996e73 nfsd: don't open-code clear_and_wake_up_bit
b11d8162c24a nfsd: call op_release, even when op_func returns an error
12eca509234a nfsd: don't replace page in rq_pages if it's a continuation of last page
8e469b994407 NFSD: Protect against filesystem freezing
17298e08006e NFSD: copy the whole verifier in nfsd_copy_write_verifier
4161b518e4a9 nfsd: don't fsync nfsd_files on last close
94e412c945e6 nfsd: fix courtesy client with deny mode handling in nfs4_upgrade_open
a0df1c3326e7 NFSD: fix problems with cleanup on errors in nfsd4_copy
22a0dd206a32 nfsd: don't hand out delegation on setuid files being opened for write
80a15dc4a021 NFSD: fix leaked reference count of nfsd4_ssc_umount_item
b3169b6ffe03 nfsd: clean up potential nfsd_file refcount leaks in COPY codepath
31d4aa4584cf nfsd: allow nfsd_file_get to sanely handle a NULL pointer
97522085eeec NFSD: enhance inter-server copy cleanup
005ef7285fb9 nfsd: don't destroy global nfs4_file table in per-net shutdown
0bc6d703109e nfsd: don't free files unconditionally in __nfsd_file_cache_purge
958294a3eb82 NFSD: replace delayed_work with work_struct for nfsd_client_shrinker
354eade5f278 NFSD: register/unregister of nfsd-client shrinker at nfsd startup/shutdown time
72906e8da982 NFSD: Use set_bit(RQ_DROPME)
d7cfba56fa75 Revert "SUNRPC: Use RMW bitops in single-threaded hot paths"
0b778361998d nfsd: fix handling of cached open files in nfsd4_open codepath
83a8aba1b725 nfsd: rework refcounting in filecache
43afef9fab65 NFSD: Avoid clashing function prototypes
1e9eac6a111c NFSD: Use only RQ_DROPME to signal the need to drop a reply
d8065d0f2121 NFSD: add CB_RECALL_ANY tracepoints
e18fc5fb2f00 NFSD: add delegation reaper to react to low memory condition
ed36015f7ef9 NFSD: add support for sending CB_RECALL_ANY
8766b38f54e9 NFSD: refactoring courtesy_client_reaper to a generic low memory shrinker
ce0b786b6ebf trace: Relocate event helper files
af7ee7ec1051 lockd: fix file selection in nlmsvc_cancel_blocked
eb0433d95c84 lockd: ensure we use the correct file descriptor when unlocking
281092cf3fc3 lockd: set missing fl_flags field when retrieving args
d561fe540e80 NFSD: Use struct_size() helper in alloc_session()
4e293f2d214c nfsd: return error if nfs4_setacl fails
2c1be5d65d76 NFSD: Add an nfsd_file_fsync tracepoint
8dafc6143041 nfsd: fix up the filecache laundrette scheduling
e8f25bd0e842 filelock: add a new locks_inode_context accessor function
dc468e079961 nfsd: reorganize filecache.c
6340d965599d nfsd: remove the pages_flushed statistic from filecache
99bf0850f399 NFSD: Fix licensing header in filecache.c
43cf59a34b34 NFSD: Use rhashtable for managing nfs4_file objects
323c83bde6d6 NFSD: Refactor find_file()
2b03fd9fe4bc NFSD: Clean up find_or_add_file()
d02c59ebe058 NFSD: Add a nfsd4_file_hash_remove() helper
0b4436381ee0 NFSD: Clean up nfsd4_init_file()
d78f7abe63fc NFSD: Update file_hashtbl() helpers
94f52a094c24 NFSD: Use const pointers as parameters to fh_ helpers
3d1af4319d25 NFSD: Trace delegation revocations
0cf54e35894c NFSD: Trace stateids returned via DELEGRETURN
cb966b357f01 NFSD: Clean up nfs4_preprocess_stateid_op() call sites
6baa3dfe404b NFSD: Flesh out a documenting comment for filecache.c
5fbeb6216e10 NFSD: Add an NFSD_FILE_GC flag to enable nfsd_file garbage collection
a08d9df51c52 NFSD: Revert "NFSD: NFSv4 CLOSE should release an nfsd_file immediately"
b34aa1a8c7a7 NFSD: Pass the target nfsd_file to nfsd_commit()
81c3ab9b95bf exportfs: use pr_debug for unreachable debug statements
10d55a17899a nfsd: allow disabling NFSv2 at compile time
4d1fa40d54ae nfsd: move nfserrno() to vfs.c
3b623a6a12b7 nfsd: ignore requests to disable unsupported versions
1c2f1a171bf0 NFSD: Finish converting the NFSv3 GETACL result encoder
98278765a215 NFSD: Remove redundant assignment to variable host_err
28798577f805 NFSD: Simplify READ_PLUS
19fbd8c2b53f nfsd: use locks_inode_context helper
b11f5d7bc0ea lockd: use locks_inode_context helper
071eb319ce4d NFSD: Fix reads with a non-zero offset that don't end on a page boundary
e4d787430855 NFSD: Fix trace_nfsd_fh_verify_err() crasher
3f439c7701d3 nfsd: put the export reference in nfsd4_verify_deleg_dentry
98d400fc2d09 nfsd: fix use-after-free in nfsd_file_do_acquire tracepoint
3ec2c9976c17 nfsd: fix net-namespace logic in __nfsd_file_cache_purge
f17c07f8ea77 nfsd: ensure we always call fh_verify_error tracepoint
15d01caf3587 NFSD: unregister shrinker when nfsd_init_net() fails
d1b0ceeac1dc nfsd: rework hashtable handling in nfsd_do_file_acquire
405ade5b561a nfsd: fix nfsd_file_unhash_and_dispose
dde8424b249c fanotify: Remove obsoleted fanotify_event_has_path()
a0ca9025c8be fsnotify: remove unused declaration
6029a4f7ad98 fs/notify: constify path
3af497e3f7cc nfsd: extra checks when freeing delegation stateids
e55378bce5f6 nfsd: make nfsd4_run_cb a bool return function
f6279fa0dc9d nfsd: fix comments about spinlock handling with delegations
ecb0eb07eeda nfsd: only fill out return pointer on success in nfsd4_lookup_stateid
4ad28d583e58 NFSD: Cap rsize_bop result based on send buffer size
4794c948de06 NFSD: Rename the fields in copy_stateid_t
0793ec49baaf nfsd: use DEFINE_SHOW_ATTRIBUTE to define nfsd_file_cache_stats_fops
815efd78cbe8 nfsd: use DEFINE_SHOW_ATTRIBUTE to define nfsd_reply_cache_stats_fops
861a163d4973 nfsd: use DEFINE_SHOW_ATTRIBUTE to define client_info_fops
25e0dd89d455 nfsd: use DEFINE_SHOW_ATTRIBUTE to define export_features_fops and supported_enctypes_fops
685d01c2b280 nfsd: use DEFINE_PROC_SHOW_ATTRIBUTE to define nfsd_proc_ops
82fbfbe92d4b NFSD: Pack struct nfsd4_compoundres
cd8bcaeeae6f NFSD: Remove unused nfsd4_compoundargs::cachetype field
ba3bd2bf0c74 NFSD: Remove "inline" directives on op_rsize_bop helpers
d8d3a672e159 NFSD: Clean up nfs4svc_encode_compoundres()
fc47f8ddfc85 NFSD: Clean up WRITE arg decoders
b3f3b21ed289 NFSD: Use xdr_inline_decode() to decode NFSv3 symlinks
cab5399262ec NFSD: Refactor common code out of dirlist helpers
07b68ff5c71c NFSD: Reduce amount of struct nfsd4_compoundargs that needs clearing
2005eba603e9 SUNRPC: Parametrize how much of argsize should be zeroed
9acc4812427e NFSD: add shrinker to reap courtesy clients on low memory condition
8c9e5ad10357 NFSD: keep track of the number of courtesy clients in the system
c65977020ba8 NFSD: Make nfsd4_remove() wait before returning NFS4ERR_DELAY
d1ee3403e098 NFSD: Make nfsd4_rename() wait before returning NFS4ERR_DELAY
50aa6a80d0a7 NFSD: Make nfsd4_setattr() wait before returning NFS4ERR_DELAY
9863ece99e95 NFSD: Refactor nfsd_setattr()
8a3c48cd5346 NFSD: Add a mechanism to wait for a DELEGRETURN
bcd4c7511593 NFSD: Add tracepoints to report NFSv4 callback completions
3fe32c519bef NFSD: Trace NFSv4 COMPOUND tags
62980365d6e8 NFSD: Replace dprintk() call site in fh_verify()
5118eb6c2926 nfsd: remove nfsd4_prepare_cb_recall() declaration
4440588b936c nfsd: clean up mounted_on_fileid handling
5f6f6b2a3bb1 NFSD: drop fname and flen args from nfsd_create_locked()
37f3b9c39895 NFSD: Increase NFSD_MAX_OPS_PER_COMPOUND
56ffc3ab884c nfsd: Propagate some error code returned by memdup_user()
371d2d25bf61 nfsd: Avoid some useless tests
211014047ec9 NFSD: remove redundant variable status
5b6441a5d371 NFSD enforce filehandle check for source file in COPY
285579928965 lockd: move from strlcpy with unused retval to strscpy
574ec47ac850 NFSD: move from strlcpy with unused retval to strscpy
460743da0e55 nfsd_splice_actor(): handle compound pages
c9cb32ad429c NFSD: fix regression with setting ACLs.
4b910dd7fe47 NFSD: discard fh_locked flag and fh_lock/fh_unlock
7538fc9cba84 NFSD: use (un)lock_inode instead of fh_(un)lock for file operations
e0335e7c4a51 NFSD: use explicit lock/unlock for directory ops
ebd1b016ad4d NFSD: reduce locking in nfsd_lookup()
ba4b518a23d3 NFSD: only call fh_unlock() once in nfsd_link()
ff01da71e484 NFSD: always drop directory lock in nfsd_unlink()
4655bcbce761 NFSD: change nfsd_create()/nfsd_symlink() to unlock directory before returning.
d52acd23a327 NFSD: add posix ACLs to struct nfsd_attrs
a3f27177c21b NFSD: add security label to struct nfsd_attrs
8a26a1b5c887 NFSD: set attributes when creating symlinks
183514794814 NFSD: introduce struct nfsd_attrs
162f99ff7b95 NFSD: verify the opened dentry after setting a delegation
3a5ab224a838 NFSD: drop fh argument from alloc_init_deleg
b6494b36b80c NFSD: Move copy offload callback arguments into a separate structure
8918b50537e9 NFSD: Add nfsd4_send_cb_offload()
bb1eb9755892 NFSD: Remove kmalloc from nfsd4_do_async_copy()
9cecf4772e8c NFSD: Refactor nfsd4_do_copy()
a48454785bc9 NFSD: Refactor nfsd4_cleanup_inter_ssc() (2/2)
4952fe668917 NFSD: Refactor nfsd4_cleanup_inter_ssc() (1/2)
6cb00ba23083 NFSD: Replace boolean fields in struct nfsd4_copy
6ff95a5f72eb NFSD: Make nfs4_put_copy() static
9a99c7f5d98b NFSD: Reorder the fields in struct nfsd4_op
7d1e44fd0637 NFSD: Shrink size of struct nfsd4_copy
24286575c674 NFSD: Shrink size of struct nfsd4_copy_notify
00eb5bd3844c NFSD: nfserrno(-ENOMEM) is nfserr_jukebox
9032c8e3aecb NFSD: Fix strncpy() fortify warning
0dfb19289614 NFSD: Clean up nfsd4_encode_readlink()
fc7380a198f2 NFSD: Use xdr_pad_size()
2528f487c825 NFSD: Simplify starting_len
7bc543311784 NFSD: Optimize nfsd4_encode_readv()
a70976ec89c2 NFSD: Add an nfsd4_read::rd_eof field
2540b7042998 NFSD: Clean up SPLICE_OK in nfsd4_encode_read()
3e7adac61db2 NFSD: Optimize nfsd4_encode_fattr()
0d6c82286ddf NFSD: Optimize nfsd4_encode_operation()
b9e6a5610b5c nfsd: silence extraneous printk on nfsd.ko insertion
650417956a22 NFSD: limit the number of v4 clients to 1024 per 1GB of system memory
59d35878294b NFSD: keep track of the number of v4 clients in the system
0f202977cad1 NFSD: refactoring v4 specific code to a helper in nfs4state.c
a52bb607abd0 NFSD: Ensure nf_inode is never dereferenced
e3befca679a9 NFSD: NFSv4 CLOSE should release an nfsd_file immediately
9be6499171fb NFSD: Move nfsd_file_trace_alloc() tracepoint
06d9c87204b2 NFSD: Separate tracepoints for acquire and create
4b338b528c43 NFSD: Clean up unused code after rhashtable conversion
1bea66c08890 NFSD: Convert the filecache to use rhashtable
208bd42a1a16 NFSD: Set up an rhashtable for the filecache
0b3a69057db2 NFSD: Replace the "init once" mechanism
76e2424c0d29 NFSD: Remove nfsd_file::nf_hashval
ec30a456359c NFSD: nfsd_file_hash_remove can compute hashval
7e8d4a933468 NFSD: Refactor __nfsd_file_close_inode()
2aa9fd1db009 NFSD: nfsd_file_unhash can compute hashval from nf->nf_inode
d6a23d45e2ef NFSD: Remove lockdep assertion from unhash_and_release_locked()
e97c2d5a71cf NFSD: No longer record nf_hashval in the trace log
1db19c3574f2 NFSD: Never call nfsd_file_gc() in foreground paths
81e3c7702799 NFSD: Fix the filecache LRU shrinker
ffb1a10a4405 NFSD: Leave open files out of the filecache LRU
175f88a6d509 NFSD: Trace filecache LRU activity
eed6df31603e NFSD: WARN when freeing an item still linked via nf_lru
16cbc64f9ce4 NFSD: Hook up the filecache stat file
4ade29dd0944 NFSD: Zero counters when the filecache is re-initialized
a880dcef74da NFSD: Record number of flush calls
ae76efbdfef7 NFSD: Report the number of items evicted by the LRU walk
5ce93c611c13 NFSD: Refactor nfsd_file_lru_scan()
5b6f8b083676 NFSD: Refactor nfsd_file_gc()
c162c99a29f7 NFSD: Add nfsd_file_lru_dispose_list() helper
4420d19ed4e4 NFSD: Report average age of filecache items
c18563275fbc NFSD: Report count of freed filecache items
b2dc4d30b0d8 NFSD: Report count of calls to nfsd_file_acquire()
0369b53886ec NFSD: Report filecache LRU size
f1785afc8946 NFSD: Demote a WARN to a pr_warn()
f87230a7dbe4 nfsd: remove redundant assignment to variable len
cad76843c768 NFSD: Fix space and spelling mistake
dcbebc868503 NFSD: Instrument fh_verify()
6345e92a9d0c NLM: Defend against file_lock changes after vfs_test_lock()
3482739bd413 fsnotify: Fix comment typo
b65b2d418759 fanotify: introduce FAN_MARK_IGNORE
c1f1797a8316 fanotify: cleanups for fanotify_mark() input validations
4c3723c53549 fanotify: prepare for setting event flags in ignore mask
cbe3bf6fcdf1 fs: inotify: Fix typo in inotify comment
f3222a6b66ae NFSD: Decode NFSv4 birth time attribute
0a160dc54991 fanotify: refine the validation checks on non-dir inode mask
47a1d1a2c1d5 NFS: restore module put when manager exits.
261eabe19cb2 NFSD: Fix potential use-after-free in nfsd_file_put()
ba68ab7d14dc NFSD: nfsd_file_put() can sleep
f55b83a598db NFSD: Add documenting comment for nfsd4_release_lockowner()
0775c8784e4c NFSD: Modernize nfsd4_release_lockowner()
5e4ee807e35a nfsd: Fix null-ptr-deref in nfsd_fill_super()
bf3182054995 nfsd: Unregister the cld notifier when laundry_wq create failed
3a66ad7ea7b1 SUNRPC: Use RMW bitops in single-threaded hot paths
7af208c9ea06 NFSD: Trace filecache opens
73d9eb9e19c6 NFSD: Move documenting comment for nfsd4_process_open2()
7dfad7f7da07 NFSD: Fix whitespace
b54f6a079ab2 NFSD: Remove dprintk call sites from tail of nfsd4_open()
106331a12b0f NFSD: Instantiate a struct file when creating a regular NFSv4 file
ce2296da5dad NFSD: Clean up nfsd_open_verified()
dabf24069b12 NFSD: Remove do_nfsd_create()
62bac33a70e8 NFSD: Refactor NFSv4 OPEN(CREATE)
ab407e0bf8d5 NFSD: Refactor NFSv3 CREATE
3bd0ae962ba8 NFSD: Refactor nfsd_create_setattr()
cf655c890bb6 NFSD: Avoid calling fh_drop_write() twice in do_nfsd_create()
55cb08630eb6 NFSD: Clean up nfsd3_proc_create()
2e0f8ee3c1ae NFSD: Show state of courtesy client in client info
6e56a5f75c55 NFSD: add support for lock conflict to courteous server
c3b2013544c8 fs/lock: add 2 callbacks to lock_manager_operations to resolve conflict
a8040fed13ed fs/lock: add helper locks_owner_has_blockers to check for blockers
d9fc2f8267e7 NFSD: move create/destroy of laundry_wq to init_nfsd and exit_nfsd
492634cbfe3d NFSD: add support for share reservation conflict to courteous server
26540b8940a2 NFSD: add courteous server support for thread with only delegation
56bc7e3821e8 NFSD: Clean up nfsd_splice_actor()
f14aa4a04472 fanotify: fix incorrect fmode_t casts
40ca5d91b578 fsnotify: consistent behavior for parent not watching children
f0628430d25d fsnotify: introduce mark type iterator
a97561b460c7 fanotify: enable "evictable" inode marks
c47bab4394a7 fanotify: use fsnotify group lock helpers
7fcef3285ade fanotify: implement "evictable" inode marks
33e91fb5eee5 fanotify: factor out helper fanotify_mark_update_flags()
5054f130f81f fanotify: create helper fanotify_mark_user_flags()
4f145b67c075 fsnotify: allow adding an inode mark without pinning inode
3c9dc688678b dnotify: use fsnotify group lock helpers
50612cd6a783 nfsd: use fsnotify group lock helpers
35f3fad0e30a inotify: use fsnotify group lock helpers
e419965d9323 fsnotify: create helpers for group mark_mutex lock
cdf89b045b30 fsnotify: make allow_dups a property of the group
ac51c087abd2 fsnotify: pass flags argument to fsnotify_alloc_group()
d032dd5a823b inotify: move control flags from mask to mark flags
93d2afc7d27c fs/lock: documentation cleanup. Replace inode->i_lock with flc_lock.
e19ec9acfbcb fanotify: do not allow setting dirent events in mask of non-dir
a98e5b3d958a nfsd: Clean up nfsd_file_put()
893fa2b80235 nfsd: Fix a write performance regression
091e4062ffd0 fsnotify: remove redundant parameter judgment
fd7de66b50b5 fsnotify: optimize FS_MODIFY events with no ignored masks
4bef66ca56d1 fsnotify: fix merge with parent's ignored mask
7dcd851cf863 nfsd: fix using the correct variable for sizeof()
bd0fee92b4e8 NFSD: Clean up _lm_ operation names
a028a32ab617 NFSD: Remove CONFIG_NFSD_V3
511360e1f526 NFSD: Move svc_serv_ops::svo_function into struct svc_serv
a5deac8754d6 NFSD: Remove svc_serv_ops::svo_module
7d94952cd5cf SUNRPC: Remove svc_shutdown_net()
c3fa9c2d3666 SUNRPC: Rename svc_close_xprt()
6c8231f0c289 SUNRPC: Rename svc_create_xprt()
4c9a56a70b4d SUNRPC: Remove svo_shutdown method
9d3cc211779a SUNRPC: Merge svc_do_enqueue_xprt() into svc_enqueue_xprt()
466562c48101 SUNRPC: Remove the .svo_enqueue_xprt method
61a9ecdb77c6 NFSD: Remove NFSD_PROC_ARGS_* macros
b42c9b5d9c84 NFSD: Streamline the rare "found" case
69e08eb5bf00 NFSD: Skip extra computation for RC_NOCACHE case
863aed522ef0 orDate: Thu Sep 30 19:19:57 2021 -0400
5b3110364f50 nfsd: Add support for the birth time attribute
392c68189565 NFSD: Deprecate NFS_OFFSET_MAX
91ec401bcd67 fsnotify: invalidate dcache before IN_DELETE event
8d5d1b4956a1 NFSD: Move fill_pre_wcc() and fill_post_wcc()
6be1619d4b05 NFSD: Trace boot verifier resets
d83ffc800f12 NFSD: Rename boot verifier functions
1510c051967e NFSD: Clean up the nfsd_net::nfssvc_boot field
5b2cfc4bb751 NFSD: Write verifier might go backwards
14d5c7263d42 nfsd: Add a tracepoint for errors in nfsd4_clone_file_range()
399451927d0e NFSD: De-duplicate net_generic(SVC_NET(rqstp), nfsd_net_id)
a330a794f428 NFSD: Clean up nfsd_vfs_write()
e7a3814a0029 nfsd: Retry once in nfsd_open on an -EOPENSTALE return
87e2bf374be2 nfsd: Add errno mapping for EREMOTEIO
92453b36fabc nfsd: map EBADF
1a197bcedf80 nfsd4: add refcount for nfsd4_blocked_lock
64ff32b8ad80 nfs: block notification on fs with its own ->lock
190a61768581 NFSD: De-duplicate nfsd4_decode_bitmap4()
30000dff921e nfsd: improve stateid access bitmask documentation
6f8664c6b50f NFSD: Combine XDR error tracepoints
3bc94fb44f10 NFSD: simplify per-net file cache management
fdf657bd7537 NFSD: Fix inconsistent indenting
19fbf344ba33 NFSD: Remove be32_to_cpu() from DRC hash function
018f6069471c NFS: switch the callback service back to non-pooled.
a11fe42af525 lockd: use svc_set_num_threads() for thread start and stop
f3f120852428 SUNRPC: always treat sv_nrpools==1 as "not pooled"
5c377f380120 SUNRPC: move the pool_map definitions (back) into svc.c
764ab3f970e6 lockd: rename lockd_create_svc() to lockd_get()
d38cc54be6f3 lockd: introduce lockd_put()
232cbc9b359d lockd: move svc_exit_thread() into the thread
3b068224105c lockd: move lockd_start_svc() call into lockd_create_svc()
ace565c3f246 lockd: simplify management of network status notifiers
d30ef2cf0656 lockd: introduce nlmsvc_serv
95364365f5b0 NFSD: simplify locking for network notifier.
c1ef7e9d72d4 SUNRPC: discard svo_setup and rename svc_set_num_threads_sync()
b11ea2be63b8 NFSD: Make it possible to use svc_set_num_threads_sync
091b6f516c50 NFSD: narrow nfsd_mutex protection in nfsd thread
dedfae92f9d7 SUNRPC: use sv_lock to protect updates to sv_nrthreads.
e6f08647c559 nfsd: make nfsd_stats.th_cnt atomic_t
c78050962735 SUNRPC: stop using ->sv_nrthreads as a refcount
c6f2b5942783 SUNRPC/NFSD: clean up get/put functions.
d021ef89a7de SUNRPC: change svc_get() to return the svc.
4fdd01ce33b6 NFSD: handle errors better in write_ports_addfd()
2049935c523e exit: Rename module_put_and_exit to module_put_and_kthread_exit
dd6663096680 exit: Implement kthread_exit
de7e2adfc784 fanotify: wire up FAN_RENAME event
a187e777d74d fanotify: report old and/or new parent+name in FAN_RENAME event
4b5743bdc592 fanotify: record either old name new name or both for FAN_RENAME
9acb63f955ca fanotify: record old and new parent and name in FAN_RENAME event
6a8facc4bd3e fanotify: support secondary dir fh and name in fanotify_info
c8d3ee69ee5d fanotify: use helpers to parcel fanotify_info buffer
3eec21b66085 fanotify: use macros to get the offset to fanotify_info buffer
932090b8abf6 fsnotify: generate FS_RENAME event with rich information
8bd3d40ea3df fanotify: introduce group flag FAN_REPORT_TARGET_FID
395ff6dc9ba3 fsnotify: separate mark iterator type from object type enum
f7d76fa9a881 fsnotify: clarify object type argument
a20d087cdffc ext4: fix error code saved on super block during file system abort
e11c8a6e8c92 nfsd4: remove obselete comment
60f18f40ca88 NFSD:fix boolreturn.cocci warning
0ca26103e06f nfsd: update create verifier comment
bf0416e0284b SUNRPC: Change return value type of .pc_encode
bd117f87569b SUNRPC: Replace the "__be32 *p" parameter to .pc_encode
b24695861020 NFSD: Save location of NFSv4 COMPOUND status
eadf587a2a25 SUNRPC: Change return value type of .pc_decode
85658caa8bbf SUNRPC: Replace the "__be32 *p" parameter to .pc_decode
10150232dcdd NFSD: Initialize pointer ni with NULL and not plain integer 0
767727a7e02f NFSD: simplify struct nfsfh
ed0815c8b7ca NFSD: drop support for ancient filehandles
f829bb3a0682 NFSD: move filehandle format declarations out of "uapi".
af12deba5335 NFSD: Optimize DRC bucket pruning
61116d723ea2 NFS: Move NFS protocol display macros to global header
53af55ba9ea2 NFS: Move generic FS show macros to global header
f78ab849df2b SUNRPC: Tracepoints should display tk_pid and cl_clid as a fixed-size field
20bbdbe31c0b NFS: Remove unnecessary TRACE_DEFINE_ENUM()s
45e16146c159 docs: Document the FAN_FS_ERROR event
b394c80e2c8d ext4: Send notifications on error
0e825bc84df7 fanotify: Allow users to request FAN_FS_ERROR events
c7c013dff4bd fanotify: Emit generic error info for error event
92eb45210b87 fanotify: Report fid info for file related file system errors
c8b6b09f3fb2 fanotify: WARN_ON against too large file handles
ebd89f7d0737 fanotify: Add helpers to decide whether to report FID/DFID
a83c3ed2e267 fanotify: Wrap object_fh inline space in a creator macro
7aafd61567a9 fanotify: Support merging of error events
c44d8071436c fanotify: Support enqueueing of error events
9258a9908b6d fanotify: Pre-allocate pool of error events
11280c7181b0 fanotify: Reserve UAPI bits for FAN_FS_ERROR
c0a6b12ecde7 fsnotify: Support FS_ERROR event type
965daffd0d15 fanotify: Require fid_mode for any non-fd event
1dad39ebf451 fanotify: Encode empty file handle when no inode is provided
5f34524dde58 fanotify: Allow file handle encoding for unhashed events
900fe4d70474 fanotify: Support null inode event in fanotify_dfid_inode
20bb62edd673 fsnotify: Pass group argument to free_event
84f904f03116 fsnotify: Protect fsnotify_handle_inode_event from no-inode events
4b6b5edcc701 fsnotify: Retrieve super block from the data field
8eb16abe8937 fsnotify: Add wrapper around fsnotify_add_event
e58d543a8cf2 fsnotify: Add helper to detect overflow_event
3e63bff7acdb inotify: Don't force FS_IN_IGNORED
dbeb08836b69 fanotify: Split fsid check from other fid mode checks
cce35a487832 fanotify: Fold event size calculation to its own function
8c7986c2bcc9 fsnotify: Don't insert unmergeable events in hashtable
18370157880b fsnotify: clarify contract for create event hooks
d92a8789fef6 fsnotify: pass dentry instead of inode data
7d5be4f79dac fsnotify: pass data_type to fsnotify_name()
764929accff3 x86/static_call: Add support for Jcc tail-calls
7339b1ce5ea6 x86/alternatives: Teach text_poke_bp() to patch Jcc.d32 instructions
f4ba357b0739 x86/alternatives: Introduce int3_emulate_jcc()
9b4eff016dea x86/asm: Differentiate between code and function alignment
ab8f581408c5 arch: Introduce CONFIG_FUNCTION_ALIGNMENT
2ae88e83f3b7 KVM/x86: Export RFDS_NO and RFDS_CLEAR to guests
2fb08b672eb7 x86/rfds: Mitigate Register File Data Sampling (RFDS)
4fa001418efd Documentation/hw-vuln: Add documentation for RFDS
a2b586df5546 x86/mmio: Disable KVM mitigation when X86_FEATURE_CLEAR_CPU_BUF is set
598fb2804482 KVM/VMX: Move VERW closer to VMentry for MDS mitigation
9fe80d3c1197 KVM/VMX: Use BT+JNC, i.e. EFLAGS.CF to select VMRESUME vs. VMLAUNCH
913ae894c2b0 x86/bugs: Use ALTERNATIVE() instead of mds_user_clear static key
d54de9f2a127 x86/entry_32: Add VERW just before userspace transition
eabab0a5f13e x86/entry_64: Add VERW just before userspace transition
f32b5db5fe35 x86/bugs: Add asm helpers for executing VERW
6b54d55bb3bc x86/asm: Add _ASM_RIP() macro for x86-64 (%rip) suffix
0a6f0f8702ea KVM: arm64: Limit stage2_apply_range() batch size to largest block
b4926c95ad0f KVM: arm64: Work out supported block level at compile time
142a01435c1e tty: serial: imx: Fix broken RS485
9bd2f11ac9ef printk: Update @console_may_schedule in console_trylock_spinning()
2280bb8577aa iommu/dma: Force swiotlb_max_mapping_size on an untrusted device
aa4cc17b3418 dma-iommu: add iommu_dma_opt_mapping_size()
f3e7d9471cc1 dma-mapping: add dma_opt_mapping_size()
685e8332deff swiotlb: Fix alignment checks when both allocation and DMA masks are present
cf716d5a0dd8 minmax: add umin(a, b) and umax(a, b)
f2ad3ce0b0b8 entry: Respect changes to system call number by trace_sys_enter()
2e2aadd6e175 clocksource/drivers/arm_global_timer: Fix maximum prescaler value
4949affd5288 ACPI: CPPC: Use access_width over bit_width for system memory accesses
ea592baf9e41 xen/events: close evtchn after mapping cleanup
b3914fee0955 i2c: i801: Avoid potential double call to gpiod_remove_lookup_table
4b12ff5edd14 tee: optee: Fix kernel panic caused by incorrect error handling
a71cba07783a fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion
0190d19d7651 vt: fix unicode buffer corruption when deleting characters
7dc4ed980968 mei: me: add arrow lake point H DID
e294f0eb3510 mei: me: add arrow lake point S DID
fed1f00e4834 tty: serial: fsl_lpuart: avoid idle preamble pending if CTS is enabled
a44c6c61af48 usb: port: Don't try to peer unused USB ports based on location
92b051b87658 usb: gadget: ncm: Fix handling of zero block length packets
6c1f36d92c0a USB: usb-storage: Prevent divide-by-0 error in isd200_ata_command
f4ffa18d2eb0 ALSA: hda/realtek - Fix headset Mic no show at resume back for Lenovo ALC897 platform
3e31af7c468b drm/i915: Check before removing mm notifier
898127d612a2 tracing: Use .flush() call to wake up readers
e126b508ed2e KVM: SVM: Flush pages under kvm->lock to fix UAF in svm_register_enc_region()
461a4f333c5a xfrm: Avoid clang fortify warning in copy_to_user_tmpl()
2fb9845251ce Drivers: hv: vmbus: Calculate ring buffer size for more efficient use of memory
9a92743d533e netfilter: nf_tables: reject constant set with timeout
7cdc1be24cc1 netfilter: nf_tables: disallow anonymous set with timeout flag
291cca35818b netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
f381224482ec cpufreq: brcmstb-avs-cpufreq: fix up "add check for cpufreq_cpu_get's return value"
df7889f78cc0 net: ravb: Add R-Car Gen4 support
1e7d2f14a24f x86/pm: Work around false positive kmemleak report in msr_build_context()
116562e804ff dm snapshot: fix lockup in dm_exception_table_exit
76c1568ac842 drm/amd/display: Fix noise issue on HDMI AV mute
efb754344932 drm/amd/display: Return the correct HDCP error code
5d5f1a7f3b10 drm/amdgpu: amdgpu_ttm_gart_bind set gtt bound flag
d69abe190a5f ahci: asm1064: asm1166: don't limit reported ports
205c06684a18 ahci: asm1064: correct count of reported ports
4be453271a88 wireguard: netlink: access device through ctx instead of peer
710a177f3472 wireguard: netlink: check for dangling peer via is_dead instead of empty list
3ff793aa0742 net: hns3: tracing: fix hclgevf trace event strings
81b9ddd44d3a NFSD: Fix nfsd_clid_class use of __string_len() macro
2031b61be8b7 x86/CPU/AMD: Update the Zenbleed microcode revisions
d8ae3bf07ebc cpufreq: dt: always allocate zeroed cpumask
ca581d237f3b nilfs2: prevent kernel bug at submit_bh_wbc()
2e2619ff5d0d nilfs2: fix failure to detect DAT corruption in btree and direct mappings
5a1729bc070f memtest: use {READ,WRITE}_ONCE in memory scanning
e8d993bd36b6 drm/vc4: hdmi: do not return negative values from .get_modes()
9ae98fc9fe4a drm/imx/ipuv3: do not return negative values from .get_modes()
912c149a52c3 drm/exynos: do not return negative values from .get_modes()
f781f0d82cf7 drm/panel: do not return negative error codes from drm_panel_get_modes()
a55677878b93 s390/zcrypt: fix reference counting on zcrypt card objects
9a3ca8292ce9 soc: fsl: qbman: Use raw spinlock for cgr_lock
d378c937131a soc: fsl: qbman: Add CGR update function
e25ceea9bc79 soc: fsl: qbman: Add helper for sanity checking cgr ops
e6378314bb92 soc: fsl: qbman: Always disable interrupts when taking cgr_lock
de0dcfa62306 ring-buffer: Use wait_event_interruptible() in ring_buffer_wait()
73becffc5d08 ring-buffer: Fix full_waiters_pending in poll
5a24b3a28d0c ring-buffer: Fix resetting of shortest_full
d3229afd170b ring-buffer: Do not set shortest_full when full target is hit
66fdf3a7cf52 ring-buffer: Fix waking up ring buffer readers
34cd4d5de121 ksmbd: retrieve number of blocks using vfs_getattr in set_file_allocation_info
f73c3e259593 vfio/platform: Disable virqfds on cleanup
fc92804048f3 PCI: dwc: endpoint: Fix advertised resizable BAR size
5273c56f3fd4 kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1
80d24b308b7e nfs: fix UAF in direct writes
a323e5e98f46 PCI/AER: Block runtime suspend when handling errors
967e74124f1e speakup: Fix 8bit characters from direct synth
eebe53270b4f usb: gadget: tegra-xudc: Fix USB3 PHY retrieval logic
fd8e9ef13ac7 phy: tegra: xusb: Add API to retrieve the port number of phy
4960561a6c36 slimbus: core: Remove usage of the deprecated ida_simple_xx() API
cf51c32c00c5 nvmem: meson-efuse: fix function pointer type mismatch
239c669edb2b ext4: fix corruption during on-line resize
d778917dd033 hwmon: (amc6821) add of_match table
a6c13d23d9e0 landlock: Warn once if a Landlock action is requested while disabled
6203f20d668c drm/etnaviv: Restore some id values
05ecc53f9480 mmc: core: Fix switch on gp3 partition
2da5568ee222 mm: swap: fix race between free_swap_and_cache() and swapoff()
86a08ddff8bb swap: comments get_swap_device() with usage rule
d3d858650933 mac802154: fix llsec key resources release in mac802154_llsec_key_del
a3b6004bfc2f dm-raid: fix lockdep waring in "pers->hot_add_disk"
125de155011c PCI/DPC: Quirk PIO log size for Intel Raptor Lake Root Ports
4e194de3a961 PCI/DPC: Quirk PIO log size for certain Intel Root Ports
ecbe3ca2ac9c PCI/ASPM: Make Intel DG2 L1 acceptable latency unlimited
25f6c4c440b6 PCI: Work around Intel I210 ROM BAR overlap defect
7cc94dd36e48 PCI/PM: Drain runtime-idle callbacks before driver removal
95e86a8f1c9e PCI: Drop pci_device_remove() test of pci_dev->driver
fa3762b45ea9 btrfs: fix off-by-one chunk length calculation at contains_pending_extent()
bbf72db11fe6 serial: Lock console when calling into driver before registration
63f8999cac33 printk/console: Split out code that enables default console
3f6a9daf0da4 usb: typec: ucsi: Clean up UCSI_CABLE_PROP macros
6eac5030fc97 fuse: don't unhash root
773783681d87 fuse: fix root lookup with nonzero generation
ede56884ccde mmc: tmio: avoid concurrent runs of mmc_request_done()
f3f867201bb8 PM: sleep: wakeirq: fix wake irq warning in system suspend
ad71f7bbd4c2 USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M
c1db6b1613ed USB: serial: option: add MeiG Smart SLM320 product
f9bad5759668 USB: serial: cp210x: add ID for MGP Instruments PDS100
1342e40c0779 USB: serial: add device ID for VeriFone adapter
60e9148baf12 USB: serial: ftdi_sio: add support for GMC Z216C Adapter IR-USB
c11808f4fb71 powerpc/fsl: Fix mfpmr build errors with newer binutils
4a49d24fdec0 usb: xhci: Add error handling in xhci_map_urb_for_dma
8f562f3b2517 clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays
3aedcf3755c7 clk: qcom: mmcc-apq8084: fix terminating of frequency table arrays
9de184d4e557 clk: qcom: gcc-ipq8074: fix terminating of frequency table arrays
b4527ee3de36 clk: qcom: gcc-ipq6018: fix terminating of frequency table arrays
18f1f468dd79 PM: suspend: Set mem_sleep_current during kernel command line setup
0552d5727e80 parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds
6a427a132e73 parisc: Fix csum_ipv6_magic on 64-bit systems
c38df21ec9a0 parisc: Fix csum_ipv6_magic on 32-bit systems
6817e1a1d650 parisc: Fix ip_fast_csum
a903a1e93f3b parisc: Avoid clobbering the C/B bits in the PSW with tophys and tovirt macros
60d6c5d40de9 mtd: rawnand: meson: fix scrambling mode value in command macro
6f203afea2dc ubi: correct the calculation of fastmap size
8ce982285414 ubi: Check for too small LEB size in VTBL code
f19b1023a375 ubifs: Set page uptodate in the correct place
b7fb63e807c6 fat: fix uninitialized field in nostale filehandles
d2a7a81088c6 bounds: support non-power-of-two CONFIG_NR_CPUS
218e2610b015 kasan/test: avoid gcc warning for intentional overflow
76645e0f5a2a kasan: test: add memcpy test that avoids out-of-bounds write
d05e6ba1b74a block: Clear zone limits for a non-zoned stacked queue
447753bdd69b ext4: correct best extent lstart adjustment logic
29d7089bed0d selftests/mqueue: Set timeout to 180 seconds
4ae5a97781ce crypto: qat - resolve race condition during AER recovery
b228e16a3ae1 crypto: qat - fix double free during reset
980cc81298c0 sparc: vDSO: fix return value of __setup handler
dc8c55b3ecbc sparc64: NMI watchdog: fix return value of __setup handler
83d3c5e30961 KVM: Always flush async #PF workqueue when vCPU is being destroyed
fec51819607f media: xc4000: Fix atomicity violation in xc4000_get_frequency
5e4b23e7a7b3 pci_iounmap(): Fix MMIO mapping leak
899e154f9546 drm/vmwgfx: Fix possible null pointer derefence with invalid contexts
29a327c4544a arm: dts: marvell: Fix maxium->maxim typo in brownstone dts
840e1b69081a smack: Handle SMACK64TRANSMUTE in smack_inode_setsecurity()
28b78c7b620e smack: Set SMACK64TRANSMUTE only for dirs in smack_inode_setxattr()
8b47e69ac83e clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd
0fa86b3b6a15 media: staging: ipu3-imgu: Set fields before media_entity_pads_init()
8c36205123dc wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach
2382f2e45c71 timers: Rename del_timer_sync() to timer_delete_sync()
2a873e61782f timers: Use del_timer_sync() even on UP
1c2f22864bcd timers: Update kernel-doc for various functions
85c3bdff671f KVM: x86: Use a switch statement and macros in __feature_translate()
01771ffad6f1 KVM: x86: Advertise CPUID.(EAX=7,ECX=2):EDX[5:0] to userspace
e99e8685fde5 KVM: x86: Update KVM-only leaf handling to allow for 100% KVM-only leafs
9ccce26837a8 x86/bugs: Use sysfs_emit()
4957fd741d61 x86/cpu: Support AMD Automatic IBRS
26445d9bb036 Documentation/hw-vuln: Update spectre doc
8d1bab770956 locking/rwsem: Disable preemption while trying for rwsem lock
7c82dac02886 block, loop: support partitions without scanning
45f504f301d4 bpftool: Fix pretty print dump for maps without BTF loaded
1f24338cb789 jbd2: Drop the merge conflicted hunk
e1d0e3c51bde tpm: tis_i2c: Limit write bursts to I2C_SMBUS_BLOCK_MAX (32) bytes
1abe841fe331 tpm: tis_i2c: Limit read bursts to I2C_SMBUS_BLOCK_MAX (32) bytes
6224acfc1d56 tpm: Add flag to use default cancellation policy
1cd19d48fb90 tpm: tis_i2c: Fix sanity check interrupt enable mask
a883da132fa8 tpm: Add tpm_tis_i2c backend for tpm_tis_core
a742ac8a1c51 tpm: Add tpm_tis_verify_crc to the tpm_tis_phy_ops protocol layer
ef495c5f45f2 tpm: Remove read16/read32/write32 calls from tpm_tis_phy_ops
1f3be2e23aa6 gcc-plugins: Reorganize gimple includes for GCC 13
24615a3b932a ata: ahci: fix enum constants for gcc-13
5d6cb145541a net: stmmac: Enable mac_managed_pm phylink config
fd93aabb4287 tools/resolve_btfids: Use pkg-config to locate libelf
130f9da78406 tools/resolve_btfids: Build with host flags
00f2f1a782f9 tools/resolve_btfids: Support cross-building the kernel with clang
17776a4ba9c2 tools/resolve_btfids: Install libbpf headers when building
7c9808380d70 libbpf: Make libbpf_version.h non-auto-generated
37ae1ba791ac libbpf: Add LIBBPF_DEPRECATED_SINCE macro for scheduling API deprecations
a2667e6d7314 drm/radeon: free iio for atombios when driver shutdown
f100c753aa1f powerpc: Fix reschedule bug in KUAP-unlocked user copy
da5513f30187 libbpf: Fix build warning on ref_ctr_off
4c5a089621a8 perf python: Account for multiple words in CC
1c5699ee85d4 fs: move S_ISGID stripping into the vfs_*() helpers
838f5d0701d8 fs: add mode_strip_sgid() helper
d97172683641 squashfs: provide backing_dev_info in order to disable read-ahead
ed037d7be40c irq_work: use kasan_record_aux_stack_noalloc() record callstack
1363bd7dbde3 ixgbevf: add disable link state
e5601ae2bd24 ixgbe: add improvement for MDD response functionality
caa57cd80575 ixgbe: add the ability for the PF to disable VF link state
16a77bfcc7df Check /dev/console using init_stat()
04574fd5579a tracing/arm: Have max stack tracer handle the case of return address after data
0e51e5717018 gpiolib: cdev: Set lineevent_state::irq after IRQ register successfully
1e6b7da6ddba drivers/base: Fix unsigned comparison to -1 in CPUMAP_FILE_MAX_BYTES
493160901320 mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, release} to avoid race condition
04224f725aa3 irqchip/gic-v3-its: Skip HP notifier when no ITS is registered
6f6c2996a81c irqchip/gic-v3-its: Postpone LPI pending table freeing and memreserve
1fa94473423f irqchip/gic-v3-its: Give the percpu rdist struct its own flags field
6013d1ae5feb cert host tools: Stop complaining about deprecated OpenSSL functions
efe20512212b init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash
a40d2daf2795 pnmtologo: use relocatable file name
3b40d5b41155 of: configfs: remove unused variable overlay_lock
6c085baf1838 tools: use basename to identify file in gen-mach-types
2fca0fd71981 lib/build_OID_registry: fix reproducibility issues
0f586f4ee8ad vt/conmakehash: improve reproducibility
a75774679f28 OF: DT-Overlay configfs interface (v8)
d179c639b30b x86/boot: Wrap literal addresses in absolute_pointer()
856ec356cf91 ACPI: thermal: drop an always true check
7614af249993 xfs: Fix -Werror=dangling-pointer work-around for older GCC
41470215f97e xfs: Work around GCC 12 -Werror=dangling-pointer for xfs_attr_remote.o
44a445c1922d virtio-pci: Remove wrong address verification in vp_del_vqs()
77aa9e489eaf bpf: Disallow unprivileged bpf by default
ebfb1822e9f9 fs/aufs: fixup 5.15.36 fixups
4eba9348d3e2 Revert "Revert "fbdev: Hot-unplug firmware fb devices on forced removal""
5df6d1b00f95 jbd2: fix use-after-free of transaction_t race
2d83e8196487 jbd2: refactor wait logic for transaction updates into a common function
07a63f760793 netfilter: conntrack: avoid useless indirection during conntrack destruction
4e7122625996 Revert "fbdev: Hot-unplug firmware fb devices on forced removal"
7ba4cb36fd4f rcu: Avoid alloc_pages() when recording stack
f78574dee71e kasan: test: silence intentional read overflow warnings
d313cb89b6b1 kasan: arm64: fix pcpu_page_first_chunk crash with KASAN_VMALLOC
5e279d5647cc arm64: support page mapping percpu first chunk allocator
e5bf16752dca vmalloc: choose a better start address in vm_area_register_early()
660b3d21b46f kasan: test: bypass __alloc_size checks
00aa7573e53a kasan: test: add memcpy test that avoids out-of-bounds write
67becf0b1bd4 kasan: fix tag for large allocations when using CONFIG_SLAB
bedf1e033213 workqueue, kasan: avoid alloc_pages() when recording stack
7195b67ce69b kasan: generic: introduce kasan_record_aux_stack_noalloc()
bdff763f0e29 kasan: common: provide can_alloc in kasan_save_stack()
51423ebb36ad lib/stackdepot: introduce __stack_depot_save()
85373e66d847 lib/stackdepot: remove unused function argument
5b6cc9b251f3 lib/stackdepot: include gfp.h
c9f3902d8069 aufs: reduce overhead for "code present but disabled" use case.
b98d189df02c aufs: bugfix, umount passes NULL to ->parse_monolithic()
13b883cbbbd9 aufs standalone: cosmetic, missing copyright sentence
21f8b0d81898 aufs: 5.15.5-20220117 ---> 5.15.5-20220221
6199fd896645 aufs: tiny, headers after fs_context
8ddb40e31c29 aufs: fs_context 7/7, finally remount
69035f71c6fd aufs: fs_context 6/7, now mount
bc841b970697 aufs: fs_context 5/7, parse all other mount options
435188053da2 aufs: fs_context 4/7, parse xino options
9af1f1825cbd aufs: fs_context 3/7, parse the branch-management options
1c05eb767f8c aufs: fs_context 2/7, parse "br" mount option
a8488f603134 aufs: fs_context 1/7, skelton of the new shceme
8e32e0015564 aufs: pre fs_context, convert a static flag to a macro
f90cb4144aec aufs: pre fs_context, support the incomplete sb and sbinfo case
948762ef859c aufs: pre fs_context, convert the type of alloc_sbinfo()
77151a08776b aufs: 5.15.5-20211129 ---> 5.15.5-20220117
2539adbbbe1e aufs: 5.14-20211018 ---> 5.15.5-20211129
7d32b25193c4 aufs: for v5.15-rc1, sync_inode() is gone
66ec0c509225 aufs: for v5.15-rc1, new param 'rcu' for ->get_acl()
69709dc518cd aufs: for v5.15-rc1, no mand-lock anymore
ada8fe9543e5 aufs: 5.14-20210906 ---> 5.14-20211018
b77f7f3f394a Revert "aufs: adjust to v5.15 fs changes"
81bdce5b5876 tick/nohz: WARN_ON --> WARN_ON_ONCE to prevent console saturation
97c963889222 sched/isolation: really align nohz_full with rcu_nocbs
871f23ad3627 Revert "ARM: defconfig: Enable ax88796c driver for Exynos boards"
ffad0783dd5b ARM: config: multi v7: Regenerate defconifg
5c1e1a1ff2d3 ARM: config: multi v7: Add renamed symbols
badaf96564fe ARM: config: multi v7: Clean up enabled by default options
34996040fc9b ARM: config: multi v7: Drop unavailable options
7f685244afb3 powerpc/mm: Switch obsolete dssall to .long
20301aeb1a64 riscv: fix build with binutils 2.38
9df58d070506 powerpc/lib/sstep: fix 'ptesync' build error
720b61fc400b x86_64_defconfig: Fix warnings
02bf23d26bc4 arm64: defconfig: cleanup config options
05914e2c87e5 arm: defconfig: drop unused POWER_AVS option
ffb532fa19b9 aufs5: fix build against v5.15.3+
a4b3abf4d96d qemux86: add configuration symbol to select values
fee94ee09154 clear_warn_once: add a clear_warn_once= boot parameter
3d8762d900d9 clear_warn_once: bind a timer to written reset value
95faacac47e8 clear_warn_once: expand debugfs to include read support
de20c4240018 perf: perf can not parser the backtrace of app in the 32bit system and 64bit kernel.
0e4aacead9c1 perf: x86-32: explicitly include <errno.h>
9ad92c11468e perf: mips64: Convert __u64 to unsigned long long
09e7efe3e68a perf: fix bench numa compilation
e79becc44fa6 perf: add SLANG_INC for slang.h
b1033b588681 perf: add sgidefs.h to for mips builds
cf9db484ac0b perf: change --root to --prefix for python install
7fd052c2c562 perf: add 'libperl not found' warning
27a437cdd469 perf: force include of <stdbool.h>
3b99d21bec2f fat: don't use obsolete random32 call in namei_vfat
a7e9293b506b FAT: Added FAT_NO_83NAME
6fd0e71d9e5c FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES option
c379b0d324ae FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES option
538be0fdb124 aufs: adjust to v5.15 fs changes
f45da75c8759 aufs5: core
047f57e07e01 aufs5: standalone
029fc15574c8 aufs5: mmap
610d0192ee94 aufs5: base
d4e428d0ec5f aufs5: kbuild
eb067eca251a yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR and NULL
286af18d0875 yaffs: fix -Wstringop-overread compile warning in yaffs_fix_null_name
24d59a4e26a6 yaffs2: v5.12+ build fixups (not runtime tested)
22c73536d5d7 yaffs: include blkdev.h
506b7251bfb8 yaffs: fix misplaced variable declaration
a0e26ff364dc yaffs2: v5.6 build fixups
b10b1b2d169e yaffs2: fix memory leak when /proc/yaffs is read
ad9adccbb214 yaffs: add strict check when call yaffs_internal_read_super
2e3c3aec8279 yaffs: repair yaffs_get_mtd_device
d662538516a7 yaffs: Fix build failure by handling inode i_version with proper atomic API
70a6113ee2c7 yaffs2: fix memory leak in mount/umount
3378e4a9e404 yaffs: Avoid setting any ACL releated xattr
ec2284edddef Yaffs:check oob size before auto selecting Yaffs1
c2a49874051c fs: yaffs2: replace CURRENT_TIME by other appropriate apis
e9a5105a3e73 yaffs2: adjust to proper location of MS_RDONLY
608807406f13 yaffs2: import git revision b4ce1bb (jan, 2020)
89e660ece42c initramfs: allow an optional wrapper script around initramfs generation
b179dbc9aa10 iwlwifi: select MAC80211_LEDS conditionally
3fd5ca3673d0 net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119)
d1f6edbf0188 arm64/perf: Fix wrong cast that may cause wrong truncation
d202fb2caf33 defconfigs: drop obselete options
9a27e3b5f4e7 arm64/perf: fix backtrace for AAPCS with FP enabled
e20d8cf019b4 linux-yocto: Handle /bin/awk issues
b6d2a3dbbd3a uvesafb: provide option to specify timeout for task completion
adb40f1e6a1a uvesafb: print error message when task timeout occurs
f280a1ed0962 compiler.h: Undef before redefining __attribute_const__
4352732f268c vmware: include jiffies.h
7954a677968d Resolve jiffies wrapping about arp
5f28a1035d95 nfs: Allow default io size to be configured.
0d7260ad7106 check console device file on fs when booting
900a12e37e0a mount_root: clarify error messages for when no rootfs found
7b878cbea726 menuconfig,mconf-cfg: Allow specification of ncurses location
6604fc1763b3 modpost: mask trivial warnings
0d294adb09cb kbuild: exclude meta directory from distclean processing
a097cdd95a9e powerpc: serialize image targets
5db6ec39a0a3 arm: serialize build targets
cbabca27905e crtsavres: fixups for 5.4+
7fc7656ed403 powerpc/ptrace: Disable array-bounds warning with gcc8
a5faac5a19a2 powerpc: Disable attribute-alias warnings from gcc8
186c54665b67 powerpc: add crtsavres.o to archprepare for kbuild
d1ea862964ca powerpc: kexec fix for powerpc64
2ac35b89a0f9 powerpc: Add unwind information for SPE registers of E500 core
2e1c348a28bb mips: vdso: fix 'jalr $t9' crash in vdso code
ec57870b303a mips: Kconfig: add QEMUMIPS64 option
6a81b3c08107 4kc cache tlb hazard: tlbp cache coherency
74e3b2a21e54 malta uhci quirks: make allowance for slow 4k(e)c
22e65b63d3b4 arm/Makefile: Fix systemtap
b7f1ab59f19e vexpress: Pass LOADADDR to Makefile
ce2800c73bf7 arm: ARM EABI socketcall
019d142fd956 ARM: LPAE: Invalidate the TLB for module addresses during translation fault
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../linux/linux-yocto-rt_5.15.bb | 6 ++---
.../linux/linux-yocto-tiny_5.15.bb | 6 ++---
meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++----------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index 5ad7febb20..f6ff6ede18 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "bf104e8f5db008e45d982ff2d96b136e619be9ee"
-SRCREV_meta ?= "0b6359f487c6f8dc0d6adb061dd5afe476cc71a2"
+SRCREV_machine ?= "450d764329026c622d2fcc8e0841ee8c003deb48"
+SRCREV_meta ?= "9f60e205e8e28fdf90fbceb54c6ed2aec0b42ed3"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.15.153"
+LINUX_VERSION ?= "5.15.155"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
index a55ad58eaa..6e59eb6ceb 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
@@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.15.153"
+LINUX_VERSION ?= "5.15.155"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "4ef577ca14a247aa0c3283ad1fc3f5c9dcc80e63"
-SRCREV_meta ?= "0b6359f487c6f8dc0d6adb061dd5afe476cc71a2"
+SRCREV_machine ?= "b662753bbd1caacf51d1cef578eceb1b58a753f0"
+SRCREV_meta ?= "9f60e205e8e28fdf90fbceb54c6ed2aec0b42ed3"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
index 8026be18a8..b6d7fbf7c1 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
@@ -14,24 +14,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base"
KBRANCH:qemux86-64 ?= "v5.15/standard/base"
KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "019dfee2a419e087baacbfca08d7bbb2bfd26ec5"
-SRCREV_machine:qemuarm64 ?= "17269f6b7e7ddf2178fb957f7e3f4c038de10f51"
-SRCREV_machine:qemumips ?= "a0b4f69bd55db8f36a749febbe952ed635677faf"
-SRCREV_machine:qemuppc ?= "9768dfa1dde96b13c14a40a7abb936217d8ac1ef"
-SRCREV_machine:qemuriscv64 ?= "163500b871852fd7eb5f148948583ca7bed338db"
-SRCREV_machine:qemuriscv32 ?= "163500b871852fd7eb5f148948583ca7bed338db"
-SRCREV_machine:qemux86 ?= "163500b871852fd7eb5f148948583ca7bed338db"
-SRCREV_machine:qemux86-64 ?= "163500b871852fd7eb5f148948583ca7bed338db"
-SRCREV_machine:qemumips64 ?= "5a278da2a79b5b84ce6bb6a6e19af7b1f30af0b2"
-SRCREV_machine ?= "163500b871852fd7eb5f148948583ca7bed338db"
-SRCREV_meta ?= "0b6359f487c6f8dc0d6adb061dd5afe476cc71a2"
+SRCREV_machine:qemuarm ?= "699ce07e7326d5a4143655ab8416bf7b8d641260"
+SRCREV_machine:qemuarm64 ?= "1f8f9d20707574ce56ab3ada6554c2a9cbce55fb"
+SRCREV_machine:qemumips ?= "5eeedd87a05a973e797357c61564c2e82cff7755"
+SRCREV_machine:qemuppc ?= "5f854a0765bf57db2289780152651d2b463fb41e"
+SRCREV_machine:qemuriscv64 ?= "97a728f8e22ebd7ed35066e01060e97b4a89da05"
+SRCREV_machine:qemuriscv32 ?= "97a728f8e22ebd7ed35066e01060e97b4a89da05"
+SRCREV_machine:qemux86 ?= "97a728f8e22ebd7ed35066e01060e97b4a89da05"
+SRCREV_machine:qemux86-64 ?= "97a728f8e22ebd7ed35066e01060e97b4a89da05"
+SRCREV_machine:qemumips64 ?= "9aa2c6f70ea08ee03c53ed3a96b91907db782dd8"
+SRCREV_machine ?= "97a728f8e22ebd7ed35066e01060e97b4a89da05"
+SRCREV_meta ?= "9f60e205e8e28fdf90fbceb54c6ed2aec0b42ed3"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "9465fef4ae351749f7068da8c78af4ca27e61928"
+SRCREV_machine:class-devupstream ?= "fa3df276cd36c5dbbd9deb64129d0d0f14c35dc8"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v5.15/base"
@@ -39,7 +39,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.15.153"
+LINUX_VERSION ?= "5.15.155"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.34.1
^ permalink raw reply related [relevance 1%]
* linux-next: Tree for May 9
@ 2024-05-09 6:37 3% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-09 6:37 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 40687 bytes --]
Hi all,
Changes since 20240508:
The dma-mapping tree glost its build failure.
The v4l-dvb-next tree lost its build failure.
The net-next tree gained a conflict against the dma-mapping tree.
The bitmap tree lost its build failure.
The refactor-heap tree gained conflicts against the block tree for which
I dropped the refator-heap tree.
Non-merge commits (relative to Linus' tree): 11135
11149 files changed, 747918 insertions(+), 274039 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (45db3ab70092 Merge tag '6.9-rc7-ksmbd-fixes' of git://git.samba.org/ksmbd)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (ea3b7b27db4f mailmap: add entry for Barry Song)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (5549d1e39989 Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (7bbe449d0bdb s390/paes: Reestablish retry loop in paes)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (02754103e1f7 Merge branch 'rxrpc-miscellaneous-fixes')
Merging bpf/master (3e9bc0472b91 Merge branch 'bpf: Add BPF_PROG_TYPE_CGROUP_SKB attach type enforcement in BPF_LINK_CREATE')
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging ipvs/main (8a2e4d37afb8 s390/qeth: Fix kernel panic after setting hsuid)
Merging wireless/for-next (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (fdb3f29dfe0d ALSA: hda/realtek: Fix build error without CONFIG_PM)
Merging sound-asoc-fixes/for-linus (6490bec6d5bf ASoC: Intel: avs: boards: Properly name input device)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (d1ef160b45a0 regulator: rtq2208: Fix the BUCK ramp_delay range to maximum of 16mVstep/us)
Merging spi-fixes/for-linus (52b62e7a5d4f spi: stm32: enable controller before asserting CS)
Merging pci-current/for-linus (f3d049b35b01 PCI/ASPM: Restore parent state to parent, child state to child)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler)
Merging usb.current/usb-linus (dd5a440a31fa Linux 6.9-rc7)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (bb198e29fe75 iio: dac: ad5592r: fix temperature channel scaling value)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (008ab3c53bc4 speakup: Fix sizeof() vs ARRAY_SIZE() bug)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (dd5a440a31fa Linux 6.9-rc7)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (0a9c28bec202 Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (d02abd57e794 hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (cbf613cd4d3c Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (515a3c3a5489 platform/x86: ISST: Add Grand Ridge to HPM CPU list)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so)
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (dd5a440a31fa Linux 6.9-rc7)
Merging drm-intel-fixes/for-linux-next-fixes (43b26bdd2ee5 drm/i915/bios: Fix parsing backlight BDB data)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (a86d27693066 gpiolib: fix the speed of descriptor label setting with SRCU)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (55750148e559 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe())
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (6897204ea3df drm/connector: Add
Merging mm-stable/mm-stable (447bac3d292f thp: remove HPAGE_PMD_ORDER minimum assertion)
Merging mm-nonmm-stable/mm-nonmm-stable (8fcb916cac89 kernel/watchdog_perf.c: tidy up kerneldoc)
Merging mm/mm-everything (2711e01a675b foo)
Merging kbuild/for-next (5e9e4712f006 kconfig: use menu_list_for_each_sym() in sym_check_choice_deps())
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (187c219b57ea perf dwarf-aux: Print array type name with "[]")
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (163943ac00cb xsk: use generic DMA sync shortcut instead of a custom one)
Merging asm-generic/master (02af68767d27 Merge branch 'alpha-cleanup-6.9' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (b7e329ac0464 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (d794066844ed Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf', 'for-next/selftests' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support)
Merging arm-soc/for-next (9fee410d765a Merge branch 'soc/dt-late' into for-next)
Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (4cece7649650 Linux 6.9-rc1)
Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (7468eb6710ce Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-clk/next' into for-next)
Merging samsung-krzk/for-next (a9c32618cd2a Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (2dc107360e22 dts: zynqmp: add properties for TCM in remoteproc)
Merging clk/clk-next (9e878b146fd7 Merge branch 'clk-stm' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (7b7e584f90bf LoongArch: KVM: Add mmio trace events support)
Merging m68k/for-next (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1)
Merging m68knommu/for-next (a5044ce7d1d9 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (487fa28fa8b6 parisc: Define sigset_t in parisc uapi header)
Merging powerpc/next (98ec6d38ee57 selftests/powerpc/dexcr: Fix spelling mistake "predicition" -> "prediction")
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree())
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
CONFLICT (content): Merge conflict in arch/riscv/Makefile
CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
CONFLICT (content): Merge conflict in kernel/sys.c
Merging riscv-dt/riscv-dt-for-next (1c80d50bb697 riscv: dts: microchip: add pac1934 power-monitor to icicle)
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (a1bca25da366 Merge branch 'features' into for-next)
Merging sh/for-next (21b8651502d5 sh: boot: Add proper forward declarations)
Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask var)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (a74979689d4a bcachefs: Invalid devices are now checked for by fsck, not .invalid methods)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (55b52af44d50 Merge branch 'for-next-next-v6.9-20240508' into for-next-20240508)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (ae4f73e84cb1 smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (8c0b8b1bee17 erofs: Zstandard compression support)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (e6b4c0a8589b Merge ext2 Kconfig cleanup.)
Merging ext4/dev (dc1c4663bc49 ext4: propagate errors from ext4_sb_bread() in ext4_xattr_block_cache_find())
Merging f2fs/dev (3763f9effcdc f2fs: use helper to print zone condition)
Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning)
Merging fuse/for-next (9fe2a036a23c fuse: Add initial support for fs-verity)
Merging gfs2/for-next (c1c53c26e338 gfs2: make timeout values more explicit)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (691aae4f36f9 ksmbd: do not grant v2 lease if parent lease key and epoch are not set)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (939cb14d51a1 NFS/knfsd: Remove the invalid NFS error 'NFSERR_OPNOTSUPP')
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access)
Merging overlayfs/overlayfs-next (096802748ea1 ovl: remove upper umask handling from ovl_create_upper())
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (f5e217b1e5dc Merge branch 'vfs.super' into vfs.all)
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in fs/ext4/file.c
CONFLICT (content): Merge conflict in fs/tracefs/inode.c
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (596ffa476e20 Merge branch 'for-6.10' into for-next)
Merging pci/next (85e9c34ad6fb Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (14ee3d12f37b Merge branch 'for-6.10/hid-bpf' into for-next)
Merging i2c/i2c/for-next (20e70be866cc Merge branch 'i2c/for-current' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE())
Merging i3c/i3c/next (acec16dbb338 i3c: dw: Add hot-join support.)
Merging dmi/dmi-for-next (7d5019435585 firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (6a8157812f5b hwmon: (emc1403) Add support for conversion interval configuration)
Merging jc_docs/docs-next (a8907c5df2a3 Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (4a7d735191de media: dw2102: fix coding style issues)
Merging v4l-dvb-next/master (48259b909737 media: media: intel/ipu6: Fix spelling mistake "remappinp" -> "remapping")
Merging pm/linux-next (15a871c024c3 Merge branch 'pm-devfreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (ccad360a2d41 PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions)
Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (734b5def91b5 thermal/drivers/loongson2: Add Loongson-2K2000 support)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (f483f6a29d4d IB/hfi1: Remove generic .ndo_get_stats64)
Merging net-next/main (252aa6d53931 test: hsr: Call cleanup_all_ns when hsr_redbox.sh script exits)
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/Makefile
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in net/core/page_pool.c
Merging bpf-next/for-next (009367099eb6 bpf: Avoid uninitialized value in BPF_CORE_READ_BITFIELD)
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (1f1dda1caac5 Bluetooth: btintel: Fix compiler warning for multi_v7_defconfig config)
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.c
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.h
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
Merging wireless-next/for-next (1d60eabb8269 wifi: mwl8k: initialize cmd->addr[] properly)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (6117af863659 crypto: hisilicon/sec2 - fix for register offset)
Merging drm/drm-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
Merging drm-exynos/for-linux-next (2236a61bd491 Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next)
Merging drm-misc/for-linux-next (713a75079f37 drm: xlnx: zynqmp_dpsub: Fix compilation error)
Merging amdgpu/drm-next (10f624ef239b drm/amdkfd: Reconcile the definition and use of oem_id in struct kfd_topology_device)
Merging drm-intel/for-linux-next (0097ecd06d9d drm/i915: Use drm_crtc_vblank_crtc())
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vbt_defs.h
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (b587f413ca47 drm/msm/gen_header: allow skipping the validation)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Makefile
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (fe0154cf8222 drm/xe/xe2: Enable Indirect Ring State support for Xe2)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (9b1fe0510494 regmap: Reorder fields in 'struct regmap_config' to save some memory)
Merging sound/for-next (d344873c4cbd ALSA: hda: cs35l56: Fix lifetime of cs_dsp instance)
Merging ieee1394/for-next (21151fd8f0ea firewire: obsolete usage of *-objs in Makefile for KUnit test)
Merging sound-asoc/for-next (0849ef17fbfb Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (da3fe9d0be5b bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (5128de84d8fc Input: cros_ec_keyb - remove an unused field in struct cros_ec_keyb)
Merging block/for-next (1fcf6c69ab54 Merge branch 'for-6.10/block' into for-next)
CONFLICT (content): Merge conflict in block/ioctl.c
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (83637d9017b2 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (d4a89339f17c ata: pata_legacy: make legacy_exit() work again)
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs)
Merging mfd/for-mfd-next (7fcb2977c0b5 dt-bindings: mfd: Convert lp873x.txt to json-schema)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (4da294108e38 backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (fd980b3c2af5 Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (dd80c7465029 MAINTAINERS: repair file entry in SECURITY SUBSYSTEM)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (ca584966d106 Documentation: tpm: Add TPM security docs toctree entry)
Merging watchdog/master (413bf4e857fd watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in sa1100dog_probe())
Merging iommu/next (36bb003ed686 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (49e9d01f669e dt-bindings: Use full path to other schemas)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (a2890dc5d13c Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (c064e5cb8336 Merge branch into tip/master: 'x86/timers')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (ab80b31cd7b2 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (2604e6c504cc Merge branches 'cmpxchg.2024.05.01a', 'kcsan.2024.05.07a', 'lkmm.2024.05.06a', 'rcu-merge.2024.05.01a' and 'tsc.2024.04.09c' into HEAD)
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kvm/next (40269c03fdbf KVM: x86: Explicitly zero kvm_caps during vendor module load)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Applying: fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code"
Merging kvm-arm/next (e28157060cdd Merge branch kvm-arm64/misc-6.10 into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (b52e8cd3f835 KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info())
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/aarch64/psci_test.c
Merging xen-tip/linux-next (802600ebdf23 x86/xen: return a sane initial apic id when running as PV guest)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (76f09e22027f platform/x86: ISST: Support SST-BF and SST-TF per level)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (880a746fa3ea device property: Fix a typo in the description of device_get_child_node_count())
Merging usb/usb-next (a2cf936ebef2 usb: gadget: u_audio: Clear uac pointer when freed.)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/core.c
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (6bd23e0c2bb6 tty: add the option to have a tty reject a new ldisc)
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (336d8cd99405 Merge tag 'extcon-next-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x)
Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property)
Merging extcon/extcon-next (3e8e45b65d9f extcon: adc-jack: Document missing struct members)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (bb208810b1ab vfio/qat: Add vfio_pci driver for Intel QAT SR-IOV VF devices)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (4cece7649650 Linux 6.9-rc1)
Merging staging/staging-next (eb563dc752d3 staging: pi433: Remove unused driver)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (28059ddbee0e MAINTAINERS: Update role for IDXD driver)
Merging cgroup/for-next (8f6d24a5db2a selftests/cgroup: fix uninitialized variables in test_zswap.c)
Merging scsi/for-next (9bfaa1936169 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (40ae6a1ee5fd Merge patch series "Update lpfc to revision 14.4.0.2")
Merging vhost/linux-next (88199634e516 vduse: enable Virtio-net device type)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (c8d8f841e95b Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (7f45fe2ea3b8 gpio: nuvoton: Fix sgpio irq handle error)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (9429f847dd72 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (fd9364395767 dt-bindings: pwm: renesas,tpu: Do not require pwm-cells twice)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (2c3b8f8f37c6 selftests/sgx: Include KHDR_INCLUDES in Makefile)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (5496b9b77d74 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (e406737b1110 seccomp: Constify sysctl subhelpers)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (4cece7649650 Linux 6.9-rc1)
Merging nvmem/for-next (4cece7649650 Linux 6.9-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (ba3d5b5d07d6 Merge branch 'fix-vfork-test-next' into landlock-next)
Merging rust/rust-next (97ab3e8eec0c rust: alloc: fix dangling pointer in VecExt<T>::reserve())
CONFLICT (content): Merge conflict in rust/Makefile
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (4bbf9c3b53e6 fs/coredump: Enable dynamic configuration of max file note size)
Merging bitmap/bitmap-for-next (892e4e01f7da usercopy: Don't use "proxy" headers)
552467a38cf5 ("arm64: tlb: Fix TLBI RANGE operand")
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (6d305cbef1aa uapi: stddef.h: Provide UAPI macros for __counted_by_{le, be})
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (788c1bf8de9f tools/power turbostat: version 2024.05.07)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.c
CONFLICT (content): Merge conflict in drivers/md/bcache/bset.h
CONFLICT (content): Merge conflict in drivers/md/bcache/btree.c
CONFLICT (content): Merge conflict in drivers/md/bcache/writeback.c
$ git merge --abort
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 3%]
* ❌ FAIL (MISSED 5 of 204): Test report for master (6.9.0-rc7, mainline.kernel.org-clang, 45db3ab7)
@ 2024-05-09 1:21 4% cki-project
0 siblings, 0 replies; 200+ results
From: cki-project @ 2024-05-09 1:21 UTC (permalink / raw)
To: bhe, bgoncalv, yiyan, llvm, xiawu, xzhou
Hi, we tested your kernel and here are the results:
Overall result: FAILED
Merge: OK
Compile: OK
Test: FAILED
Kernel information:
Commit message: Merge tag '6.9-rc7-ksmbd-fixes' of git://git.samba.org/ksmbd
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/redhat:1283625471
One or more kernel tests failed:
Unrecognized or new issues:
kdump - kexec-file-load
x86_64
Logs: https://datawarehouse.cki-project.org/kcidb/tests/redhat:1283625471-x86_64-kernel_upt_26
Non-passing ran subtests:
❌ FAIL /kdump/kexec-file-load
Reboot test
x86_64
Logs: https://datawarehouse.cki-project.org/kcidb/tests/redhat:1283625471-x86_64-kernel_upt_37
Non-passing ran subtests:
❌ FAIL misc/reboot-test/journalctl-check
xfstests - cifsv3.11
x86_64 (debug)
Logs: https://datawarehouse.cki-project.org/kcidb/tests/redhat:1283625471-x86_64-kernel-debug_upt_32
Non-passing ran subtests:
❌ FAIL generic/428
❌ FAIL generic/590
xfstests - nfsv4.2
x86_64 (debug)
Logs: https://datawarehouse.cki-project.org/kcidb/tests/redhat:1283625471-x86_64-kernel-debug_upt_31
We also see the following known issues which are not related to your changes:
Issue: [upstream] blktests tests/zbd/010 failed (WARNING: CPU: 22 PID: 44011 at fs/iomap/iter.c:51)
URL: https://lore.kernel.org/linux-block/CAHj4cs-kfojYC9i0G73PRkYzcxCTex=-vugRFeP40g_URGvnfQ@mail.gmail.com/T/#u
Affected tests:
Storage - blktests - blk - upstream [aarch64, s390x, x86_64]
Issue: [upstream] stress-ng: avc denial on secretmemory
URL: https://gitlab.com/redhat/centos-stream/tests/kernel/kernel-tests/-/issues/1752
Affected tests:
stress: stress-ng - memory [aarch64, s390x, x86_64]
Issue: avc: denied { name_bind } for pid=897864 comm="rpcbind" src=63924 scontext=system_u:system_r:rpcbind_t:s0 tcontext=system_u:object_r:unreserved_port_t:s0 tclass=udp_socket permissive=1
URL: https://bugzilla.redhat.com/show_bug.cgi?id=1758147
Affected tests:
xfstests - nfsv4.2 [x86_64]
Issue: (ppc64le) selinux-policy: serge-testsuite: ld: cannot find arch/powerpc/lib/crtsavres.o: No such file or directory
URL: https://gitlab.com/redhat/centos-stream/tests/kernel/kernel-tests/-/issues/1267
Affected tests:
selinux-policy: serge-testsuite [ppc64le]
Issue: [rawhide] [s390x] avc: denied { read write } for pid=12701 comm="systemd-user-ru" name="z90crypt" dev="devtmpfs" ino=103 scontext=system_u:system_r:systemd_logind_t:s0 tcontext=system_u:object_r:crypt_device_t:s0 tclass=chr_file permissive=1
URL: https://bugzilla.redhat.com/show_bug.cgi?id=2263825
Affected tests:
Boot test [s390x]
Libkcapi AF_ALG test [s390x]
machineinfo [s390x]
Networking cki netfilter test [s390x]
Networking vnic: ipvlan/basic [s390x]
POSIX pjd-fstest suites [s390x]
Reboot test [s390x]
Storage - blktests - blk - upstream [s390x]
Storage - blktests - nvme-tcp - upstream [s390x]
Storage - swraid scsi_raid [s390x]
stress: stress-ng - cpu-cache [s390x]
stress: stress-ng - memory [s390x]
Issue: kselftests: bpf:test_tunnel.sh [FAIL]
URL: https://gitlab.com/redhat/centos-stream/tests/kernel/kernel-tests/-/issues/1749
Affected tests:
kselftests upstream - bpf [x86_64 (debug)]
Tests that were not ran because of internal issues:
Memory function: memfd_create [aarch64, ppc64le, s390x, x86_64, x86_64 (debug)]
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
^ permalink raw reply [relevance 4%]
* ksmbd stuck open response
@ 2024-05-08 21:24 11% Steve French
2024-05-09 12:31 4% ` Namjae Jeon
0 siblings, 1 reply; 200+ results
From: Steve French @ 2024-05-08 21:24 UTC (permalink / raw)
To: CIFS
I saw an example in 6.9-rc6 where ksmbd was failing to send an open
response repeatedly (it showed up running test cifs/102
On the client I see the call one stuck SMB3.1.1 open request (never
returns) and call stack of:
[root@fedora29 ~]# cat /proc/5042/stack
[<0>] wait_for_response+0xd1/0x130 [cifs]
[<0>] compound_send_recv+0x68e/0x10b0 [cifs]
[<0>] cifs_send_recv+0x23/0x30 [cifs]
[<0>] SMB2_open+0x378/0xbd0 [cifs]
[<0>] smb2_open_file+0x171/0x560 [cifs]
[<0>] cifs_do_create.isra.0+0x471/0xd40 [cifs]
[<0>] cifs_atomic_open+0x382/0x780 [cifs]
[<0>] lookup_open.isra.0+0x6b0/0x930
[<0>] path_openat+0x491/0x10d0
[<0>] do_filp_open+0x144/0x250
[<0>] do_sys_openat2+0xe0/0x110
[<0>] __x64_sys_openat+0xc1/0x120
[<0>] do_syscall_64+0x78/0x180
[<0>] entry_SYSCALL_64_after_hwframe+0x76/0x7e
on the server I see lots of failure to send a message on the socket
every five seconds:
...
[Wed May 8 21:13:59 2024] ksmbd: Failed to send message: -11
[Wed May 8 21:14:04 2024] ksmbd: Failed to send message: -11
[Wed May 8 21:14:09 2024] ksmbd: Failed to send message: -11
[Wed May 8 21:14:14 2024] ksmbd: Failed to send message: -11
[Wed May 8 21:14:20 2024] ksmbd: Failed to send message: -11
[Wed May 8 21:14:25 2024] ksmbd: Failed to send message: -11
[Wed May 8 21:14:30 2024] ksmbd: Failed to send message: -11
[Wed May 8 21:14:35 2024] ksmbd: Failed to send message: -11
[Wed May 8 21:14:40 2024] ksmbd: Failed to send message: -11
[Wed May 8 21:14:45 2024] ksmbd: Failed to send message: -11
doing "ksmbd.control -s" did free that request but hangs on the server
(and subsequent requests on the client fail). Nothing obvious in
dmesg on client or server, except the following (xfs bug?) which was
logged after the "ksmbd.control -s" on the server:
[24324.546128] Call Trace:
[24324.546130] <TASK>
[24324.546134] dump_stack_lvl+0x76/0xa0
[24324.546141] dump_stack+0x10/0x20
[24324.546145] xfs_error_report+0x4a/0x70 [xfs]
[24324.546298] ? xfs_remove+0x175/0x300 [xfs]
[24324.546440] xfs_trans_cancel+0x14b/0x170 [xfs]
[24324.546582] xfs_remove+0x175/0x300 [xfs]
[24324.546724] xfs_vn_unlink+0x53/0xb0 [xfs]
[24324.546866] vfs_unlink+0x146/0x2e0
[24324.546872] ksmbd_vfs_unlink+0xa9/0x140 [ksmbd]
[24324.546888] ? __pfx_session_fd_check+0x10/0x10 [ksmbd]
[24324.546902] __ksmbd_close_fd+0x2ba/0x2d0 [ksmbd]
[24324.546916] ? _raw_spin_unlock+0xe/0x40
[24324.546920] ? __pfx_session_fd_check+0x10/0x10 [ksmbd]
[24324.546936] __close_file_table_ids+0x60/0xb0 [ksmbd]
[24324.546950] ksmbd_destroy_file_table+0x22/0x60 [ksmbd]
[24324.546966] ksmbd_session_destroy+0x5a/0x1b0 [ksmbd]
[24324.546984] ksmbd_sessions_deregister+0x24c/0x270 [ksmbd]
[24324.547001] ksmbd_server_terminate_conn+0x12/0x30 [ksmbd]
[24324.547016] ksmbd_conn_handler_loop+0x203/0x370 [ksmbd]
[24324.547034] ? __pfx_ksmbd_conn_handler_loop+0x10/0x10 [ksmbd]
[24324.547050] kthread+0xe4/0x110
[24324.547054] ? __pfx_kthread+0x10/0x10
[24324.547058] ret_from_fork+0x47/0x70
[24324.547062] ? __pfx_kthread+0x10/0x10
[24324.547065] ret_from_fork_asm+0x1a/0x30
[24324.547070] </TASK>
Any ideas?
--
Thanks,
Steve
^ permalink raw reply [relevance 11%]
* Re: kdevops BoF at LSFMM
2024-05-08 17:45 3% ` Steve French
@ 2024-05-08 17:54 0% ` Chuck Lever III
2024-05-12 20:20 0% ` Luis Chamberlain
0 siblings, 1 reply; 200+ results
From: Chuck Lever III @ 2024-05-08 17:54 UTC (permalink / raw)
To: Steve French
Cc: Amir Goldstein, Luis Chamberlain, lsf-pc, kdevops,
Linux FS Devel, linux-mm, linux-cxl, Jan Kara
> On May 8, 2024, at 1:45 PM, Steve French <smfrench@gmail.com> wrote:
>
> I would be very happy if there were an easy way to do three things
> faster/easier:
> 1) make it easier to run a reasonably large set of fs tests automatically
> on checkin of a commit or set of commits (e.g. to an externally visible
> github branch) before it goes in linux-next, and a larger set
> of test automation that is automatically run on P/Rs (I kick these tests
> off semi-manually for cifs.ko and ksmbd.ko today)
> 2) make it easier as a maintainer to get reports of automated testing of
> stable-rc (or automate running of tests against stable-rc by filesystem type
> and send failures to the specific fs's mailing list). Make the tests run
> for a particular fs more visible, so maintainers/contributors can note
> where important tests are left out against a particular fs
In my experience, these require the addition of a CI
apparatus like BuildBot or Jenkins -- they are not
directly part of kdevops' mission. Scott Mayhew and
I have been playing with BuildBot, and there are some
areas where integration between kdevops and BuildBot
could be improved (and could be discussed next week).
> 3) make it easier to auto-bisect what commit regressed when a failing test
> is spotted
Jeff Layton has mentioned this as well. I don't think
it would be impossible to get kdevops to orchestrate
a bisect, as long as it has an automatic way to decide
when to use "git bisect {good|bad}"
> 6) an easy way to tell if a kdevops run is "suspiciously slow" (ie if a test
> or set of tests is more than 20% slower than the baseline test run, it
> could indicate a performance regression that needs to be bisected
> and identified)
Well sometimes things are just slow because you've built
a test kernel with KASAN and lockdep, or because there are
other jobs running on your test system. Also, due to all
the virtualization involved, it might be difficult to get
consistent performance measurements.
This one seems like it would be hard to engineer, but maybe
there's something that could be done?
--
Chuck Lever
^ permalink raw reply [relevance 0%]
* Re: [GIT PULL] ksmbd fixes
2024-05-08 15:19 11% [GIT PULL] ksmbd fixes Steve French
@ 2024-05-08 17:46 4% ` pr-tracker-bot
0 siblings, 0 replies; 200+ results
From: pr-tracker-bot @ 2024-05-08 17:46 UTC (permalink / raw)
To: Steve French; +Cc: Linus Torvalds, LKML, CIFS
The pull request you sent on Wed, 8 May 2024 10:19:07 -0500:
> git://git.samba.org/ksmbd.git tags/6.9-rc7-ksmbd-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/45db3ab70092637967967bfd8e6144017638563c
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [relevance 4%]
* Re: kdevops BoF at LSFMM
@ 2024-05-08 17:45 3% ` Steve French
2024-05-08 17:54 0% ` Chuck Lever III
0 siblings, 1 reply; 200+ results
From: Steve French @ 2024-05-08 17:45 UTC (permalink / raw)
To: Amir Goldstein
Cc: Luis Chamberlain, lsf-pc, kdevops, Linux FS Devel, linux-mm,
linux-cxl, Jan Kara
On Wed, May 8, 2024 at 2:48 AM Amir Goldstein <amir73il@gmail.com> wrote:
>
> On Tue, May 7, 2024 at 9:44 PM Luis Chamberlain <mcgrof@kernel.org> wrote:
> >
> > Dear LPC session leads,
> >
> > We'd like to gather together and talk about current ongoing
> > developments / changes on kdevops at LSFMM. Those interested in
> > automation on complex workflows with kdevops are also welcomed. This
> > is best addressed informally, but since I see an open slot for at
> > 10:30am for Tuesday, figured I'd check to see if we can snatch it.
>
> The empty slot is there for flexibility of the schedule and also
> wouldn't storage/MM people be interested in kdevops?
>
> I've placed you session instead of the FS lightning talks on Tuesday
> after Leah's FS testing session.
> There are enough slots for FS lightning talks.
>
> There are several empty slots throughout the agenda left for
> flexibility, including the one you mentioned on Tue morning.
> kdevops session is for a very specialized group of developers,
> so if that group is assembled and decides to use an earlier slot
> we can do that on the spot.
kdevops could be *extrememly* useful to understand better (and
to share "best practices" and ideas on testing from various filesystems)
I would be very happy if there were an easy way to do three things
faster/easier:
1) make it easier to run a reasonably large set of fs tests automatically
on checkin of a commit or set of commits (e.g. to an externally visible
github branch) before it goes in linux-next, and a larger set
of test automation that is automatically run on P/Rs (I kick these tests
off semi-manually for cifs.ko and ksmbd.ko today)
2) make it easier as a maintainer to get reports of automated testing of
stable-rc (or automate running of tests against stable-rc by filesystem type
and send failures to the specific fs's mailing list). Make the tests run
for a particular fs more visible, so maintainers/contributors can note
where important tests are left out against a particular fs
3) make it easier to auto-bisect what commit regressed when a failing test
is spotted
4) make it easier to automatically enable certain fs specific debug
tooling (e.g. eBPF scripts or trace points or log capturing) when a
test fails, or when a test fails - enable tracing and restart tests
5) make it easier to collect log output at the end of each test to
catch "suspicious" things (like network reconnects/timeouts, dmesg
events logged, fs specific stats or debug data that show excessive
failures or slow responses)
6) an easy way to tell if a kdevops run is "suspiciously slow" (ie if a test
or set of tests is more than 20% slower than the baseline test run, it
could indicate a performance regression that needs to be bisected
and identified)
--
Thanks,
Steve
^ permalink raw reply [relevance 3%]
* [GIT PULL] ksmbd fixes
@ 2024-05-08 15:19 11% Steve French
2024-05-08 17:46 4% ` pr-tracker-bot
0 siblings, 1 reply; 200+ results
From: Steve French @ 2024-05-08 15:19 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, CIFS
Please pull the following changes since commit
e67572cd2204894179d89bd7b984072f19313b03:
Linux 6.9-rc6 (2024-04-28 13:47:24 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.9-rc7-ksmbd-fixes
for you to fetch changes up to 691aae4f36f9825df6781da4399a1e718951085a:
ksmbd: do not grant v2 lease if parent lease key and epoch are not
set (2024-05-04 23:53:36 -0500)
----------------------------------------------------------------
Five ksmbd server fixes, all also for stable
- Three fixes related to SMB3 leases (fixes two xfstests, and a locking issue)
- Unitialized variable fix
- Socket creation fix when bindv6only is set
----------------------------------------------------------------
Namjae Jeon (5):
ksmbd: fix uninitialized symbol 'share' in smb2_tree_connect()
ksmbd: off ipv6only for both ipv4/ipv6 binding
ksmbd: avoid to send duplicate lease break notifications
ksmbd: use rwsem instead of rwlock for lease break
ksmbd: do not grant v2 lease if parent lease key and epoch are not set
fs/smb/server/oplock.c | 65 +++++++++++++++++++++++--------------------
fs/smb/server/smb2pdu.c | 8 +++---
fs/smb/server/smb_common.c | 4 +--
fs/smb/server/transport_tcp.c | 4 +++
fs/smb/server/vfs_cache.c | 28 +++++++++----------
fs/smb/server/vfs_cache.h | 2 +-
6 files changed, 60 insertions(+), 51 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [relevance 11%]
* linux-next: Tree for May 8
@ 2024-05-08 7:29 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-08 7:29 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 40850 bytes --]
Hi all,
Changes since 20240507:
The dma-mapping tree gained a build failure so I used the version from
next-20240507.
The s390 tree gained a conflict against the kbuild tree.
The vfs-brauner tree gained a conflict against the ext4 tree.
The hid tree lots its build failure.
The v4l-dvb-next tree still had its build failure for which I applied
a patch.
The block tree gained a conflict against the vfs-brauner tree.
The bitmap tree gained a build failure so I used the version from
next-20240507.
Non-merge commits (relative to Linus' tree): 10928
10900 files changed, 743175 insertions(+), 272621 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (dccb07f2914c Merge tag 'for-6.9-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (f9454c237618 mailmap: add entry for Barry Song)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (5549d1e39989 Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (7bbe449d0bdb s390/paes: Reestablish retry loop in paes)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (9adcac650618 netlink: specs: Add missing bridge linkinfo attrs)
Merging bpf/master (3e9bc0472b91 Merge branch 'bpf: Add BPF_PROG_TYPE_CGROUP_SKB attach type enforcement in BPF_LINK_CREATE')
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging ipvs/main (8a2e4d37afb8 s390/qeth: Fix kernel panic after setting hsuid)
Merging wireless/for-next (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (fdb3f29dfe0d ALSA: hda/realtek: Fix build error without CONFIG_PM)
Merging sound-asoc-fixes/for-linus (6490bec6d5bf ASoC: Intel: avs: boards: Properly name input device)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (d1ef160b45a0 regulator: rtq2208: Fix the BUCK ramp_delay range to maximum of 16mVstep/us)
Merging spi-fixes/for-linus (52b62e7a5d4f spi: stm32: enable controller before asserting CS)
Merging pci-current/for-linus (f3d049b35b01 PCI/ASPM: Restore parent state to parent, child state to child)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler)
Merging usb.current/usb-linus (ae11f04b452b usb: typec: tcpm: Check for port partner validity before consuming it)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (bb198e29fe75 iio: dac: ad5592r: fix temperature channel scaling value)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (98241a774db4 slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (dd5a440a31fa Linux 6.9-rc7)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (0a9c28bec202 Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (d02abd57e794 hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (cbf613cd4d3c Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (515a3c3a5489 platform/x86: ISST: Add Grand Ridge to HPM CPU list)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (09e10499ee6a Merge tag 'drm-misc-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (43b26bdd2ee5 drm/i915/bios: Fix parsing backlight BDB data)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (a86d27693066 gpiolib: fix the speed of descriptor label setting with SRCU)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (55750148e559 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe())
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (6897204ea3df drm/connector: Add
Merging mm-stable/mm-stable (447bac3d292f thp: remove HPAGE_PMD_ORDER minimum assertion)
Merging mm-nonmm-stable/mm-nonmm-stable (f9757d20bcc6 kernel/watchdog_perf.c: tidy up kerneldoc)
Merging mm/mm-everything (b6df6c26d084 foo)
Merging kbuild/for-next (5e9e4712f006 kconfig: use menu_list_for_each_sym() in sym_check_choice_deps())
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (d9180e23fbfa perf bench internals inject-build-id: Fix trap divide when collecting just one DSO)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (66772d621cbe xsk: use generic DMA sync shortcut instead of a custom one)
$ git reset --hard HEAD^
Merging next-20240507 version of dma-mapping
Merging asm-generic/master (02af68767d27 Merge branch 'alpha-cleanup-6.9' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (431dd6281857 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (d794066844ed Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf', 'for-next/selftests' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support)
Merging arm-soc/for-next (766602e1a192 soc: document merges)
Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (4cece7649650 Linux 6.9-rc1)
Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (b43b8fcbb87a Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-clk/next' into for-next)
Merging samsung-krzk/for-next (a9c32618cd2a Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (2dc107360e22 dts: zynqmp: add properties for TCM in remoteproc)
Merging clk/clk-next (9e878b146fd7 Merge branch 'clk-stm' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (7b7e584f90bf LoongArch: KVM: Add mmio trace events support)
Merging m68k/for-next (bd622532f7b3 m68k: amiga: Use str_plural() to fix Coccinelle warning)
Merging m68knommu/for-next (a5044ce7d1d9 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (487fa28fa8b6 parisc: Define sigset_t in parisc uapi header)
Merging powerpc/next (8873aab86461 powerpc/xmon: Check cpu id in commands "c#", "dp#" and "dx#")
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree())
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
CONFLICT (content): Merge conflict in arch/riscv/Makefile
CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
CONFLICT (content): Merge conflict in kernel/sys.c
Merging riscv-dt/riscv-dt-for-next (1c80d50bb697 riscv: dts: microchip: add pac1934 power-monitor to icicle)
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (8b7b86661c1a Merge branch 'features-s390-6.10-more' into for-next)
CONFLICT (content): Merge conflict in scripts/Makefile.vdsoinst
Merging sh/for-next (21b8651502d5 sh: boot: Add proper forward declarations)
Merging sparc/for-next (48d85acdaa52 sparc: chmc: Convert to platform remove callback returning void)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (641e1600537d bcachefs: Improve sysfs internal/btree_cache)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (dd5a440a31fa Linux 6.9-rc7)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (0d31c9b6d1c6 Merge branch 'for-next-next-v6.9-20240506' into for-next-20240506)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (ae4f73e84cb1 smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (e6b4c0a8589b Merge ext2 Kconfig cleanup.)
Merging ext4/dev (dc1c4663bc49 ext4: propagate errors from ext4_sb_bread() in ext4_xattr_block_cache_find())
Merging f2fs/dev (3763f9effcdc f2fs: use helper to print zone condition)
Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning)
Merging fuse/for-next (fa7e19337908 fuse: Add initial support for fs-verity)
Merging gfs2/for-next (c1c53c26e338 gfs2: make timeout values more explicit)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (691aae4f36f9 ksmbd: do not grant v2 lease if parent lease key and epoch are not set)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (939cb14d51a1 NFS/knfsd: Remove the invalid NFS error 'NFSERR_OPNOTSUPP')
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access)
Merging overlayfs/overlayfs-next (096802748ea1 ovl: remove upper umask handling from ovl_create_upper())
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (bf0a67a23c55 Merge branch 'vfs.netfs' into vfs.all)
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in fs/ext4/file.c
CONFLICT (content): Merge conflict in fs/tracefs/inode.c
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (596ffa476e20 Merge branch 'for-6.10' into for-next)
Merging pci/next (85e9c34ad6fb Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (14ee3d12f37b Merge branch 'for-6.10/hid-bpf' into for-next)
Merging i2c/i2c/for-next (20e70be866cc Merge branch 'i2c/for-current' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE())
Merging i3c/i3c/next (acec16dbb338 i3c: dw: Add hot-join support.)
Merging dmi/dmi-for-next (7d5019435585 firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (6a8157812f5b hwmon: (emc1403) Add support for conversion interval configuration)
Merging jc_docs/docs-next (a8907c5df2a3 Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (4a7d735191de media: dw2102: fix coding style issues)
Merging v4l-dvb-next/master (8a09bb1be67a media: intel/ipu6: Don't re-allocate memory for firmware)
Applying: media: intel/ipu6: explicitly include vmalloc.h
Merging pm/linux-next (f471f351f0d8 Merge branch 'pnp' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (734b5def91b5 thermal/drivers/loongson2: Add Loongson-2K2000 support)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (e4e40a87024c RDMA/ipoib: Remove NULL check before dev_{put, hold})
Merging net-next/main (1b3b2d9e772b net: usb: smsc75xx: stop lying about skb->truesize)
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/Makefile
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/slab.h
Merging bpf-next/for-next (7e2c7a3f732b Merge branch 'libbpf: further struct_ops fixes and improvements')
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (a2d2fabcf778 Bluetooth: btintel_pcie: Add *setup* function to download firmware)
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.c
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.h
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
Merging wireless-next/for-next (1d60eabb8269 wifi: mwl8k: initialize cmd->addr[] properly)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (6117af863659 crypto: hisilicon/sec2 - fix for register offset)
Merging drm/drm-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
Merging drm-exynos/for-linux-next (2236a61bd491 Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next)
Merging drm-misc/for-linux-next (be3f3042391d drm: zynqmp_dpsub: Always register bridge)
Merging amdgpu/drm-next (b0923d5d80fa drm/amdgpu: remove ip dump reg_count variable)
Merging drm-intel/for-linux-next (c286f6a973c6 drm/i915/bios: Fix parsing backlight BDB data)
8e056b50d92a ("drm/i915/audio: Fix audio time stamp programming for DP")
c286f6a973c6 ("drm/i915/bios: Fix parsing backlight BDB data")
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (b587f413ca47 drm/msm/gen_header: allow skipping the validation)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Makefile
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (b7f6318a9c3d drm/xe: Fix xe_device.h)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (9b1fe0510494 regmap: Reorder fields in 'struct regmap_config' to save some memory)
Merging sound/for-next (0aa881621279 ALSA: hda/realtek: Fix internal speakers for Legion Y9000X 2022 IAH7)
Merging ieee1394/for-next (6b0b708f12d1 firewire: core: add tracepoint event for handling bus reset)
Merging sound-asoc/for-next (bb09a58ccd0a Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (493abdac43bf bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (5128de84d8fc Input: cros_ec_keyb - remove an unused field in struct cros_ec_keyb)
Merging block/for-next (22332e40575c Merge branch 'for-6.10/io_uring' into for-next)
CONFLICT (content): Merge conflict in block/ioctl.c
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (83637d9017b2 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (d4a89339f17c ata: pata_legacy: make legacy_exit() work again)
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs)
Merging mfd/for-mfd-next (7fcb2977c0b5 dt-bindings: mfd: Convert lp873x.txt to json-schema)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (4da294108e38 backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (ff4a1f38f447 Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (dd80c7465029 MAINTAINERS: repair file entry in SECURITY SUBSYSTEM)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (ca584966d106 Documentation: tpm: Add TPM security docs toctree entry)
Merging watchdog/master (413bf4e857fd watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in sa1100dog_probe())
Merging iommu/next (36bb003ed686 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (649bad67d4b1 dt-bindings: PCI: microchip: increase number of items in ranges property)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (c99dcc0f0f21 Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (7598293ab37c Merge branch into tip/master: 'x86/timers')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (ab80b31cd7b2 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (2604e6c504cc Merge branches 'cmpxchg.2024.05.01a', 'kcsan.2024.05.07a', 'lkmm.2024.05.06a', 'rcu-merge.2024.05.01a' and 'tsc.2024.04.09c' into HEAD)
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kvm/next (40269c03fdbf KVM: x86: Explicitly zero kvm_caps during vendor module load)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Applying: fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code"
Merging kvm-arm/next (b63b7db624b3 Merge branch kvm-arm64/misc-6.10 into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (b52e8cd3f835 KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info())
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/aarch64/psci_test.c
Merging xen-tip/linux-next (802600ebdf23 x86/xen: return a sane initial apic id when running as PV guest)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (76f09e22027f platform/x86: ISST: Support SST-BF and SST-TF per level)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (e5019b14230a Merge 6.9-rc5 into driver-core-next)
Merging usb/usb-next (b3e40fc85735 USB: usb_parse_endpoint: ignore reserved bits)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/core.c
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (6bd23e0c2bb6 tty: add the option to have a tty reject a new ldisc)
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (1565fce99bd0 Merge tag 'iio-for-6.10b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x)
Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (bb208810b1ab vfio/qat: Add vfio_pci driver for Intel QAT SR-IOV VF devices)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (3bb8cd556eae spmi: pmic-arb: Add multi bus support)
Merging staging/staging-next (eb563dc752d3 staging: pi433: Remove unused driver)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (28059ddbee0e MAINTAINERS: Update role for IDXD driver)
Merging cgroup/for-next (8f6d24a5db2a selftests/cgroup: fix uninitialized variables in test_zswap.c)
Merging scsi/for-next (9bfaa1936169 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (40ae6a1ee5fd Merge patch series "Update lpfc to revision 14.4.0.2")
Merging vhost/linux-next (88199634e516 vduse: enable Virtio-net device type)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (c8d8f841e95b Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (7f45fe2ea3b8 gpio: nuvoton: Fix sgpio irq handle error)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (9429f847dd72 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (fd9364395767 dt-bindings: pwm: renesas,tpu: Do not require pwm-cells twice)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (d4e6fbd245c4 selftests: default to host arch for LLVM builds)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (5496b9b77d74 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (4cece7649650 Linux 6.9-rc1)
Merging nvmem/for-next (4cece7649650 Linux 6.9-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (ba3d5b5d07d6 Merge branch 'fix-vfork-test-next' into landlock-next)
Merging rust/rust-next (97ab3e8eec0c rust: alloc: fix dangling pointer in VecExt<T>::reserve())
CONFLICT (content): Merge conflict in rust/Makefile
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (13513eafc3ea fs/coredump: Enable dynamic configuration of max file note size)
Merging bitmap/bitmap-for-next (d1c886059e8d usercopy: Don't use "proxy" headers)
$ git reset --hard HEAD^
Merging next-20240507 version of bitmap
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (0e148d3cca0d stackleak: Use a copy of the ctl_table argument)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (788c1bf8de9f tools/power turbostat: version 2024.05.07)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* [ANNOUNCE] Release v6.1.90-cip20
@ 2024-05-07 12:50 4% nobuhiro1.iwamatsu
0 siblings, 0 replies; 200+ results
From: nobuhiro1.iwamatsu @ 2024-05-07 12:50 UTC (permalink / raw)
To: cip-dev; +Cc: pavel, uli, jan.kiszka, masami.ichikawa, Chris.Paterson2
Hi,
CIP kernel team has released Linux kernel v6.1.90-cip20.
The linux-6.1.y-cip tree has been updated base version from v6.1.86 to v6.1.90.
This release also includes patches for the Renesas ARM64 SoC RZ/G3S.
You can get this release via the git tree at:
v6.1.90-cip20:
repository:
https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git
branch:
linux-6.1.y-cip
commit hash:
4e312831fe188da5bb477eeae886bcf07184f0eb
Fixed CVEs:
CVE-2024-27022: fork: defer linking file vma until vma is fully initialized
CVE-2024-27019: netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
CVE-2024-27000: serial: mxs-auart: add spinlock around changing cts state
CVE-2024-26993: fs: sysfs: Fix reference leak in sysfs_break_active_protection()
CVE-2024-27009: s390/cio: fix race condition during online processing
CVE-2024-26994: speakup: Avoid crash on very long word
CVE-2024-26983: bootconfig: use memblock_free_late to free xbc memory to buddy
CVE-2024-26981: nilfs2: fix OOB in nilfs_set_de_type
CVE-2024-26939: drm/i915/vma: Fix UAF on destroy against retire race
CVE-2024-27003: clk: Get runtime PM before walking tree for clk_summary
CVE-2024-27015: netfilter: flowtable: incorrect pppoe tuple
CVE-2024-26996: usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
CVE-2024-26922: drm/amdgpu: validate the parameters of bo mapping operations more clearly
CVE-2024-26989: arm64: hibernate: Fix level3 translation fault in swsusp_save()
CVE-2024-27020: netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
CVE-2024-26997: usb: dwc2: host: Fix dereference issue in DDMA completion flow.
CVE-2024-27018: netfilter: br_netfilter: skip conntrack input hook for promisc packets
CVE-2024-26926: binder: check offset alignment in binder_get_object()
CVE-2024-26984: nouveau: fix instmem race condition around ptr stores
CVE-2024-26605: PCI/ASPM: Fix deadlock when enabling ASPM
CVE-2024-27014: net/mlx5e: Prevent deadlock while disabling aRFS
CVE-2024-27001: comedi: vmk80xx: fix incomplete endpoint checking
CVE-2024-26987: mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled
CVE-2024-26936: ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
CVE-2024-27004: clk: Get runtime PM before walking tree during disable_unused
CVE-2024-26924: netfilter: nft_set_pipapo: do not free live element
CVE-2024-27016: netfilter: flowtable: validate pppoe header
CVE-2024-27002: clk: mediatek: Do a runtime PM get on controllers during probe
CVE-2024-26988: init/main.c: Fix potential static_command_line memory overflow
CVE-2024-26992: KVM: x86/pmu: Disable support for adaptive PEBS
CVE-2024-27008: drm: nv04: Fix out of bounds access
CVE-2024-26999: serial/pmac_zilog: Remove flawed mitigation for rx irq flood
CVE-2024-26980: ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
CVE-2024-27013: tun: limit printing rate when illegal packet received by tun dev
CVE-2024-26923: af_unix: Fix garbage collector racing against connect()
added commits:
CIP: Bump version suffix to -cip20 after merge from stable
arm64: defconfig: Enable RZ/G3S (R9A08G045) SoC
arm64: dts: renesas: rzg3s-smarc: Enable SDHI1
arm64: dts: renesas: rzg3s-smarc-som: Enable SDHI2
arm64: dts: renesas: rzg3s-smarc-som: Spelling s/device-type/device_type/
arm64: dts: renesas: r9a08g045: Add missing cache-level for L3 cache
arm64: dts: renesas: r9a08g045: Add nodes for SDHI1 and SDHI2
arm64: dts: renesas: Add initial device tree for RZ/G3S SMARC EVK board
arm64: dts: renesas: Add initial device tree for RZ SMARC Carrier-II Board
arm64: dts: renesas: Add initial support for RZ/G3S SMARC SoM
arm64: dts: renesas: Add initial DTSI for RZ/G3S SoC
dt-bindings: soc: renesas: Document SMARC Carrier-II EVK
dt-bindings: soc: renesas: Document RZ/G3S SMARC SoM
dt-bindings: serial: renesas,scif: document r9a08g045 support
dt-bindings: mmc: renesas,sdhi: Document RZ/G3S support
pinctrl: renesas: rzg2l: Add RZ/G3S support
dt-bindings: pinctrl: renesas: Document RZ/G3S SoC
pinctrl: renesas: rzg2l: Add support for different DS values on different groups
pinctrl: renesas: rzg2l: Move DS and OI to SoC-specific configuration
pinctrl: renesas: rzg2l: Adapt function number for RZ/G3S
pinctrl: renesas: rzg2l: Adapt for different SD/PWPR register offsets
pinctrl: renesas: rzg2l: Index all registers based on port offset
pinctrl: renesas: rzg2l: Add validation of GPIO pin in rzg2l_gpio_request()
pinctrl: renesas: rzg2l: Rename rzg2l_gpio_configs[]
pinctrl: renesas: rzg2l: Make struct rzg2l_pinctrl_data::dedicated_pins constant
soc: renesas: Identify RZ/G3S SoC
soc: renesas: Use "#ifdef" for single-symbol definition checks
clk: renesas: r9a07g04[34]: Use SEL_SDHI1_STS status configuration for SD1 mux
clk: renesas: r9a08g045: Add clock and reset support for SDHI1 and SDHI2
clk: renesas: Add minimal boot support for RZ/G3S SoC
dt-bindings: clock: renesas,rzg2l-cpg: Document RZ/G3S SoC
clk: renesas: rzg2l: Add divider clock for RZ/G3S
clk: renesas: rzg2l: Refactor SD mux driver
clk: renesas: rzg2l: Remove CPG_SDHI_DSEL from generic header
clk: renesas: rzg2l: Add struct clk_hw_data
clk: renesas: rzg2l: Add support for RZ/G3S PLL
clk: renesas: rzg2l: Remove critical area
clk: renesas: rzg2l: Simplify the logic in rzg2l_mod_clock_endisable()
clk: renesas: rzg2l: Use core->name for clock name
clk: renesas: rzg2l: Simplify .determine_rate()
clk: renesas: rzg2l: Use u32 for flag and mux_flags
clk: renesas: rzg2l: Convert to readl_poll_timeout_atomic()
clk: renesas: rzg2l: Don't assume all CPG_MOD clocks support PM
dt-bindings: soc: renesas: Document Renesas RZ/G3S SoC variants
dt-bindings: soc: renesas: renesas,rzg2l-sysc: Document RZ/G3S SoC
Best regards,
Nobuhiro
^ permalink raw reply [relevance 4%]
* linux-next: Tree for May 7
@ 2024-05-07 7:10 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-07 7:10 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 39996 bytes --]
Hi all,
Changes since 20240506:
The risc-v tree gained a conflict against the powerpc tree.
The hid tree gained a build failure so I used the version from
next-20240506.
The v4l-dvb-next tree still had its build failure for which I applied
a patch.
The drm-msm tree gained a conflict against the kbuild tree.
Non-merge commits (relative to Linus' tree): 10630
10428 files changed, 731972 insertions(+), 268440 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (dccb07f2914c Merge tag 'for-6.9-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (c6d793331b53 mailmap: add entry for Barry Song)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (e845bcc8cfda Merge tag 'riscv-soc-fixes-for-v6.9-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (7bbe449d0bdb s390/paes: Reestablish retry loop in paes)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging bpf/master (3e9bc0472b91 Merge branch 'bpf: Add BPF_PROG_TYPE_CGROUP_SKB attach type enforcement in BPF_LINK_CREATE')
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (a26ff37e624d net: fix out-of-bounds access in ops_init)
Merging ipvs/main (8a2e4d37afb8 s390/qeth: Fix kernel panic after setting hsuid)
Merging wireless/for-next (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (fdb3f29dfe0d ALSA: hda/realtek: Fix build error without CONFIG_PM)
Merging sound-asoc-fixes/for-linus (09068d624c49 ASoC: amd: acp: fix for acp platform device creation failure)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (d1ef160b45a0 regulator: rtq2208: Fix the BUCK ramp_delay range to maximum of 16mVstep/us)
Merging spi-fixes/for-linus (52b62e7a5d4f spi: stm32: enable controller before asserting CS)
Merging pci-current/for-linus (f3d049b35b01 PCI/ASPM: Restore parent state to parent, child state to child)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler)
Merging usb.current/usb-linus (ae11f04b452b usb: typec: tcpm: Check for port partner validity before consuming it)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (bb198e29fe75 iio: dac: ad5592r: fix temperature channel scaling value)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (98241a774db4 slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (16c20208b9c2 Merge tag 'kvmarm-fixes-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (d02abd57e794 hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (cbf613cd4d3c Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (515a3c3a5489 platform/x86: ISST: Add Grand Ridge to HPM CPU list)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (09e10499ee6a Merge tag 'drm-misc-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (dd5a440a31fa Linux 6.9-rc7)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (e67572cd2204 Linux 6.9-rc6)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (55750148e559 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe())
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (08001033121d drm/meson: dw-hdmi: add bandgap setting for g12)
Merging mm-stable/mm-stable (24b7fa3d7d1d thp: remove HPAGE_PMD_ORDER minimum assertion)
Merging mm-nonmm-stable/mm-nonmm-stable (f9757d20bcc6 kernel/watchdog_perf.c: tidy up kerneldoc)
Merging mm/mm-everything (185521a1748f foo)
Merging kbuild/for-next (1af0ac1bcdb0 kbuild: buildtar: install riscv compressed images as vmlinuz)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (77a70f80751d perf vendor events amd: Add Zen 5 mapping)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (c93f261dfc39 Documentation/core-api: add swiotlb documentation)
Merging asm-generic/master (02d947bc83a2 Merge branch 'alpha-cleanup-6.9' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (431dd6281857 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (02a5cc61de06 Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf', 'for-next/selftests' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support)
Merging arm-soc/for-next (fa8870d46ddf soc: document merges)
Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (4cece7649650 Linux 6.9-rc1)
Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (b43b8fcbb87a Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-clk/next' into for-next)
Merging samsung-krzk/for-next (f599b6538b60 Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (2dc107360e22 dts: zynqmp: add properties for TCM in remoteproc)
Merging clk/clk-next (804e3d8b695b Merge branch 'clk-binding' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (7b7e584f90bf LoongArch: KVM: Add mmio trace events support)
Merging m68k/for-next (bd622532f7b3 m68k: amiga: Use str_plural() to fix Coccinelle warning)
Merging m68knommu/for-next (2595108e5842 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (487fa28fa8b6 parisc: Define sigset_t in parisc uapi header)
Merging powerpc/next (be140f1732b5 powerpc/64: Set _IO_BASE to POISON_POINTER_DELTA not 0 for CONFIG_PCI=n)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree())
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
CONFLICT (content): Merge conflict in kernel/sys.c
Merging riscv-dt/riscv-dt-for-next (8fd63d81a760 riscv: dts: microchip: add pac1934 power-monitor to icicle)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (b7fb0445d8cf Merge branch 'features' into for-next)
Merging sh/for-next (21b8651502d5 sh: boot: Add proper forward declarations)
Merging sparc/for-next (48d85acdaa52 sparc: chmc: Convert to platform remove callback returning void)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (bab182cf6a98 bcachefs: Move nocow unlock to bch2_write_endio())
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (0d31c9b6d1c6 Merge branch 'for-next-next-v6.9-20240506' into for-next-20240506)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (ae4f73e84cb1 smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (e6b4c0a8589b Merge ext2 Kconfig cleanup.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (3763f9effcdc f2fs: use helper to print zone condition)
Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning)
Merging fuse/for-next (fa7e19337908 fuse: Add initial support for fs-verity)
Merging gfs2/for-next (50fabd42cb2f gfs2: Convert gfs2_aspace_writepage() to use a folio)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (691aae4f36f9 ksmbd: do not grant v2 lease if parent lease key and epoch are not set)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (939cb14d51a1 NFS/knfsd: Remove the invalid NFS error 'NFSERR_OPNOTSUPP')
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (096802748ea1 ovl: remove upper umask handling from ovl_create_upper())
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (bf0a67a23c55 Merge branch 'vfs.netfs' into vfs.all)
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in fs/tracefs/inode.c
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (456e1f511e4b Merge branch 'for-6.10-base-small' into for-next)
Merging pci/next (85e9c34ad6fb Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (26ebeb7df1df Merge branch 'for-6.9/upstream-fixes' into for-next)
$ git reset --hard HEAD^
Merging next-20240506 version of hid
Merging i2c/i2c/for-next (20e70be866cc Merge branch 'i2c/for-current' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE())
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (0ef11f604503 firmware: dmi: Stop decoding on broken entry)
Merging hwmon-staging/hwmon-next (45bf8305fb2e hwmon: (max6639) Use regmap)
Merging jc_docs/docs-next (404b444fbb3d Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (4a7d735191de media: dw2102: fix coding style issues)
Merging v4l-dvb-next/master (8a09bb1be67a media: intel/ipu6: Don't re-allocate memory for firmware)
Applying: media: intel/ipu6: explicitly include vmalloc.h
Merging pm/linux-next (f471f351f0d8 Merge branch 'pnp' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (734b5def91b5 thermal/drivers/loongson2: Add Loongson-2K2000 support)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (e4e40a87024c RDMA/ipoib: Remove NULL check before dev_{put, hold})
Merging net-next/main (8c4e4798123f Merge branch 'add-tcp-fraglist-gro-support')
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/Makefile
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/slab.h
Merging bpf-next/for-next (329a6720a3eb Merge branch 'bpf-verifier-range-computation-improvements')
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (93e31170f4d0 Bluetooth: L2CAP: Fix div-by-zero in l2cap_le_flowctl_init())
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.c
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.h
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
Merging wireless-next/for-next (9875b54762a7 wifi: iwlwifi: Ensure prph_mac dump includes all addresses)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (6117af863659 crypto: hisilicon/sec2 - fix for register offset)
Merging drm/drm-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
Merging drm-exynos/for-linux-next (2236a61bd491 Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next)
Merging drm-misc/for-linux-next (be3f3042391d drm: zynqmp_dpsub: Always register bridge)
Merging amdgpu/drm-next (b0923d5d80fa drm/amdgpu: remove ip dump reg_count variable)
Merging drm-intel/for-linux-next (accd3e041e8f drm/i915: pass dev_priv explicitly to PORT_ALPM_LFPS_CTL)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (07a2f8716c41 drm/msm/gen_header: allow skipping the validation)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Makefile
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (50aec9665e0b drm/xe: Use ordered WQ for G2H handler)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (e479514e9bd4 selftests/alsa: make dump_config_tree() as void function)
Merging ieee1394/for-next (6b0b708f12d1 firewire: core: add tracepoint event for handling bus reset)
Merging sound-asoc/for-next (94c721d6461c Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (493abdac43bf bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (5128de84d8fc Input: cros_ec_keyb - remove an unused field in struct cros_ec_keyb)
Merging block/for-next (089a9c3631ed Merge branch 'for-6.10/block' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (83637d9017b2 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (d4a89339f17c ata: pata_legacy: make legacy_exit() work again)
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs)
Merging mfd/for-mfd-next (7fcb2977c0b5 dt-bindings: mfd: Convert lp873x.txt to json-schema)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (4da294108e38 backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (4f6454d1bf73 Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (67889688e05b MAINTAINERS: update the LSM file list)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (152585665f0f docs: trusted-encrypted: add DCP as new trust source)
Merging watchdog/master (413bf4e857fd watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in sa1100dog_probe())
Merging iommu/next (36bb003ed686 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (649bad67d4b1 dt-bindings: PCI: microchip: increase number of items in ranges property)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (37d1f4619e22 Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (89948cc11a08 Merge branch into tip/master: 'x86/timers')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (ab80b31cd7b2 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (e7d6f9dff52c rcu/nocb: Remove buggy bypass lock contention mitigation)
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kvm/next (a96cb3bf390e Merge x86 bugfixes from Linux 6.9-rc3)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Applying: fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code"
Merging kvm-arm/next (b63b7db624b3 Merge branch kvm-arm64/misc-6.10 into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/aarch64/psci_test.c
Merging xen-tip/linux-next (802600ebdf23 x86/xen: return a sane initial apic id when running as PV guest)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (76f09e22027f platform/x86: ISST: Support SST-BF and SST-TF per level)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (e5019b14230a Merge 6.9-rc5 into driver-core-next)
Merging usb/usb-next (b3e40fc85735 USB: usb_parse_endpoint: ignore reserved bits)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/core.c
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (6bd23e0c2bb6 tty: add the option to have a tty reject a new ldisc)
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (1565fce99bd0 Merge tag 'iio-for-6.10b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x)
Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (bb208810b1ab vfio/qat: Add vfio_pci driver for Intel QAT SR-IOV VF devices)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (3bb8cd556eae spmi: pmic-arb: Add multi bus support)
Merging staging/staging-next (eb563dc752d3 staging: pi433: Remove unused driver)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (28059ddbee0e MAINTAINERS: Update role for IDXD driver)
Merging cgroup/for-next (8f6d24a5db2a selftests/cgroup: fix uninitialized variables in test_zswap.c)
Merging scsi/for-next (8c5220c43ba0 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (40ae6a1ee5fd Merge patch series "Update lpfc to revision 14.4.0.2")
Merging vhost/linux-next (88199634e516 vduse: enable Virtio-net device type)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (14ce7eb4bae1 Merge branches 'rproc-next' and 'rpmsg-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (5539287ca656 gpio: brcmstb: add support for gpio-ranges)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (9429f847dd72 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (b664fc60d7f8 dt-bindings: pwm: snps,dw-apb-timers: Do not require pwm-cells twice)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (d4e6fbd245c4 selftests: default to host arch for LLVM builds)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (5496b9b77d74 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (4cece7649650 Linux 6.9-rc1)
Merging nvmem/for-next (4cece7649650 Linux 6.9-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (ba3d5b5d07d6 Merge branch 'fix-vfork-test-next' into landlock-next)
Merging rust/rust-next (1161057f53f6 rust: alloc: fix dangling pointer in VecExt<T>::reserve())
CONFLICT (content): Merge conflict in rust/Makefile
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (10e29251be0e binfmt_elf_fdpic: fix /proc/<pid>/auxv)
Merging bitmap/bitmap-for-next (2eb411f428b8 MAINTAINERS: add BITOPS API record)
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (0e148d3cca0d stackleak: Use a copy of the ctl_table argument)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (42ea5e97a9ab tools/power turbostat: fix regression in --add package)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Re: backport of missing fs/smb patches not in 6.6.30 stable
2024-05-03 4:28 6% backport of missing fs/smb patches not in 6.6.30 stable Steve French
@ 2024-05-06 23:11 0% ` Sasha Levin
0 siblings, 0 replies; 200+ results
From: Sasha Levin @ 2024-05-06 23:11 UTC (permalink / raw)
To: Steve French; +Cc: Stable, Greg KH, CIFS, Namjae Jeon
On Thu, May 02, 2024 at 11:28:38PM -0500, Steve French wrote:
>6.6.30-rc1 has a large set of fs/smb (cifs.ko and ksmbd.ko) patches
>backported but was missing more than 30 fixes so I put together a safe
>backport of the remaining, leaving out patches that had dependencies
>on things outside of fs/smb
>
>The following changes since commit 488f7008e62890fae8c7a2d3583913c8074f1fc6:
>
> smb3: fix lock ordering potential deadlock in cifs_sync_mid_result
>(2024-04-30 12:30:53 -0500)
>
>are available in the Git repository at:
>
> git://git.samba.org/ksmbd.git tags/6.6.30-rc1-full-fs-smb-backport
>
>for you to fetch changes up to 411b6f385ac2427ee9d70fae277a4ed6b9d3983f:
>
> smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings
>(2024-05-01 02:18:25 -0500)
>
>----------------------------------------------------------------
>full backport for 6.6.30, includes all 80 (of the relevant) missing
>fs/smb changesets
>
>Test results look good (and better than without the patches). Here
>are the functional test results (they passed exhaustive set of tests
>to various server types):
>http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/3/builds/99
>http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/5/builds/117
>http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/9/builds/51
>http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/10/builds/63
>
>Note that 22 patches had dependencies and were not appropriate to
>backport and are not included, but here is the list of the additional
>80 fs/smb patches included, many of which fix bugs (the others reduce
>risk of backport, and help avoid merge conflicts):
>411b6f385ac2 (HEAD -> fs-smb-backport-linux-6.6.30-rc1, tag:
>6.6.30-rc1-full-fs-smb-backport,
>origin/fs-smb-backport-linux-6.6.30-rc1) smb: smb2pdu.h: Avoid
>-Wflex-array-member-not-at-end warnings
Thanks Steve, I'll pick these up.
In the future, if the patches don't need massaging, just a list of the
upstream commit ids would be great :)
--
Thanks,
Sasha
^ permalink raw reply [relevance 0%]
* linux-next: Tree for May 6
@ 2024-05-06 6:49 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-06 6:49 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 43467 bytes --]
Hi all,
Changes since 20240503:
The mm tree lost its build failure.
The arm tree lost its build failure.
The vfs-brauner tree gained a conflict against Linus' tree.
The v4l-dvb-next tree lost its build failure but gained another for
which I applied a patch.
The dmi tree lost its build failure.
The net-next tree gained a conflict against the kbuild tree.
The drm-msm tree gained a conflict against the kbuild tree.
The drm-xe tree gained a conflict against the drm-intel tree.
The rust tree gained a conflict against the kbuild tree.
Non-merge commits (relative to Linus' tree): 10384
10232 files changed, 718413 insertions(+), 256326 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (dd5a440a31fa Linux 6.9-rc7)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (39f6e51dddbb XArray: Set the marks correctly when splitting an entry)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (e845bcc8cfda Merge tag 'riscv-soc-fixes-for-v6.9-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (7bbe449d0bdb s390/paes: Reestablish retry loop in paes)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (fa870b45b08a MAINTAINERS: update cxgb4 and cxgb3 network drivers maintainer)
Merging bpf/master (3e9bc0472b91 Merge branch 'bpf: Add BPF_PROG_TYPE_CGROUP_SKB attach type enforcement in BPF_LINK_CREATE')
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (8a2e4d37afb8 s390/qeth: Fix kernel panic after setting hsuid)
Merging ipvs/main (8a2e4d37afb8 s390/qeth: Fix kernel panic after setting hsuid)
Merging wireless/for-next (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (fdb3f29dfe0d ALSA: hda/realtek: Fix build error without CONFIG_PM)
Merging sound-asoc-fixes/for-linus (09068d624c49 ASoC: amd: acp: fix for acp platform device creation failure)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (d1ef160b45a0 regulator: rtq2208: Fix the BUCK ramp_delay range to maximum of 16mVstep/us)
Merging spi-fixes/for-linus (52b62e7a5d4f spi: stm32: enable controller before asserting CS)
Merging pci-current/for-linus (2e0239d47d75 PCI/ASPM: Clarify that pcie_aspm=off means leave ASPM untouched)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler)
Merging usb.current/usb-linus (ae11f04b452b usb: typec: tcpm: Check for port partner validity before consuming it)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (4f11dc1b7fd2 iio: pressure: bmp280: Fix BMP580 temperature reading)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (98241a774db4 slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (16c20208b9c2 Merge tag 'kvmarm-fixes-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (d02abd57e794 hwmon: (corsair-cpro) Protect ccp->wait_input_report with a spinlock)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (dd11e0f129c3 Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (515a3c3a5489 platform/x86: ISST: Add Grand Ridge to HPM CPU list)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (09e10499ee6a Merge tag 'drm-misc-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (e67572cd2204 Linux 6.9-rc6)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (e67572cd2204 Linux 6.9-rc6)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (18f109e5edc8 i2c: cadence: Avoid fifo clear after start)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (08001033121d drm/meson: dw-hdmi: add bandgap setting for g12)
Merging mm-stable/mm-stable (72801513b2bf mm: set pageblock_order to HPAGE_PMD_ORDER in case with !CONFIG_HUGETLB_PAGE but THP enabled)
Merging mm-nonmm-stable/mm-nonmm-stable (e02577872ff5 crash: add prefix for crash dumping messages)
Merging mm/mm-everything (ebacef4eb695 foo)
Merging kbuild/for-next (1af0ac1bcdb0 kbuild: buildtar: install riscv compressed images as vmlinuz)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (77a70f80751d perf vendor events amd: Add Zen 5 mapping)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (c93f261dfc39 Documentation/core-api: add swiotlb documentation)
Merging asm-generic/master (8823fff36eb5 Merge branch 'alpha-cleanup-6.9' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (431dd6281857 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (02a5cc61de06 Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf', 'for-next/selftests' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support)
Merging arm-soc/for-next (fa8870d46ddf soc: document merges)
Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (7f6f45a762c3 Merge branches 'v6.9-next/soc' and 'v6.9-next/dts64' into for-next)
7c9faab9d28f ("arm64: dts: mediatek: mt8183-pico6: Fix bluetooth node")
Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (b43b8fcbb87a Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-clk/next' into for-next)
Merging samsung-krzk/for-next (f599b6538b60 Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (2dc107360e22 dts: zynqmp: add properties for TCM in remoteproc)
Merging clk/clk-next (804e3d8b695b Merge branch 'clk-binding' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (511b5b342cce LoongArch: KVM: Add mmio trace events support)
Merging m68k/for-next (bd622532f7b3 m68k: amiga: Use str_plural() to fix Coccinelle warning)
Merging m68knommu/for-next (2595108e5842 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (487fa28fa8b6 parisc: Define sigset_t in parisc uapi header)
Merging powerpc/next (1fcd25473337 MAINTAINERS: MMU GATHER: Update Aneesh's address)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (849599b702ef powerpc/crash: add crash memory hotplug support)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (8fd63d81a760 riscv: dts: microchip: add pac1934 power-monitor to icicle)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (63f922a4c63f Merge branch 'features-revert' into for-next)
Merging sh/for-next (21b8651502d5 sh: boot: Add proper forward declarations)
Merging sparc/for-next (48d85acdaa52 sparc: chmc: Convert to platform remove callback returning void)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (bab182cf6a98 bcachefs: Move nocow unlock to bch2_write_endio())
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (d49e9f686546 Merge branch 'for-next-next-v6.9-20240503' into for-next-20240503)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (ae4f73e84cb1 smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (e6b4c0a8589b Merge ext2 Kconfig cleanup.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (3763f9effcdc f2fs: use helper to print zone condition)
Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning)
Merging fuse/for-next (fa7e19337908 fuse: Add initial support for fs-verity)
Merging gfs2/for-next (50fabd42cb2f gfs2: Convert gfs2_aspace_writepage() to use a folio)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (691aae4f36f9 ksmbd: do not grant v2 lease if parent lease key and epoch are not set)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (7d3d6536ca8a nfsd: set security label during create operations)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (096802748ea1 ovl: remove upper umask handling from ovl_create_upper())
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (25576c5420e6 xfs: simplify iext overflow checking and upgrade)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (bf0a67a23c55 Merge branch 'vfs.netfs' into vfs.all)
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in fs/tracefs/inode.c
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (ccd0bdb57e31 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5deb5b56bccb i2c: smbus: fix NULL function pointer dereference)
Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE())
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (0ef11f604503 firmware: dmi: Stop decoding on broken entry)
Merging hwmon-staging/hwmon-next (45bf8305fb2e hwmon: (max6639) Use regmap)
Merging jc_docs/docs-next (404b444fbb3d Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (4a7d735191de media: dw2102: fix coding style issues)
Merging v4l-dvb-next/master (8a09bb1be67a media: intel/ipu6: Don't re-allocate memory for firmware)
Applying: media: intel/ipu6: explicitly include vmalloc.h
Merging pm/linux-next (058b3af4882a Merge branches 'acpica', 'acpi-scan' and 'acpi-resource' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next)
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (734b5def91b5 thermal/drivers/loongson2: Add Loongson-2K2000 support)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (e4e40a87024c RDMA/ipoib: Remove NULL check before dev_{put, hold})
Merging net-next/main (cdc74c9d06e7 Merge branch 'gve-queue-api')
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/Makefile
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/slab.h
Merging bpf-next/for-next (a9e7715ce8b3 libbpf: Avoid casts from pointers to enums in bpf_tracing.h)
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (f7bbc1e0ec8f Bluetooth: hci_conn: Use __counted_by() and avoid -Wfamnae warning)
0438daa3384a ("Bluetooth: qca: fix info leak when fetching board id")
3da8bd8c636d ("Bluetooth: qca: fix wcn3991 device address check")
438fcfbffd50 ("Bluetooth: qca: fix NVM configuration parsing")
540587c30a7b ("Bluetooth: HCI: Fix potential null-ptr-deref")
639fb017762b ("Bluetooth: msft: fix slab-use-after-free in msft_do_close()")
a757a088c27b ("arm64: dts: mediatek: mt8183-pico6: Fix bluetooth node")
a7632943b8d8 ("Bluetooth: qca: fix firmware check error path")
acef4e6d383c ("Bluetooth: qca: generalise device address check")
bf6e892b6fd5 ("Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout")
ce5e3554beb7 ("Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout")
e3631691e44b ("Bluetooth: qca: fix info leak when fetching fw build id")
f905ae0be4b7 ("Bluetooth: qca: add missing firmware sanity checks")
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.c
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.h
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
Merging wireless-next/for-next (f1c26960b6af Merge tag 'ath-next-20240502' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (6117af863659 crypto: hisilicon/sec2 - fix for register offset)
Merging drm/drm-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
28d21e3e66c5 ("drm/xe/vm: prevent UAF in rebind_work_func()")
8e1d1905951d ("drm/amdgpu: Fix VRAM memory accounting")
b528cac6deaa ("drm/amd/display: Handle Y carry-over in VCP X.Y calculation")
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
Merging drm-exynos/for-linux-next (2236a61bd491 Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next)
Merging drm-misc/for-linux-next (be3f3042391d drm: zynqmp_dpsub: Always register bridge)
Merging amdgpu/drm-next (b0923d5d80fa drm/amdgpu: remove ip dump reg_count variable)
04790139c59a ("drm/amdgpu: fix doorbell regression")
2b6c4a4b7ae5 ("drm/amd/display: Ensure that dmcub support flag is set for DCN20")
35df442d813d ("drm/amd/display: Disable seamless boot on 128b/132b encoding")
6aa96aa8ffbe ("drm/amd/display: Fix DC mode screen flickering on DCN321")
771c75ad0bd2 ("drm/amd/display: Allocate zero bw after bw alloc enable")
81f3d3c9a037 ("drm/amd/display: Fix incorrect DSC instance for MST")
8acb83689258 ("drm/amd/display: Atom Integrated System Info v2_2 for DCN35")
a89a05e3ca3e ("drm/amdkfd: Flush the process wq before creating a kfd_process")
b9f5fcef7280 ("drm/amd/display: Add VCO speed parameter for DCN31 FPU")
c83ad4c3f943 ("drm/amd/display: Add dtbclk access to dcn315")
d17846a096b3 ("drm/amd/display: Disable panel replay by default for now")
ffda7081489b ("drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2")
Merging drm-intel/for-linux-next (ca5d5ecbb90d drm/xe/bmg: Enable the display support)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Makefile
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (e9c190b9b8e7 drm/xe: Demote CCS_MODE info to debug only)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (e7aeb238026c ALSA: aoa: soundbus: i2sbus: pcm: use 'time_left' variable with wait_for_completion_timeout())
Merging ieee1394/for-next (6b0b708f12d1 firewire: core: add tracepoint event for handling bus reset)
Merging sound-asoc/for-next (3785e220fd42 Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (493abdac43bf bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (7b4e0b39182c Input: cyapa - add missing input core locking to suspend/resume functions)
Merging block/for-next (7153772abb58 Merge branch 'for-6.10/block' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (83637d9017b2 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs)
Merging mfd/for-mfd-next (7fcb2977c0b5 dt-bindings: mfd: Convert lp873x.txt to json-schema)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (4da294108e38 backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (d3ff4628b912 Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (67889688e05b MAINTAINERS: update the LSM file list)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (152585665f0f docs: trusted-encrypted: add DCP as new trust source)
71dd2201bdef ("MAINTAINERS: Update URL's for KEYS/KEYRINGS_INTEGRITY and TPM DEVICE DRIVER")
Merging watchdog/master (413bf4e857fd watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in sa1100dog_probe())
Merging iommu/next (ef6e717d93c7 Merge branches 'arm/renesas', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (649bad67d4b1 dt-bindings: PCI: microchip: increase number of items in ranges property)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (7f17199c1f36 Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (7de3d344c432 Merge branch into tip/master: 'x86/timers')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (03db22b93a01 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (e7d6f9dff52c rcu/nocb: Remove buggy bypass lock contention mitigation)
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kvm/next (a96cb3bf390e Merge x86 bugfixes from Linux 6.9-rc3)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Applying: fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code"
Merging kvm-arm/next (b63b7db624b3 Merge branch kvm-arm64/misc-6.10 into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/aarch64/psci_test.c
Merging xen-tip/linux-next (802600ebdf23 x86/xen: return a sane initial apic id when running as PV guest)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (76f09e22027f platform/x86: ISST: Support SST-BF and SST-TF per level)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (e5019b14230a Merge 6.9-rc5 into driver-core-next)
Merging usb/usb-next (b3e40fc85735 USB: usb_parse_endpoint: ignore reserved bits)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/core.c
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (6bd23e0c2bb6 tty: add the option to have a tty reject a new ldisc)
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (1565fce99bd0 Merge tag 'iio-for-6.10b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x)
Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (bb208810b1ab vfio/qat: Add vfio_pci driver for Intel QAT SR-IOV VF devices)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (3bb8cd556eae spmi: pmic-arb: Add multi bus support)
Merging staging/staging-next (eb563dc752d3 staging: pi433: Remove unused driver)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (28059ddbee0e MAINTAINERS: Update role for IDXD driver)
Merging cgroup/for-next (8f6d24a5db2a selftests/cgroup: fix uninitialized variables in test_zswap.c)
Merging scsi/for-next (8c5220c43ba0 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (aca061774bc4 scsi: mpi3mr: Fix some kernel-doc warnings in scsi_bsg_mpi3mr.h)
Merging vhost/linux-next (88199634e516 vduse: enable Virtio-net device type)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (0496190c4d42 Merge branches 'rproc-next' and 'rpmsg-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (5539287ca656 gpio: brcmstb: add support for gpio-ranges)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (077895d14a6b Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (b664fc60d7f8 dt-bindings: pwm: snps,dw-apb-timers: Do not require pwm-cells twice)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (70bfefe4252d selftests: default to host arch for LLVM builds)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (2168e528f867 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
5e8e32f81813 ("slimbus: qcom-ngd-ctrl: Reduce auto suspend delay")
772be93c1c24 ("slimbus: qcom-ctrl: fix module autoloading")
b12bd525ca6e ("slimbus: qcom-ngd-ctrl: Add timeout for wait operation")
f6c637ffe528 ("slimbus: Convert to platform remove callback returning void")
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
04075398ec4f ("nvmem: lpc18xx_eeprom: Convert to platform remove callback returning void")
2ce7240c076f ("dt-bindings: nvmem: Add compatible for SC8280XP")
3575d48e5d2f ("nvmem: layouts: sl28vpd: drop driver owner initialization")
995b22c48ed0 ("nvmem: layouts: onie-tlv: drop driver owner initialization")
9e29a1dba59b ("nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct")
af868167a709 ("dt-bindings: nvmem: qcom,spmi-sdam: update maintainer")
e428f11ae8fb ("nvmem: layouts: store owner from modules with nvmem_layout_driver_register()")
e5630036dab1 ("dt-bindings: nvmem: Add compatible for sm8450, sm8550 and sm8650")
ea8f9ec2bbb7 ("nvmem: core: switch to use device_add_groups()")
fbd0d725d4fa ("nvmem: sprd: fix module autoloading")
fc7d05b8e427 ("nvmem: sc27xx: fix module autoloading")
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (d6a07bb3c18c MAINTAINERS: Add Günther Noack as Landlock reviewer)
Merging rust/rust-next (56f64b370612 rust: upgrade to Rust 1.78.0)
CONFLICT (content): Merge conflict in rust/Makefile
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (10e29251be0e binfmt_elf_fdpic: fix /proc/<pid>/auxv)
Merging bitmap/bitmap-for-next (2eb411f428b8 MAINTAINERS: add BITOPS API record)
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (0e148d3cca0d stackleak: Use a copy of the ctl_table argument)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (6b9cd589464f tools/power turbostat: version 2024.04.27)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Re: [syzbot] [can?] KMSAN: kernel-infoleak in raw_recvmsg
2024-04-26 11:04 3% [syzbot] [can?] KMSAN: kernel-infoleak in raw_recvmsg syzbot
@ 2024-05-06 3:34 0% ` Oliver Hartkopp
0 siblings, 0 replies; 200+ results
From: Oliver Hartkopp @ 2024-05-06 3:34 UTC (permalink / raw)
To: o.rempel
Cc: syzbot, davem, edumazet, kernel, kuba, linux-can, linux-kernel,
mkl, netdev, pabeni, robin, syzkaller-bugs
Hello Oleksij,
can this probably be caused by a missing initialization of unused data
in j1939_sk_alloc_skb()?
Best regards,
Oliver
On 26.04.24 13:04, syzbot wrote:
> Hello,
>
> syzbot found the following issue on:
>
> HEAD commit: 71b1543c83d6 Merge tag '6.9-rc5-ksmbd-fixes' of git://git...
> git tree: upstream
> console+strace: https://syzkaller.appspot.com/x/log.txt?x=1784bdd7180000
> kernel config: https://syzkaller.appspot.com/x/.config?x=776c05250f36d55c
> dashboard link: https://syzkaller.appspot.com/bug?extid=5681e40d297b30f5b513
> compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40
> syz repro: https://syzkaller.appspot.com/x/repro.syz?x=15b440d3180000
> C reproducer: https://syzkaller.appspot.com/x/repro.c?x=14b00907180000
>
> Downloadable assets:
> disk image: https://storage.googleapis.com/syzbot-assets/14813ccfbcb3/disk-71b1543c.raw.xz
> vmlinux: https://storage.googleapis.com/syzbot-assets/e7b88b42cf07/vmlinux-71b1543c.xz
> kernel image: https://storage.googleapis.com/syzbot-assets/3a64a5abfbba/bzImage-71b1543c.xz
>
> IMPORTANT: if you fix the issue, please add the following tag to the commit:
> Reported-by: syzbot+5681e40d297b30f5b513@syzkaller.appspotmail.com
>
> =====================================================
> BUG: KMSAN: kernel-infoleak in instrument_copy_to_user include/linux/instrumented.h:114 [inline]
> BUG: KMSAN: kernel-infoleak in copy_to_user_iter lib/iov_iter.c:24 [inline]
> BUG: KMSAN: kernel-infoleak in iterate_ubuf include/linux/iov_iter.h:29 [inline]
> BUG: KMSAN: kernel-infoleak in iterate_and_advance2 include/linux/iov_iter.h:245 [inline]
> BUG: KMSAN: kernel-infoleak in iterate_and_advance include/linux/iov_iter.h:271 [inline]
> BUG: KMSAN: kernel-infoleak in _copy_to_iter+0x366/0x2520 lib/iov_iter.c:185
> instrument_copy_to_user include/linux/instrumented.h:114 [inline]
> copy_to_user_iter lib/iov_iter.c:24 [inline]
> iterate_ubuf include/linux/iov_iter.h:29 [inline]
> iterate_and_advance2 include/linux/iov_iter.h:245 [inline]
> iterate_and_advance include/linux/iov_iter.h:271 [inline]
> _copy_to_iter+0x366/0x2520 lib/iov_iter.c:185
> copy_to_iter include/linux/uio.h:196 [inline]
> memcpy_to_msg include/linux/skbuff.h:4113 [inline]
> raw_recvmsg+0x2b8/0x9e0 net/can/raw.c:1008
> sock_recvmsg_nosec net/socket.c:1046 [inline]
> sock_recvmsg+0x2c4/0x340 net/socket.c:1068
> ____sys_recvmsg+0x18a/0x620 net/socket.c:2803
> ___sys_recvmsg+0x223/0x840 net/socket.c:2845
> do_recvmmsg+0x4fc/0xfd0 net/socket.c:2939
> __sys_recvmmsg net/socket.c:3018 [inline]
> __do_sys_recvmmsg net/socket.c:3041 [inline]
> __se_sys_recvmmsg net/socket.c:3034 [inline]
> __x64_sys_recvmmsg+0x397/0x490 net/socket.c:3034
> x64_sys_call+0xf6c/0x3b50 arch/x86/include/generated/asm/syscalls_64.h:300
> do_syscall_x64 arch/x86/entry/common.c:52 [inline]
> do_syscall_64+0xcf/0x1e0 arch/x86/entry/common.c:83
> entry_SYSCALL_64_after_hwframe+0x77/0x7f
>
> Uninit was created at:
> slab_post_alloc_hook mm/slub.c:3804 [inline]
> slab_alloc_node mm/slub.c:3845 [inline]
> kmem_cache_alloc_node+0x613/0xc50 mm/slub.c:3888
> kmalloc_reserve+0x13d/0x4a0 net/core/skbuff.c:577
> __alloc_skb+0x35b/0x7a0 net/core/skbuff.c:668
> alloc_skb include/linux/skbuff.h:1313 [inline]
> alloc_skb_with_frags+0xc8/0xbf0 net/core/skbuff.c:6504
> sock_alloc_send_pskb+0xa81/0xbf0 net/core/sock.c:2795
> sock_alloc_send_skb include/net/sock.h:1842 [inline]
> j1939_sk_alloc_skb net/can/j1939/socket.c:878 [inline]
> j1939_sk_send_loop net/can/j1939/socket.c:1142 [inline]
> j1939_sk_sendmsg+0xc0a/0x2730 net/can/j1939/socket.c:1277
> sock_sendmsg_nosec net/socket.c:730 [inline]
> __sock_sendmsg+0x30f/0x380 net/socket.c:745
> ____sys_sendmsg+0x877/0xb60 net/socket.c:2584
> ___sys_sendmsg+0x28d/0x3c0 net/socket.c:2638
> __sys_sendmsg net/socket.c:2667 [inline]
> __do_sys_sendmsg net/socket.c:2676 [inline]
> __se_sys_sendmsg net/socket.c:2674 [inline]
> __x64_sys_sendmsg+0x307/0x4a0 net/socket.c:2674
> x64_sys_call+0xc4b/0x3b50 arch/x86/include/generated/asm/syscalls_64.h:47
> do_syscall_x64 arch/x86/entry/common.c:52 [inline]
> do_syscall_64+0xcf/0x1e0 arch/x86/entry/common.c:83
> entry_SYSCALL_64_after_hwframe+0x77/0x7f
>
> Bytes 12-15 of 16 are uninitialized
> Memory access of size 16 starts at ffff888120969690
> Data copied to user address 00000000200017c0
>
> CPU: 1 PID: 5050 Comm: syz-executor198 Not tainted 6.9.0-rc5-syzkaller-00031-g71b1543c83d6 #0
> Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024
> =====================================================
>
>
> ---
> This report is generated by a bot. It may contain errors.
> See https://goo.gl/tpsmEJ for more information about syzbot.
> syzbot engineers can be reached at syzkaller@googlegroups.com.
>
> syzbot will keep track of this issue. See:
> https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
>
> If the report is already addressed, let syzbot know by replying with:
> #syz fix: exact-commit-title
>
> If you want syzbot to run the reproducer, reply with:
> #syz test: git://repo/address.git branch-or-commit-hash
> If you attach or paste a git patch, syzbot will apply it before testing.
>
> If you want to overwrite report's subsystems, reply with:
> #syz set subsystems: new-subsystem
> (See the list of subsystem names on the web dashboard)
>
> If the report is a duplicate of another one, reply with:
> #syz dup: exact-subject-of-another-report
>
> If you want to undo deduplication, reply with:
> #syz undup
>
^ permalink raw reply [relevance 0%]
* Added various xfstests to ksmbd test run
@ 2024-05-06 3:08 8% Steve French
0 siblings, 0 replies; 200+ results
From: Steve French @ 2024-05-06 3:08 UTC (permalink / raw)
To: Namjae Jeon, CIFS
Good news - I added 15 more tests to the xfstest group but one of them
(test 707) as well as one that has run fine for a long time (test
069), failed a couple times today (although succeeded when I ran them
individually later, and consistently worked fine when run on my local
system to ksmbd). Any ideas, or additional information on why
intermittent failure in test generic/069 and generic/707?
Here is the full test run (6.9-rc6) with the 15 additional tests added:
http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/10/builds/65
and here is running them individually:
generic/069 12s ... 7s
generic/707 265s ... 226s
--
Thanks,
Steve
^ permalink raw reply [relevance 8%]
* rmmod cifs error
@ 2024-05-05 4:10 1% Steve French
0 siblings, 0 replies; 200+ results
From: Steve French @ 2024-05-05 4:10 UTC (permalink / raw)
To: CIFS; +Cc: Paulo Alcantara, Bharath S M
I saw this doing "unmount /mnt/test ; rmmod cifs" after running a
'full xfstest run' with current mainline against ksmbd. Have you seen
this before? Any ideas?
[20769.458158] run fstests generic/502 at 2024-05-04 16:55:46
[20770.643121] run fstests generic/503 at 2024-05-04 16:55:48
[20772.047150] CIFS: Attempting to mount //10.0.0.10/scratch
[43069.416552] Key type cifs.idmap unregistered
[43069.416615] Key type cifs.spnego unregistered
[43069.547744] =============================================================================
[43069.548091] BUG cifs_small_rq (Not tainted): Objects remaining in
cifs_small_rq on __kmem_cache_shutdown()
[43069.548097] -----------------------------------------------------------------------------
[43069.548100] Slab 0x00000000c3bca063 objects=32 used=1
fp=0x0000000074f47125
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.548109] CPU: 6 PID: 13873 Comm: rmmod Not tainted 6.9.0-rc6 #1
[43069.548114] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.548119] Call Trace:
[43069.548122] <TASK>
[43069.548126] dump_stack_lvl+0x79/0xb0
[43069.548143] slab_err+0xb6/0xf0
[43069.548158] ? __lock_acquire+0x2689/0x31c0
[43069.548166] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.548175] ? do_raw_spin_lock+0xf8/0x190
[43069.548183] __kmem_cache_shutdown+0x176/0x310
[43069.548198] kmem_cache_destroy+0x65/0x1a0
[43069.548209] exit_cifs+0x65/0x460 [cifs]
[43069.548382] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.548390] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.548395] ? mark_held_locks+0x24/0x90
[43069.548403] ? __x64_sys_close+0x54/0xa0
[43069.548409] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.548416] ? kasan_quarantine_put+0x97/0x1f0
[43069.548427] ? mark_held_locks+0x24/0x90
[43069.548439] do_syscall_64+0x78/0x180
[43069.548447] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.548454] RIP: 0033:0x7f25b50bdd4b
[43069.548460] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.548465] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.548472] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.548476] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.548480] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.548483] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.548487] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.548508] </TASK>
[43069.548510] Disabling lock debugging due to kernel taint
[43069.548514] Object 0x00000000f92344d7 @offset=5632
[43069.548517] =============================================================================
[43069.548519] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.548522] -----------------------------------------------------------------------------
[43069.548524] Slab 0x000000003e783061 objects=32 used=1
fp=0x00000000e9d9a99b
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.548529] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.548533] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.548535] Call Trace:
[43069.548537] <TASK>
[43069.548539] dump_stack_lvl+0x79/0xb0
[43069.548544] slab_err+0xb6/0xf0
[43069.548550] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.548554] ? do_raw_spin_unlock+0x8d/0x100
[43069.548559] __kmem_cache_shutdown+0x176/0x310
[43069.548565] kmem_cache_destroy+0x65/0x1a0
[43069.548570] exit_cifs+0x65/0x460 [cifs]
[43069.548725] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.548730] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.548733] ? mark_held_locks+0x24/0x90
[43069.548738] ? __x64_sys_close+0x54/0xa0
[43069.548742] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.548746] ? kasan_quarantine_put+0x97/0x1f0
[43069.548750] ? mark_held_locks+0x24/0x90
[43069.548756] do_syscall_64+0x78/0x180
[43069.548760] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.548764] RIP: 0033:0x7f25b50bdd4b
[43069.548767] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.548771] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.548774] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.548777] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.548780] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.548782] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.548784] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.548791] </TASK>
[43069.548796] Object 0x000000001ea3d3e5 @offset=1536
[43069.548799] =============================================================================
[43069.548801] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.548803] -----------------------------------------------------------------------------
[43069.548805] Slab 0x00000000df780979 objects=32 used=1
fp=0x0000000055c1ab0c
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.548809] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.548812] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.548815] Call Trace:
[43069.548816] <TASK>
[43069.548818] dump_stack_lvl+0x79/0xb0
[43069.548823] slab_err+0xb6/0xf0
[43069.548829] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.548833] ? do_raw_spin_unlock+0x8d/0x100
[43069.548838] __kmem_cache_shutdown+0x176/0x310
[43069.548844] kmem_cache_destroy+0x65/0x1a0
[43069.548850] exit_cifs+0x65/0x460 [cifs]
[43069.549018] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.549022] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.549026] ? mark_held_locks+0x24/0x90
[43069.549031] ? __x64_sys_close+0x54/0xa0
[43069.549034] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.549038] ? kasan_quarantine_put+0x97/0x1f0
[43069.549043] ? mark_held_locks+0x24/0x90
[43069.549049] do_syscall_64+0x78/0x180
[43069.549053] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.549057] RIP: 0033:0x7f25b50bdd4b
[43069.549060] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.549063] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.549067] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.549070] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.549072] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.549075] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.549077] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.549084] </TASK>
[43069.549089] Object 0x00000000c50b80d8 @offset=6144
[43069.549092] =============================================================================
[43069.549094] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.549096] -----------------------------------------------------------------------------
[43069.549098] Slab 0x00000000214adb68 objects=32 used=1
fp=0x00000000d0cdfe51
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.549103] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.549106] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.549107] Call Trace:
[43069.549109] <TASK>
[43069.549111] dump_stack_lvl+0x79/0xb0
[43069.549116] slab_err+0xb6/0xf0
[43069.549122] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.549126] ? do_raw_spin_unlock+0x8d/0x100
[43069.549130] __kmem_cache_shutdown+0x176/0x310
[43069.549137] kmem_cache_destroy+0x65/0x1a0
[43069.549142] exit_cifs+0x65/0x460 [cifs]
[43069.549296] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.549301] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.549304] ? mark_held_locks+0x24/0x90
[43069.549309] ? __x64_sys_close+0x54/0xa0
[43069.549312] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.549316] ? kasan_quarantine_put+0x97/0x1f0
[43069.549320] ? mark_held_locks+0x24/0x90
[43069.549326] do_syscall_64+0x78/0x180
[43069.549330] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.549335] RIP: 0033:0x7f25b50bdd4b
[43069.549337] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.549341] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.549344] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.549347] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.549349] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.549351] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.549354] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.549360] </TASK>
[43069.549364] Object 0x000000005a4f4045 @offset=7680
[43069.549367] =============================================================================
[43069.549369] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.549371] -----------------------------------------------------------------------------
[43069.549373] Slab 0x000000009299b178 objects=32 used=1
fp=0x00000000c449daa1
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.549377] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.549380] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.549382] Call Trace:
[43069.549384] <TASK>
[43069.549386] dump_stack_lvl+0x79/0xb0
[43069.549391] slab_err+0xb6/0xf0
[43069.549397] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.549402] ? do_raw_spin_unlock+0x8d/0x100
[43069.549407] __kmem_cache_shutdown+0x176/0x310
[43069.549413] kmem_cache_destroy+0x65/0x1a0
[43069.549418] exit_cifs+0x65/0x460 [cifs]
[43069.549573] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.549577] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.549580] ? mark_held_locks+0x24/0x90
[43069.549585] ? __x64_sys_close+0x54/0xa0
[43069.549588] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.549592] ? kasan_quarantine_put+0x97/0x1f0
[43069.549597] ? mark_held_locks+0x24/0x90
[43069.549603] do_syscall_64+0x78/0x180
[43069.549607] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.549611] RIP: 0033:0x7f25b50bdd4b
[43069.549614] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.549617] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.549621] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.549624] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.549626] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.549629] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.549631] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.549638] </TASK>
[43069.549643] Object 0x000000004d22b885 @offset=9216
[43069.549646] =============================================================================
[43069.549648] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.549651] -----------------------------------------------------------------------------
[43069.549652] Slab 0x0000000039ac8184 objects=32 used=1
fp=0x000000003494909d
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.549657] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.549660] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.549662] Call Trace:
[43069.549664] <TASK>
[43069.549666] dump_stack_lvl+0x79/0xb0
[43069.549670] slab_err+0xb6/0xf0
[43069.549676] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.549681] ? do_raw_spin_unlock+0x8d/0x100
[43069.549685] __kmem_cache_shutdown+0x176/0x310
[43069.549691] kmem_cache_destroy+0x65/0x1a0
[43069.549697] exit_cifs+0x65/0x460 [cifs]
[43069.549851] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.549855] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.549859] ? mark_held_locks+0x24/0x90
[43069.549863] ? __x64_sys_close+0x54/0xa0
[43069.549867] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.549871] ? kasan_quarantine_put+0x97/0x1f0
[43069.549876] ? mark_held_locks+0x24/0x90
[43069.549882] do_syscall_64+0x78/0x180
[43069.549886] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.549890] RIP: 0033:0x7f25b50bdd4b
[43069.549893] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.549896] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.549900] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.549902] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.549905] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.549907] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.549910] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.549917] </TASK>
[43069.549921] Object 0x000000006d356e19 @offset=3072
[43069.549924] =============================================================================
[43069.549926] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.549929] -----------------------------------------------------------------------------
[43069.549931] Slab 0x000000008c7d4f98 objects=32 used=1
fp=0x00000000bf6e5aae
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.549935] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.549938] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.549940] Call Trace:
[43069.549942] <TASK>
[43069.549944] dump_stack_lvl+0x79/0xb0
[43069.549948] slab_err+0xb6/0xf0
[43069.549954] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.549959] ? do_raw_spin_unlock+0x8d/0x100
[43069.549963] __kmem_cache_shutdown+0x176/0x310
[43069.549969] kmem_cache_destroy+0x65/0x1a0
[43069.549975] exit_cifs+0x65/0x460 [cifs]
[43069.550138] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.550142] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.550146] ? mark_held_locks+0x24/0x90
[43069.550150] ? __x64_sys_close+0x54/0xa0
[43069.550154] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.550158] ? kasan_quarantine_put+0x97/0x1f0
[43069.550162] ? mark_held_locks+0x24/0x90
[43069.550168] do_syscall_64+0x78/0x180
[43069.550172] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.550177] RIP: 0033:0x7f25b50bdd4b
[43069.550179] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.550183] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.550186] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.550189] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.550191] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.550194] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.550196] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.550203] </TASK>
[43069.550207] Object 0x000000000fa84f6b @offset=1024
[43069.550210] =============================================================================
[43069.550212] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.550215] -----------------------------------------------------------------------------
[43069.550216] Slab 0x00000000dbc4c940 objects=32 used=1
fp=0x000000007903ed13
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.550221] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.550224] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.550226] Call Trace:
[43069.550228] <TASK>
[43069.550229] dump_stack_lvl+0x79/0xb0
[43069.550234] slab_err+0xb6/0xf0
[43069.550240] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.550245] ? do_raw_spin_unlock+0x8d/0x100
[43069.550249] __kmem_cache_shutdown+0x176/0x310
[43069.550255] kmem_cache_destroy+0x65/0x1a0
[43069.550261] exit_cifs+0x65/0x460 [cifs]
[43069.550414] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.550418] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.550422] ? mark_held_locks+0x24/0x90
[43069.550426] ? __x64_sys_close+0x54/0xa0
[43069.550430] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.550433] ? kasan_quarantine_put+0x97/0x1f0
[43069.550438] ? mark_held_locks+0x24/0x90
[43069.550444] do_syscall_64+0x78/0x180
[43069.550448] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.550452] RIP: 0033:0x7f25b50bdd4b
[43069.550455] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.550458] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.550462] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.550465] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.550467] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.550469] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.550472] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.550479] </TASK>
[43069.550483] Object 0x000000005df1fc39 @offset=7680
[43069.550485] =============================================================================
[43069.550487] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.550490] -----------------------------------------------------------------------------
[43069.550492] Slab 0x000000009bfcbe94 objects=32 used=1
fp=0x0000000051ba06de
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.550496] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.550499] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.550501] Call Trace:
[43069.550503] <TASK>
[43069.550505] dump_stack_lvl+0x79/0xb0
[43069.550509] slab_err+0xb6/0xf0
[43069.550515] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.550520] ? do_raw_spin_unlock+0x8d/0x100
[43069.550524] __kmem_cache_shutdown+0x176/0x310
[43069.550530] kmem_cache_destroy+0x65/0x1a0
[43069.550536] exit_cifs+0x65/0x460 [cifs]
[43069.550691] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.550695] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.550699] ? mark_held_locks+0x24/0x90
[43069.550704] ? __x64_sys_close+0x54/0xa0
[43069.550707] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.550711] ? kasan_quarantine_put+0x97/0x1f0
[43069.550715] ? mark_held_locks+0x24/0x90
[43069.550721] do_syscall_64+0x78/0x180
[43069.550725] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.550730] RIP: 0033:0x7f25b50bdd4b
[43069.550732] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.550736] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.550739] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.550742] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.550744] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.550747] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.550749] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.550756] </TASK>
[43069.550761] Object 0x000000007e641d2e @offset=8192
[43069.550763] =============================================================================
[43069.550765] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.550768] -----------------------------------------------------------------------------
[43069.550770] Slab 0x000000005d611d8a objects=32 used=1
fp=0x00000000f2b2273f
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.550774] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.550777] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.550779] Call Trace:
[43069.550781] <TASK>
[43069.550783] dump_stack_lvl+0x79/0xb0
[43069.550787] slab_err+0xb6/0xf0
[43069.550793] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.550798] ? do_raw_spin_unlock+0x8d/0x100
[43069.550802] __kmem_cache_shutdown+0x176/0x310
[43069.550808] kmem_cache_destroy+0x65/0x1a0
[43069.550814] exit_cifs+0x65/0x460 [cifs]
[43069.550967] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.550972] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.550975] ? mark_held_locks+0x24/0x90
[43069.550980] ? __x64_sys_close+0x54/0xa0
[43069.550983] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.550994] ? kasan_quarantine_put+0x97/0x1f0
[43069.550999] ? mark_held_locks+0x24/0x90
[43069.551005] do_syscall_64+0x78/0x180
[43069.551009] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.551014] RIP: 0033:0x7f25b50bdd4b
[43069.551016] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.551020] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.551023] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.551026] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.551028] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.551031] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.551033] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.551040] </TASK>
[43069.551045] Object 0x00000000387d1dd2 @offset=4096
[43069.551047] =============================================================================
[43069.551049] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.551052] -----------------------------------------------------------------------------
[43069.551054] Slab 0x000000001b2ee585 objects=32 used=2
fp=0x000000005d08c8ce
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.551058] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.551061] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.551063] Call Trace:
[43069.551065] <TASK>
[43069.551067] dump_stack_lvl+0x79/0xb0
[43069.551072] slab_err+0xb6/0xf0
[43069.551078] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.551082] ? do_raw_spin_unlock+0x8d/0x100
[43069.551087] __kmem_cache_shutdown+0x176/0x310
[43069.551093] kmem_cache_destroy+0x65/0x1a0
[43069.551098] exit_cifs+0x65/0x460 [cifs]
[43069.551253] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.551257] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.551261] ? mark_held_locks+0x24/0x90
[43069.551266] ? __x64_sys_close+0x54/0xa0
[43069.551269] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.551273] ? kasan_quarantine_put+0x97/0x1f0
[43069.551278] ? mark_held_locks+0x24/0x90
[43069.551283] do_syscall_64+0x78/0x180
[43069.551288] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.551292] RIP: 0033:0x7f25b50bdd4b
[43069.551295] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.551298] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.551301] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.551304] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.551306] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.551309] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.551311] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.551318] </TASK>
[43069.551323] Object 0x0000000085af2a9b @offset=8192
[43069.551325] Object 0x000000004b2efd7a @offset=12288
[43069.551327] =============================================================================
[43069.551329] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.551332] -----------------------------------------------------------------------------
[43069.551334] Slab 0x00000000ee7fd84c objects=32 used=1
fp=0x000000007320e380
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.551338] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.551341] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.551343] Call Trace:
[43069.551345] <TASK>
[43069.551347] dump_stack_lvl+0x79/0xb0
[43069.551351] slab_err+0xb6/0xf0
[43069.551358] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.551362] ? do_raw_spin_unlock+0x8d/0x100
[43069.551366] __kmem_cache_shutdown+0x176/0x310
[43069.551373] kmem_cache_destroy+0x65/0x1a0
[43069.551378] exit_cifs+0x65/0x460 [cifs]
[43069.551532] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.551536] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.551540] ? mark_held_locks+0x24/0x90
[43069.551545] ? __x64_sys_close+0x54/0xa0
[43069.551548] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.551552] ? kasan_quarantine_put+0x97/0x1f0
[43069.551556] ? mark_held_locks+0x24/0x90
[43069.551562] do_syscall_64+0x78/0x180
[43069.551566] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.551571] RIP: 0033:0x7f25b50bdd4b
[43069.551573] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.551577] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.551580] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.551583] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.551585] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.551588] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.551590] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.551597] </TASK>
[43069.551601] Object 0x000000004eae45f6 @offset=3584
[43069.551604] =============================================================================
[43069.551606] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.551608] -----------------------------------------------------------------------------
[43069.551610] Slab 0x00000000c15c251a objects=32 used=1
fp=0x00000000e6784a72
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.551614] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.551617] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.551619] Call Trace:
[43069.551621] <TASK>
[43069.551623] dump_stack_lvl+0x79/0xb0
[43069.551627] slab_err+0xb6/0xf0
[43069.551633] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.551638] ? do_raw_spin_unlock+0x8d/0x100
[43069.551642] __kmem_cache_shutdown+0x176/0x310
[43069.551649] kmem_cache_destroy+0x65/0x1a0
[43069.551654] exit_cifs+0x65/0x460 [cifs]
[43069.551808] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.551813] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.551816] ? mark_held_locks+0x24/0x90
[43069.551821] ? __x64_sys_close+0x54/0xa0
[43069.551825] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.551828] ? kasan_quarantine_put+0x97/0x1f0
[43069.551833] ? mark_held_locks+0x24/0x90
[43069.551839] do_syscall_64+0x78/0x180
[43069.551843] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.551847] RIP: 0033:0x7f25b50bdd4b
[43069.551850] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.551853] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.551857] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.551859] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.551862] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.551864] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.551867] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.551873] </TASK>
[43069.551879] Object 0x00000000e7624370 @offset=4096
[43069.551881] =============================================================================
[43069.551883] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.551886] -----------------------------------------------------------------------------
[43069.551888] Slab 0x00000000a2e5a32b objects=32 used=1
fp=0x00000000c47e553f
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.551892] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.551895] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.551897] Call Trace:
[43069.551899] <TASK>
[43069.551901] dump_stack_lvl+0x79/0xb0
[43069.551905] slab_err+0xb6/0xf0
[43069.551912] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.551916] ? do_raw_spin_unlock+0x8d/0x100
[43069.551921] __kmem_cache_shutdown+0x176/0x310
[43069.551927] kmem_cache_destroy+0x65/0x1a0
[43069.551932] exit_cifs+0x65/0x460 [cifs]
[43069.552093] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.552098] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.552101] ? mark_held_locks+0x24/0x90
[43069.552106] ? __x64_sys_close+0x54/0xa0
[43069.552109] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.552113] ? kasan_quarantine_put+0x97/0x1f0
[43069.552118] ? mark_held_locks+0x24/0x90
[43069.552124] do_syscall_64+0x78/0x180
[43069.552128] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.552132] RIP: 0033:0x7f25b50bdd4b
[43069.552135] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.552138] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.552142] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.552145] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.552147] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.552149] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.552152] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.552159] </TASK>
[43069.552164] Object 0x00000000fe3fd465 @offset=15872
[43069.552166] =============================================================================
[43069.552168] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.552171] -----------------------------------------------------------------------------
[43069.552172] Slab 0x000000000f0fb5cd objects=32 used=1
fp=0x0000000033f6e4e0
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.552177] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.552180] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.552182] Call Trace:
[43069.552184] <TASK>
[43069.552186] dump_stack_lvl+0x79/0xb0
[43069.552190] slab_err+0xb6/0xf0
[43069.552196] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.552201] ? do_raw_spin_unlock+0x8d/0x100
[43069.552205] __kmem_cache_shutdown+0x176/0x310
[43069.552211] kmem_cache_destroy+0x65/0x1a0
[43069.552217] exit_cifs+0x65/0x460 [cifs]
[43069.552371] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.552375] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.552379] ? mark_held_locks+0x24/0x90
[43069.552384] ? __x64_sys_close+0x54/0xa0
[43069.552387] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.552391] ? kasan_quarantine_put+0x97/0x1f0
[43069.552395] ? mark_held_locks+0x24/0x90
[43069.552401] do_syscall_64+0x78/0x180
[43069.552405] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.552409] RIP: 0033:0x7f25b50bdd4b
[43069.552412] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.552415] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.552419] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.552422] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.552424] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.552426] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.552429] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.552436] </TASK>
[43069.552441] Object 0x000000003aadef4d @offset=14336
[43069.552443] =============================================================================
[43069.552445] BUG cifs_small_rq (Tainted: G B ):
Objects remaining in cifs_small_rq on __kmem_cache_shutdown()
[43069.552448] -----------------------------------------------------------------------------
[43069.552449] Slab 0x0000000064dc475e objects=32 used=1
fp=0x00000000be31bda9
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.552454] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.552457] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.552459] Call Trace:
[43069.552460] <TASK>
[43069.552462] dump_stack_lvl+0x79/0xb0
[43069.552467] slab_err+0xb6/0xf0
[43069.552473] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.552477] ? do_raw_spin_unlock+0x8d/0x100
[43069.552482] __kmem_cache_shutdown+0x176/0x310
[43069.552488] kmem_cache_destroy+0x65/0x1a0
[43069.552493] exit_cifs+0x65/0x460 [cifs]
[43069.552650] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.552654] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.552657] ? mark_held_locks+0x24/0x90
[43069.552662] ? __x64_sys_close+0x54/0xa0
[43069.552665] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.552669] ? kasan_quarantine_put+0x97/0x1f0
[43069.552674] ? mark_held_locks+0x24/0x90
[43069.552680] do_syscall_64+0x78/0x180
[43069.552684] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.552688] RIP: 0033:0x7f25b50bdd4b
[43069.552691] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.552694] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.552698] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.552700] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.552703] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.552705] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.552708] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.552714] </TASK>
[43069.552719] Object 0x0000000015c7497a @offset=15872
[43069.552783] ------------[ cut here ]------------
[43069.552786] kmem_cache_destroy cifs_small_rq: Slab cache still has
objects when called from exit_cifs+0x65/0x460 [cifs]
[43069.552946] WARNING: CPU: 6 PID: 13873 at mm/slab_common.c:497
kmem_cache_destroy+0x10d/0x1a0
[43069.552953] Modules linked in: loop cmac nls_utf8 cifs(-) cifs_arc4
nls_ucs2_utils cifs_md4 rpcsec_gss_krb5 auth_rpcgss nfsv4 dns_resolver
nfs lockd grace netfs nf_conntrack_netbios_ns nf_conntrack_broadcast
xt_CT ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 ipt_REJECT
nf_reject_ipv4 xt_conntrack ebtable_nat ip6table_nat ip6table_mangle
ip6table_raw ip6table_security iptable_nat nf_nat iptable_mangle
iptable_raw iptable_security nf_conntrack nf_defrag_ipv6
nf_defrag_ipv4 ip_set nfnetlink ebtable_filter ebtables
ip6table_filter ip6_tables iptable_filter sunrpc kvm_intel kvm
crct10dif_pclmul crc32_pclmul ghash_clmulni_intel sha512_ssse3
sha1_ssse3 bochs drm_vram_helper drm_ttm_helper ttm drm_kms_helper drm
virtio_balloon floppy ip_tables xfs virtio_net crc32c_intel
net_failover sha256_ssse3 virtio_blk virtio_console failover
qemu_fw_cfg
[43069.553069] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B
6.9.0-rc6 #1
[43069.553260] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.553263] RIP: 0010:kmem_cache_destroy+0x10d/0x1a0
[43069.553268] Code: 48 89 ef 5b 5d 41 5c 41 5d e9 0f 08 09 00 48 8b
55 60 48 8b 4c 24 20 48 c7 c6 20 01 b6 a5 48 c7 c7 98 9d 38 a6 e8 d3
87 be ff <0f> 0b 48 c7 c7 a0 dd 9d a6 e8 d5 4c 12 01 5b 5d 41 5c 41 5d
e9 8a
[43069.553272] RSP: 0018:ff110001325e7df8 EFLAGS: 00010282
[43069.553276] RAX: dffffc0000000000 RBX: 1fe22000264bcfc6 RCX: 0000000000000027
[43069.553279] RDX: 0000000000000027 RSI: 0000000000000004 RDI: ff110004cb3319c8
[43069.553281] RBP: ff1100011c4dc780 R08: ffffffffa440d70e R09: ffe21c0099666339
[43069.553284] R10: ff110004cb3319cb R11: 0000000000000001 R12: 0000000000045010
[43069.553287] R13: 00000000000000b0 R14: 0000000000000000 R15: 0000000000000000
[43069.553290] FS: 00007f25b4f9d280(0000) GS:ff110004cb300000(0000)
knlGS:0000000000000000
[43069.553293] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[43069.553296] CR2: 0000555e19fdfd58 CR3: 000000012da70003 CR4: 0000000000371ef0
[43069.553305] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[43069.553308] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[43069.553311] Call Trace:
[43069.553313] <TASK>
[43069.553315] ? __warn+0xa4/0x220
[43069.553321] ? kmem_cache_destroy+0x10d/0x1a0
[43069.553326] ? report_bug+0x1d4/0x1e0
[43069.553332] ? handle_bug+0x42/0x80
[43069.553336] ? exc_invalid_op+0x18/0x50
[43069.553341] ? asm_exc_invalid_op+0x1a/0x20
[43069.553347] ? irq_work_claim+0x1e/0x40
[43069.553354] ? kmem_cache_destroy+0x10d/0x1a0
[43069.553359] ? kmem_cache_destroy+0x10d/0x1a0
[43069.553364] exit_cifs+0x65/0x460 [cifs]
[43069.553494] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.553499] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.553503] ? mark_held_locks+0x24/0x90
[43069.553508] ? __x64_sys_close+0x54/0xa0
[43069.553512] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.553516] ? kasan_quarantine_put+0x97/0x1f0
[43069.553520] ? mark_held_locks+0x24/0x90
[43069.553526] do_syscall_64+0x78/0x180
[43069.553530] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.553535] RIP: 0033:0x7f25b50bdd4b
[43069.553538] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.553541] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.553545] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.553548] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.553550] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.553553] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.553555] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.553562] </TASK>
[43069.553564] irq event stamp: 9810
[43069.553565] hardirqs last enabled at (9809): [<ffffffffa569d848>]
_raw_spin_unlock_irq+0x28/0x50
[43069.553570] hardirqs last disabled at (9810): [<ffffffffa569d543>]
_raw_spin_lock_irq+0x53/0x60
[43069.553574] softirqs last enabled at (9692): [<ffffffffa41645fc>]
__irq_exit_rcu+0xfc/0x120
[43069.553579] softirqs last disabled at (9671): [<ffffffffa41645fc>]
__irq_exit_rcu+0xfc/0x120
[43069.553583] ---[ end trace 0000000000000000 ]---
[43069.614650] =============================================================================
[43069.614657] BUG cifs_mpx_ids (Tainted: G B W ):
Objects remaining in cifs_mpx_ids on __kmem_cache_shutdown()
[43069.614662] -----------------------------------------------------------------------------
[43069.614663] Slab 0x00000000cfd8415b objects=32 used=1
fp=0x00000000bb9d9202
flags=0x17ffffe0000a40(workingset|slab|head|node=0|zone=2|lastcpupid=0x3fffff)
[43069.614672] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B W
6.9.0-rc6 #1
[43069.614676] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.614679] Call Trace:
[43069.614682] <TASK>
[43069.614686] dump_stack_lvl+0x79/0xb0
[43069.614696] slab_err+0xb6/0xf0
[43069.614703] ? do_raw_spin_lock+0x100/0x190
[43069.614709] ? __pfx_do_raw_spin_lock+0x10/0x10
[43069.614714] ? do_raw_spin_lock+0xf8/0x190
[43069.614718] __kmem_cache_shutdown+0x176/0x310
[43069.614725] kmem_cache_destroy+0x65/0x1a0
[43069.614735] exit_cifs+0x7d/0x460 [cifs]
[43069.614882] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.614888] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.614891] ? mark_held_locks+0x24/0x90
[43069.614897] ? __x64_sys_close+0x54/0xa0
[43069.614901] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.614905] ? kasan_quarantine_put+0x97/0x1f0
[43069.614910] ? mark_held_locks+0x24/0x90
[43069.614916] do_syscall_64+0x78/0x180
[43069.614921] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.614926] RIP: 0033:0x7f25b50bdd4b
[43069.614931] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.614934] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.614939] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.614942] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.614945] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.614947] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.614950] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.614956] </TASK>
[43069.614961] Object 0x00000000b8ccc787 @offset=7936
[43069.614967] ------------[ cut here ]------------
[43069.614969] kmem_cache_destroy cifs_mpx_ids: Slab cache still has
objects when called from exit_cifs+0x7d/0x460 [cifs]
[43069.615194] WARNING: CPU: 6 PID: 13873 at mm/slab_common.c:497
kmem_cache_destroy+0x10d/0x1a0
[43069.615202] Modules linked in: loop cmac nls_utf8 cifs(-) cifs_arc4
nls_ucs2_utils cifs_md4 rpcsec_gss_krb5 auth_rpcgss nfsv4 dns_resolver
nfs lockd grace netfs nf_conntrack_netbios_ns nf_conntrack_broadcast
xt_CT ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 ipt_REJECT
nf_reject_ipv4 xt_conntrack ebtable_nat ip6table_nat ip6table_mangle
ip6table_raw ip6table_security iptable_nat nf_nat iptable_mangle
iptable_raw iptable_security nf_conntrack nf_defrag_ipv6
nf_defrag_ipv4 ip_set nfnetlink ebtable_filter ebtables
ip6table_filter ip6_tables iptable_filter sunrpc kvm_intel kvm
crct10dif_pclmul crc32_pclmul ghash_clmulni_intel sha512_ssse3
sha1_ssse3 bochs drm_vram_helper drm_ttm_helper ttm drm_kms_helper drm
virtio_balloon floppy ip_tables xfs virtio_net crc32c_intel
net_failover sha256_ssse3 virtio_blk virtio_console failover
qemu_fw_cfg
[43069.615308] CPU: 6 PID: 13873 Comm: rmmod Tainted: G B W
6.9.0-rc6 #1
[43069.615311] Hardware name: Red Hat KVM, BIOS 1.16.1-1.el9 04/01/2014
[43069.615313] RIP: 0010:kmem_cache_destroy+0x10d/0x1a0
[43069.615318] Code: 48 89 ef 5b 5d 41 5c 41 5d e9 0f 08 09 00 48 8b
55 60 48 8b 4c 24 20 48 c7 c6 20 01 b6 a5 48 c7 c7 98 9d 38 a6 e8 d3
87 be ff <0f> 0b 48 c7 c7 a0 dd 9d a6 e8 d5 4c 12 01 5b 5d 41 5c 41 5d
e9 8a
[43069.615322] RSP: 0018:ff110001325e7df8 EFLAGS: 00010282
[43069.615325] RAX: dffffc0000000000 RBX: 1fe22000264bcfc6 RCX: ffffffffa42ea6de
[43069.615328] RDX: dffffc0000000000 RSI: 0000000000000008 RDI: ff110004cb336c40
[43069.615331] RBP: ff1100011c4dcc80 R08: 0000000000000001 R09: ffe21c00264bcf8d
[43069.615334] R10: ff110001325e7c6f R11: 0000000000000000 R12: 0000000000045010
[43069.615336] R13: 00000000000000b0 R14: 0000000000000000 R15: 0000000000000000
[43069.615339] FS: 00007f25b4f9d280(0000) GS:ff110004cb300000(0000)
knlGS:0000000000000000
[43069.615343] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[43069.615345] CR2: 0000555e19fdfd58 CR3: 000000012da70003 CR4: 0000000000371ef0
[43069.615353] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[43069.615356] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[43069.615359] Call Trace:
[43069.615361] <TASK>
[43069.615363] ? __warn+0xa4/0x220
[43069.615369] ? kmem_cache_destroy+0x10d/0x1a0
[43069.615374] ? report_bug+0x1d4/0x1e0
[43069.615380] ? handle_bug+0x42/0x80
[43069.615385] ? exc_invalid_op+0x18/0x50
[43069.615389] ? asm_exc_invalid_op+0x1a/0x20
[43069.615396] ? tick_nohz_tick_stopped+0x1e/0x40
[43069.615402] ? kmem_cache_destroy+0x10d/0x1a0
[43069.615407] ? kmem_cache_destroy+0x10d/0x1a0
[43069.615413] exit_cifs+0x7d/0x460 [cifs]
[43069.615542] __do_sys_delete_module.constprop.0+0x23f/0x450
[43069.615546] ? __pfx___do_sys_delete_module.constprop.0+0x10/0x10
[43069.615550] ? mark_held_locks+0x24/0x90
[43069.615555] ? __x64_sys_close+0x54/0xa0
[43069.615559] ? lockdep_hardirqs_on_prepare+0x139/0x200
[43069.615562] ? kasan_quarantine_put+0x97/0x1f0
[43069.615568] ? mark_held_locks+0x24/0x90
[43069.615574] do_syscall_64+0x78/0x180
[43069.615578] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[43069.615583] RIP: 0033:0x7f25b50bdd4b
[43069.615586] Code: 73 01 c3 48 8b 0d 3d 11 0c 00 f7 d8 64 89 01 48
83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00
00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d 11 0c 00 f7 d8 64 89
01 48
[43069.615589] RSP: 002b:00007ffcfd0f6f08 EFLAGS: 00000206 ORIG_RAX:
00000000000000b0
[43069.615593] RAX: ffffffffffffffda RBX: 0000555e19fd57a0 RCX: 00007f25b50bdd4b
[43069.615596] RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555e19fd5808
[43069.615598] RBP: 0000000000000000 R08: 00007ffcfd0f5e81 R09: 0000000000000000
[43069.615600] R10: 00007f25b512fae0 R11: 0000000000000206 R12: 00007ffcfd0f7130
[43069.615603] R13: 00007ffcfd0f86ea R14: 0000555e19fd5260 R15: 0000555e19fd57a0
[43069.615609] </TASK>
[43069.615611] irq event stamp: 9810
[43069.615613] hardirqs last enabled at (9809): [<ffffffffa569d848>]
_raw_spin_unlock_irq+0x28/0x50
[43069.615618] hardirqs last disabled at (9810): [<ffffffffa569d543>]
_raw_spin_lock_irq+0x53/0x60
[43069.615622] softirqs last enabled at (9692): [<ffffffffa41645fc>]
__irq_exit_rcu+0xfc/0x120
[43069.615627] softirqs last disabled at (9671): [<ffffffffa41645fc>]
__irq_exit_rcu+0xfc/0x120
[43069.615631] ---[ end trace 0000000000000000 ]---
--
Thanks,
Steve
^ permalink raw reply [relevance 1%]
* Re: [OE-core][kirkstone 11/12] linux-yocto/5.15: update to v5.15.157
2024-05-03 17:39 0% ` Steve Sakoman
@ 2024-05-03 17:40 0% ` Bruce Ashfield
0 siblings, 0 replies; 200+ results
From: Bruce Ashfield @ 2024-05-03 17:40 UTC (permalink / raw)
To: Steve Sakoman; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 26421 bytes --]
I'll revisit this in a week or so, and send the queue again at that point.
The fix is trivial, I've just moved on from it for the time being
Bruce
On Fri, May 3, 2024 at 1:39 PM Steve Sakoman <steve@sakoman.com> wrote:
> Hi Bruce,
>
> Unfortunately I'm getting warnings on many of the builds:
>
> WARNING: linux-yocto-5.15.157+gitAUTOINC+21fd5becb1_f0d16a142e-r0
> do_kernel_configcheck: [kernel config]: This BSP contains fragments
> with warnings:
> [INFO]: the following symbols were not found in the active configuration:
> - CONFIG_NFSD_V3
>
> Steve
>
> On Thu, May 2, 2024 at 7:52 PM <bruce.ashfield@gmail.com> wrote:
> >
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >
> > Updating linux-yocto/5.15 to the latest korg -stable release that
> comprises
> > the following commits:
> >
> > b925f60c6ee7 Linux 5.15.157
> > d564809f27ea net: dsa: mt7530: fix enabling EEE on MT7531 switch on
> all boards
> > eb6535c6f7c2 net: dsa: mt7530: fix improper frames on all 25MHz and
> 40MHz XTAL MT7530
> > 63ba7a80d6e2 net: dsa: introduce preferred_default_local_cpu_port
> and use on MT7530
> > 84b7f50e631a net: dsa: mt7530: set all CPU ports in MT7531_CPU_PMAP
> > bdbe483da21f nilfs2: fix OOB in nilfs_set_de_type
> > 3ab056814cd8 nouveau: fix instmem race condition around ptr stores
> > 49c9958cf0a2 drm/vmwgfx: Sort primary plane formats by order of
> preference
> > 8b12fc7b0326 drm/amdgpu: validate the parameters of bo mapping
> operations more clearly
> > a2fd6dbc98be binder: check offset alignment in binder_get_object()
> > 0dc727a4e054 init/main.c: Fix potential static_command_line memory
> overflow
> > 813f5213f2c6 arm64: hibernate: Fix level3 translation fault in
> swsusp_save()
> > f5a55db79bf7 KVM: x86/pmu: Do not mask LVTPC when handling a PMI on
> AMD platforms
> > 7169354120d8 KVM: x86: Snapshot if a vCPU's vendor model is AMD vs.
> Intel compatible
> > 43f00210cb25 fs: sysfs: Fix reference leak in
> sysfs_break_active_protection()
> > 0d130158db29 speakup: Avoid crash on very long word
> > d8a2225f7dfa mei: me: disable RPL-S on SPS and IGN firmwares
> > 7f67c2020cb0 usb: gadget: f_ncm: Fix UAF ncm object at re-bind after
> usb ep transport error
> > 75ceeadfab1c usb: Disable USB3 LPM at shutdown
> > 8aa5c28ac65c usb: dwc2: host: Fix dereference issue in DDMA
> completion flow.
> > 7182175f565f Revert "usb: cdc-wdm: close race between read and
> workqueue"
> > def039849617 USB: serial: option: add Telit FN920C04 rmnet
> compositions
> > cd27cf1ec66d USB: serial: option: add Rolling RW101-GL and RW135-GL
> support
> > c48d624bbbad USB: serial: option: support Quectel EM060K sub-models
> > 3338a967ca08 USB: serial: option: add Lonsung U8300/U9300 product
> > e94566d88701 USB: serial: option: add support for Fibocom FM650/FG650
> > 6b5043463619 USB: serial: option: add Fibocom FM135-GL variants
> > 7a3bbe41efa5 serial/pmac_zilog: Remove flawed mitigation for rx irq
> flood
> > b0b268eeb087 comedi: vmk80xx: fix incomplete endpoint checking
> > e39fae579d17 thunderbolt: Fix wake configurations after device unplug
> > 62e0a5d4d4de thunderbolt: Avoid notify PM core about runtime PM
> resume
> > 4291a6233ba8 x86/cpufeatures: Fix dependencies for GFNI, VAES, and
> VPCLMULQDQ
> > 0be237b6b753 x86/bugs: Fix BHI retpoline check
> > a29ec0465dce clk: Get runtime PM before walking tree during
> disable_unused
> > db7c0ef4afea clk: Initialize struct clk_core kref earlier
> > bc6d766991e1 clk: Print an info line before disabling unused clocks
> > f3d89bc7dd65 clk: remove extra empty line
> > bdd70c8b02e7 clk: Mark 'all_lists' as const
> > 3254a1f27952 clk: Remove prepare_lock hold assertion in
> __clk_release()
> > ce77f3beed02 drm/panel: visionox-rm69299: don't unregister DSI device
> > df0991da7db8 drm: nv04: Fix out of bounds access
> > 3076b3c38a70 s390/cio: fix race condition during online processing
> > 498f7b8037da s390/qdio: handle deferred cc1
> > 45d70025006c RDMA/mlx5: Fix port number for counter query in
> multi-port configuration
> > 8261489de3af RDMA/cm: Print the old state when cm_destroy_id gets
> timeout
> > 2973b4a5eae7 RDMA/rxe: Fix the problem "mutex_destroy missing"
> > 831157756e3c net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels
> before using them
> > 9495b7a412e3 net: dsa: mt7530: fix mirroring frames received on
> local port
> > a50dbeca28ac tun: limit printing rate when illegal packet received
> by tun dev
> > ae3f9e1221b3 af_unix: Don't peek OOB data without MSG_OOB.
> > 1738dfe72c52 af_unix: Call manage_oob() for every skb in
> unix_stream_read_generic().
> > e719b52d0c56 netfilter: flowtable: incorrect pppoe tuple
> > d06977b9a410 netfilter: flowtable: validate pppoe header
> > 5345d78ae64d netfilter: nf_flow_table: count pending offload
> workqueue tasks
> > 7a1679e2d9bf netfilter: nft_set_pipapo: do not free live element
> > dceb683ab87c netfilter: br_netfilter: skip conntrack input hook for
> promisc packets
> > 379bf7257bc5 netfilter: nf_tables: Fix potential data-race in
> __nft_obj_type_get()
> > 0b6de00206ad netfilter: nf_tables: Fix potential data-race in
> __nft_expr_type_get()
> > fc1021337e59 Revert "lockd: introduce safe async lock op"
> > 2a3073d58382 Revert "tracing/trigger: Fix to return error if failed
> to alloc snapshot"
> > 2df2dd27066c kprobes: Fix possible use-after-free issue on kprobe
> registration
> > 1253e34a548f bpf: Fix ringbuf memory type confusion when passing to
> helpers
> > cc9ac419351b bpf: Fix out of bounds access for ringbuf helpers
> > adc2d11b86ea bpf: Generally fix helper register offset check
> > 0c261cbc29a6 bpf: Generalize check_ctx_reg for reuse with other types
> > 1b661661642d bpf: Extend kfunc with PTR_TO_CTX, PTR_TO_MEM argument
> support
> > 621bbe924c68 selftests/ftrace: Limit length in subsystem-enable tests
> > edfaf679b7c3 SUNRPC: Fix rpcgss_context trace event acceptor field
> > 2364d0278fe1 btrfs: record delayed inode root in transaction
> > 747228929b32 ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB
> 3.1.1
> > 88b7f1143b15 ksmbd: validate payload size in ipc response
> > 044b3d6c94c6 ksmbd: don't send oplock break if rename fails
> > b8086c3c1548 reiserfs: Avoid touching renamed directory if parent
> does not change
> > ea091017ef62 ipv6: Fix data races around sk->sk_prot.
> > ff8710da80ee ipv6: annotate some data-races around sk->sk_prot
> > e8c2eafaaa6a tcp: Fix data races around icsk->icsk_af_ops.
> > 8d1bab770956 locking/rwsem: Disable preemption while trying for
> rwsem lock
> > 7c82dac02886 block, loop: support partitions without scanning
> > 45f504f301d4 bpftool: Fix pretty print dump for maps without BTF
> loaded
> > 1f24338cb789 jbd2: Drop the merge conflicted hunk
> > e1d0e3c51bde tpm: tis_i2c: Limit write bursts to I2C_SMBUS_BLOCK_MAX
> (32) bytes
> > 1abe841fe331 tpm: tis_i2c: Limit read bursts to I2C_SMBUS_BLOCK_MAX
> (32) bytes
> > 6224acfc1d56 tpm: Add flag to use default cancellation policy
> > 1cd19d48fb90 tpm: tis_i2c: Fix sanity check interrupt enable mask
> > a883da132fa8 tpm: Add tpm_tis_i2c backend for tpm_tis_core
> > a742ac8a1c51 tpm: Add tpm_tis_verify_crc to the tpm_tis_phy_ops
> protocol layer
> > ef495c5f45f2 tpm: Remove read16/read32/write32 calls from
> tpm_tis_phy_ops
> > 1f3be2e23aa6 gcc-plugins: Reorganize gimple includes for GCC 13
> > 24615a3b932a ata: ahci: fix enum constants for gcc-13
> > 5d6cb145541a net: stmmac: Enable mac_managed_pm phylink config
> > fd93aabb4287 tools/resolve_btfids: Use pkg-config to locate libelf
> > 130f9da78406 tools/resolve_btfids: Build with host flags
> > 00f2f1a782f9 tools/resolve_btfids: Support cross-building the kernel
> with clang
> > 17776a4ba9c2 tools/resolve_btfids: Install libbpf headers when
> building
> > 7c9808380d70 libbpf: Make libbpf_version.h non-auto-generated
> > 37ae1ba791ac libbpf: Add LIBBPF_DEPRECATED_SINCE macro for
> scheduling API deprecations
> > a2667e6d7314 drm/radeon: free iio for atombios when driver shutdown
> > f100c753aa1f powerpc: Fix reschedule bug in KUAP-unlocked user copy
> > da5513f30187 libbpf: Fix build warning on ref_ctr_off
> > 4c5a089621a8 perf python: Account for multiple words in CC
> > 1c5699ee85d4 fs: move S_ISGID stripping into the vfs_*() helpers
> > 838f5d0701d8 fs: add mode_strip_sgid() helper
> > d97172683641 squashfs: provide backing_dev_info in order to disable
> read-ahead
> > ed037d7be40c irq_work: use kasan_record_aux_stack_noalloc() record
> callstack
> > 1363bd7dbde3 ixgbevf: add disable link state
> > e5601ae2bd24 ixgbe: add improvement for MDD response functionality
> > caa57cd80575 ixgbe: add the ability for the PF to disable VF link
> state
> > 16a77bfcc7df Check /dev/console using init_stat()
> > 04574fd5579a tracing/arm: Have max stack tracer handle the case of
> return address after data
> > 0e51e5717018 gpiolib: cdev: Set lineevent_state::irq after IRQ
> register successfully
> > 1e6b7da6ddba drivers/base: Fix unsigned comparison to -1 in
> CPUMAP_FILE_MAX_BYTES
> > 493160901320 mtd_blkdevs: add mtd_table_mutex lock back to
> blktrans_{open, release} to avoid race condition
> > 04224f725aa3 irqchip/gic-v3-its: Skip HP notifier when no ITS is
> registered
> > 6f6c2996a81c irqchip/gic-v3-its: Postpone LPI pending table freeing
> and memreserve
> > 1fa94473423f irqchip/gic-v3-its: Give the percpu rdist struct its
> own flags field
> > 6013d1ae5feb cert host tools: Stop complaining about deprecated
> OpenSSL functions
> > efe20512212b init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with
> dash
> > a40d2daf2795 pnmtologo: use relocatable file name
> > 3b40d5b41155 of: configfs: remove unused variable overlay_lock
> > 6c085baf1838 tools: use basename to identify file in gen-mach-types
> > 2fca0fd71981 lib/build_OID_registry: fix reproducibility issues
> > 0f586f4ee8ad vt/conmakehash: improve reproducibility
> > a75774679f28 OF: DT-Overlay configfs interface (v8)
> > d179c639b30b x86/boot: Wrap literal addresses in absolute_pointer()
> > 856ec356cf91 ACPI: thermal: drop an always true check
> > 7614af249993 xfs: Fix -Werror=dangling-pointer work-around for older
> GCC
> > 41470215f97e xfs: Work around GCC 12 -Werror=dangling-pointer for
> xfs_attr_remote.o
> > 44a445c1922d virtio-pci: Remove wrong address verification in
> vp_del_vqs()
> > 77aa9e489eaf bpf: Disallow unprivileged bpf by default
> > ebfb1822e9f9 fs/aufs: fixup 5.15.36 fixups
> > 4eba9348d3e2 Revert "Revert "fbdev: Hot-unplug firmware fb devices
> on forced removal""
> > 5df6d1b00f95 jbd2: fix use-after-free of transaction_t race
> > 2d83e8196487 jbd2: refactor wait logic for transaction updates into
> a common function
> > 07a63f760793 netfilter: conntrack: avoid useless indirection during
> conntrack destruction
> > 4e7122625996 Revert "fbdev: Hot-unplug firmware fb devices on forced
> removal"
> > 7ba4cb36fd4f rcu: Avoid alloc_pages() when recording stack
> > f78574dee71e kasan: test: silence intentional read overflow warnings
> > d313cb89b6b1 kasan: arm64: fix pcpu_page_first_chunk crash with
> KASAN_VMALLOC
> > 5e279d5647cc arm64: support page mapping percpu first chunk allocator
> > e5bf16752dca vmalloc: choose a better start address in
> vm_area_register_early()
> > 660b3d21b46f kasan: test: bypass __alloc_size checks
> > 00aa7573e53a kasan: test: add memcpy test that avoids out-of-bounds
> write
> > 67becf0b1bd4 kasan: fix tag for large allocations when using
> CONFIG_SLAB
> > bedf1e033213 workqueue, kasan: avoid alloc_pages() when recording
> stack
> > 7195b67ce69b kasan: generic: introduce
> kasan_record_aux_stack_noalloc()
> > bdff763f0e29 kasan: common: provide can_alloc in kasan_save_stack()
> > 51423ebb36ad lib/stackdepot: introduce __stack_depot_save()
> > 85373e66d847 lib/stackdepot: remove unused function argument
> > 5b6cc9b251f3 lib/stackdepot: include gfp.h
> > c9f3902d8069 aufs: reduce overhead for "code present but disabled"
> use case.
> > b98d189df02c aufs: bugfix, umount passes NULL to ->parse_monolithic()
> > 13b883cbbbd9 aufs standalone: cosmetic, missing copyright sentence
> > 21f8b0d81898 aufs: 5.15.5-20220117 ---> 5.15.5-20220221
> > 6199fd896645 aufs: tiny, headers after fs_context
> > 8ddb40e31c29 aufs: fs_context 7/7, finally remount
> > 69035f71c6fd aufs: fs_context 6/7, now mount
> > bc841b970697 aufs: fs_context 5/7, parse all other mount options
> > 435188053da2 aufs: fs_context 4/7, parse xino options
> > 9af1f1825cbd aufs: fs_context 3/7, parse the branch-management
> options
> > 1c05eb767f8c aufs: fs_context 2/7, parse "br" mount option
> > a8488f603134 aufs: fs_context 1/7, skelton of the new shceme
> > 8e32e0015564 aufs: pre fs_context, convert a static flag to a macro
> > f90cb4144aec aufs: pre fs_context, support the incomplete sb and
> sbinfo case
> > 948762ef859c aufs: pre fs_context, convert the type of alloc_sbinfo()
> > 77151a08776b aufs: 5.15.5-20211129 ---> 5.15.5-20220117
> > 2539adbbbe1e aufs: 5.14-20211018 ---> 5.15.5-20211129
> > 7d32b25193c4 aufs: for v5.15-rc1, sync_inode() is gone
> > 66ec0c509225 aufs: for v5.15-rc1, new param 'rcu' for ->get_acl()
> > 69709dc518cd aufs: for v5.15-rc1, no mand-lock anymore
> > ada8fe9543e5 aufs: 5.14-20210906 ---> 5.14-20211018
> > b77f7f3f394a Revert "aufs: adjust to v5.15 fs changes"
> > 81bdce5b5876 tick/nohz: WARN_ON --> WARN_ON_ONCE to prevent console
> saturation
> > 97c963889222 sched/isolation: really align nohz_full with rcu_nocbs
> > 871f23ad3627 Revert "ARM: defconfig: Enable ax88796c driver for
> Exynos boards"
> > ffad0783dd5b ARM: config: multi v7: Regenerate defconifg
> > 5c1e1a1ff2d3 ARM: config: multi v7: Add renamed symbols
> > badaf96564fe ARM: config: multi v7: Clean up enabled by default
> options
> > 34996040fc9b ARM: config: multi v7: Drop unavailable options
> > 7f685244afb3 powerpc/mm: Switch obsolete dssall to .long
> > 20301aeb1a64 riscv: fix build with binutils 2.38
> > 9df58d070506 powerpc/lib/sstep: fix 'ptesync' build error
> > 720b61fc400b x86_64_defconfig: Fix warnings
> > 02bf23d26bc4 arm64: defconfig: cleanup config options
> > 05914e2c87e5 arm: defconfig: drop unused POWER_AVS option
> > ffb532fa19b9 aufs5: fix build against v5.15.3+
> > a4b3abf4d96d qemux86: add configuration symbol to select values
> > fee94ee09154 clear_warn_once: add a clear_warn_once= boot parameter
> > 3d8762d900d9 clear_warn_once: bind a timer to written reset value
> > 95faacac47e8 clear_warn_once: expand debugfs to include read support
> > de20c4240018 perf: perf can not parser the backtrace of app in the
> 32bit system and 64bit kernel.
> > 0e4aacead9c1 perf: x86-32: explicitly include <errno.h>
> > 9ad92c11468e perf: mips64: Convert __u64 to unsigned long long
> > 09e7efe3e68a perf: fix bench numa compilation
> > e79becc44fa6 perf: add SLANG_INC for slang.h
> > b1033b588681 perf: add sgidefs.h to for mips builds
> > cf9db484ac0b perf: change --root to --prefix for python install
> > 7fd052c2c562 perf: add 'libperl not found' warning
> > 27a437cdd469 perf: force include of <stdbool.h>
> > 3b99d21bec2f fat: don't use obsolete random32 call in namei_vfat
> > a7e9293b506b FAT: Added FAT_NO_83NAME
> > 6fd0e71d9e5c FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES option
> > c379b0d324ae FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES option
> > 538be0fdb124 aufs: adjust to v5.15 fs changes
> > f45da75c8759 aufs5: core
> > 047f57e07e01 aufs5: standalone
> > 029fc15574c8 aufs5: mmap
> > 610d0192ee94 aufs5: base
> > d4e428d0ec5f aufs5: kbuild
> > eb067eca251a yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both
> ERR and NULL
> > 286af18d0875 yaffs: fix -Wstringop-overread compile warning in
> yaffs_fix_null_name
> > 24d59a4e26a6 yaffs2: v5.12+ build fixups (not runtime tested)
> > 22c73536d5d7 yaffs: include blkdev.h
> > 506b7251bfb8 yaffs: fix misplaced variable declaration
> > a0e26ff364dc yaffs2: v5.6 build fixups
> > b10b1b2d169e yaffs2: fix memory leak when /proc/yaffs is read
> > ad9adccbb214 yaffs: add strict check when call
> yaffs_internal_read_super
> > 2e3c3aec8279 yaffs: repair yaffs_get_mtd_device
> > d662538516a7 yaffs: Fix build failure by handling inode i_version
> with proper atomic API
> > 70a6113ee2c7 yaffs2: fix memory leak in mount/umount
> > 3378e4a9e404 yaffs: Avoid setting any ACL releated xattr
> > ec2284edddef Yaffs:check oob size before auto selecting Yaffs1
> > c2a49874051c fs: yaffs2: replace CURRENT_TIME by other appropriate
> apis
> > e9a5105a3e73 yaffs2: adjust to proper location of MS_RDONLY
> > 608807406f13 yaffs2: import git revision b4ce1bb (jan, 2020)
> > 89e660ece42c initramfs: allow an optional wrapper script around
> initramfs generation
> > b179dbc9aa10 iwlwifi: select MAC80211_LEDS conditionally
> > 3fd5ca3673d0 net/dccp: make it depend on CONFIG_BROKEN
> (CVE-2020-16119)
> > d1f6edbf0188 arm64/perf: Fix wrong cast that may cause wrong
> truncation
> > d202fb2caf33 defconfigs: drop obselete options
> > 9a27e3b5f4e7 arm64/perf: fix backtrace for AAPCS with FP enabled
> > e20d8cf019b4 linux-yocto: Handle /bin/awk issues
> > b6d2a3dbbd3a uvesafb: provide option to specify timeout for task
> completion
> > adb40f1e6a1a uvesafb: print error message when task timeout occurs
> > f280a1ed0962 compiler.h: Undef before redefining __attribute_const__
> > 4352732f268c vmware: include jiffies.h
> > 7954a677968d Resolve jiffies wrapping about arp
> > 5f28a1035d95 nfs: Allow default io size to be configured.
> > 0d7260ad7106 check console device file on fs when booting
> > 900a12e37e0a mount_root: clarify error messages for when no rootfs
> found
> > 7b878cbea726 menuconfig,mconf-cfg: Allow specification of ncurses
> location
> > 6604fc1763b3 modpost: mask trivial warnings
> > 0d294adb09cb kbuild: exclude meta directory from distclean processing
> > a097cdd95a9e powerpc: serialize image targets
> > 5db6ec39a0a3 arm: serialize build targets
> > cbabca27905e crtsavres: fixups for 5.4+
> > 7fc7656ed403 powerpc/ptrace: Disable array-bounds warning with gcc8
> > a5faac5a19a2 powerpc: Disable attribute-alias warnings from gcc8
> > 186c54665b67 powerpc: add crtsavres.o to archprepare for kbuild
> > d1ea862964ca powerpc: kexec fix for powerpc64
> > 2ac35b89a0f9 powerpc: Add unwind information for SPE registers of
> E500 core
> > 2e1c348a28bb mips: vdso: fix 'jalr $t9' crash in vdso code
> > ec57870b303a mips: Kconfig: add QEMUMIPS64 option
> > 6a81b3c08107 4kc cache tlb hazard: tlbp cache coherency
> > 74e3b2a21e54 malta uhci quirks: make allowance for slow 4k(e)c
> > 22e65b63d3b4 arm/Makefile: Fix systemtap
> > b7f1ab59f19e vexpress: Pass LOADADDR to Makefile
> > ce2800c73bf7 arm: ARM EABI socketcall
> > 019d142fd956 ARM: LPAE: Invalidate the TLB for module addresses
> during translation fault
> >
> > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > ---
> > .../linux/linux-yocto-rt_5.15.bb | 6 ++---
> > .../linux/linux-yocto-tiny_5.15.bb | 6 ++---
> > meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++----------
> > 3 files changed, 19 insertions(+), 19 deletions(-)
> >
> > diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
> b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
> > index 426266e9a5..91bf0350d5 100644
> > --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
> > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
> > @@ -11,13 +11,13 @@ python () {
> > raise bb.parse.SkipRecipe("Set
> PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
> > }
> >
> > -SRCREV_machine ?= "82bab3e1d1637710832e9fe0a222d876b5f9e9e2"
> > -SRCREV_meta ?= "1427f4d13f99b5b3811ef5f4207b6ff43cf1771a"
> > +SRCREV_machine ?= "f8d4297d452f7c832d90bfb992d90db2e30ffc23"
> > +SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910"
> >
> > SRC_URI = "git://
> git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine
> <http://git.yoctoproject.org/linux-yocto.git;branch=$%7BKBRANCH%7D;name=machine>
> \
> > git://
> git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}
> <http://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=$%7BKMETA%7D>
> "
> >
> > -LINUX_VERSION ?= "5.15.156"
> > +LINUX_VERSION ?= "5.15.157"
> >
> > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
> >
> > diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
> b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
> > index 1ea634f2e1..722523ced9 100644
> > --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
> > +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
> > @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig"
> >
> > require recipes-kernel/linux/linux-yocto.inc
> >
> > -LINUX_VERSION ?= "5.15.156"
> > +LINUX_VERSION ?= "5.15.157"
> > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
> >
> > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '',
> d)}"
> > @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native"
> > KMETA = "kernel-meta"
> > KCONF_BSP_AUDIT_LEVEL = "2"
> >
> > -SRCREV_machine ?= "a94a5a767e0b0014c4d1f4ac6587bd30af2b18d5"
> > -SRCREV_meta ?= "1427f4d13f99b5b3811ef5f4207b6ff43cf1771a"
> > +SRCREV_machine ?= "7a8fce8cbd9a8a7d68a0c2537141c85d63f6eda3"
> > +SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910"
> >
> > PV = "${LINUX_VERSION}+git${SRCPV}"
> >
> > diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
> b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
> > index 0601353e1c..6784703ce2 100644
> > --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
> > +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
> > @@ -14,24 +14,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base"
> > KBRANCH:qemux86-64 ?= "v5.15/standard/base"
> > KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"
> >
> > -SRCREV_machine:qemuarm ?= "7125a4b2f341b906fa6ad96d7b5caab2fe031b40"
> > -SRCREV_machine:qemuarm64 ?= "a71076982c5b7d5f38a7c00ab4fd6f4f907e267d"
> > -SRCREV_machine:qemumips ?= "0d5ad939681fe4971f4895b909554d755ba72d66"
> > -SRCREV_machine:qemuppc ?= "46ff907d522c13b8f6fab5a0da95f7a9807e2595"
> > -SRCREV_machine:qemuriscv64 ?= "70388803a5a55f986721232d0160381bb8097ba3"
> > -SRCREV_machine:qemuriscv32 ?= "70388803a5a55f986721232d0160381bb8097ba3"
> > -SRCREV_machine:qemux86 ?= "70388803a5a55f986721232d0160381bb8097ba3"
> > -SRCREV_machine:qemux86-64 ?= "70388803a5a55f986721232d0160381bb8097ba3"
> > -SRCREV_machine:qemumips64 ?= "a1357daf3592cb612b67058e401d5b05aebde45e"
> > -SRCREV_machine ?= "70388803a5a55f986721232d0160381bb8097ba3"
> > -SRCREV_meta ?= "1427f4d13f99b5b3811ef5f4207b6ff43cf1771a"
> > +SRCREV_machine:qemuarm ?= "b844615e2b799c40eac746cd24e009b620114230"
> > +SRCREV_machine:qemuarm64 ?= "aeb63de10514b28d35049f285ae9a371d6d5ccd2"
> > +SRCREV_machine:qemumips ?= "3740052e902e15416c22ce7f2544de7afe83a845"
> > +SRCREV_machine:qemuppc ?= "167c9e8d0e760cfb299408647efe46214fd06ac0"
> > +SRCREV_machine:qemuriscv64 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
> > +SRCREV_machine:qemuriscv32 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
> > +SRCREV_machine:qemux86 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
> > +SRCREV_machine:qemux86-64 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
> > +SRCREV_machine:qemumips64 ?= "d34e0789d8d5e0d7ab521889e80967edcac38dc6"
> > +SRCREV_machine ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
> > +SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910"
> >
> > # set your preferred provider of linux-yocto to 'linux-yocto-upstream',
> and you'll
> > # get the <version>/base branch, which is pure upstream -stable, and
> the same
> > # meta SRCREV as the linux-yocto-standard builds. Select your version
> using the
> > # normal PREFERRED_VERSION settings.
> > BBCLASSEXTEND = "devupstream:target"
> > -SRCREV_machine:class-devupstream ?=
> "c52b9710c83d3b8ab63bb217cc7c8b61e13f12cd"
> > +SRCREV_machine:class-devupstream ?=
> "b925f60c6ee7ec871d2d48575d0fde3872129c20"
> > PN:class-devupstream = "linux-yocto-upstream"
> > KBRANCH:class-devupstream = "v5.15/base"
> >
> > @@ -39,7 +39,7 @@ SRC_URI = "git://
> git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
> <http://git.yoctoproject.org/linux-yocto.git;name=machine;branch=$%7BKBRA>
> > git://
> git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}
> <http://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=$%7BKMETA%7D>
> "
> >
> > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
> > -LINUX_VERSION ?= "5.15.156"
> > +LINUX_VERSION ?= "5.15.157"
> >
> > DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '',
> d)}"
> > DEPENDS += "openssl-native util-linux-native"
> > --
> > 2.39.2
> >
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
[-- Attachment #2: Type: text/html, Size: 31901 bytes --]
^ permalink raw reply [relevance 0%]
* Re: [OE-core][kirkstone 11/12] linux-yocto/5.15: update to v5.15.157
2024-05-03 2:52 3% ` [OE-core][kirkstone 11/12] linux-yocto/5.15: update to v5.15.157 bruce.ashfield
@ 2024-05-03 17:39 0% ` Steve Sakoman
2024-05-03 17:40 0% ` Bruce Ashfield
0 siblings, 1 reply; 200+ results
From: Steve Sakoman @ 2024-05-03 17:39 UTC (permalink / raw)
To: bruce.ashfield; +Cc: openembedded-core
Hi Bruce,
Unfortunately I'm getting warnings on many of the builds:
WARNING: linux-yocto-5.15.157+gitAUTOINC+21fd5becb1_f0d16a142e-r0
do_kernel_configcheck: [kernel config]: This BSP contains fragments
with warnings:
[INFO]: the following symbols were not found in the active configuration:
- CONFIG_NFSD_V3
Steve
On Thu, May 2, 2024 at 7:52 PM <bruce.ashfield@gmail.com> wrote:
>
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
>
> Updating linux-yocto/5.15 to the latest korg -stable release that comprises
> the following commits:
>
> b925f60c6ee7 Linux 5.15.157
> d564809f27ea net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
> eb6535c6f7c2 net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
> 63ba7a80d6e2 net: dsa: introduce preferred_default_local_cpu_port and use on MT7530
> 84b7f50e631a net: dsa: mt7530: set all CPU ports in MT7531_CPU_PMAP
> bdbe483da21f nilfs2: fix OOB in nilfs_set_de_type
> 3ab056814cd8 nouveau: fix instmem race condition around ptr stores
> 49c9958cf0a2 drm/vmwgfx: Sort primary plane formats by order of preference
> 8b12fc7b0326 drm/amdgpu: validate the parameters of bo mapping operations more clearly
> a2fd6dbc98be binder: check offset alignment in binder_get_object()
> 0dc727a4e054 init/main.c: Fix potential static_command_line memory overflow
> 813f5213f2c6 arm64: hibernate: Fix level3 translation fault in swsusp_save()
> f5a55db79bf7 KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
> 7169354120d8 KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
> 43f00210cb25 fs: sysfs: Fix reference leak in sysfs_break_active_protection()
> 0d130158db29 speakup: Avoid crash on very long word
> d8a2225f7dfa mei: me: disable RPL-S on SPS and IGN firmwares
> 7f67c2020cb0 usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
> 75ceeadfab1c usb: Disable USB3 LPM at shutdown
> 8aa5c28ac65c usb: dwc2: host: Fix dereference issue in DDMA completion flow.
> 7182175f565f Revert "usb: cdc-wdm: close race between read and workqueue"
> def039849617 USB: serial: option: add Telit FN920C04 rmnet compositions
> cd27cf1ec66d USB: serial: option: add Rolling RW101-GL and RW135-GL support
> c48d624bbbad USB: serial: option: support Quectel EM060K sub-models
> 3338a967ca08 USB: serial: option: add Lonsung U8300/U9300 product
> e94566d88701 USB: serial: option: add support for Fibocom FM650/FG650
> 6b5043463619 USB: serial: option: add Fibocom FM135-GL variants
> 7a3bbe41efa5 serial/pmac_zilog: Remove flawed mitigation for rx irq flood
> b0b268eeb087 comedi: vmk80xx: fix incomplete endpoint checking
> e39fae579d17 thunderbolt: Fix wake configurations after device unplug
> 62e0a5d4d4de thunderbolt: Avoid notify PM core about runtime PM resume
> 4291a6233ba8 x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
> 0be237b6b753 x86/bugs: Fix BHI retpoline check
> a29ec0465dce clk: Get runtime PM before walking tree during disable_unused
> db7c0ef4afea clk: Initialize struct clk_core kref earlier
> bc6d766991e1 clk: Print an info line before disabling unused clocks
> f3d89bc7dd65 clk: remove extra empty line
> bdd70c8b02e7 clk: Mark 'all_lists' as const
> 3254a1f27952 clk: Remove prepare_lock hold assertion in __clk_release()
> ce77f3beed02 drm/panel: visionox-rm69299: don't unregister DSI device
> df0991da7db8 drm: nv04: Fix out of bounds access
> 3076b3c38a70 s390/cio: fix race condition during online processing
> 498f7b8037da s390/qdio: handle deferred cc1
> 45d70025006c RDMA/mlx5: Fix port number for counter query in multi-port configuration
> 8261489de3af RDMA/cm: Print the old state when cm_destroy_id gets timeout
> 2973b4a5eae7 RDMA/rxe: Fix the problem "mutex_destroy missing"
> 831157756e3c net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
> 9495b7a412e3 net: dsa: mt7530: fix mirroring frames received on local port
> a50dbeca28ac tun: limit printing rate when illegal packet received by tun dev
> ae3f9e1221b3 af_unix: Don't peek OOB data without MSG_OOB.
> 1738dfe72c52 af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
> e719b52d0c56 netfilter: flowtable: incorrect pppoe tuple
> d06977b9a410 netfilter: flowtable: validate pppoe header
> 5345d78ae64d netfilter: nf_flow_table: count pending offload workqueue tasks
> 7a1679e2d9bf netfilter: nft_set_pipapo: do not free live element
> dceb683ab87c netfilter: br_netfilter: skip conntrack input hook for promisc packets
> 379bf7257bc5 netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
> 0b6de00206ad netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
> fc1021337e59 Revert "lockd: introduce safe async lock op"
> 2a3073d58382 Revert "tracing/trigger: Fix to return error if failed to alloc snapshot"
> 2df2dd27066c kprobes: Fix possible use-after-free issue on kprobe registration
> 1253e34a548f bpf: Fix ringbuf memory type confusion when passing to helpers
> cc9ac419351b bpf: Fix out of bounds access for ringbuf helpers
> adc2d11b86ea bpf: Generally fix helper register offset check
> 0c261cbc29a6 bpf: Generalize check_ctx_reg for reuse with other types
> 1b661661642d bpf: Extend kfunc with PTR_TO_CTX, PTR_TO_MEM argument support
> 621bbe924c68 selftests/ftrace: Limit length in subsystem-enable tests
> edfaf679b7c3 SUNRPC: Fix rpcgss_context trace event acceptor field
> 2364d0278fe1 btrfs: record delayed inode root in transaction
> 747228929b32 ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
> 88b7f1143b15 ksmbd: validate payload size in ipc response
> 044b3d6c94c6 ksmbd: don't send oplock break if rename fails
> b8086c3c1548 reiserfs: Avoid touching renamed directory if parent does not change
> ea091017ef62 ipv6: Fix data races around sk->sk_prot.
> ff8710da80ee ipv6: annotate some data-races around sk->sk_prot
> e8c2eafaaa6a tcp: Fix data races around icsk->icsk_af_ops.
> 8d1bab770956 locking/rwsem: Disable preemption while trying for rwsem lock
> 7c82dac02886 block, loop: support partitions without scanning
> 45f504f301d4 bpftool: Fix pretty print dump for maps without BTF loaded
> 1f24338cb789 jbd2: Drop the merge conflicted hunk
> e1d0e3c51bde tpm: tis_i2c: Limit write bursts to I2C_SMBUS_BLOCK_MAX (32) bytes
> 1abe841fe331 tpm: tis_i2c: Limit read bursts to I2C_SMBUS_BLOCK_MAX (32) bytes
> 6224acfc1d56 tpm: Add flag to use default cancellation policy
> 1cd19d48fb90 tpm: tis_i2c: Fix sanity check interrupt enable mask
> a883da132fa8 tpm: Add tpm_tis_i2c backend for tpm_tis_core
> a742ac8a1c51 tpm: Add tpm_tis_verify_crc to the tpm_tis_phy_ops protocol layer
> ef495c5f45f2 tpm: Remove read16/read32/write32 calls from tpm_tis_phy_ops
> 1f3be2e23aa6 gcc-plugins: Reorganize gimple includes for GCC 13
> 24615a3b932a ata: ahci: fix enum constants for gcc-13
> 5d6cb145541a net: stmmac: Enable mac_managed_pm phylink config
> fd93aabb4287 tools/resolve_btfids: Use pkg-config to locate libelf
> 130f9da78406 tools/resolve_btfids: Build with host flags
> 00f2f1a782f9 tools/resolve_btfids: Support cross-building the kernel with clang
> 17776a4ba9c2 tools/resolve_btfids: Install libbpf headers when building
> 7c9808380d70 libbpf: Make libbpf_version.h non-auto-generated
> 37ae1ba791ac libbpf: Add LIBBPF_DEPRECATED_SINCE macro for scheduling API deprecations
> a2667e6d7314 drm/radeon: free iio for atombios when driver shutdown
> f100c753aa1f powerpc: Fix reschedule bug in KUAP-unlocked user copy
> da5513f30187 libbpf: Fix build warning on ref_ctr_off
> 4c5a089621a8 perf python: Account for multiple words in CC
> 1c5699ee85d4 fs: move S_ISGID stripping into the vfs_*() helpers
> 838f5d0701d8 fs: add mode_strip_sgid() helper
> d97172683641 squashfs: provide backing_dev_info in order to disable read-ahead
> ed037d7be40c irq_work: use kasan_record_aux_stack_noalloc() record callstack
> 1363bd7dbde3 ixgbevf: add disable link state
> e5601ae2bd24 ixgbe: add improvement for MDD response functionality
> caa57cd80575 ixgbe: add the ability for the PF to disable VF link state
> 16a77bfcc7df Check /dev/console using init_stat()
> 04574fd5579a tracing/arm: Have max stack tracer handle the case of return address after data
> 0e51e5717018 gpiolib: cdev: Set lineevent_state::irq after IRQ register successfully
> 1e6b7da6ddba drivers/base: Fix unsigned comparison to -1 in CPUMAP_FILE_MAX_BYTES
> 493160901320 mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, release} to avoid race condition
> 04224f725aa3 irqchip/gic-v3-its: Skip HP notifier when no ITS is registered
> 6f6c2996a81c irqchip/gic-v3-its: Postpone LPI pending table freeing and memreserve
> 1fa94473423f irqchip/gic-v3-its: Give the percpu rdist struct its own flags field
> 6013d1ae5feb cert host tools: Stop complaining about deprecated OpenSSL functions
> efe20512212b init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash
> a40d2daf2795 pnmtologo: use relocatable file name
> 3b40d5b41155 of: configfs: remove unused variable overlay_lock
> 6c085baf1838 tools: use basename to identify file in gen-mach-types
> 2fca0fd71981 lib/build_OID_registry: fix reproducibility issues
> 0f586f4ee8ad vt/conmakehash: improve reproducibility
> a75774679f28 OF: DT-Overlay configfs interface (v8)
> d179c639b30b x86/boot: Wrap literal addresses in absolute_pointer()
> 856ec356cf91 ACPI: thermal: drop an always true check
> 7614af249993 xfs: Fix -Werror=dangling-pointer work-around for older GCC
> 41470215f97e xfs: Work around GCC 12 -Werror=dangling-pointer for xfs_attr_remote.o
> 44a445c1922d virtio-pci: Remove wrong address verification in vp_del_vqs()
> 77aa9e489eaf bpf: Disallow unprivileged bpf by default
> ebfb1822e9f9 fs/aufs: fixup 5.15.36 fixups
> 4eba9348d3e2 Revert "Revert "fbdev: Hot-unplug firmware fb devices on forced removal""
> 5df6d1b00f95 jbd2: fix use-after-free of transaction_t race
> 2d83e8196487 jbd2: refactor wait logic for transaction updates into a common function
> 07a63f760793 netfilter: conntrack: avoid useless indirection during conntrack destruction
> 4e7122625996 Revert "fbdev: Hot-unplug firmware fb devices on forced removal"
> 7ba4cb36fd4f rcu: Avoid alloc_pages() when recording stack
> f78574dee71e kasan: test: silence intentional read overflow warnings
> d313cb89b6b1 kasan: arm64: fix pcpu_page_first_chunk crash with KASAN_VMALLOC
> 5e279d5647cc arm64: support page mapping percpu first chunk allocator
> e5bf16752dca vmalloc: choose a better start address in vm_area_register_early()
> 660b3d21b46f kasan: test: bypass __alloc_size checks
> 00aa7573e53a kasan: test: add memcpy test that avoids out-of-bounds write
> 67becf0b1bd4 kasan: fix tag for large allocations when using CONFIG_SLAB
> bedf1e033213 workqueue, kasan: avoid alloc_pages() when recording stack
> 7195b67ce69b kasan: generic: introduce kasan_record_aux_stack_noalloc()
> bdff763f0e29 kasan: common: provide can_alloc in kasan_save_stack()
> 51423ebb36ad lib/stackdepot: introduce __stack_depot_save()
> 85373e66d847 lib/stackdepot: remove unused function argument
> 5b6cc9b251f3 lib/stackdepot: include gfp.h
> c9f3902d8069 aufs: reduce overhead for "code present but disabled" use case.
> b98d189df02c aufs: bugfix, umount passes NULL to ->parse_monolithic()
> 13b883cbbbd9 aufs standalone: cosmetic, missing copyright sentence
> 21f8b0d81898 aufs: 5.15.5-20220117 ---> 5.15.5-20220221
> 6199fd896645 aufs: tiny, headers after fs_context
> 8ddb40e31c29 aufs: fs_context 7/7, finally remount
> 69035f71c6fd aufs: fs_context 6/7, now mount
> bc841b970697 aufs: fs_context 5/7, parse all other mount options
> 435188053da2 aufs: fs_context 4/7, parse xino options
> 9af1f1825cbd aufs: fs_context 3/7, parse the branch-management options
> 1c05eb767f8c aufs: fs_context 2/7, parse "br" mount option
> a8488f603134 aufs: fs_context 1/7, skelton of the new shceme
> 8e32e0015564 aufs: pre fs_context, convert a static flag to a macro
> f90cb4144aec aufs: pre fs_context, support the incomplete sb and sbinfo case
> 948762ef859c aufs: pre fs_context, convert the type of alloc_sbinfo()
> 77151a08776b aufs: 5.15.5-20211129 ---> 5.15.5-20220117
> 2539adbbbe1e aufs: 5.14-20211018 ---> 5.15.5-20211129
> 7d32b25193c4 aufs: for v5.15-rc1, sync_inode() is gone
> 66ec0c509225 aufs: for v5.15-rc1, new param 'rcu' for ->get_acl()
> 69709dc518cd aufs: for v5.15-rc1, no mand-lock anymore
> ada8fe9543e5 aufs: 5.14-20210906 ---> 5.14-20211018
> b77f7f3f394a Revert "aufs: adjust to v5.15 fs changes"
> 81bdce5b5876 tick/nohz: WARN_ON --> WARN_ON_ONCE to prevent console saturation
> 97c963889222 sched/isolation: really align nohz_full with rcu_nocbs
> 871f23ad3627 Revert "ARM: defconfig: Enable ax88796c driver for Exynos boards"
> ffad0783dd5b ARM: config: multi v7: Regenerate defconifg
> 5c1e1a1ff2d3 ARM: config: multi v7: Add renamed symbols
> badaf96564fe ARM: config: multi v7: Clean up enabled by default options
> 34996040fc9b ARM: config: multi v7: Drop unavailable options
> 7f685244afb3 powerpc/mm: Switch obsolete dssall to .long
> 20301aeb1a64 riscv: fix build with binutils 2.38
> 9df58d070506 powerpc/lib/sstep: fix 'ptesync' build error
> 720b61fc400b x86_64_defconfig: Fix warnings
> 02bf23d26bc4 arm64: defconfig: cleanup config options
> 05914e2c87e5 arm: defconfig: drop unused POWER_AVS option
> ffb532fa19b9 aufs5: fix build against v5.15.3+
> a4b3abf4d96d qemux86: add configuration symbol to select values
> fee94ee09154 clear_warn_once: add a clear_warn_once= boot parameter
> 3d8762d900d9 clear_warn_once: bind a timer to written reset value
> 95faacac47e8 clear_warn_once: expand debugfs to include read support
> de20c4240018 perf: perf can not parser the backtrace of app in the 32bit system and 64bit kernel.
> 0e4aacead9c1 perf: x86-32: explicitly include <errno.h>
> 9ad92c11468e perf: mips64: Convert __u64 to unsigned long long
> 09e7efe3e68a perf: fix bench numa compilation
> e79becc44fa6 perf: add SLANG_INC for slang.h
> b1033b588681 perf: add sgidefs.h to for mips builds
> cf9db484ac0b perf: change --root to --prefix for python install
> 7fd052c2c562 perf: add 'libperl not found' warning
> 27a437cdd469 perf: force include of <stdbool.h>
> 3b99d21bec2f fat: don't use obsolete random32 call in namei_vfat
> a7e9293b506b FAT: Added FAT_NO_83NAME
> 6fd0e71d9e5c FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES option
> c379b0d324ae FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES option
> 538be0fdb124 aufs: adjust to v5.15 fs changes
> f45da75c8759 aufs5: core
> 047f57e07e01 aufs5: standalone
> 029fc15574c8 aufs5: mmap
> 610d0192ee94 aufs5: base
> d4e428d0ec5f aufs5: kbuild
> eb067eca251a yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR and NULL
> 286af18d0875 yaffs: fix -Wstringop-overread compile warning in yaffs_fix_null_name
> 24d59a4e26a6 yaffs2: v5.12+ build fixups (not runtime tested)
> 22c73536d5d7 yaffs: include blkdev.h
> 506b7251bfb8 yaffs: fix misplaced variable declaration
> a0e26ff364dc yaffs2: v5.6 build fixups
> b10b1b2d169e yaffs2: fix memory leak when /proc/yaffs is read
> ad9adccbb214 yaffs: add strict check when call yaffs_internal_read_super
> 2e3c3aec8279 yaffs: repair yaffs_get_mtd_device
> d662538516a7 yaffs: Fix build failure by handling inode i_version with proper atomic API
> 70a6113ee2c7 yaffs2: fix memory leak in mount/umount
> 3378e4a9e404 yaffs: Avoid setting any ACL releated xattr
> ec2284edddef Yaffs:check oob size before auto selecting Yaffs1
> c2a49874051c fs: yaffs2: replace CURRENT_TIME by other appropriate apis
> e9a5105a3e73 yaffs2: adjust to proper location of MS_RDONLY
> 608807406f13 yaffs2: import git revision b4ce1bb (jan, 2020)
> 89e660ece42c initramfs: allow an optional wrapper script around initramfs generation
> b179dbc9aa10 iwlwifi: select MAC80211_LEDS conditionally
> 3fd5ca3673d0 net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119)
> d1f6edbf0188 arm64/perf: Fix wrong cast that may cause wrong truncation
> d202fb2caf33 defconfigs: drop obselete options
> 9a27e3b5f4e7 arm64/perf: fix backtrace for AAPCS with FP enabled
> e20d8cf019b4 linux-yocto: Handle /bin/awk issues
> b6d2a3dbbd3a uvesafb: provide option to specify timeout for task completion
> adb40f1e6a1a uvesafb: print error message when task timeout occurs
> f280a1ed0962 compiler.h: Undef before redefining __attribute_const__
> 4352732f268c vmware: include jiffies.h
> 7954a677968d Resolve jiffies wrapping about arp
> 5f28a1035d95 nfs: Allow default io size to be configured.
> 0d7260ad7106 check console device file on fs when booting
> 900a12e37e0a mount_root: clarify error messages for when no rootfs found
> 7b878cbea726 menuconfig,mconf-cfg: Allow specification of ncurses location
> 6604fc1763b3 modpost: mask trivial warnings
> 0d294adb09cb kbuild: exclude meta directory from distclean processing
> a097cdd95a9e powerpc: serialize image targets
> 5db6ec39a0a3 arm: serialize build targets
> cbabca27905e crtsavres: fixups for 5.4+
> 7fc7656ed403 powerpc/ptrace: Disable array-bounds warning with gcc8
> a5faac5a19a2 powerpc: Disable attribute-alias warnings from gcc8
> 186c54665b67 powerpc: add crtsavres.o to archprepare for kbuild
> d1ea862964ca powerpc: kexec fix for powerpc64
> 2ac35b89a0f9 powerpc: Add unwind information for SPE registers of E500 core
> 2e1c348a28bb mips: vdso: fix 'jalr $t9' crash in vdso code
> ec57870b303a mips: Kconfig: add QEMUMIPS64 option
> 6a81b3c08107 4kc cache tlb hazard: tlbp cache coherency
> 74e3b2a21e54 malta uhci quirks: make allowance for slow 4k(e)c
> 22e65b63d3b4 arm/Makefile: Fix systemtap
> b7f1ab59f19e vexpress: Pass LOADADDR to Makefile
> ce2800c73bf7 arm: ARM EABI socketcall
> 019d142fd956 ARM: LPAE: Invalidate the TLB for module addresses during translation fault
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> ---
> .../linux/linux-yocto-rt_5.15.bb | 6 ++---
> .../linux/linux-yocto-tiny_5.15.bb | 6 ++---
> meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++----------
> 3 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
> index 426266e9a5..91bf0350d5 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
> @@ -11,13 +11,13 @@ python () {
> raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
> }
>
> -SRCREV_machine ?= "82bab3e1d1637710832e9fe0a222d876b5f9e9e2"
> -SRCREV_meta ?= "1427f4d13f99b5b3811ef5f4207b6ff43cf1771a"
> +SRCREV_machine ?= "f8d4297d452f7c832d90bfb992d90db2e30ffc23"
> +SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910"
>
> SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
> git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
>
> -LINUX_VERSION ?= "5.15.156"
> +LINUX_VERSION ?= "5.15.157"
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
>
> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
> index 1ea634f2e1..722523ced9 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
> @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig"
>
> require recipes-kernel/linux/linux-yocto.inc
>
> -LINUX_VERSION ?= "5.15.156"
> +LINUX_VERSION ?= "5.15.157"
> LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
>
> DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
> @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native"
> KMETA = "kernel-meta"
> KCONF_BSP_AUDIT_LEVEL = "2"
>
> -SRCREV_machine ?= "a94a5a767e0b0014c4d1f4ac6587bd30af2b18d5"
> -SRCREV_meta ?= "1427f4d13f99b5b3811ef5f4207b6ff43cf1771a"
> +SRCREV_machine ?= "7a8fce8cbd9a8a7d68a0c2537141c85d63f6eda3"
> +SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910"
>
> PV = "${LINUX_VERSION}+git${SRCPV}"
>
> diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
> index 0601353e1c..6784703ce2 100644
> --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
> @@ -14,24 +14,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base"
> KBRANCH:qemux86-64 ?= "v5.15/standard/base"
> KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"
>
> -SRCREV_machine:qemuarm ?= "7125a4b2f341b906fa6ad96d7b5caab2fe031b40"
> -SRCREV_machine:qemuarm64 ?= "a71076982c5b7d5f38a7c00ab4fd6f4f907e267d"
> -SRCREV_machine:qemumips ?= "0d5ad939681fe4971f4895b909554d755ba72d66"
> -SRCREV_machine:qemuppc ?= "46ff907d522c13b8f6fab5a0da95f7a9807e2595"
> -SRCREV_machine:qemuriscv64 ?= "70388803a5a55f986721232d0160381bb8097ba3"
> -SRCREV_machine:qemuriscv32 ?= "70388803a5a55f986721232d0160381bb8097ba3"
> -SRCREV_machine:qemux86 ?= "70388803a5a55f986721232d0160381bb8097ba3"
> -SRCREV_machine:qemux86-64 ?= "70388803a5a55f986721232d0160381bb8097ba3"
> -SRCREV_machine:qemumips64 ?= "a1357daf3592cb612b67058e401d5b05aebde45e"
> -SRCREV_machine ?= "70388803a5a55f986721232d0160381bb8097ba3"
> -SRCREV_meta ?= "1427f4d13f99b5b3811ef5f4207b6ff43cf1771a"
> +SRCREV_machine:qemuarm ?= "b844615e2b799c40eac746cd24e009b620114230"
> +SRCREV_machine:qemuarm64 ?= "aeb63de10514b28d35049f285ae9a371d6d5ccd2"
> +SRCREV_machine:qemumips ?= "3740052e902e15416c22ce7f2544de7afe83a845"
> +SRCREV_machine:qemuppc ?= "167c9e8d0e760cfb299408647efe46214fd06ac0"
> +SRCREV_machine:qemuriscv64 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
> +SRCREV_machine:qemuriscv32 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
> +SRCREV_machine:qemux86 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
> +SRCREV_machine:qemux86-64 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
> +SRCREV_machine:qemumips64 ?= "d34e0789d8d5e0d7ab521889e80967edcac38dc6"
> +SRCREV_machine ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
> +SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910"
>
> # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
> # get the <version>/base branch, which is pure upstream -stable, and the same
> # meta SRCREV as the linux-yocto-standard builds. Select your version using the
> # normal PREFERRED_VERSION settings.
> BBCLASSEXTEND = "devupstream:target"
> -SRCREV_machine:class-devupstream ?= "c52b9710c83d3b8ab63bb217cc7c8b61e13f12cd"
> +SRCREV_machine:class-devupstream ?= "b925f60c6ee7ec871d2d48575d0fde3872129c20"
> PN:class-devupstream = "linux-yocto-upstream"
> KBRANCH:class-devupstream = "v5.15/base"
>
> @@ -39,7 +39,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
> git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
> -LINUX_VERSION ?= "5.15.156"
> +LINUX_VERSION ?= "5.15.157"
>
> DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
> DEPENDS += "openssl-native util-linux-native"
> --
> 2.39.2
>
^ permalink raw reply [relevance 0%]
* linux-next: Tree for May 3
@ 2024-05-03 7:17 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-03 7:17 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 39981 bytes --]
Hi all,
Changes since 20240502:
The mm tree still had its build failure for which I revreted 2 commits.
The arm tree gained a build failure, so I used the version from
next-20240502.
The vfs-brauner tree gained a conflict against the btrfs tree.
The v4l-dvb-next tree still had its build failure so I used the version
from next-20240430.
The dmi tree still had its build failure for which I reverted a commit.
The bitmap tree gained a conflict against the mm tree.
Non-merge commits (relative to Linus' tree): 9804
9482 files changed, 680592 insertions(+), 239314 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (f03359bca01b Merge tag 'for-6.9-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (bcf28f9e63d4 selftests/vDSO: fix runtime errors on LoongArch)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (e845bcc8cfda Merge tag 'riscv-soc-fixes-for-v6.9-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (7bbe449d0bdb s390/paes: Reestablish retry loop in paes)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (545c494465d2 Merge tag 'net-6.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf/master (3e9bc0472b91 Merge branch 'bpf: Add BPF_PROG_TYPE_CGROUP_SKB attach type enforcement in BPF_LINK_CREATE')
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (8a2e4d37afb8 s390/qeth: Fix kernel panic after setting hsuid)
Merging ipvs/main (8a2e4d37afb8 s390/qeth: Fix kernel panic after setting hsuid)
Merging wireless/for-next (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (fdb3f29dfe0d ALSA: hda/realtek: Fix build error without CONFIG_PM)
Merging sound-asoc-fixes/for-linus (c5782bb5468a ASoC: meson: tdm fixes)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (ff33132605c1 regulator: change devm_regulator_get_enable_optional() stub to return Ok)
Merging spi-fixes/for-linus (4756fa529b2f spi: fix null pointer dereference within spi_sync)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging usb.current/usb-linus (ae11f04b452b usb: typec: tcpm: Check for port partner validity before consuming it)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (4108a30f1097 mei: me: add lunar lake point M DID)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (00e7d3bea2ce dyndbg: fix old BUG_ON in >control parser)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (16c20208b9c2 Merge tag 'kvmarm-fixes-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
Merging kvms390-fixes/master (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (dd11e0f129c3 Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y)
Merging drivers-x86-fixes/fixes (515a3c3a5489 platform/x86: ISST: Add Grand Ridge to HPM CPU list)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (e67572cd2204 Linux 6.9-rc6)
Merging drm-intel-fixes/for-linux-next-fixes (e67572cd2204 Linux 6.9-rc6)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (c714fcdf5b75 Merge tag 'intel-gpio-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-current)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (e67572cd2204 Linux 6.9-rc6)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging drm-misc-fixes/for-linux-next-fixes (da85f0aaa9f2 drm/panel: ili9341: Use predefined error codes)
Merging mm-stable/mm-stable (72801513b2bf mm: set pageblock_order to HPAGE_PMD_ORDER in case with !CONFIG_HUGETLB_PAGE but THP enabled)
Merging mm-nonmm-stable/mm-nonmm-stable (e02577872ff5 crash: add prefix for crash dumping messages)
Merging mm/mm-everything (3c2a0d2f0ca0 foo)
Applying: Revert "mm/vmscan: avoid split lazyfree THP during shrink_folio_list()"
Applying: Revert "mm/rmap: integrate PMD-mapped folio splitting into pagewalk loop"
Merging kbuild/for-next (060ef2b42249 kconfig: remove 'optional' property support)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (8c618b58c89c perf test: Reintroduce -p/--parallel and make -S/--sequential the default)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (c93f261dfc39 Documentation/core-api: add swiotlb documentation)
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (15b7967c1ef1 Merge branches 'amba', 'cfi', 'clkdev', 'fixes' and 'misc' into for-next)
$ git reset --hard HEAD^
Merging next-20240502 version of arm
Merging arm64/for-next/core (7befe2ef9384 Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (4052ce07d5d7 perf/arm-spe: Assign parents for event_source device)
Merging arm-soc/for-next (fa8870d46ddf soc: document merges)
Merging amlogic/for-next (2b952b1d0a54 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (7f6f45a762c3 Merge branches 'v6.9-next/soc' and 'v6.9-next/dts64' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (1d0a6cdb7d77 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (8dabf52bd8db Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (ec19533517d5 Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (2dc107360e22 dts: zynqmp: add properties for TCM in remoteproc)
Merging clk/clk-next (15daa68811f4 Merge branch 'clk-imx' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (f3334ebb8a2a LoongArch: Lately init pmu after smp is online)
Merging m68k/for-next (bd622532f7b3 m68k: amiga: Use str_plural() to fix Coccinelle warning)
Merging m68knommu/for-next (2595108e5842 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (487fa28fa8b6 parisc: Define sigset_t in parisc uapi header)
Merging powerpc/next (1fcd25473337 MAINTAINERS: MMU GATHER: Update Aneesh's address)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (849599b702ef powerpc/crash: add crash memory hotplug support)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (8fd63d81a760 riscv: dts: microchip: add pac1934 power-monitor to icicle)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (1bc9e285c78a Merge branch 'features' into for-next)
Merging sh/for-next (21b8651502d5 sh: boot: Add proper forward declarations)
Merging sparc/for-next (48d85acdaa52 sparc: chmc: Convert to platform remove callback returning void)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (36c2e90c4a0b bcachefs: bch2_dev_have_ref())
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (d49e9f686546 Merge branch 'for-next-next-v6.9-20240503' into for-next-20240503)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (ae4f73e84cb1 smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (7ca906c7f7e5 Pull ext2 and isofs removal to PageError bit.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (3763f9effcdc f2fs: use helper to print zone condition)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (fa7e19337908 fuse: Add initial support for fs-verity)
Merging gfs2/for-next (50760f778119 gfs2: Convert gfs2_aspace_writepage() to use a folio)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (bc642d7bfdac ksmbd: fix uninitialized symbol 'share' in smb2_tree_connect())
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (e308c853b2a4 NFSD: Add COPY status code to OFFLOAD_STATUS response)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (096802748ea1 ovl: remove upper umask handling from ovl_create_upper())
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (21255afdd729 xfs: do not allocate the entire delalloc extent in xfs_bmapi_write)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (eea3260250ea Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (ccd0bdb57e31 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5deb5b56bccb i2c: smbus: fix NULL function pointer dereference)
Merging i2c-host/i2c/i2c-host (856cd5f13de7 i2c: designware: Create shared header hosting driver name)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (868577e6bfe1 firmware: dmi: Stop decoding on broken entry)
Applying: Revert "firmware: dmi: Stop decoding on broken entry"
Merging hwmon-staging/hwmon-next (1d4d6733594d hwmon: (npcm750-pwm-fan) Remove another unused field in struct npcm7xx_cooling_device)
Merging jc_docs/docs-next (404b444fbb3d Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (4a7d735191de media: dw2102: fix coding style issues)
Merging v4l-dvb-next/master (5c883a709ef5 media: verisilicon: Correct a typo in H1_REG_MAD_CTRL_MAD_THRESHOLD)
$ git reset --hard HEAD^
Merging next-20240430 version of v4l-dvb-next
Merging pm/linux-next (058b3af4882a Merge branches 'acpica', 'acpi-scan' and 'acpi-resource' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (0cebf7cb2d70 pmdomain: core: Don't clear suspended_count at genpd_prepare())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (734b5def91b5 thermal/drivers/loongson2: Add Loongson-2K2000 support)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (fd3af5e21866 RDMA/mlx5: Track DCT, DCI and REG_UMR QPs as diver_detail resources.)
Merging net-next/main (ec6f25bc8aba selftests/net: skip partial checksum packets in csum test)
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/slab.h
Merging bpf-next/for-next (087d757fb473 libbpf: fix ring_buffer__consume_n() return result logic)
Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (5c7d0f260187 Bluetooth: HCI: Fix potential null-ptr-deref)
f90ac18d01cd ("arm64: dts: mediatek: mt8183-pico6: Fix bluetooth node")
Merging wireless-next/for-next (8886b6d681f2 wifi: qtnfmac: Remove generic .ndo_get_stats64)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (ed265f7fd9a6 crypto: x86/aes-gcm - simplify GCM hash subkey derivation)
Merging drm/drm-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging drm-exynos/for-linux-next (2236a61bd491 Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next)
Merging drm-misc/for-linux-next (be3f3042391d drm: zynqmp_dpsub: Always register bridge)
Merging amdgpu/drm-next (0a92269d1a91 drm/amdgpu: remove ip dump reg_count variable)
Merging drm-intel/for-linux-next (8e056b50d92a drm/i915/audio: Fix audio time stamp programming for DP)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (8ad0e1810bf2 drm/xe/gt: Fix assert in L3 bank mask generation)
06e7139a034f ("drm/xe: Fix unexpected backmerge results")
3d44d67c441a ("drm/xe/vm: prevent UAF in rebind_work_func()")
4caf410766ad ("drm/xe: Merge 16021540221 and 18034896535 WAs")
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (e7aeb238026c ALSA: aoa: soundbus: i2sbus: pcm: use 'time_left' variable with wait_for_completion_timeout())
Merging ieee1394/for-next (e447f9e094a2 firewire: core: add tracepoint event for handling bus reset)
Merging sound-asoc/for-next (ea1aac8c37ae Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (3c2c250cb3a5 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (7b4e0b39182c Input: cyapa - add missing input core locking to suspend/resume functions)
Merging block/for-next (1c16609710aa Merge branch 'for-6.10/block' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (83637d9017b2 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (e38063b94324 mmc: atmel-mci: Switch to use dev_err_probe())
Merging mfd/for-mfd-next (7fcb2977c0b5 dt-bindings: mfd: Convert lp873x.txt to json-schema)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (4da294108e38 backlight: sky81452-backlight: Remove unnecessary call to of_node_get())
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (d3ff4628b912 Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (67889688e05b MAINTAINERS: update the LSM file list)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (3c6e94beeacd Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (ef6e717d93c7 Merge branches 'arm/renesas', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (9b4a5ae6be9b dt-bindings: Drop unnecessary quotes on keys)
828215066d88 ("dt-bindings: mfd: aspeed: Drop 'oneOf' for pinctrl node")
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (02ca3b9791ef Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (9699b5214fb3 Merge branch into tip/master: 'x86/timers')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (03db22b93a01 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (e7d6f9dff52c rcu/nocb: Remove buggy bypass lock contention mitigation)
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kvm/next (a96cb3bf390e Merge x86 bugfixes from Linux 6.9-rc3)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Applying: fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code"
Merging kvm-arm/next (5099601bb8df Merge branch kvm-arm64/pkvm-6.10 into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (04b1c6b4841d Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/aarch64/psci_test.c
Merging xen-tip/linux-next (802600ebdf23 x86/xen: return a sane initial apic id when running as PV guest)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (76f09e22027f platform/x86: ISST: Support SST-BF and SST-TF per level)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv')
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (e5019b14230a Merge 6.9-rc5 into driver-core-next)
Merging usb/usb-next (080e73c9411b usb: xhci: compact 'trb_in_td()' arguments)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/core.c
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (660a70809856 Merge 6.9-rc5 into tty-next)
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (33075a03f47b Merge tag 'mhi-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-next)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (9900e7a54764 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (9c79b779643e phy: rockchip: fix CONFIG_TYPEC dependency)
Merging soundwire/next (a36ec5f7625d soundwire: intel_ace2x: simplify check_wake())
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (848e447e000c vfio/cdx: add interrupt support)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (539a47de89d6 spmi: pmic-arb: Fix of_irq_get_byname() error checking)
Merging staging/staging-next (75ff53c44f5e staging: vc04_services: Drop completed TODO item)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (700b2e1eccb4 dmaengine: xilinx: xdma: fix module autoloading)
Merging cgroup/for-next (b7d56d953a67 cgroup/cpuset: Remove outdated comment in sched_partition_write())
Merging scsi/for-next (8c5220c43ba0 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (aca061774bc4 scsi: mpi3mr: Fix some kernel-doc warnings in scsi_bsg_mpi3mr.h)
Merging vhost/linux-next (88199634e516 vduse: enable Virtio-net device type)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (0496190c4d42 Merge branches 'rproc-next' and 'rpmsg-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (5539287ca656 gpio: brcmstb: add support for gpio-ranges)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (077895d14a6b Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (b664fc60d7f8 dt-bindings: pwm: snps,dw-apb-timers: Do not require pwm-cells twice)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (693fe2f6a9ea selftests: kselftest: Make ksft_exit functions return void instead of int)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (2168e528f867 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (d6a07bb3c18c MAINTAINERS: Add Günther Noack as Landlock reviewer)
Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature)
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (10e29251be0e binfmt_elf_fdpic: fix /proc/<pid>/auxv)
Merging bitmap/bitmap-for-next (1b6ef2812522 bitops: Optimize fns() for improved performance)
CONFLICT (content): Merge conflict in include/linux/bitops.h
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (7d78a7773355 string: Add additional __realloc_size() annotations for "dup" helpers)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (6b9cd589464f tools/power turbostat: version 2024.04.27)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* backport of missing fs/smb patches not in 6.6.30 stable
@ 2024-05-03 4:28 6% Steve French
2024-05-06 23:11 0% ` Sasha Levin
0 siblings, 1 reply; 200+ results
From: Steve French @ 2024-05-03 4:28 UTC (permalink / raw)
To: Stable, Sasha Levin; +Cc: Greg KH, CIFS, Namjae Jeon
6.6.30-rc1 has a large set of fs/smb (cifs.ko and ksmbd.ko) patches
backported but was missing more than 30 fixes so I put together a safe
backport of the remaining, leaving out patches that had dependencies
on things outside of fs/smb
The following changes since commit 488f7008e62890fae8c7a2d3583913c8074f1fc6:
smb3: fix lock ordering potential deadlock in cifs_sync_mid_result
(2024-04-30 12:30:53 -0500)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.6.30-rc1-full-fs-smb-backport
for you to fetch changes up to 411b6f385ac2427ee9d70fae277a4ed6b9d3983f:
smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings
(2024-05-01 02:18:25 -0500)
----------------------------------------------------------------
full backport for 6.6.30, includes all 80 (of the relevant) missing
fs/smb changesets
Test results look good (and better than without the patches). Here
are the functional test results (they passed exhaustive set of tests
to various server types):
http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/3/builds/99
http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/5/builds/117
http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/9/builds/51
http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/10/builds/63
Note that 22 patches had dependencies and were not appropriate to
backport and are not included, but here is the list of the additional
80 fs/smb patches included, many of which fix bugs (the others reduce
risk of backport, and help avoid merge conflicts):
411b6f385ac2 (HEAD -> fs-smb-backport-linux-6.6.30-rc1, tag:
6.6.30-rc1-full-fs-smb-backport,
origin/fs-smb-backport-linux-6.6.30-rc1) smb: smb2pdu.h: Avoid
-Wflex-array-member-not-at-end warnings
e97b85914501 ksmbd: add continuous availability share parameter
c52ce70edb58 cifs: Add tracing for the cifs_tcon struct refcounting
6fa6d5ed6a06 smb3: fix broken reconnect when password changing on the
server by allowing password rotation
d8833245b0f3 smb: client: instantiate when creating SFU files
4c8cf606bdb9 smb: client: fix NULL ptr deref in
cifs_mark_open_handles_for_deleted_file()
e0727528f3be smb3: add trace event for mknod
b71e6511fa98 smb311: additional compression flag defined in updated
protocol spec
0725c800685e smb311: correct incorrect offset field in compression header
e25e2f027599 cifs: Move some extern decls from .c files to .h
0d422616d36e ksmbd: fix potencial out-of-bounds when buffer offset is invalid
3967f3e18d66 ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
aec926736509 ksmbd: Fix spelling mistake "connction" -> "connection"
43f609cc80a5 ksmbd: fix possible null-deref in smb_lazy_parent_lease_break_close
3f1a838bc984 cifs: remove redundant variable assignment
05415df6229c cifs: fixes for get_inode_info
025b6f60cccc cifs: defer close file handles having RH lease
f1907205b6d3 ksmbd: add support for durable handles v1/v2
38b6f9391d64 ksmbd: mark SMB2_SESSION_EXPIRED to session when
destroying previous session
5ab62e6d22d1 cifs: update internal module version number for cifs.ko
4dcd0fe0c185 smb: common: simplify compression headers
0409ad4bad2b smb: common: fix fields sizes in compression_pattern_payload_v1
25fc3d85adc6 smb: client: negotiate compression algorithms
f3351838c269 smb3: add dynamic trace point for ioctls
7716c6db1c3b smb: client: return reparse type in /proc/mounts
1c3fbd8f92e9 smb: client: set correct d_type for reparse DFS/DFSR and
mount point
555e4ef34991 smb: client: parse uid, gid, mode and dev from WSL reparse points
5232c56b469f smb: client: introduce SMB2_OP_QUERY_WSL_EA
2bcfc0b089f7 smb: client: Fix a NULL vs IS_ERR() check in wsl_set_xattrs()
7ef14e642141 smb: client: add support for WSL reparse points
324c9dc5ab0b smb: client: reduce number of parameters in smb2_compound_op()
8b52dc432b0a smb: client: fix potential broken compound request
8f22fd9f0396 smb: client: move most of reparse point handling code to
common file
0ddb5bfd6f20 smb: client: introduce reparse mount option
370c2c605121 smb: client: retry compound request without reusing lease
6051d1b018ea smb: client: do not defer close open handles to deleted files
6a9d47b768c4 smb: client: reuse file lease key in compound operations
87eec3c54337 smb: client: get rid of smb311_posix_query_path_info()
32fab0e3e9b9 smb: client: parse owner/group when creating reparse points
df9a4c3f5db4 smb3: update allocation size more accurately on write completion
4d7263b3bf67 smb: client: handle path separator of created SMB symlinks
bd15b21c46c1 cifs: update the same create_guid on replay
6feda182ccf0 ksmbd: Add kernel-doc for ksmbd_extract_sharename() function
a12c76c3f311 cifs: set replay flag for retries of write command
e0a86c86ec5f cifs: commands that are retried should have replay flag set
207e9813ad88 smb: client: delete "true", "false" defines
6eb8a67757c6 smb: Fix some kernel-doc comments
3c21bffee62f cifs: new mount option called retrans
005892f2a944 smb: client: don't clobber ->i_rdev from cached reparse points
222edc9359a6 cifs: new nt status codes from MS-SMB2
80e719af52b9 cifs: pick channel for tcon and tdis
56c978ef1555 cifs: minor comment cleanup
6008da8e76ac cifs: remove redundant variable tcon_exist
95d9120fd9b0 cifs: update internal module version number for cifs.ko
2bbd03ad1d98 ksmbd: vfs: fix all kernel-doc warnings
0988e25500d0 ksmbd: auth: fix most kernel-doc warnings
9198cebadcef cifs: remove unneeded return statement
2b8222b46d92 cifs: get rid of dup length check in parse_reparse_point()
a1975468bc0d cifs: Pass unbyteswapped eof value into SMB2_set_eof()
b312f2d94a42 smb3: Improve exception handling in allocate_mr_list()
b6a02523d103 cifs: fix in logging in cifs_chan_update_iface
f7e60be64713 smb: client: handle special files and symlinks in SMB3 POSIX
2f68be9f5e9d smb: client: cleanup smb2_query_reparse_point()
eed182ebb134 smb: client: allow creating symlinks via reparse points
95c6eac76fa5 smb: client: optimise reparse point querying
8dbc76e94b4b smb: client: allow creating special files via reparse points
a5a4a5bc172b smb: client: extend smb2_compound_op() to accept more commands
778c2e03cbf4 smb: client: Fix minor whitespace errors and warnings
757f636f8fb0 smb: client: introduce cifs_sfu_make_node()
52740954fa81 cifs: fix use after free for iface while disabling
secondary channels
789f47984ddf cifs: update internal module version number for cifs.ko
120608af2863 Missing field not being returned in ioctl CIFS_IOC_GET_MNT_INFO
d1e9469bb4de smb3: minor cleanup of session handling code
09f7cf2bba1b smb3: more minor cleanups for session handling routines
6e19e4e86f02 smb3: minor RDMA cleanup
d73d7f8d1faa cifs: print server capabilities in DebugData
a88a5c2bf942 smb: use crypto_shash_digest() in symlink_hash()
56ad4435b30b Add definition for new smb3.1.1 command type
5900e9b37aa2 SMB3: clarify some of the unused CreateOption flags
fdf07b15f7d7 cifs: Add client version details to NTLM authenticate message
--
Thanks,
Steve
^ permalink raw reply [relevance 6%]
* [OE-core][nanbield 09/10] linux-yocto/6.1: update to v6.1.89
2024-05-03 3:00 1% [OE-core][nanbield 01/10] linux-yocto/6.1: update to v6.1.79 bruce.ashfield
2024-05-03 3:00 1% ` [OE-core][nanbield 06/10] linux-yocto/6.1: update to v6.1.84 bruce.ashfield
2024-05-03 3:00 3% ` [OE-core][nanbield 07/10] linux-yocto/6.1: update to v6.1.86 bruce.ashfield
@ 2024-05-03 3:00 4% ` bruce.ashfield
2 siblings, 0 replies; 200+ results
From: bruce.ashfield @ 2024-05-03 3:00 UTC (permalink / raw)
To: steve; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/6.1 to the latest korg -stable release that comprises
the following commits:
dcbc050cb0d3 Linux 6.1.89
8a5291736e70 Revert "ASoC: ti: Convert Pandora ASoC to GPIO descriptors"
f2295faba5e8 Linux 6.1.88
0f7908a016c0 PCI/ASPM: Fix deadlock when enabling ASPM
67a877128bbe ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
4687606d94de ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
21ff9d7d223c ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
b80ba648714e ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
7d51db455ca0 net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
41a004ffba9b net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
d9c2f69cc12c net: dsa: introduce preferred_default_local_cpu_port and use on MT7530
013c787d2311 net: dsa: mt7530: set all CPU ports in MT7531_CPU_PMAP
897ac5306bbe nilfs2: fix OOB in nilfs_set_de_type
1e7feb31a18c bootconfig: use memblock_free_late to free xbc memory to buddy
ad74d208f213 nouveau: fix instmem race condition around ptr stores
bcff1ed2ff19 drm/vmwgfx: Fix crtc's atomic check conditional
8f79b42d1c21 drm/vmwgfx: Sort primary plane formats by order of preference
212e3baccdb1 drm/amdgpu: validate the parameters of bo mapping operations more clearly
5ef7ba2799a3 mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled
76c2f4d426a5 init/main.c: Fix potential static_command_line memory overflow
f7e71a7cf399 arm64: hibernate: Fix level3 translation fault in swsusp_save()
e09465aeccf1 KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
0fb74c00d140 KVM: x86/pmu: Disable support for adaptive PEBS
e487b8eccf67 KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
5d43e072285e fs: sysfs: Fix reference leak in sysfs_break_active_protection()
89af25bd4b4b speakup: Avoid crash on very long word
7c6f941492b7 mei: me: disable RPL-S on SPS and IGN firmwares
0588bbbd718a usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
a676b17edb52 usb: Disable USB3 LPM at shutdown
9de10b59d168 usb: dwc2: host: Fix dereference issue in DDMA completion flow.
8672ad663a22 Revert "usb: cdc-wdm: close race between read and workqueue"
4ed7c7720aa0 USB: serial: option: add Telit FN920C04 rmnet compositions
19f98f214bd6 USB: serial: option: add Rolling RW101-GL and RW135-GL support
25a299c566bf USB: serial: option: support Quectel EM060K sub-models
9eba0750255a USB: serial: option: add Lonsung U8300/U9300 product
3e34029b3c11 USB: serial: option: add support for Fibocom FM650/FG650
3c4ba8a6c589 USB: serial: option: add Fibocom FM135-GL variants
282b223cfd5b serial: stm32: Reset .throttled state in .startup()
87d15af82d24 serial: stm32: Return IRQ_NONE in the ISR if no handling happend
bbaafbb4651f serial/pmac_zilog: Remove flawed mitigation for rx irq flood
2c9b943e9924 serial: mxs-auart: add spinlock around changing cts state
ac882d6b21bf comedi: vmk80xx: fix incomplete endpoint checking
9eae1facfc06 thunderbolt: Fix wake configurations after device unplug
38e10c9faa95 thunderbolt: Avoid notify PM core about runtime PM resume
a6d2a8b211c8 binder: check offset alignment in binder_get_object()
d05380576fb4 ALSA: hda/realtek - Enable audio jacks of Haier Boyue G42 with ALC269VC
943c3e45c80a x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
d17075a93501 x86/bugs: Fix BHI retpoline check
165d22647257 clk: mediatek: Do a runtime PM get on controllers during probe
c1d87d56af06 clk: mediatek: clk-mtk: Extend mtk_clk_simple_probe()
a4fe8813a786 clk: mediatek: clk-mux: Propagate struct device for mtk-mux
6f5f72a684a2 clk: mediatek: clk-mtk: Propagate struct device for composites
082b831488a4 clk: mediatek: clk-gate: Propagate struct device with mtk_clk_register_gates()
647a25b07d6d clk: mediatek: mt8192: Propagate struct device for gate clocks
0904f9ef910a clk: mediatek: mt8192: Correctly unregister and free clocks on failure
83ada89e4a86 clk: Get runtime PM before walking tree for clk_summary
5a704c267a21 clk: Show active consumers of clocks in debugfs
5833b99cf8fd clk: remove unnecessary (void*) conversions
a424e713e0cc clk: Get runtime PM before walking tree during disable_unused
5558b3b68c24 clk: Initialize struct clk_core kref earlier
43bc4cfef2b1 clk: Print an info line before disabling unused clocks
349dbfd65f86 clk: Remove prepare_lock hold assertion in __clk_release()
f6ac4fdfa519 usb: new quirk to reduce the SET_ADDRESS request timeout
5f9b63193bca usb: xhci: Add timeout argument in address_device USB HCD callback
1d011d972f58 drm: panel-orientation-quirks: Add quirk for Lenovo Legion Go
7989b04d6cc4 ALSA: scarlett2: Rename scarlett_gen2 to scarlett2
39f932d2953b PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word()
636f0fdb3623 PCI/DPC: Use FIELD_GET()
aedbd0961467 ALSA: scarlett2: Add Focusrite Clarett 2Pre and 4Pre USB support
03bfe0e93613 ALSA: scarlett2: Add Focusrite Clarett+ 2Pre and 4Pre support
7c02a4a6ccea ALSA: scarlett2: Add correct product series name to messages
b928cde9c07c ALSA: scarlett2: Default mixer driver to enabled
0f4048e1a0c6 ASoC: ti: Convert Pandora ASoC to GPIO descriptors
e2b8480b709d ALSA: scarlett2: Add support for Clarett 8Pre USB
4d74cb9cdfd5 ALSA: scarlett2: Move USB IDs out from device_info struct
bbdfa1448205 PCI: switchtec: Add support for PCIe Gen5 devices
87709f7ecdb8 PCI: switchtec: Use normal comment style
89a9196aec6b PCI: Execute quirk_enable_clear_retrain_link() earlier
caa7ff1d7d51 thunderbolt: Add debug log for link controller power quirk
932a7651002b thunderbolt: Log function name of the called quirk
4b7ed2400e0d x86/quirks: Include linux/pnp.h for arch_pnpbios_disabled()
f4aae2afe2d5 PCI: Delay after FLR of Solidigm P44 Pro NVMe
0fe6a97a5fea usb: pci-quirks: Reduce the length of a spinlock section in usb_amd_find_chipset_info()
c96b07dca169 HID: kye: Sort kye devices
57aadcc0288c PCI: Avoid FLR for SolidRun SNET DPU rev 1
3c55d4396b15 ARM: omap2: n8x0: stop instantiating codec platform data
c330a13ab77c drm/panel: visionox-rm69299: don't unregister DSI device
5fd4b090304e drm: nv04: Fix out of bounds access
559f3a633339 s390/cio: fix race condition during online processing
beb3ff19a55d s390/qdio: handle deferred cc1
fe446927f8af RDMA/mlx5: Fix port number for counter query in multi-port configuration
ea42dbe75992 RDMA/cm: Print the old state when cm_destroy_id gets timeout
196617d07dd6 RDMA/rxe: Fix the problem "mutex_destroy missing"
45e811bab2d0 net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
e86c9db58eba net: dsa: mt7530: fix mirroring frames received on local port
62e27ef18eb4 tun: limit printing rate when illegal packet received by tun dev
6a6ebec40820 ice: tc: allow zero flags in parsing tc flower
46efa4d5930c net/mlx5e: Prevent deadlock while disabling aRFS
8635ac7dd9cf net/mlx5: Lag, restore buckets number to default after hash LAG deactivation
ba0db4638525 af_unix: Don't peek OOB data without MSG_OOB.
a1d3e3521f02 af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
f1c3c61701a0 netfilter: flowtable: incorrect pppoe tuple
8bf7c76a2a20 netfilter: flowtable: validate pppoe header
41d8fdf3afaf netfilter: nft_set_pipapo: do not free live element
b13db0d16bc7 netfilter: br_netfilter: skip conntrack input hook for promisc packets
df7c0fb8c2b9 netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
8d56bad42ac4 netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
408a43b6c948 x86/efistub: Remap kernel text read-only before dropping NX attribute
f56faf87c1e9 x86/sev: Move early startup code into .head.text section
d6f5bc5ff04f x86/sme: Move early SME kernel encryption handling into .head.text
e6489cc45fa7 x86/head/64: Move the __head definition to <asm/init.h>
bbcd0534a3eb x86/head/64: Add missing __head annotation to startup_64_load_idt()
20dc656b0657 x86/mm: Remove P*D_PAGE_MASK and P*D_PAGE_SIZE macros
d327e961573f x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section
c4421279b6c2 x86/boot: Increase section and file alignment to 4k/512
581f5d5e02ef x86/boot: Split off PE/COFF .data section
43b1920588fa x86/boot: Drop PE/COFF .reloc section
d03399c3e252 x86/boot: Construct PE/COFF .text section from assembler
1fa0a2147590 x86/boot: Derive file size from _edata symbol
1c754c6ec978 x86/boot: Define setup size in linker script
f9d68334dd99 x86/boot: Set EFI handover offset directly in header asm
e1380c923ccd x86/boot: Grab kernel_info offset from zoffset header directly
67b8dc50890b x86/boot: Drop references to startup_64
33d38d9b35e9 x86/boot: Drop redundant code setting the root device
5c3e92ad493d x86/boot: Omit compression buffer from PE/COFF image memory footprint
f31f521ad27e x86/boot: Remove the 'bugger off' message
0db16d1dce52 x86/efi: Drop alignment flags from PE section headers
1800c9628ece x86/efistub: Reinstate soft limit for initrd loading
f46e0e9fbef5 x86/efi: Disregard setup header of loaded image
f5603f9e13ad x86/efi: Drop EFI stub .bss from .data section
704edc9252f4 drm/i915/vma: Fix UAF on destroy against retire race
add0ff34863e net: usb: ax88179_178a: avoid writing the mac address before first reading
07b37f227c8d random: handle creditable entropy from atomic process context
bcdd9ce78d66 selftests/ftrace: Limit length in subsystem-enable tests
45eec81eaca6 SUNRPC: Fix rpcgss_context trace event acceptor field
cbe7b911e0c9 io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
121a83be215b drm/amd/display: Do not recursively call manual trigger programming
01c227f5a72b drm/amdgpu: fix incorrect number of active RBs for gfx11
87f8aac740f1 drm/amdgpu: fix incorrect active rb bitmap for gfx11
1e053399681c drm/vmwgfx: Enable DMA mappings with SEV
b140d9d4515f drm/bridge: adv7511: fix crash on irq during probe
5c3bf5a26d61 reiserfs: Avoid touching renamed directory if parent does not change
cc4860dd1375 Subject: [PATCH v6.1] powerpc: drop duplicate entry in Makefile for lib dir
e083231c43f3 net: fix IPSTATS_MIB_OUTFORWDATAGRAMS increment after fragment check
6ee7f29fed8c net: ipv4, ipv6: fix IPSTATS_MIB_OUTOCTETS increment duplicated
a771780cdf4a net: fix IPSTATS_MIB_OUTPKGS increment in OutForwDatagrams.
8a9f2d0717f0 riscv: Fix build with CONFIG_CC_OPTIMIZE_FOR_SIZE=y
44fd0c7a5a79 tick/rcu: fix false positive "softirq work is pending" messages on RT
786775632028 kernel/sched: Fix double free on invalid isolcpus/nohz_full params
4675ec8d0b9a kernel/sched: Fix uninitialized read in nohz_full/isolcpus setup
f46dc32a8617 bpf: btf: limit logging of ignored BTF mismatches
4687b40201db Revert "Revert "tick/common: Align tick period with the HZ tick.""
947f660bde07 Revert "tick/common: Align tick period with the HZ tick."
dded404c66bb yaffs2: Fix miscalculation of devname buffer length
30350f237490 mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, release} to avoid race condition
0ac32a83ca02 OF: DT-Overlay configfs interface (v8)
0b07d2478b6b fat: Replace prandom_u32() with get_random_u32()
927b66bfd641 aufs6: core
2af5eb310b11 aufs6: standalone
e6537c94f033 aufs6: mmap
c51d7f19876f aufs6: base
1785f762bbbb aufs6: kbuild
8f625cf94585 qemux86: add configuration symbol to select values
d81fac6e842a sched/isolation: really align nohz_full with rcu_nocbs
07c526200cb3 clear_warn_once: add a clear_warn_once= boot parameter
61e2c52ce198 clear_warn_once: bind a timer to written reset value
de03f5a3e6c6 clear_warn_once: expand debugfs to include read support
d3f9a25028d4 tools: Remove some options from CLANG_CROSS_FLAGS
0fb98cd2429a libbpf: Fix build warning on ref_ctr_off
e156ff56a19f perf python: Account for multiple words in CC
f06b9c6ae59d perf: perf can not parser the backtrace of app in the 32bit system and 64bit kernel.
1b099e82095d perf: x86-32: explicitly include <errno.h>
5fec311e2fd2 perf: mips64: Convert __u64 to unsigned long long
6cf30287aeaa perf: fix bench numa compilation
bd8f67dcb8e4 perf: add SLANG_INC for slang.h
0314b09bf6b9 perf: add sgidefs.h to for mips builds
4a39cc37b957 perf: change --root to --prefix for python install
3db4f4e91769 perf: add 'libperl not found' warning
fa3d24bac29a perf: force include of <stdbool.h>
deaadc523f8d fat: don't use obsolete random32 call in namei_vfat
d3c72f5df9a3 FAT: Added FAT_NO_83NAME
8f1eebeb519c FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES option
78b0423ccc14 FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES option
e998ad53fb68 yaffs2: replace bdevname call with sprintf
1175db6bf4cb yaffs2: convert read_page -> readfolio
beb275c683de yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR and NULL
e807c9e420bd yaffs: fix -Wstringop-overread compile warning in yaffs_fix_null_name
2fdd54282de3 yaffs2: v5.12+ build fixups (not runtime tested)
869f41030ed8 yaffs: include blkdev.h
e955b68f2b1f yaffs: fix misplaced variable declaration
f089603aba1d yaffs2: v5.6 build fixups
82da54859f0b yaffs2: fix memory leak when /proc/yaffs is read
2c4cf6808649 yaffs: add strict check when call yaffs_internal_read_super
e7dadb47ef11 yaffs: repair yaffs_get_mtd_device
f2e29be130f7 yaffs: Fix build failure by handling inode i_version with proper atomic API
8ea43ac7f3a3 yaffs2: fix memory leak in mount/umount
56db60d0abd2 yaffs: Avoid setting any ACL releated xattr
023baea095bc Yaffs:check oob size before auto selecting Yaffs1
409d39918661 fs: yaffs2: replace CURRENT_TIME by other appropriate apis
4bf42c774804 yaffs2: adjust to proper location of MS_RDONLY
08696e21a84c yaffs2: import git revision b4ce1bb (jan, 2020)
ca3d9f546a60 initramfs: allow an optional wrapper script around initramfs generation
301742baace5 pnmtologo: use relocatable file name
aba96ccce7d9 tools: use basename to identify file in gen-mach-types
e195c32ca7c7 lib/build_OID_registry: fix reproducibility issues
876e2f1f7726 vt/conmakehash: improve reproducibility
28b7a366cfef iwlwifi: select MAC80211_LEDS conditionally
69933d85f61e net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119)
5a308d8f142a arm64/perf: Fix wrong cast that may cause wrong truncation
339523a797e9 defconfigs: drop obselete options
3d751aeb9bcd arm64/perf: fix backtrace for AAPCS with FP enabled
86fa47f362ae linux-yocto: Handle /bin/awk issues
86f04668ef6e uvesafb: provide option to specify timeout for task completion
0db5521a1b3c uvesafb: print error message when task timeout occurs
710303c12e99 compiler.h: Undef before redefining __attribute_const__
14a0ede85080 vmware: include jiffies.h
e232e6ffe081 Resolve jiffies wrapping about arp
c16abf2d705f nfs: Allow default io size to be configured.
9e9e885f4a6c check console device file on fs when booting
0ce0ce443d58 mount_root: clarify error messages for when no rootfs found
32449db67de8 menuconfig,mconf-cfg: Allow specification of ncurses location
c55f1054bdce modpost: mask trivial warnings
30a45d4ee261 kbuild: exclude meta directory from distclean processing
0890b10d8fb1 powerpc: serialize image targets
6c0feb81c3ae arm: serialize build targets
77fa1b70cdbd crtsavres: fixups for 5.4+
cd107e4edd5f crtsavres: fixups for 5.4+
8f763b35ae5b powerpc/ptrace: Disable array-bounds warning with gcc8
fe6f93755196 powerpc: Disable attribute-alias warnings from gcc8
9b7097364b87 powerpc: add crtsavres.o to archprepare for kbuild
c106cd86a07b powerpc: kexec fix for powerpc64
33b7738c61fc powerpc: Add unwind information for SPE registers of E500 core
c04e26a9beda mips: vdso: fix 'jalr $t9' crash in vdso code
4733368eab80 mips: Kconfig: add QEMUMIPS64 option
ec2df6ae5ee5 4kc cache tlb hazard: tlbp cache coherency
c8c511fae0f0 malta uhci quirks: make allowance for slow 4k(e)c
b2bf1b6e971a arm64: defconfig: cleanup config options
a40a34b02336 vexpress: Pass LOADADDR to Makefile
7c51524611bb arm: ARM EABI socketcall
1f6e77027c24 ARM: LPAE: Invalidate the TLB for module addresses during translation fault
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.1.bb | 6 ++--
.../linux/linux-yocto-tiny_6.1.bb | 6 ++--
meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
index a1b3e2d33c..5872d75a28 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
@@ -14,13 +14,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "d8b7bfb52d81a60cce39809fb105d760a359def1"
-SRCREV_meta ?= "2ccedc62a19929df39eef4a5f2255b6f03652b31"
+SRCREV_machine ?= "0efb10b7f099e769d4f27db872ef52394021e5b5"
+SRCREV_meta ?= "6bf76ba66fb63fb2deb03805dc45ca86186e7010"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https"
-LINUX_VERSION ?= "6.1.87"
+LINUX_VERSION ?= "6.1.89"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
index 2f99c068c1..313aa27406 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
# CVE exclusions
include recipes-kernel/linux/cve-exclusion_6.1.inc
-LINUX_VERSION ?= "6.1.87"
+LINUX_VERSION ?= "6.1.89"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "9bf85a364245b2c3b98879c869725adbf8fb37ca"
-SRCREV_meta ?= "2ccedc62a19929df39eef4a5f2255b6f03652b31"
+SRCREV_machine ?= "728b553d7c4fc1fb3512c59462f628b997fff257"
+SRCREV_meta ?= "6bf76ba66fb63fb2deb03805dc45ca86186e7010"
PV = "${LINUX_VERSION}+git"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
index ad19080bc7..e39106ccd2 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.1/standard/base"
KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "80e50241e06c17d0ba9d637bbd2e01aeadc0b385"
-SRCREV_machine:qemuarm64 ?= "9bf85a364245b2c3b98879c869725adbf8fb37ca"
-SRCREV_machine:qemuloongarch64 ?= "9bf85a364245b2c3b98879c869725adbf8fb37ca"
-SRCREV_machine:qemumips ?= "32a30aff77ba61611596d04faab7658d2e3d9154"
-SRCREV_machine:qemuppc ?= "c2dc480743bc2fa933761e7c68f01d973875f6d9"
-SRCREV_machine:qemuriscv64 ?= "9bf85a364245b2c3b98879c869725adbf8fb37ca"
-SRCREV_machine:qemuriscv32 ?= "9bf85a364245b2c3b98879c869725adbf8fb37ca"
-SRCREV_machine:qemux86 ?= "9bf85a364245b2c3b98879c869725adbf8fb37ca"
-SRCREV_machine:qemux86-64 ?= "9bf85a364245b2c3b98879c869725adbf8fb37ca"
-SRCREV_machine:qemumips64 ?= "fce0b9ab6a695ab8a214c65f22a5f58ad623b1f9"
-SRCREV_machine ?= "9bf85a364245b2c3b98879c869725adbf8fb37ca"
-SRCREV_meta ?= "2ccedc62a19929df39eef4a5f2255b6f03652b31"
+SRCREV_machine:qemuarm ?= "b1cc4225c4b5588cf0c63e6f86116a38cdb53c64"
+SRCREV_machine:qemuarm64 ?= "728b553d7c4fc1fb3512c59462f628b997fff257"
+SRCREV_machine:qemuloongarch64 ?= "728b553d7c4fc1fb3512c59462f628b997fff257"
+SRCREV_machine:qemumips ?= "731b88d4e5731096e2ca6cb8f04eb8325693abac"
+SRCREV_machine:qemuppc ?= "ffcfc9a6c9dfe39c7ed298dce35d814b361774d6"
+SRCREV_machine:qemuriscv64 ?= "728b553d7c4fc1fb3512c59462f628b997fff257"
+SRCREV_machine:qemuriscv32 ?= "728b553d7c4fc1fb3512c59462f628b997fff257"
+SRCREV_machine:qemux86 ?= "728b553d7c4fc1fb3512c59462f628b997fff257"
+SRCREV_machine:qemux86-64 ?= "728b553d7c4fc1fb3512c59462f628b997fff257"
+SRCREV_machine:qemumips64 ?= "3b4c60db0192221d71a32d8646efa3aa5b96dc8e"
+SRCREV_machine ?= "728b553d7c4fc1fb3512c59462f628b997fff257"
+SRCREV_meta ?= "6bf76ba66fb63fb2deb03805dc45ca86186e7010"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "6741e066ec7633450d3186946035c1f80c4226b8"
+SRCREV_machine:class-devupstream ?= "dcbc050cb0d304c3427d6583384eebcaf0e3caee"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.1/base"
@@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.1.87"
+LINUX_VERSION ?= "6.1.89"
PV = "${LINUX_VERSION}+git"
--
2.39.2
^ permalink raw reply related [relevance 4%]
* [OE-core][nanbield 07/10] linux-yocto/6.1: update to v6.1.86
2024-05-03 3:00 1% [OE-core][nanbield 01/10] linux-yocto/6.1: update to v6.1.79 bruce.ashfield
2024-05-03 3:00 1% ` [OE-core][nanbield 06/10] linux-yocto/6.1: update to v6.1.84 bruce.ashfield
@ 2024-05-03 3:00 3% ` bruce.ashfield
2024-05-03 3:00 4% ` [OE-core][nanbield 09/10] linux-yocto/6.1: update to v6.1.89 bruce.ashfield
2 siblings, 0 replies; 200+ results
From: bruce.ashfield @ 2024-05-03 3:00 UTC (permalink / raw)
To: steve; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/6.1 to the latest korg -stable release that comprises
the following commits:
cd5d98c0556c Linux 6.1.86
c5f9fe2c1e50 Revert "drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init()"
eea65ed73898 VMCI: Fix possible memcpy() run-time warning in vmci_datagram_invoke_guest_handler()
cea93dae3e25 net: mpls: error out if inner headers are not set
21f5cfed1e7a Bluetooth: btintel: Fixe build regression
00e34ff1ce81 platform/x86: intel-vbtn: Update tablet mode switch at end of probe
e80b4980af26 randomize_kstack: Improve entropy diffusion
649e5646362a virtio: reenable config if freezing device failed
3a9c459091e3 scsi: sd: usb_storage: uas: Access media prior to querying device properties
345b6b831980 Revert "scsi: core: Add struct for args to execution functions"
f1465ff4c83c Revert "scsi: sd: usb_storage: uas: Access media prior to querying device properties"
cf0650adb625 gcc-plugins/stackleak: Avoid .head.text section
2b85977977cb tty: n_gsm: require CAP_NET_ADMIN to attach N_GSM0710 ldisc
2aeb805a1bcd netfilter: nf_tables: discard table flag update with pending basechain deletion
8d3a58af50e4 netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
fcd1993a2937 netfilter: nf_tables: release batch on table validation from abort path
664206ff8b01 fbmon: prevent division by zero in fb_videomode_from_videomode()
30044c66bc1a drivers/nvme: Add quirks for device 126f:2262
5245a6da27ef io_uring: clear opcode specific data for an early failure
f8a7b7b085df fbdev: viafb: fix typo in hw_bitblt_1 and hw_bitblt_2
8b849265dad8 ASoC: soc-core.c: Skip dummy codec when adding platforms
103c0f946f9a thermal/of: Assume polling-delay(-passive) 0 when absent
409289d0a151 usb: sl811-hcd: only defined function checkdone if QUIRK2 is defined
57e6634e591b usb: typec: tcpci: add generic tcpci fallback compatible
f692c547e3f2 thunderbolt: Keep the domain powered when USB4 port is in redrive mode
893b2562613f usb: gadget: uvc: mark incomplete frames with UVC_STREAM_ERR
7dbf082988d6 bus: mhi: host: Add MHI_PM_SYS_ERR_FAIL state
63eaa43d5d5f tools: iio: replace seekdir() in iio_generic_buffer
1e9f5619d908 ring-buffer: use READ_ONCE() to read cpu_buffer->commit_page in concurrent environment
5e7da5bb2d34 ktest: force $buildonly = 1 for 'make_warnings_file' test type
39da708cb201 perf/x86/amd/lbr: Discard erroneous branch entries
44479c7fefc8 platform/x86: touchscreen_dmi: Add an extra entry for a variant of the Chuwi Vi8 tablet
70310e55b529 Input: allocate keycode for Display refresh rate toggle
055e406d7b0e Input: imagis - use FIELD_GET where applicable
4097b1f10f04 RDMA/cm: add timeout to cm_destroy_id wait
512a01da7134 block: prevent division by zero in blk_rq_stat_sum()
c87e811cae7e input/touchscreen: imagis: Correct the maximum touch area value
b7d153bfba62 libperf evlist: Avoid out-of-bounds access
aaefa79c1532 Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default"
43be051f35f9 SUNRPC: increase size of rpc_wait_queue.qlen from unsigned short to unsigned int
3a94feab045f drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init()
354a5d7bb740 drm/amd/display: Fix nanosec stat overflow
aba664845af3 ext4: forbid commit inconsistent quota data when errors=remount-ro
baba35106855 ext4: add a hint for block bitmap corrupt state in mb_groups
b75395ec4b7a ALSA: firewire-lib: handle quirk to calculate payload quadlets as data block counter
84ed33a08218 media: sta2x11: fix irq handler cast
2e2177f94c0e Julia Lawall reported this null pointer dereference, this should fix it.
3f3c1e735d3e rcu-tasks: Repair RCU Tasks Trace quiescence check
eae948ecd5f0 ASoC: Intel: common: DMI remap for rebranded Intel NUC M15 (LAPRC710) laptops
13701b0f01b6 isofs: handle CDs with bad root inode but good Joliet root directory
ee0b5f96b6d6 scsi: lpfc: Fix possible memory leak in lpfc_rcv_padisc()
53cb1e52c9db sysv: don't call sb_bread() with pointers_lock held
5238e1c2bd31 pinctrl: renesas: checker: Limit cfg reg enum checks to provided IDs
c87dd159189a drm: panel-orientation-quirks: Add quirk for GPD Win Mini
ac1e0f080a76 Input: synaptics-rmi4 - fail probing if memory allocation for "phys" fails
48bfb4b03c5f drm/vc4: don't check if plane->state->fb == state->fb
a83a7728e487 Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922
b19fe5eea619 Bluetooth: btintel: Fix null ptr deref in btintel_read_version
d7ee3bf0caf5 net/smc: reduce rtnl pressure in smc_pnet_create_pnetids_list()
5693dd6d3d01 ice: use relative VSI index for VFs instead of PF VSI number
9ae356c627b4 btrfs: send: handle path ref underflow in header iterate_inode_ref()
0f30f95b918e btrfs: export: handle invalid inode or root reference in btrfs_get_parent()
36c2a2863bc3 btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks()
50bd749c60ce cpufreq: Don't unregister cpufreq cooling on CPU hotplug
6597a6687af5 wifi: ath11k: decrease MHI channel buffer length to 8KB
4e0cfb25d49d dma-direct: Leak pages on dma_set_decrypted() failure
a3f6045ce3c9 net: pcs: xpcs: Return EINVAL in the internal methods
51a9b20a047d tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num()
635594cca59f pstore/zone: Add a null pointer check to the psz_kmsg_read
8ead0a04a7f3 wifi: brcmfmac: Add DMI nvram filename quirk for ACEPC W5 Pro
161d6b803778 firmware: tegra: bpmp: Return directly after a failed kzalloc() in get_filename()
8af60bb2b215 net: skbuff: add overflow debug check to pull/push helpers
b8ca15861c88 ionic: set adminq irq affinity
6925d11fbda2 arm64: dts: rockchip: fix rk3399 hdmi ports node
a29204893476 arm64: dts: rockchip: fix rk3328 hdmi ports node
b510fbe3a7bf cpuidle: Avoid potential overflow in integer multiplication
94b016b28bdd panic: Flush kernel log buffer at the end
8d80e092027a wifi: iwlwifi: pcie: Add the PCI device id for new hardware
feacd430b42b VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host()
fd5fdacae93a wifi: rtw89: pci: enlarge RX DMA buffer to consider size of RX descriptor
d6b0472d5fbd bnx2x: Fix firmware version string character counts
7dd4831c3ecb wifi: ath9k: fix LNA selection in ath_ant_try_scan()
e6768c6737f4 amdkfd: use calloc instead of kzalloc to avoid integer overflow
bf1e3b1cb1e0 Linux 6.1.85
e21838dfd084 x86: set SPECTRE_BHI_ON as default
3e4283b77107 KVM: x86: Add BHI_NO
43704e993ae5 x86/bhi: Mitigate KVM by default
bb8384b6dfbc x86/bhi: Add BHI mitigation knob
42196bdec082 x86/bhi: Enumerate Branch History Injection (BHI) bug
29c50bb6fbe4 x86/bhi: Define SPEC_CTRL_BHI_DIS_S
07dbb10f153f x86/bhi: Add support for clearing branch history at syscall entry
74fcb181772e x86/syscall: Don't force use of indirect calls for system calls
fd52c0397b53 x86/bugs: Change commas to semicolons in 'spectre_v2' sysfs file
5e6898b8544d nvme: fix miss command type check
9c2b4b657739 mm/secretmem: fix GUP-fast succeeding on secretmem folios
a6dc534c073b selftests: mptcp: display simult in extra_msg
d1fefedc1a0e mptcp: don't account accept() of non-MPC client as fallback to TCP
08ef93ebc73c selftests: mptcp: join: fix dev in check_endpoint
7e8360ac8774 smb: client: fix potential UAF in cifs_signal_cifsd_for_reconnect()
f9414004798d smb: client: fix potential UAF in smb2_is_network_name_deleted()
494c91e1e941 smb: client: fix potential UAF in is_valid_oplock_break()
c868cabdf6fd smb: client: fix potential UAF in smb2_is_valid_lease_break()
84488466b7a6 smb: client: fix potential UAF in smb2_is_valid_oplock_break()
16b7d785775e smb: client: fix potential UAF in cifs_stats_proc_show()
8fefd166fcb3 smb: client: fix potential UAF in cifs_stats_proc_write()
229042314602 smb: client: fix potential UAF in cifs_debug_files_proc_show()
8c99dfb49bdc smb3: retrying on failed server close
f6583444d7e7 riscv: process: Fix kernel gp leakage
c88f7a709512 riscv: Fix spurious errors from __get/put_kernel_nofault
447d844a3e10 s390/entry: align system call table on 8 bytes
22943e4fe4b3 x86/coco: Require seeding RNG with RDRAND on CoCo systems
20a915154ccb x86/mce: Make sure to grab mce_sysfs_mutex in set_bank()
97e93367e827 x86/mm/pat: fix VM_PAT handling in COW mappings
7b6df050c45a of: dynamic: Synchronize of_changeset_destroy() with the devlink removals
9406d598a13a driver core: Introduce device_link_wait_removal()
f35d7ede62d9 ALSA: hda/realtek: Update Panasonic CF-SZ6 quirk to support headset with microphone
2ff8f0655057 ALSA: hda/realtek - Fix inactive headset mic jack
883e072e83f1 ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
51a6c2af9d20 ksmbd: validate payload size in ipc response
2e5f8dc1dec8 ksmbd: don't send oplock break if rename fails
7ef6a7f9b32f x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk
c19715ec258d nfsd: hold a lighter-weight client reference over CB_RECALL_ANY
12059cf0487f ata: sata_mv: Fix PCI device ID table declaration compilation warning
78942ac75499 cifs: Fix caching to try to do open O_WRONLY as rdwr on server
9adcfd56703c scsi: sd: Unregister device if device_add_disk() failed in sd_probe()
4b87c1bc2559 scsi: mylex: Fix sysfs buffer lengths
7171d6aef1f1 ata: sata_sx4: fix pdc20621_get_from_dimm() on 64-bit
7ff957cea8af ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw
4ff3d8ac6234 ASoC: rt711-sdw: fix locking sequence
044c34fe3531 ASoC: rt711-sdca: fix locking sequence
eb028d1ebd0b ASoC: rt5682-sdw: fix locking sequence
392c47fea7aa drm/panfrost: fix power transition timeout warnings
81f7c9da2bed drivers/perf: riscv: Disable PERF_SAMPLE_BRANCH_* while not supported
d00c24ddec51 9p: Fix read/write debug statements to report server reply
90a477dfda3b fs/pipe: Fix lockdep false-positive in watchqueue pipe_write()
4af6d5b4d9f1 KVM: SVM: Add support for allowing zero SEV ASIDs
2233bd583cb5 KVM: SVM: Use unsigned integers when dealing with ASIDs
815c2a1c432b KVM: SVM: WARN, but continue, if misc_cg_set_capacity() fails
2f7efda53a0a KVM: SVM: enhance info printk's in SEV init
f089d4554a0b net: ravb: Always update error counters
f9690dfa1814 net: ravb: Always process TX descriptor ring
265a0fc55f13 net: ravb: Let IP-specific receive function to interrogate descriptors
b3608fe28fab net: fec: Set mac_managed_pm during probe
c1781222079c drivers: net: convert to boolean for the mac_managed_pm flag
4eed9d0a4816 tcp: Fix bind() regression for v6-only wildcard and v4(-mapped-v6) non-wildcard addresses.
77db987b47b7 r8169: prepare rtl_hw_aspm_clkreq_enable for usage in atomic context
9109472e7102 r8169: use spinlock to protect access to registers Config2 and Config5
a33b7cb18492 r8169: use spinlock to protect mac ocp register access
095cfa2d9bde i40e: Enforce software interrupt during busy-poll exit
2f6953617d1c i40e: Remove _t suffix from enum type names
f3c2ceb84759 i40e: Store the irq number in i40e_q_vector
810dd068ae3b drm/amd: Flush GFXOFF requests in prepare stage
43df8e64dfb8 drm/amd: Add concept of running prepare_suspend() sequence for IP blocks
2990d8eacd2c drm/amd: Evict resources during PM ops prepare() callback
3e89846283f3 i40e: fix vf may be used uninitialized in this function warning
fe74ea5b8b78 i40e: fix i40e_count_filters() to count only active/new filters
d417e3c16dc5 octeontx2-af: Add array index check
e7e7030f0ae2 octeontx2-pf: check negative error code in otx2_open()
39efe5b6f611 octeontx2-af: Fix issue with loading coalesced KPU profiles
940ff35ae8d1 udp: prevent local UDP tunnel packets from being GROed
8c58d384050b udp: do not transition UDP GRO fraglist partial checksums to unnecessary
d12245080cb2 udp: do not accept non-tunnel GSO skbs landing in a tunnel
fd6692e9b5ed r8169: skip DASH fw status checks when DASH is disabled
80247e0eca14 mlxbf_gige: stop interface during shutdown
167d4b47a9bd ipv6: Fix infinite recursion in fib6_dump_done().
2febb7eeb493 selftests: reuseaddr_conflict: add missing new line at the end of the output
1db7fcb2b290 erspan: make sure erspan_base_hdr is present in skb->head
1829b618ccc4 i40e: Fix VF MAC filter removal
ed37bdaee64b x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO
23178ec5abbd x86/bugs: Fix the SRSO mitigation on Zen3/4
2eeab8c47c3c gro: fix ownership transfer
66cb6659008b selftests: net: gro fwd: update vxlan GRO test expectations
10608161696c net: phy: micrel: Fix potential null pointer dereference
77f5e52d7bee net: phy: micrel: lan8814: Fix when enabling/disabling 1-step timestamping
e01835f3a1bd net: stmmac: fix rx queue priority assignment
b7d1ce2cc719 net/sched: fix lockdep splat in qdisc_tree_reduce_backlog()
55d3fe7b2b7b net/sched: act_skbmod: prevent kernel-infoleak
a44770fed865 bpf, sockmap: Prevent lock inversion deadlock in map delete elem
8a57544e9285 vboxsf: Avoid an spurious warning if load_nls_xxx() fails
18aae2cb87e5 netfilter: validate user input for expected length
9b5b7708ec2b netfilter: nf_tables: Fix potential data-race in __nft_flowtable_type_get()
4e8447a9a3d3 netfilter: nf_tables: flush pending destroy work before exit_net release
745cf6a84389 netfilter: nf_tables: reject new basechain after table flag update
1c9e71ca615d Revert "x86/mm/ident_map: Use gbpages only where full GB page should be mapped."
db388b8e12aa vsock/virtio: fix packet delivery to tap device
fc77240f6316 net: usb: ax88179_178a: avoid the interface always configured as random address
cbaac2e5488e net/rds: fix possible cp null dereference
7c1250796b6c xen-netfront: Add missing skb_mark_for_recycle
18e189442a58 Bluetooth: Fix TOCTOU in HCI debugfs implementation
38e3eaa861bd Bluetooth: hci_event: set the conn encrypted before conn establishes
3e773d04aef9 Bluetooth: add quirk for broken address properties
a2812ff7ea40 Bluetooth: qca: fix device-address endianness
298dc5dd38d2 arm64: dts: qcom: sc7180-trogdor: mark bluetooth address as broken
9bf4acc80296 Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT"
5d920886c382 x86/cpufeatures: Add CPUID_LNX_5 to track recently added Linux-defined word
3d61f1704bdf r8169: fix issue caused by buggy BIOS on certain boards with RTL8168d
923579201dec KVM: arm64: Fix host-programmed guest events in nVHE
ad141b08d1ce perf/x86/amd/lbr: Use freeze based on availability
8d029111b809 x86/cpufeatures: Add new word for scattered features
58638e3b4879 dm integrity: fix out-of-range warning
7d0567842b78 inet: inet_defrag: prevent sk release while still in use
064267376533 Octeontx2-af: fix pause frame configuration in GMP mode
2553bfaa19b4 net: lan743x: Add set RFE read fifo threshold for PCI1x1x chips
852698c9fd5b cifs: Fix duplicate fscache cookie warnings
98cdac206b11 bpf: Protect against int overflow for stack access size
24444af5ddf7 mlxbf_gige: call request_irq() after NAPI initialized
30fabe50a7ac tls: get psock ref after taking rxlock to avoid leak
f52c8f1210da tls: adjust recv return with async crypto and failed copy to userspace
efb4573feaa5 tls: recv: process_rx_list shouldn't use an offset with kvec
0e111ce740fc net: hns3: mark unexcuted loopback test result as UNEXECUTED
50b69054f455 net: hns3: fix kernel crash when devlink reload during pf initialization
b8b533eeee5b net: hns3: fix index limit to support all queue stats
ebabdae52f2a ACPICA: debugger: check status of acpi_evaluate_object() in acpi_db_walk_for_fields()
beaf0e7996b7 net: wwan: t7xx: Split 64bit accesses to fix alignment issues
91b243de910a tcp: properly terminate timers for kernel sockets
16307e7bc112 s390/qeth: handle deferred cc1
231b189fa1a1 ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa()
99a75d750074 wifi: iwlwifi: mvm: rfi: fix potential response leaks
57beec623ac5 mlxbf_gige: stop PHY during open() error paths
b51ec7fc9f87 nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
0336995512cd dma-buf: Fix NULL pointer dereference in sanitycheck()
8333aae9bba1 scripts/bpf_doc: Use silent mode when exec make cmd
cc4860dd1375 Subject: [PATCH v6.1] powerpc: drop duplicate entry in Makefile for lib dir
e083231c43f3 net: fix IPSTATS_MIB_OUTFORWDATAGRAMS increment after fragment check
6ee7f29fed8c net: ipv4, ipv6: fix IPSTATS_MIB_OUTOCTETS increment duplicated
a771780cdf4a net: fix IPSTATS_MIB_OUTPKGS increment in OutForwDatagrams.
8a9f2d0717f0 riscv: Fix build with CONFIG_CC_OPTIMIZE_FOR_SIZE=y
44fd0c7a5a79 tick/rcu: fix false positive "softirq work is pending" messages on RT
786775632028 kernel/sched: Fix double free on invalid isolcpus/nohz_full params
4675ec8d0b9a kernel/sched: Fix uninitialized read in nohz_full/isolcpus setup
f46dc32a8617 bpf: btf: limit logging of ignored BTF mismatches
4687b40201db Revert "Revert "tick/common: Align tick period with the HZ tick.""
947f660bde07 Revert "tick/common: Align tick period with the HZ tick."
dded404c66bb yaffs2: Fix miscalculation of devname buffer length
30350f237490 mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, release} to avoid race condition
0ac32a83ca02 OF: DT-Overlay configfs interface (v8)
0b07d2478b6b fat: Replace prandom_u32() with get_random_u32()
927b66bfd641 aufs6: core
2af5eb310b11 aufs6: standalone
e6537c94f033 aufs6: mmap
c51d7f19876f aufs6: base
1785f762bbbb aufs6: kbuild
8f625cf94585 qemux86: add configuration symbol to select values
d81fac6e842a sched/isolation: really align nohz_full with rcu_nocbs
07c526200cb3 clear_warn_once: add a clear_warn_once= boot parameter
61e2c52ce198 clear_warn_once: bind a timer to written reset value
de03f5a3e6c6 clear_warn_once: expand debugfs to include read support
d3f9a25028d4 tools: Remove some options from CLANG_CROSS_FLAGS
0fb98cd2429a libbpf: Fix build warning on ref_ctr_off
e156ff56a19f perf python: Account for multiple words in CC
f06b9c6ae59d perf: perf can not parser the backtrace of app in the 32bit system and 64bit kernel.
1b099e82095d perf: x86-32: explicitly include <errno.h>
5fec311e2fd2 perf: mips64: Convert __u64 to unsigned long long
6cf30287aeaa perf: fix bench numa compilation
bd8f67dcb8e4 perf: add SLANG_INC for slang.h
0314b09bf6b9 perf: add sgidefs.h to for mips builds
4a39cc37b957 perf: change --root to --prefix for python install
3db4f4e91769 perf: add 'libperl not found' warning
fa3d24bac29a perf: force include of <stdbool.h>
deaadc523f8d fat: don't use obsolete random32 call in namei_vfat
d3c72f5df9a3 FAT: Added FAT_NO_83NAME
8f1eebeb519c FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES option
78b0423ccc14 FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES option
e998ad53fb68 yaffs2: replace bdevname call with sprintf
1175db6bf4cb yaffs2: convert read_page -> readfolio
beb275c683de yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR and NULL
e807c9e420bd yaffs: fix -Wstringop-overread compile warning in yaffs_fix_null_name
2fdd54282de3 yaffs2: v5.12+ build fixups (not runtime tested)
869f41030ed8 yaffs: include blkdev.h
e955b68f2b1f yaffs: fix misplaced variable declaration
f089603aba1d yaffs2: v5.6 build fixups
82da54859f0b yaffs2: fix memory leak when /proc/yaffs is read
2c4cf6808649 yaffs: add strict check when call yaffs_internal_read_super
e7dadb47ef11 yaffs: repair yaffs_get_mtd_device
f2e29be130f7 yaffs: Fix build failure by handling inode i_version with proper atomic API
8ea43ac7f3a3 yaffs2: fix memory leak in mount/umount
56db60d0abd2 yaffs: Avoid setting any ACL releated xattr
023baea095bc Yaffs:check oob size before auto selecting Yaffs1
409d39918661 fs: yaffs2: replace CURRENT_TIME by other appropriate apis
4bf42c774804 yaffs2: adjust to proper location of MS_RDONLY
08696e21a84c yaffs2: import git revision b4ce1bb (jan, 2020)
ca3d9f546a60 initramfs: allow an optional wrapper script around initramfs generation
301742baace5 pnmtologo: use relocatable file name
aba96ccce7d9 tools: use basename to identify file in gen-mach-types
e195c32ca7c7 lib/build_OID_registry: fix reproducibility issues
876e2f1f7726 vt/conmakehash: improve reproducibility
28b7a366cfef iwlwifi: select MAC80211_LEDS conditionally
69933d85f61e net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119)
5a308d8f142a arm64/perf: Fix wrong cast that may cause wrong truncation
339523a797e9 defconfigs: drop obselete options
3d751aeb9bcd arm64/perf: fix backtrace for AAPCS with FP enabled
86fa47f362ae linux-yocto: Handle /bin/awk issues
86f04668ef6e uvesafb: provide option to specify timeout for task completion
0db5521a1b3c uvesafb: print error message when task timeout occurs
710303c12e99 compiler.h: Undef before redefining __attribute_const__
14a0ede85080 vmware: include jiffies.h
e232e6ffe081 Resolve jiffies wrapping about arp
c16abf2d705f nfs: Allow default io size to be configured.
9e9e885f4a6c check console device file on fs when booting
0ce0ce443d58 mount_root: clarify error messages for when no rootfs found
32449db67de8 menuconfig,mconf-cfg: Allow specification of ncurses location
c55f1054bdce modpost: mask trivial warnings
30a45d4ee261 kbuild: exclude meta directory from distclean processing
0890b10d8fb1 powerpc: serialize image targets
6c0feb81c3ae arm: serialize build targets
77fa1b70cdbd crtsavres: fixups for 5.4+
cd107e4edd5f crtsavres: fixups for 5.4+
8f763b35ae5b powerpc/ptrace: Disable array-bounds warning with gcc8
fe6f93755196 powerpc: Disable attribute-alias warnings from gcc8
9b7097364b87 powerpc: add crtsavres.o to archprepare for kbuild
c106cd86a07b powerpc: kexec fix for powerpc64
33b7738c61fc powerpc: Add unwind information for SPE registers of E500 core
c04e26a9beda mips: vdso: fix 'jalr $t9' crash in vdso code
4733368eab80 mips: Kconfig: add QEMUMIPS64 option
ec2df6ae5ee5 4kc cache tlb hazard: tlbp cache coherency
c8c511fae0f0 malta uhci quirks: make allowance for slow 4k(e)c
b2bf1b6e971a arm64: defconfig: cleanup config options
a40a34b02336 vexpress: Pass LOADADDR to Makefile
7c51524611bb arm: ARM EABI socketcall
1f6e77027c24 ARM: LPAE: Invalidate the TLB for module addresses during translation fault
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.1.bb | 6 ++--
.../linux/linux-yocto-tiny_6.1.bb | 6 ++--
meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
index d0173e3ee7..aac0e26210 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
@@ -14,13 +14,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "4df82ffbb2b0f0b0efb545d1f67e61c987d051c1"
-SRCREV_meta ?= "8b555bd39017d9e6b19a0e2c98e563c5ebccef14"
+SRCREV_machine ?= "7a63ce6bf87492f09a8c685bf99e9a09af97c71b"
+SRCREV_meta ?= "3e8602affb44aa12dc7ea436c5ec8514fccb5870"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https"
-LINUX_VERSION ?= "6.1.84"
+LINUX_VERSION ?= "6.1.86"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
index 1d438cb43c..486534f3cf 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
# CVE exclusions
include recipes-kernel/linux/cve-exclusion_6.1.inc
-LINUX_VERSION ?= "6.1.84"
+LINUX_VERSION ?= "6.1.86"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
-SRCREV_meta ?= "8b555bd39017d9e6b19a0e2c98e563c5ebccef14"
+SRCREV_machine ?= "3726df7e9d76ef8836dcf3a34b8cae6ba0aaa594"
+SRCREV_meta ?= "3e8602affb44aa12dc7ea436c5ec8514fccb5870"
PV = "${LINUX_VERSION}+git"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
index c4e8750e6b..0b417c471f 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.1/standard/base"
KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "6c89adaf651c4599869544f1ccc532641e5e6e9c"
-SRCREV_machine:qemuarm64 ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
-SRCREV_machine:qemuloongarch64 ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
-SRCREV_machine:qemumips ?= "cef1886035a8438205634d51fdfc3c1481b668e8"
-SRCREV_machine:qemuppc ?= "42585bdd38e874d2c4b08364a160e5dad5cd683e"
-SRCREV_machine:qemuriscv64 ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
-SRCREV_machine:qemuriscv32 ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
-SRCREV_machine:qemux86 ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
-SRCREV_machine:qemux86-64 ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
-SRCREV_machine:qemumips64 ?= "a6c079ca05576d39ff871aad90050021aecaf3c7"
-SRCREV_machine ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
-SRCREV_meta ?= "8b555bd39017d9e6b19a0e2c98e563c5ebccef14"
+SRCREV_machine:qemuarm ?= "a817e2cafd9a6f3bc48d9e88cc92330d748e0993"
+SRCREV_machine:qemuarm64 ?= "3726df7e9d76ef8836dcf3a34b8cae6ba0aaa594"
+SRCREV_machine:qemuloongarch64 ?= "3726df7e9d76ef8836dcf3a34b8cae6ba0aaa594"
+SRCREV_machine:qemumips ?= "70d990757526c642411d8a238be6f7a331dbff2c"
+SRCREV_machine:qemuppc ?= "ec55f0fb16cfa7335361c8532ccc0883d37d05f5"
+SRCREV_machine:qemuriscv64 ?= "3726df7e9d76ef8836dcf3a34b8cae6ba0aaa594"
+SRCREV_machine:qemuriscv32 ?= "3726df7e9d76ef8836dcf3a34b8cae6ba0aaa594"
+SRCREV_machine:qemux86 ?= "3726df7e9d76ef8836dcf3a34b8cae6ba0aaa594"
+SRCREV_machine:qemux86-64 ?= "3726df7e9d76ef8836dcf3a34b8cae6ba0aaa594"
+SRCREV_machine:qemumips64 ?= "219c6fc52eede3be9e7e3ae5b64bdb16f57b5dca"
+SRCREV_machine ?= "3726df7e9d76ef8836dcf3a34b8cae6ba0aaa594"
+SRCREV_meta ?= "3e8602affb44aa12dc7ea436c5ec8514fccb5870"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "347385861c50adc8d4801d4b899eded38a2f04cd"
+SRCREV_machine:class-devupstream ?= "cd5d98c0556cd790f78a3ba26afc9d2f896163e4"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.1/base"
@@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.1.84"
+LINUX_VERSION ?= "6.1.86"
PV = "${LINUX_VERSION}+git"
--
2.39.2
^ permalink raw reply related [relevance 3%]
* [OE-core][nanbield 01/10] linux-yocto/6.1: update to v6.1.79
@ 2024-05-03 3:00 1% bruce.ashfield
2024-05-03 3:00 1% ` [OE-core][nanbield 06/10] linux-yocto/6.1: update to v6.1.84 bruce.ashfield
` (2 more replies)
0 siblings, 3 replies; 200+ results
From: bruce.ashfield @ 2024-05-03 3:00 UTC (permalink / raw)
To: steve; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/6.1 to the latest korg -stable release that comprises
the following commits:
81e1dc2f7001 Linux 6.1.79
6fd24675188d mlxsw: spectrum_acl_tcam: Fix stack corruption
9020513afafe fs/ntfs3: Add null pointer checks
d028cc6d235f arm64: Subscribe Microsoft Azure Cobalt 100 to ARM Neoverse N2 errata
c5d83ac2bf6c dm: limit the number of targets and parameter size area
13f79a002602 nilfs2: replace WARN_ONs for invalid DAT metadata block requests
6589f0f72f8e nilfs2: fix potential bug in end_buffer_async_write
058d1c56167e of: property: Add in-ports/out-ports support to of_graph_get_port_parent()
24ec7504a08a sched/membarrier: reduce the ability to hammer on sys_membarrier
d3a5f798bc86 kbuild: Drop -Wdeclaration-after-statement
3c6cc62ce126 locking: Introduce __cleanup() based infrastructure
579cfab21b59 apparmor: Free up __cleanup() name
43ec3c888653 dmaengine: ioat: Free up __cleanup() name
a160c3293a1c userfaultfd: fix mmap_changing checking in mfill_atomic_hugetlb
f3e975828636 bpf: Remove trace_printk_lock
95b7476f6f68 bpf: Do cleanup in bpf_bprintf_cleanup only when needed
f7bbad9561f3 bpf: Add struct for bin_args arg in bpf_bprintf_prepare
989b0ff35fe5 net: prevent mss overflow in skb_segment()
380aeff204b9 smb: client: fix parsing of SMB3.1.1 POSIX create context
1ae3c59355dc smb: client: fix potential OOBs in smb2_parse_contexts()
270325fb3154 RDMA/irdma: Ensure iWarp QP queue memory is OS paged aligned
e1c1bdaa3879 hrtimer: Ignore slack time for RT tasks in schedule_hrtimeout_range()
51a8f31b939c nfsd: don't take fi_lock in nfsd_break_deleg_cb()
e4cf8941664c nfsd: fix RELEASE_LOCKOWNER
23027309b099 parisc: Fix random data corruption from exception handler
ebc442c6403d netfilter: ipset: Missing gc cancellations fixed
653bc5e6d999 netfilter: ipset: fix performance regression in swap operation
e7d2e87abc6f block: fix partial zone append completion handling in req_bio_endio()
bb44477d4506 crypto: lib/mpi - Fix unexpected pointer access in mpi_ec_init
c6feb7f41728 wifi: mwifiex: fix uninitialized firmware_stat
0a9e80354911 arm64: dts: qcom: sm8150: fix USB SS wakeup
c0e41c8756ef arm64: dts: qcom: sdm845: fix USB SS wakeup
2488e0e4bc23 arm64: dts: qcom: msm8916: Make blsp_dma controlled-remotely
9c84d580de3c arm64: dts: qcom: msm8916: Enable blsp_dma by default
475369350157 bus: moxtet: Add spi device table
1b7b597a69bb wifi: mwifiex: add extra delay for firmware ready
48b348232070 wifi: mwifiex: Support SD8978 chipset
5447e64acce8 ARM: dts: imx6q-apalis: add can power-up delay on ixora board
4bf19cef220a md: bypass block throttle for superblock update
9a163479ddc4 selftests/mm: Update va_high_addr_switch.sh to check CPU for la57 flag
84df059d2468 selftests/mm: ksm_tests should only MADV_HUGEPAGE valid memory
944900fe2736 tls: fix NULL deref on tls_sw_splice_eof() with empty record
0a371ed6f2c1 xfrm: Silence warnings triggerable by bad packets
cf3c8916866c xfrm: Use xfrm_state selector for BEET input
1e4432d463f3 tracing: Inform kmemleak of saved_cmdlines allocation
c7f9c3e94e61 fs/proc: do_task_stat: move thread_group_cputime_adjusted() outside of lock_task_sighand()
9359ff1a4501 pmdomain: core: Move the unused cleanup to a _sync initcall
4dd684d4bb3c can: j1939: Fix UAF in j1939_sk_match_filter during setsockopt(SO_J1939_FILTER)
aedda066d717 can: j1939: prevent deadlock by changing j1939_socks_lock to rwlock
8a72a4689a8d can: netlink: Fix TDCO calculation using the old data bittiming
08c194882376 of: property: fix typo in io-channels
79081197b4e2 mm: hugetlb pages should not be reserved by shmat() if SHM_NORESERVE
2e2c07104b49 fs,hugetlb: fix NULL pointer dereference in hugetlbs_fill_super
f3f98d7d84b3 ceph: prevent use-after-free in encode_cap_msg()
309ef7de5d84 hv_netvsc: Register VF in netvsc_probe if NET_DEVICE_REGISTER missed
4888754f3dd0 net: ethernet: ti: cpsw_new: enable mac_managed_pm to fix mdio
5140c4d5f4fd s390/qeth: Fix potential loss of L3-IP@ in case of network issues
058fbaf7716b net: ethernet: ti: cpsw: enable mac_managed_pm to fix mdio
95de4ad173ca fs: relax mount_setattr() permission checks
3ff3e6a9363a tools/rtla: Fix Makefile compiler options for clang
4ee28d5a4f57 tools/rtla: Fix uninitialized bucket/data->bucket_size warning
5ccb527b66e6 tools/rtla: Exit with EXIT_SUCCESS when help is invoked
771b74ce9212 tools/rtla: Replace setting prio with nice for SCHED_OTHER
d627693e5a55 tools/rtla: Remove unused sched_getattr() function
fcf62f94ad80 ASoC: amd: yc: Add DMI quirk for Lenovo Ideapad Pro 5 16ARP8
00f9fcc0a109 mmc: sdhci-pci-o2micro: Fix a warm reboot issue that disk can't be detected by BIOS
09fad23a1a32 zonefs: Improve error handling
ce2b826582f5 irqchip/gic-v3-its: Fix GICv4.1 VPE affinity update
659311f59318 irqchip/irq-brcmstb-l2: Add write memory barrier before exit
783912cbce88 wifi: mac80211: reload info pointer in ieee80211_tx_dequeue()
6c84dbe8f8fa wifi: cfg80211: fix wiphy delayed work queueing
685fc1711cda nfp: flower: prevent re-adding mac index for bonded port
57b8478c103a nfp: use correct macro for LengthSelect in BAR config
8731fe001a60 crypto: ccp - Fix null pointer dereference in __sev_platform_shutdown_locked
8494ba2c9ea0 nilfs2: fix hang in nilfs_lookup_dirty_data_buffers()
9c9c68d64fd3 nilfs2: fix data corruption in dsync block recovery for small block sizes
35076e3fb4b8 ALSA: hda/conexant: Add quirk for SWS JS201D
53e8abc14e57 ALSA: hda/realtek: fix mute/micmute LED For HP mt645
a943c7fbdfeb mmc: slot-gpio: Allow non-sleeping GPIO ro
eae748df18ed io_uring/net: fix multishot accept overflow handling
aedcefae6c18 x86/mm/ident_map: Use gbpages only where full GB page should be mapped.
3863ca052216 KVM: x86/pmu: Fix type length error when reading pmu->fixed_ctr_ctrl
627339cccdc9 x86/fpu: Stop relying on userspace for info to fault in xsave buffer
8b4025679e56 x86/Kconfig: Transmeta Crusoe is CPU family 5, not 6
c194adaa8a4c powerpc/pseries: fix accuracy of stolen time
42422f8f8c52 powerpc/cputable: Add missing PPC_FEATURE_BOOKE on PPC64 Book-E
76d3ad7d0264 powerpc/64: Set task pt_regs->link to the LR value on scv entry
5e2f407646fa serial: max310x: prevent infinite while() loop in port startup
0046dd2e9ff6 serial: max310x: fail probe if clock crystal is unstable
7971a029eb23 serial: max310x: improve crystal stable clock detection
5d89c48337c7 serial: max310x: set default value when reading clock ready bit
c96ce4903b62 nfp: flower: fix hardware offload for the transfer layer port
ef3d50e884d4 ring-buffer: Clean ring_buffer_poll_wait() error return
48a8ccccffba hv_netvsc: Fix race condition between netvsc_probe and netvsc_remove
3ca5a3cdc0c1 drm/amd/display: Preserve original aspect ratio in create stream
e70123fdbe82 drm/amd/display: Increase frame-larger-than for all display_mode_vba files
8c22b23a2778 drm/prime: Support page array >= 4GB
fc811d88fb4e drm/msm: Wire up tlb ops
ba5f95788345 xfrm: Remove inner/outer modes from input path
01e9f82058e2 xfrm: Remove inner/outer modes from output path
7505a0ce0858 ksmbd: free aux buffer if ksmbd_iov_pin_rsp_read fails
9f6087851ec6 media: rc: bpf attach/detach requires write permission
b79e15569d1a iio: imu: bno055: serdev requires REGMAP
9e105dd8c070 iio: imu: adis: ensure proper DMA alignment
18cbe28671e2 iio: adc: ad_sigma_delta: ensure proper DMA alignment
77ba1a86ef22 iio: accel: bma400: Fix a compilation problem
4f10423c0e34 iio: commom: st_sensors: ensure proper DMA alignment
359f220d0e75 iio: core: fix memleak in iio_device_register_sysfs
176256ff8abf iio: magnetometer: rm3100: add boundary check for the value read from RM3100_REG_TMRC
c794117a3369 staging: iio: ad5933: fix type mismatch regression
65bf19f55a87 tracing: Fix wasted memory in saved_cmdlines logic
ac894a1e19b9 ext4: avoid bb_free and bb_fragments inconsistency in mb_free_blocks()
185eab30486b ext4: fix double-free of blocks due to wrong extents moved_len
4ab56381ac26 misc: fastrpc: Mark all sessions as invalid in cb_remove
90e09c016d72 binder: signal epoll threads of self-work
f33789ca65d5 ALSA: hda/realtek: fix mute/micmute LEDs for HP ZBook Power
6c65eb988d4a ALSA: hda/cs8409: Suppress vmaster control for Dolphin models
a6bc85847272 ASoC: codecs: wcd938x: handle deferred probe
d27f6d6eacac ALSA: hda/realtek: Enable headset mic on Vaio VJFE-ADL
5953f2c7f84d modpost: Add '.ltext' and '.ltext.*' to TEXT_SECTIONS
064cb9dd10ff um: Fix adding '-no-pie' for clang
36fbcadc208e modpost: Include '.text.*' in TEXT_SECTIONS
519b7da44ee4 linux/init: remove __memexit* annotations
999ecc936a99 modpost: Don't let "driver"s reference .exit.*
a5767decf743 modpost: propagate W=1 build option to modpost
6286435cd06c xen-netback: properly sync TX responses
55e891f4a272 net: stmmac: do not clear TBS enable bit on link up/down
56440799fc46 net: hsr: remove WARN_ONCE() in send_hsr_supervision_frame()
5c0c5ffaed73 nfc: nci: free rx_data_reassembly skb on NCI device cleanup
76690354e6ac kbuild: Fix changing ELF file type for output of gen_btf for big endian
38acb2e9be54 ALSA: hda/realtek: Apply headset jack quirk for non-bass alc287 thinkpads
e1aae84f42ec firewire: core: correct documentation of fw_csr_string() kernel API
d0302e2a5732 lsm: fix the logic in security_inode_getsecctx()
dc3890441c9e drm/virtio: Set segment size for virtio_gpu device
ff70e6ff6fc2 Revert "drm/amd: flush any delayed gfxoff on suspend entry"
6bb22ac1d11d scsi: Revert "scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock"
75500e7ba2a2 media: Revert "media: rkisp1: Drop IRQF_SHARED"
e373bfc8ec3d mptcp: check addrs list in userspace_pm_get_local_id
d288d2e3e65a mptcp: drop the push_pending field
d50d031919b2 selftests: mptcp: increase timeout to 30 min
fc0e9cff9db0 selftests: mptcp: add missing kconfig for NF Mangle
2c7337ec22bc selftests: mptcp: add missing kconfig for NF Filter in v6
66e142fbe13f selftests: mptcp: add missing kconfig for NF Filter
6673d9f1c2cd mptcp: fix data re-injection from stale subflow
7857e35ef10e mptcp: get rid of msk->subflow
3e409fb74007 modpost: trim leading spaces when processing source files list
491528935c9c i2c: i801: Fix block process call transactions
0e01ccadfdf7 i2c: pasemi: split driver into two separate modules
4297217bcf1f powerpc/kasan: Limit KASAN thread size increase to 32KB
c12920ff9b57 irqchip/loongson-eiointc: Use correct struct type in eiointc_domain_alloc()
083870b029c0 i2c: qcom-geni: Correct I2C TRE sequence
7190353835b4 cifs: fix underflow in parse_server_interfaces()
0c09912dd838 powerpc/kasan: Fix addr error caused by page alignment
2aaa9239c981 driver core: fw_devlink: Improve detection of overlapping cycles
be76ad74a43f media: ir_toy: fix a memleak in irtoy_tx
6616d3c4f828 interconnect: qcom: sc8180x: Mark CO0 BCM keepalive
57e2e42ccd3c usb: dwc3: gadget: Fix NULL pointer dereference in dwc3_gadget_suspend
0ecc97c81e3a usb: f_mass_storage: forbid async queue when shutdown happen
2888258144e0 USB: hub: check for alternate port before enabling A_ALT_HNP_SUPPORT
9f754d009483 usb: ucsi_acpi: Fix command completion handling
d31b886ed6a5 usb: ulpi: Fix debugfs directory leak
3fd6c16ec78d usb: ucsi: Add missing ppm_lock
711beb8acf5d iio: hid-sensor-als: Return 0 for HID_USAGE_SENSOR_TIME_TIMESTAMP
e5c6c8ef3e4d HID: wacom: Do not register input devices until after hid_hw_start
b71a906a72dd HID: wacom: generic: Avoid reporting a serial of '0' to userspace
d7d7a0e3b6f5 HID: i2c-hid-of: fix NULL-deref on failed power up
ea09996b3711 ALSA: hda/realtek: Enable Mute LED on HP Laptop 14-fq0xxx
b23c431e5052 ALSA: hda/realtek: Fix the external mic not being recognised for Acer Swift 1 SF114-32
f00e8d0fccf6 parisc: Prevent hung tasks when printing inventory on serial console
607385d75a0b ASoC: amd: yc: Add DMI quirk for MSI Bravo 15 C7VF
30884a44e0ce dm-crypt, dm-verity: disable tasklets
221da504a55b scsi: storvsc: Fix ring buffer size calculation
16b1025eaa8f mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again
36be97e9eb53 tracing/trigger: Fix to return error if failed to alloc snapshot
76a42074d0b8 scs: add CONFIG_MMU dependency for vfree_atomic()
7a245b8a2fa9 i40e: Fix waiting for queues of all VSIs to be disabled
1c981792e4cc i40e: Do not allow untrusted VF to remove administratively set MAC
c638b4afc750 MIPS: Add 'memory' clobber to csum_ipv6_magic() inline assembler
4b02c89327f7 nouveau/svm: fix kvcalloc() argument order
20f378f92971 net: sysfs: Fix /sys/class/net/<iface> path for statistics
1f0d7792e902 ASoC: rt5645: Fix deadlock in rt5645_jack_detect_work()
251145e50437 spi: ppc4xx: Drop write-only variable
727cdd2f3dca net: tls: fix returned read length with async decrypt
20b4ed034872 net: tls: fix use-after-free with partial reads and async decrypt
7a3ca06d04d5 tls: fix race between async notify and socket close
2c6841c88201 net: tls: factor out tls_*crypt_async_wait()
d55eb0b495a9 tls: extract context alloc/initialization out of tls_set_sw_offload
5ad627faed13 tls/sw: Use splice_eof() to flush
b9357489c46c lan966x: Fix crash when adding interface under a lag
65ded4eb2206 net: openvswitch: limit the number of recursions from action sets
68614f1865a0 of: property: Improve finding the supplier of a remote-endpoint property
4bd106ac1c38 wifi: iwlwifi: uninitialized variable in iwl_acpi_get_ppag_table()
72d4600a6eb8 wifi: iwlwifi: Fix some error codes
e5ed6c922537 KVM: selftests: Fix a semaphore imbalance in the dirty ring logging test
b3557a3697ae KVM: selftests: Clear dirty ring states between two modes in dirty_log_test
0cf05064008c of: unittest: Fix compile in the non-dynamic case
0f081fcfaac3 driver core: Fix device_link_flag_is_sync_state_only()
02f2b95b00bf btrfs: don't drop extent_map for free space inode on write error
7ba7f9ed88a1 btrfs: reject encoded write if inode has nodatasum flag set
4d6b2e17b550 btrfs: don't reserve space for checksums when writing to nocow files
dfd1f44e4958 btrfs: send: return EOPNOTSUPP on unknown flags
f98913c07cd8 btrfs: forbid deleting live subvol qgroup
66b317a2fc45 btrfs: do not ASSERT() if the newly created subvolume already got read
a1a7b9589574 btrfs: forbid creating subvol qgroups
e717aecd2a43 btrfs: do not delete unused block group if it may be used soon
84b576ad44ea btrfs: add and use helper to check if block group is used
3af7236d6dbf update workarounds for gcc "asm goto" issue
f70efe54b97e work around gcc bugs with 'asm goto' with outputs
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.1.bb | 6 ++--
.../linux/linux-yocto-tiny_6.1.bb | 6 ++--
meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
index cbf8a18d30..4731848569 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
@@ -14,13 +14,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "8c4c2f0278e1c64eb5e95bfb23d6322e81090b3d"
-SRCREV_meta ?= "ea5365f818fb6031ec97b8ae7a88bb83001b901e"
+SRCREV_machine ?= "d99f54f4ced57500fd5c346afcfa79ff8bab6a61"
+SRCREV_meta ?= "1a5f3ae5c51d6698be51e36bf547433564338b18"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https"
-LINUX_VERSION ?= "6.1.78"
+LINUX_VERSION ?= "6.1.79"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
index 3f100b579f..178ab5b7d3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
# CVE exclusions
include recipes-kernel/linux/cve-exclusion_6.1.inc
-LINUX_VERSION ?= "6.1.78"
+LINUX_VERSION ?= "6.1.79"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "d025fe8c17718aa4c837bfafee0f3aa0f830bc75"
-SRCREV_meta ?= "ea5365f818fb6031ec97b8ae7a88bb83001b901e"
+SRCREV_machine ?= "2ca50ef474eea7ab53d9f769b1502c7c9d4f28cc"
+SRCREV_meta ?= "1a5f3ae5c51d6698be51e36bf547433564338b18"
PV = "${LINUX_VERSION}+git"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
index 982996b9a8..ec84d2614c 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.1/standard/base"
KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "2f7e672f9677d3cc448ec7e004763f76f95c7fe0"
-SRCREV_machine:qemuarm64 ?= "d025fe8c17718aa4c837bfafee0f3aa0f830bc75"
-SRCREV_machine:qemuloongarch64 ?= "d025fe8c17718aa4c837bfafee0f3aa0f830bc75"
-SRCREV_machine:qemumips ?= "f6c42d90dab94077c1c8b6b7eb77d6ca85eab07e"
-SRCREV_machine:qemuppc ?= "ff10270b2748ad74c93ef0abf8e76a464665c23d"
-SRCREV_machine:qemuriscv64 ?= "d025fe8c17718aa4c837bfafee0f3aa0f830bc75"
-SRCREV_machine:qemuriscv32 ?= "d025fe8c17718aa4c837bfafee0f3aa0f830bc75"
-SRCREV_machine:qemux86 ?= "d025fe8c17718aa4c837bfafee0f3aa0f830bc75"
-SRCREV_machine:qemux86-64 ?= "d025fe8c17718aa4c837bfafee0f3aa0f830bc75"
-SRCREV_machine:qemumips64 ?= "01b545e3fd1f9ea66d812e281de06b07c861dd69"
-SRCREV_machine ?= "d025fe8c17718aa4c837bfafee0f3aa0f830bc75"
-SRCREV_meta ?= "ea5365f818fb6031ec97b8ae7a88bb83001b901e"
+SRCREV_machine:qemuarm ?= "4c6c7312e0e95f7b076f86ef1d791c78d82ddeee"
+SRCREV_machine:qemuarm64 ?= "2ca50ef474eea7ab53d9f769b1502c7c9d4f28cc"
+SRCREV_machine:qemuloongarch64 ?= "2ca50ef474eea7ab53d9f769b1502c7c9d4f28cc"
+SRCREV_machine:qemumips ?= "b2a27a5acb88b991bc6d822f9fdc308d5a108583"
+SRCREV_machine:qemuppc ?= "ef1506156c8b381a51c4937c43bca036170df29e"
+SRCREV_machine:qemuriscv64 ?= "2ca50ef474eea7ab53d9f769b1502c7c9d4f28cc"
+SRCREV_machine:qemuriscv32 ?= "2ca50ef474eea7ab53d9f769b1502c7c9d4f28cc"
+SRCREV_machine:qemux86 ?= "2ca50ef474eea7ab53d9f769b1502c7c9d4f28cc"
+SRCREV_machine:qemux86-64 ?= "2ca50ef474eea7ab53d9f769b1502c7c9d4f28cc"
+SRCREV_machine:qemumips64 ?= "3a17a35babd86c4bc9121469801a04248bf7ae99"
+SRCREV_machine ?= "2ca50ef474eea7ab53d9f769b1502c7c9d4f28cc"
+SRCREV_meta ?= "1a5f3ae5c51d6698be51e36bf547433564338b18"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "8b4118fabd6eb75fed19483b04dab3a036886489"
+SRCREV_machine:class-devupstream ?= "81e1dc2f70014b9523dd02ca763788e4f81e5bac"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.1/base"
@@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.1.78"
+LINUX_VERSION ?= "6.1.79"
PV = "${LINUX_VERSION}+git"
--
2.39.2
^ permalink raw reply related [relevance 1%]
* [OE-core][nanbield 06/10] linux-yocto/6.1: update to v6.1.84
2024-05-03 3:00 1% [OE-core][nanbield 01/10] linux-yocto/6.1: update to v6.1.79 bruce.ashfield
@ 2024-05-03 3:00 1% ` bruce.ashfield
2024-05-03 3:00 3% ` [OE-core][nanbield 07/10] linux-yocto/6.1: update to v6.1.86 bruce.ashfield
2024-05-03 3:00 4% ` [OE-core][nanbield 09/10] linux-yocto/6.1: update to v6.1.89 bruce.ashfield
2 siblings, 0 replies; 200+ results
From: bruce.ashfield @ 2024-05-03 3:00 UTC (permalink / raw)
To: steve; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/6.1 to the latest korg -stable release that comprises
the following commits:
347385861c50 Linux 6.1.84
7b970a145c90 tools/resolve_btfids: fix build with musl libc
ab062fa3dc69 USB: core: Fix deadlock in usb_deauthorize_interface()
df84d9f7796f x86/sev: Skip ROM range scans and validation for SEV-SNP guests
98cfafaf2f41 scsi: libsas: Fix disk not being scanned in after being removed
d511040d8169 scsi: libsas: Add a helper sas_get_sas_addr_and_dev_type()
8dbc1762202a scsi: lpfc: Correct size for wqe for memset()
d8cd93e03047 scsi: lpfc: Correct size for cmdwqe/rspwqe for memset()
f2b85a4cc763 tls: fix use-after-free on failed backlog decryption
00f511d71629 x86/cpu: Enable STIBP on AMD if Automatic IBRS is enabled
f30b3ee9a486 scsi: qla2xxx: Delay I/O Abort on PCI error
65f195232b37 scsi: qla2xxx: Change debug message during driver unload
282877633b25 scsi: qla2xxx: Fix double free of fcport
09c0ac18cac2 scsi: qla2xxx: Fix command flush on cable pull
1bcbd100abb8 scsi: qla2xxx: NVME|FCP prefer flag not being honored
101c1d2d46a1 scsi: qla2xxx: Update manufacturer detail
14a3ca35c523 scsi: qla2xxx: Split FCE|EFT trace control
3cd58084e48e scsi: qla2xxx: Fix N2N stuck connection
3b9d72442adf scsi: qla2xxx: Prevent command send on chip reset
c223bc352cd3 usb: typec: ucsi: Clear UCSI_CCI_RESET_COMPLETE before reset
12d0306cecf1 usb: typec: ucsi_acpi: Refactor and fix DELL quirk
f8704d54c8e7 usb: typec: ucsi: Ack unsupported commands
959aacfe3ab6 usb: typec: ucsi: Clear EVENT_PENDING under PPM lock
2d28af770d4d usb: typec: Return size of buffer if pd_set operation succeeds
f74c5e0b54b0 usb: udc: remove warning when queue disabled ep
19ca7ef7d839 usb: dwc2: gadget: LPM flow fix
74cdf12f8dd8 usb: dwc2: gadget: Fix exiting from clock gating
bc48eb1b53ce usb: dwc2: host: Fix ISOC flow in DDMA mode
329492820681 usb: dwc2: host: Fix hibernation flow
4a8a42e16a5e usb: dwc2: host: Fix remote wakeup from hibernation
3e284e15b7f0 scsi: sd: Fix TCG OPAL unlock on system resume
9dac54f08198 USB: core: Fix deadlock in port "disable" sysfs attribute
cd20a6e83ba0 USB: core: Add hub_get() and hub_put() routines
8416da2df7e0 staging: vc04_services: fix information leak in create_component()
008bf3d622a9 staging: vc04_services: changen strncpy() to strscpy_pad()
3678cf67ff71 scsi: core: Fix unremoved procfs host directory regression
9d66ae0e7bb7 ALSA: sh: aica: reorder cleanup operations to avoid UAF bugs
6c6a45645a2e usb: dwc3-am62: fix module unload/reload behavior
aa1d1ce1ad6b usb: dwc3-am62: Rename private data
c9006b90ba68 USB: UAS: return ENODEV when submit urbs fail with device not attached
916cd2fcbc1e usb: cdc-wdm: close race between read and workqueue
181f92abda61 Revert "usb: phy: generic: Get the vbus supply"
fa2b938438cd Bluetooth: hci_sync: Fix not checking error on hci_cmd_sync_cancel_sync
7eab7b021835 drm/i915/gt: Reset queue_priority_hint on parking
72e4d3fb72e9 drm/i915/bios: Tolerate devdata==NULL in intel_bios_encoder_supports_dp_dual_mode()
b691954c94db drm/amdkfd: fix TLB flush after unmap for GFX9.4.2
016119154981 drm/vmwgfx: Create debugfs ttm_resource_manager entry only if needed
46efbdbc95a3 net: ll_temac: platform_get_resource replaced by wrong function
9acfd8b083a0 nouveau/dmem: handle kcalloc() allocation failure
6fc218ccd534 thermal: devfreq_cooling: Fix perf state when calculate dfc res_util
244cb8200e3a block: Do not force full zone append completion in req_bio_endio()
ad9cc5e9e53a mmc: core: Avoid negative index with array access
547f4afaced0 mmc: core: Initialize mmc_blk_ioc_data
a433300285d7 mmc: sdhci-omap: re-tuning is needed after a pm transition to support emmc HS200 mode
192058bb3e1b hexagon: vmlinux.lds.S: handle attributes section
4e79b4a64d08 exec: Fix NOMMU linux_binprm::exec in transfer_args_to_stack()
7aa70c492272 wifi: iwlwifi: fw: don't always use FW dump trig
7eeabcea79b6 wifi: mac80211: check/clear fast rx for non-4addr sta VLAN changes
d7387bcb7781 btrfs: zoned: use zone aware sb location for scrub
a321a9907c0e btrfs: zoned: don't skip block groups with 100% zone unusable
6b226ae43d82 efi/libstub: Cast away type warning in use of max()
ca8106fffc11 x86/efistub: Add missing boot_params for mixed mode compat entry
bf2ba0b241e8 init: open /initrd.image with O_LARGEFILE
3372c3ffc345 mm/migrate: set swap entry values of THP tail pages properly.
fe272b61506b x86/sev: Fix position dependent variable references in startup code
77e3de411395 x86/Kconfig: Remove CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
851ddc358737 x86/coco: Get rid of accessor functions
452a38297064 x86/coco: Export cc_vendor
083e750c9f5f vfio/fsl-mc: Block calling interrupt handler without trigger
7932db06c82c vfio/platform: Create persistent IRQ handlers
7d29d4c72c1e vfio/pci: Create persistent INTx handler
33dc33f56001 vfio: Introduce interface to flush virqfd inject workqueue
139dfcc4d723 vfio/pci: Disable auto-enable of exclusive INTx IRQ
6d87a9be2215 selftests: mptcp: diag: return KSFT_FAIL not test_cnt
052e4c8987ee blk-mq: release scheduler resource when request completes
242006996d15 block: Fix page refcounts for unaligned buffers in __bio_release_pages()
4f2debd9c680 tty: serial: imx: Fix broken RS485
44b6fb6cdedb pwm: img: fix pwm clock lookup
b9d103aca85f efi: fix panic in kdump kernel
21c7c00dae55 x86/fpu: Keep xfd_state in sync with MSR_IA32_XFD
493ed133b4e4 efi/libstub: fix efi_random_alloc() to allocate memory at alloc_min or higher address
641768431508 kprobes/x86: Use copy_from_kernel_nofault() to read from unsafe address
dc33e92af306 irqchip/renesas-rzg2l: Prevent spurious interrupts when setting trigger type
573777eb5607 irqchip/renesas-rzg2l: Rename rzg2l_irq_eoi()
551ad70e8662 irqchip/renesas-rzg2l: Rename rzg2l_tint_eoi()
5dc2cb3eeeee irqchip/renesas-rzg2l: Add macro to retrieve TITSR register offset based on register's index
7775e87f503a irqchip/renesas-rzg2l: Flush posted write in irq_eoi()
0250a68a35c9 irqchip/renesas-rzg2l: Implement restriction when writing ISCR register
2f67c82ed04e printk: Update @console_may_schedule in console_trylock_spinning()
d7f62fde4191 iommu/dma: Force swiotlb_max_mapping_size on an untrusted device
ef80ecc72127 swiotlb: Fix alignment checks when both allocation and DMA masks are present
8d8be62a7d53 minmax: add umin(a, b) and umax(a, b)
3e5222a17914 entry: Respect changes to system call number by trace_sys_enter()
936381380ae8 clocksource/drivers/arm_global_timer: Fix maximum prescaler value
64c3873cb255 iommu: Avoid races around default domain allocations
6ee02e355931 ASoC: amd: yc: Revert "Fix non-functional mic on Lenovo 21J2"
cd1bbca03f3c net: tls: handle backlogging of crypto requests
2149f8a56e2e x86/efistub: Call mixed mode boot services on the firmware's stack
7a391de927a7 drm/amd/display: handle range offsets in VRR ranges
43fe5dc9faa0 i2c: i801: Avoid potential double call to gpiod_remove_lookup_table
d50fd2f24f3e iio: accel: adxl367: fix I2C FIFO data register
5df4c386d35e iio: accel: adxl367: fix DEVID read after reset
155a3d8d8f77 mm, vmscan: prevent infinite loop for costly GFP_NOIO | __GFP_RETRY_MAYFAIL allocations
e5b5948c769a tee: optee: Fix kernel panic caused by incorrect error handling
2cfa00b0e87f ALSA: hda/realtek: fix mute/micmute LEDs for HP EliteBook
635e23035dd4 ALSA: hda/realtek - Add Headset Mic supported Acer NB platform
18d5fc3c16cc fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion
994a1e583c0c vt: fix unicode buffer corruption when deleting characters
99cd2d491d1c mei: me: add arrow lake point H DID
2d56aca54847 mei: me: add arrow lake point S DID
4154e7673541 misc: lis3lv02d_i2c: Fix regulators getting en-/dis-abled twice on suspend/resume
d40ab6921748 tty: serial: fsl_lpuart: avoid idle preamble pending if CTS is enabled
ccaa4fb8dc4f usb: port: Don't try to peer unused USB ports based on location
7664ee8bd803 usb: gadget: ncm: Fix handling of zero block length packets
f42ba916689f USB: usb-storage: Prevent divide-by-0 error in isd200_ata_command
e5b3ad3e8ee4 ALSA: hda/realtek - Fix headset Mic no show at resume back for Lenovo ALC897 platform
2eadf1adf513 drm/i915: Check before removing mm notifier
7f122486a061 drm/amdgpu/pm: Fix the error of pwm1_enable setting
3a70b1c93264 tracing: Use .flush() call to wake up readers
4868c0ecdb6c KVM: SVM: Flush pages under kvm->lock to fix UAF in svm_register_enc_region()
726374dde5d6 KVM: x86: Mark target gfn of emulated atomic instruction as dirty
d24a79ccdf25 init/Kconfig: lower GCC version check for -Warray-bounds
408837d7ef66 xfrm: Avoid clang fortify warning in copy_to_user_tmpl()
4f34b79c77ec Drivers: hv: vmbus: Calculate ring buffer size for more efficient use of memory
73e4f955b3f8 netfilter: nf_tables: reject constant set with timeout
72c1efe3f247 netfilter: nf_tables: disallow anonymous set with timeout flag
406b0241d0eb netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
196f198ca6fc tls: fix race between tx work scheduling and socket close
36c676e2ed36 platform/x86: p2sb: On Goldmont only cache P2SB and SPI devfn BAR
e82dc11315a7 cpufreq: brcmstb-avs-cpufreq: fix up "add check for cpufreq_cpu_get's return value"
62e06fdd180a x86/pm: Work around false positive kmemleak report in msr_build_context()
3d47eb405781 dm snapshot: fix lockup in dm_exception_table_exit
3070c70a3e46 drm/amd/display: Fix noise issue on HDMI AV mute
0581a4dac661 drm/amd/display: Return the correct HDCP error code
589c414138a1 drm/amdgpu: amdgpu_ttm_gart_bind set gtt bound flag
139845240d27 ahci: asm1064: asm1166: don't limit reported ports
25bc98657021 ahci: asm1064: correct count of reported ports
09c3fa70f651 wireguard: netlink: access device through ctx instead of peer
b7cea3a9af08 wireguard: netlink: check for dangling peer via is_dead instead of empty list
97cd43ba824a LoongArch: Define the __io_aw() hook as mmiowb()
77eae2d257d6 LoongArch: Change __my_cpu_offset definition to avoid mis-optimization
0e21852b888d net: hns3: tracing: fix hclgevf trace event strings
6bcf9d2cade1 NFSD: Fix nfsd_clid_class use of __string_len() macro
efd67e570ae7 x86/CPU/AMD: Update the Zenbleed microcode revisions
9f23176ad72f cpufreq: dt: always allocate zeroed cpumask
bbec4e4d84c3 cifs: open_cached_dir(): add FILE_READ_EA to desired access
192e9f9078c9 nilfs2: prevent kernel bug at submit_bh_wbc()
46b832e09d43 nilfs2: fix failure to detect DAT corruption in btree and direct mappings
f5bc133ef62e f2fs: truncate page cache before clearing flags when aborting atomic write
1f5124c74aaa f2fs: mark inode dirty for FI_ATOMIC_COMMITTED flag
af4b1a5aa00b Revert "block/mq-deadline: use correct way to throttling write requests"
50e9f82b1c1d memtest: use {READ,WRITE}_ONCE in memory scanning
fcf7345280af drm/vc4: hdmi: do not return negative values from .get_modes()
ae696b7c00ef drm/imx/ipuv3: do not return negative values from .get_modes()
8f914db6fe25 drm/exynos: do not return negative values from .get_modes()
191df89d8fb0 drm/panel: do not return negative error codes from drm_panel_get_modes()
cb676955d1ac drm/probe-helper: warn about negative .get_modes()
b7f6c3630eb3 s390/zcrypt: fix reference counting on zcrypt card objects
d6b5aac451c9 soc: fsl: qbman: Use raw spinlock for cgr_lock
a62168653774 soc: fsl: qbman: Always disable interrupts when taking cgr_lock
b1cf18e5bd87 ring-buffer: Use wait_event_interruptible() in ring_buffer_wait()
6e0f7e6fb1c4 ring-buffer: Fix full_waiters_pending in poll
6c2f0e055085 ring-buffer: Fix resetting of shortest_full
1df7dcfb8af3 ring-buffer: Do not set shortest_full when full target is hit
6615ef6e3166 ring-buffer: Fix waking up ring buffer readers
2952d0db18cf ksmbd: retrieve number of blocks using vfs_getattr in set_file_allocation_info
4ee09d4099bb vfio/platform: Disable virqfds on cleanup
3fe0ac10bd11 vfio/pci: Lock external INTx masking ops
f56ba2d48434 vfio/pci: Remove negative check on unsigned vector
dcc6b99c61ec vfio/pci: Consolidate irq cleanup on MSI/MSI-X disable
0f1e6cd8fb3c vfio: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations
4732ac1c23b5 PCI: hv: Fix ring buffer size calculation
3d863cf20797 PCI: dwc: endpoint: Fix advertised resizable BAR size
04f3652bd0fd PCI: qcom: Enable BDF to SID translation properly
a601e7a7fc8e PCI: qcom: Rename qcom_pcie_config_sid_sm8250() to reflect IP version
32eaf695d3c7 kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1
3abc2d160ed8 nfs: fix UAF in direct writes
f3ed58d7b356 sparc32: Fix parport build with sparc32
bda2265e6d1c sparc: Explicitly include correct DT includes
220778af6c72 io_uring/net: correctly handle multishot recvmsg retry setup
3a342fa31840 PCI/AER: Block runtime suspend when handling errors
768625f84b2a speakup: Fix 8bit characters from direct synth
bf1eef7fc0f3 usb: gadget: tegra-xudc: Fix USB3 PHY retrieval logic
9cb3ace50238 phy: tegra: xusb: Add API to retrieve the port number of phy
b4139fe933df slimbus: core: Remove usage of the deprecated ida_simple_xx() API
08eceec7931e nvmem: meson-efuse: fix function pointer type mismatch
fb1088d51bba ext4: fix corruption during on-line resize
b04abf51d725 hwmon: (amc6821) add of_match table
acda20add476 landlock: Warn once if a Landlock action is requested while disabled
03f58a64794a drm/etnaviv: Restore some id values
ad8a4eb66352 mmc: core: Fix switch on gp3 partition
1ede7f1d7eed mm: swap: fix race between free_swap_and_cache() and swapoff()
509546fc0347 swap: comments get_swap_device() with usage rule
dcd51ab42b7a mac802154: fix llsec key resources release in mac802154_llsec_key_del
f299404fd869 powerpc: xor_vmx: Add '-mhard-float' to CFLAGS
aab8a0745f87 dm-raid: fix lockdep waring in "pers->hot_add_disk"
c9ef367b3e39 PCI/DPC: Quirk PIO log size for Intel Raptor Lake Root Ports
900b81caf00c PCI/PM: Drain runtime-idle callbacks before driver removal
50361c2af756 btrfs: fix off-by-one chunk length calculation at contains_pending_extent()
c13e7256571f btrfs: qgroup: always free reserved space for extent records
b8073c069a84 serial: Lock console when calling into driver before registration
2496e37ada36 usb: typec: ucsi: Clean up UCSI_CABLE_PROP macros
371f27c2c8fc fuse: don't unhash root
970e8c49f2cf fuse: fix root lookup with nonzero generation
bdba49e46905 mmc: tmio: avoid concurrent runs of mmc_request_done()
56a2038d0017 PM: sleep: wakeirq: fix wake irq warning in system suspend
a43ebdbd39ce USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M
ed85c3113ad1 KVM: x86/xen: inject vCPU upcall vector when local APIC is enabled
8093d6e928bd USB: serial: option: add MeiG Smart SLM320 product
d0ab375e730a USB: serial: cp210x: add ID for MGP Instruments PDS100
b67095647f5b USB: serial: add device ID for VeriFone adapter
a87209645494 USB: serial: ftdi_sio: add support for GMC Z216C Adapter IR-USB
33a4aa08d5f0 powerpc/fsl: Fix mfpmr build errors with newer binutils
b2c898469dfc usb: xhci: Add error handling in xhci_map_urb_for_dma
537040c257ab clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays
185de0b7cdea clk: qcom: mmcc-apq8084: fix terminating of frequency table arrays
dd92b159c506 clk: qcom: gcc-ipq8074: fix terminating of frequency table arrays
852db52b45ea clk: qcom: gcc-ipq6018: fix terminating of frequency table arrays
a7b6523f9200 PM: suspend: Set mem_sleep_current during kernel command line setup
56452891e262 cpufreq: Limit resolving a frequency to policy min/max
9477cfeb3008 md/raid5: fix atomicity violation in raid5_cache_count
ceffd026f851 parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds
053bb9aab73d parisc: Fix csum_ipv6_magic on 64-bit systems
a5d32783a566 parisc: Fix csum_ipv6_magic on 32-bit systems
3b64d68d90f5 parisc: Fix ip_fast_csum
6eb684e9c0d0 parisc: Avoid clobbering the C/B bits in the PSW with tophys and tovirt macros
10857a2412fc parisc/unaligned: Rewrite 64-bit inline assembly of emulate_ldd()
ffbfea10d9c9 mtd: rawnand: meson: fix scrambling mode value in command macro
5d1442eeb936 ubi: correct the calculation of fastmap size
5ecbc7465f66 ubi: Check for too small LEB size in VTBL code
142d87c958d9 ubifs: Set page uptodate in the correct place
c8cc05de8e6b fat: fix uninitialized field in nostale filehandles
428ca0000f0a bounds: support non-power-of-two CONFIG_NR_CPUS
03b821647b73 kasan/test: avoid gcc warning for intentional overflow
5ea241b1931f block: Clear zone limits for a non-zoned stacked queue
719d7f899df4 ext4: correct best extent lstart adjustment logic
81479bf75809 selftests/mqueue: Set timeout to 180 seconds
226fc408c5fc crypto: qat - resolve race condition during AER recovery
efffffde33d6 crypto: qat - fix double free during reset
8557bef80cc3 sparc: vDSO: fix return value of __setup handler
0993f7f85d26 sparc64: NMI watchdog: fix return value of __setup handler
605ddb3a6e5f powerpc/smp: Increase nr_cpu_ids to include the boot CPU
334fb14389b5 powerpc/smp: Adjust nr_cpu_ids to cover all threads of a core
14cdbd9440a4 cpufreq: amd-pstate: Fix min_perf assignment in amd_pstate_adjust_perf()
b54478d20375 KVM: Always flush async #PF workqueue when vCPU is being destroyed
e2c545b841a7 media: mc: Expand MUST_CONNECT flag to always require an enabled link
61656ca92ea9 media: mc: Rename pad variable to clarify intent
cff51913c5cc media: mc: Add num_links flag to media_pad
f29793c33984 media: mc: Fix flags handling when creating pad links
1025ff4e6a7a media: mc: Add local pad to pipeline regardless of the link state
09c1be4d581d media: xc4000: Fix atomicity violation in xc4000_get_frequency
6d21d0356aa4 pci_iounmap(): Fix MMIO mapping leak
12609c76b755 serial: max310x: fix NULL pointer dereference in I2C instantiation
07c3fe923ff7 drm/vmwgfx: Fix possible null pointer derefence with invalid contexts
74cd997ba17b arm: dts: marvell: Fix maxium->maxim typo in brownstone dts
dee9c2586555 smack: Handle SMACK64TRANSMUTE in smack_inode_setsecurity()
d4b1c3b5ec1c smack: Set SMACK64TRANSMUTE only for dirs in smack_inode_setxattr()
a881dd09fd99 clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd
9875deeefedf remoteproc: virtio: Fix wdg cannot recovery remote processor
5166fc45d7ea arm64: dts: qcom: sc7280: Add additional MSI interrupts
e144e47703ce media: staging: ipu3-imgu: Set fields before media_entity_pads_init()
0b812f706fd7 wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach
113d5341ee12 timers: Rename del_timer_sync() to timer_delete_sync()
2957037c1d94 timers: Use del_timer_sync() even on UP
a50fd9871257 timers: Update kernel-doc for various functions
981cf0cab48a KVM: x86: Use a switch statement and macros in __feature_translate()
b6aa21725fbe KVM: x86: Advertise CPUID.(EAX=7,ECX=2):EDX[5:0] to userspace
8d70aa08326c KVM: x86: Update KVM-only leaf handling to allow for 100% KVM-only leafs
3769db86adec x86/bugs: Use sysfs_emit()
f1ee75aa66c7 x86/cpu: Support AMD Automatic IBRS
cc4860dd1375 Subject: [PATCH v6.1] powerpc: drop duplicate entry in Makefile for lib dir
e083231c43f3 net: fix IPSTATS_MIB_OUTFORWDATAGRAMS increment after fragment check
6ee7f29fed8c net: ipv4, ipv6: fix IPSTATS_MIB_OUTOCTETS increment duplicated
a771780cdf4a net: fix IPSTATS_MIB_OUTPKGS increment in OutForwDatagrams.
8a9f2d0717f0 riscv: Fix build with CONFIG_CC_OPTIMIZE_FOR_SIZE=y
44fd0c7a5a79 tick/rcu: fix false positive "softirq work is pending" messages on RT
786775632028 kernel/sched: Fix double free on invalid isolcpus/nohz_full params
4675ec8d0b9a kernel/sched: Fix uninitialized read in nohz_full/isolcpus setup
f46dc32a8617 bpf: btf: limit logging of ignored BTF mismatches
4687b40201db Revert "Revert "tick/common: Align tick period with the HZ tick.""
947f660bde07 Revert "tick/common: Align tick period with the HZ tick."
dded404c66bb yaffs2: Fix miscalculation of devname buffer length
30350f237490 mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, release} to avoid race condition
0ac32a83ca02 OF: DT-Overlay configfs interface (v8)
0b07d2478b6b fat: Replace prandom_u32() with get_random_u32()
927b66bfd641 aufs6: core
2af5eb310b11 aufs6: standalone
e6537c94f033 aufs6: mmap
c51d7f19876f aufs6: base
1785f762bbbb aufs6: kbuild
8f625cf94585 qemux86: add configuration symbol to select values
d81fac6e842a sched/isolation: really align nohz_full with rcu_nocbs
07c526200cb3 clear_warn_once: add a clear_warn_once= boot parameter
61e2c52ce198 clear_warn_once: bind a timer to written reset value
de03f5a3e6c6 clear_warn_once: expand debugfs to include read support
d3f9a25028d4 tools: Remove some options from CLANG_CROSS_FLAGS
0fb98cd2429a libbpf: Fix build warning on ref_ctr_off
e156ff56a19f perf python: Account for multiple words in CC
f06b9c6ae59d perf: perf can not parser the backtrace of app in the 32bit system and 64bit kernel.
1b099e82095d perf: x86-32: explicitly include <errno.h>
5fec311e2fd2 perf: mips64: Convert __u64 to unsigned long long
6cf30287aeaa perf: fix bench numa compilation
bd8f67dcb8e4 perf: add SLANG_INC for slang.h
0314b09bf6b9 perf: add sgidefs.h to for mips builds
4a39cc37b957 perf: change --root to --prefix for python install
3db4f4e91769 perf: add 'libperl not found' warning
fa3d24bac29a perf: force include of <stdbool.h>
deaadc523f8d fat: don't use obsolete random32 call in namei_vfat
d3c72f5df9a3 FAT: Added FAT_NO_83NAME
8f1eebeb519c FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES option
78b0423ccc14 FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES option
e998ad53fb68 yaffs2: replace bdevname call with sprintf
1175db6bf4cb yaffs2: convert read_page -> readfolio
beb275c683de yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR and NULL
e807c9e420bd yaffs: fix -Wstringop-overread compile warning in yaffs_fix_null_name
2fdd54282de3 yaffs2: v5.12+ build fixups (not runtime tested)
869f41030ed8 yaffs: include blkdev.h
e955b68f2b1f yaffs: fix misplaced variable declaration
f089603aba1d yaffs2: v5.6 build fixups
82da54859f0b yaffs2: fix memory leak when /proc/yaffs is read
2c4cf6808649 yaffs: add strict check when call yaffs_internal_read_super
e7dadb47ef11 yaffs: repair yaffs_get_mtd_device
f2e29be130f7 yaffs: Fix build failure by handling inode i_version with proper atomic API
8ea43ac7f3a3 yaffs2: fix memory leak in mount/umount
56db60d0abd2 yaffs: Avoid setting any ACL releated xattr
023baea095bc Yaffs:check oob size before auto selecting Yaffs1
409d39918661 fs: yaffs2: replace CURRENT_TIME by other appropriate apis
4bf42c774804 yaffs2: adjust to proper location of MS_RDONLY
08696e21a84c yaffs2: import git revision b4ce1bb (jan, 2020)
ca3d9f546a60 initramfs: allow an optional wrapper script around initramfs generation
301742baace5 pnmtologo: use relocatable file name
aba96ccce7d9 tools: use basename to identify file in gen-mach-types
e195c32ca7c7 lib/build_OID_registry: fix reproducibility issues
876e2f1f7726 vt/conmakehash: improve reproducibility
28b7a366cfef iwlwifi: select MAC80211_LEDS conditionally
69933d85f61e net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119)
5a308d8f142a arm64/perf: Fix wrong cast that may cause wrong truncation
339523a797e9 defconfigs: drop obselete options
3d751aeb9bcd arm64/perf: fix backtrace for AAPCS with FP enabled
86fa47f362ae linux-yocto: Handle /bin/awk issues
86f04668ef6e uvesafb: provide option to specify timeout for task completion
0db5521a1b3c uvesafb: print error message when task timeout occurs
710303c12e99 compiler.h: Undef before redefining __attribute_const__
14a0ede85080 vmware: include jiffies.h
e232e6ffe081 Resolve jiffies wrapping about arp
c16abf2d705f nfs: Allow default io size to be configured.
9e9e885f4a6c check console device file on fs when booting
0ce0ce443d58 mount_root: clarify error messages for when no rootfs found
32449db67de8 menuconfig,mconf-cfg: Allow specification of ncurses location
c55f1054bdce modpost: mask trivial warnings
30a45d4ee261 kbuild: exclude meta directory from distclean processing
0890b10d8fb1 powerpc: serialize image targets
6c0feb81c3ae arm: serialize build targets
77fa1b70cdbd crtsavres: fixups for 5.4+
cd107e4edd5f crtsavres: fixups for 5.4+
8f763b35ae5b powerpc/ptrace: Disable array-bounds warning with gcc8
fe6f93755196 powerpc: Disable attribute-alias warnings from gcc8
9b7097364b87 powerpc: add crtsavres.o to archprepare for kbuild
c106cd86a07b powerpc: kexec fix for powerpc64
33b7738c61fc powerpc: Add unwind information for SPE registers of E500 core
c04e26a9beda mips: vdso: fix 'jalr $t9' crash in vdso code
4733368eab80 mips: Kconfig: add QEMUMIPS64 option
ec2df6ae5ee5 4kc cache tlb hazard: tlbp cache coherency
c8c511fae0f0 malta uhci quirks: make allowance for slow 4k(e)c
b2bf1b6e971a arm64: defconfig: cleanup config options
a40a34b02336 vexpress: Pass LOADADDR to Makefile
7c51524611bb arm: ARM EABI socketcall
1f6e77027c24 ARM: LPAE: Invalidate the TLB for module addresses during translation fault
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.1.bb | 6 ++--
.../linux/linux-yocto-tiny_6.1.bb | 6 ++--
meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
index 6ad7302ad3..d0173e3ee7 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
@@ -14,13 +14,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "f01320520068df70be5d8c916f1d792f69643fe6"
-SRCREV_meta ?= "85ba1038b50deb50445772117e82e3e6f60c3142"
+SRCREV_machine ?= "4df82ffbb2b0f0b0efb545d1f67e61c987d051c1"
+SRCREV_meta ?= "8b555bd39017d9e6b19a0e2c98e563c5ebccef14"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https"
-LINUX_VERSION ?= "6.1.83"
+LINUX_VERSION ?= "6.1.84"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
index d59de65d49..1d438cb43c 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
# CVE exclusions
include recipes-kernel/linux/cve-exclusion_6.1.inc
-LINUX_VERSION ?= "6.1.83"
+LINUX_VERSION ?= "6.1.84"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "7e5af88b989a76a629e76ace2604f5fe8f69d710"
-SRCREV_meta ?= "85ba1038b50deb50445772117e82e3e6f60c3142"
+SRCREV_machine ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
+SRCREV_meta ?= "8b555bd39017d9e6b19a0e2c98e563c5ebccef14"
PV = "${LINUX_VERSION}+git"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
index 7f6040ddec..c4e8750e6b 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.1/standard/base"
KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "5431332379ab328763f6d3945a17420591ca58e8"
-SRCREV_machine:qemuarm64 ?= "7e5af88b989a76a629e76ace2604f5fe8f69d710"
-SRCREV_machine:qemuloongarch64 ?= "7e5af88b989a76a629e76ace2604f5fe8f69d710"
-SRCREV_machine:qemumips ?= "0d625849a0114e2389eda2b02c6b79b6b253258e"
-SRCREV_machine:qemuppc ?= "44eb5814d0930deabfa9d4167c1944f3c5e54b79"
-SRCREV_machine:qemuriscv64 ?= "7e5af88b989a76a629e76ace2604f5fe8f69d710"
-SRCREV_machine:qemuriscv32 ?= "7e5af88b989a76a629e76ace2604f5fe8f69d710"
-SRCREV_machine:qemux86 ?= "7e5af88b989a76a629e76ace2604f5fe8f69d710"
-SRCREV_machine:qemux86-64 ?= "7e5af88b989a76a629e76ace2604f5fe8f69d710"
-SRCREV_machine:qemumips64 ?= "848e49dade7ab6c477475dcdc83a1cc2d3da9822"
-SRCREV_machine ?= "7e5af88b989a76a629e76ace2604f5fe8f69d710"
-SRCREV_meta ?= "85ba1038b50deb50445772117e82e3e6f60c3142"
+SRCREV_machine:qemuarm ?= "6c89adaf651c4599869544f1ccc532641e5e6e9c"
+SRCREV_machine:qemuarm64 ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
+SRCREV_machine:qemuloongarch64 ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
+SRCREV_machine:qemumips ?= "cef1886035a8438205634d51fdfc3c1481b668e8"
+SRCREV_machine:qemuppc ?= "42585bdd38e874d2c4b08364a160e5dad5cd683e"
+SRCREV_machine:qemuriscv64 ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
+SRCREV_machine:qemuriscv32 ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
+SRCREV_machine:qemux86 ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
+SRCREV_machine:qemux86-64 ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
+SRCREV_machine:qemumips64 ?= "a6c079ca05576d39ff871aad90050021aecaf3c7"
+SRCREV_machine ?= "79fae610a03169f636ecf8a2c4a520af0c01ea58"
+SRCREV_meta ?= "8b555bd39017d9e6b19a0e2c98e563c5ebccef14"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "e5cd595e23c1a075359a337c0e5c3a4f2dc28dd1"
+SRCREV_machine:class-devupstream ?= "347385861c50adc8d4801d4b899eded38a2f04cd"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.1/base"
@@ -45,7 +45,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.1.83"
+LINUX_VERSION ?= "6.1.84"
PV = "${LINUX_VERSION}+git"
--
2.39.2
^ permalink raw reply related [relevance 1%]
* [OE-core][kirkstone 11/12] linux-yocto/5.15: update to v5.15.157
2024-05-03 2:52 1% ` [OE-core][kirkstone 07/12] linux-yocto/5.15: update to v5.15.155 bruce.ashfield
@ 2024-05-03 2:52 3% ` bruce.ashfield
2024-05-03 17:39 0% ` Steve Sakoman
1 sibling, 1 reply; 200+ results
From: bruce.ashfield @ 2024-05-03 2:52 UTC (permalink / raw)
To: steve; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.15 to the latest korg -stable release that comprises
the following commits:
b925f60c6ee7 Linux 5.15.157
d564809f27ea net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
eb6535c6f7c2 net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
63ba7a80d6e2 net: dsa: introduce preferred_default_local_cpu_port and use on MT7530
84b7f50e631a net: dsa: mt7530: set all CPU ports in MT7531_CPU_PMAP
bdbe483da21f nilfs2: fix OOB in nilfs_set_de_type
3ab056814cd8 nouveau: fix instmem race condition around ptr stores
49c9958cf0a2 drm/vmwgfx: Sort primary plane formats by order of preference
8b12fc7b0326 drm/amdgpu: validate the parameters of bo mapping operations more clearly
a2fd6dbc98be binder: check offset alignment in binder_get_object()
0dc727a4e054 init/main.c: Fix potential static_command_line memory overflow
813f5213f2c6 arm64: hibernate: Fix level3 translation fault in swsusp_save()
f5a55db79bf7 KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
7169354120d8 KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
43f00210cb25 fs: sysfs: Fix reference leak in sysfs_break_active_protection()
0d130158db29 speakup: Avoid crash on very long word
d8a2225f7dfa mei: me: disable RPL-S on SPS and IGN firmwares
7f67c2020cb0 usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
75ceeadfab1c usb: Disable USB3 LPM at shutdown
8aa5c28ac65c usb: dwc2: host: Fix dereference issue in DDMA completion flow.
7182175f565f Revert "usb: cdc-wdm: close race between read and workqueue"
def039849617 USB: serial: option: add Telit FN920C04 rmnet compositions
cd27cf1ec66d USB: serial: option: add Rolling RW101-GL and RW135-GL support
c48d624bbbad USB: serial: option: support Quectel EM060K sub-models
3338a967ca08 USB: serial: option: add Lonsung U8300/U9300 product
e94566d88701 USB: serial: option: add support for Fibocom FM650/FG650
6b5043463619 USB: serial: option: add Fibocom FM135-GL variants
7a3bbe41efa5 serial/pmac_zilog: Remove flawed mitigation for rx irq flood
b0b268eeb087 comedi: vmk80xx: fix incomplete endpoint checking
e39fae579d17 thunderbolt: Fix wake configurations after device unplug
62e0a5d4d4de thunderbolt: Avoid notify PM core about runtime PM resume
4291a6233ba8 x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
0be237b6b753 x86/bugs: Fix BHI retpoline check
a29ec0465dce clk: Get runtime PM before walking tree during disable_unused
db7c0ef4afea clk: Initialize struct clk_core kref earlier
bc6d766991e1 clk: Print an info line before disabling unused clocks
f3d89bc7dd65 clk: remove extra empty line
bdd70c8b02e7 clk: Mark 'all_lists' as const
3254a1f27952 clk: Remove prepare_lock hold assertion in __clk_release()
ce77f3beed02 drm/panel: visionox-rm69299: don't unregister DSI device
df0991da7db8 drm: nv04: Fix out of bounds access
3076b3c38a70 s390/cio: fix race condition during online processing
498f7b8037da s390/qdio: handle deferred cc1
45d70025006c RDMA/mlx5: Fix port number for counter query in multi-port configuration
8261489de3af RDMA/cm: Print the old state when cm_destroy_id gets timeout
2973b4a5eae7 RDMA/rxe: Fix the problem "mutex_destroy missing"
831157756e3c net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
9495b7a412e3 net: dsa: mt7530: fix mirroring frames received on local port
a50dbeca28ac tun: limit printing rate when illegal packet received by tun dev
ae3f9e1221b3 af_unix: Don't peek OOB data without MSG_OOB.
1738dfe72c52 af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
e719b52d0c56 netfilter: flowtable: incorrect pppoe tuple
d06977b9a410 netfilter: flowtable: validate pppoe header
5345d78ae64d netfilter: nf_flow_table: count pending offload workqueue tasks
7a1679e2d9bf netfilter: nft_set_pipapo: do not free live element
dceb683ab87c netfilter: br_netfilter: skip conntrack input hook for promisc packets
379bf7257bc5 netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
0b6de00206ad netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
fc1021337e59 Revert "lockd: introduce safe async lock op"
2a3073d58382 Revert "tracing/trigger: Fix to return error if failed to alloc snapshot"
2df2dd27066c kprobes: Fix possible use-after-free issue on kprobe registration
1253e34a548f bpf: Fix ringbuf memory type confusion when passing to helpers
cc9ac419351b bpf: Fix out of bounds access for ringbuf helpers
adc2d11b86ea bpf: Generally fix helper register offset check
0c261cbc29a6 bpf: Generalize check_ctx_reg for reuse with other types
1b661661642d bpf: Extend kfunc with PTR_TO_CTX, PTR_TO_MEM argument support
621bbe924c68 selftests/ftrace: Limit length in subsystem-enable tests
edfaf679b7c3 SUNRPC: Fix rpcgss_context trace event acceptor field
2364d0278fe1 btrfs: record delayed inode root in transaction
747228929b32 ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
88b7f1143b15 ksmbd: validate payload size in ipc response
044b3d6c94c6 ksmbd: don't send oplock break if rename fails
b8086c3c1548 reiserfs: Avoid touching renamed directory if parent does not change
ea091017ef62 ipv6: Fix data races around sk->sk_prot.
ff8710da80ee ipv6: annotate some data-races around sk->sk_prot
e8c2eafaaa6a tcp: Fix data races around icsk->icsk_af_ops.
8d1bab770956 locking/rwsem: Disable preemption while trying for rwsem lock
7c82dac02886 block, loop: support partitions without scanning
45f504f301d4 bpftool: Fix pretty print dump for maps without BTF loaded
1f24338cb789 jbd2: Drop the merge conflicted hunk
e1d0e3c51bde tpm: tis_i2c: Limit write bursts to I2C_SMBUS_BLOCK_MAX (32) bytes
1abe841fe331 tpm: tis_i2c: Limit read bursts to I2C_SMBUS_BLOCK_MAX (32) bytes
6224acfc1d56 tpm: Add flag to use default cancellation policy
1cd19d48fb90 tpm: tis_i2c: Fix sanity check interrupt enable mask
a883da132fa8 tpm: Add tpm_tis_i2c backend for tpm_tis_core
a742ac8a1c51 tpm: Add tpm_tis_verify_crc to the tpm_tis_phy_ops protocol layer
ef495c5f45f2 tpm: Remove read16/read32/write32 calls from tpm_tis_phy_ops
1f3be2e23aa6 gcc-plugins: Reorganize gimple includes for GCC 13
24615a3b932a ata: ahci: fix enum constants for gcc-13
5d6cb145541a net: stmmac: Enable mac_managed_pm phylink config
fd93aabb4287 tools/resolve_btfids: Use pkg-config to locate libelf
130f9da78406 tools/resolve_btfids: Build with host flags
00f2f1a782f9 tools/resolve_btfids: Support cross-building the kernel with clang
17776a4ba9c2 tools/resolve_btfids: Install libbpf headers when building
7c9808380d70 libbpf: Make libbpf_version.h non-auto-generated
37ae1ba791ac libbpf: Add LIBBPF_DEPRECATED_SINCE macro for scheduling API deprecations
a2667e6d7314 drm/radeon: free iio for atombios when driver shutdown
f100c753aa1f powerpc: Fix reschedule bug in KUAP-unlocked user copy
da5513f30187 libbpf: Fix build warning on ref_ctr_off
4c5a089621a8 perf python: Account for multiple words in CC
1c5699ee85d4 fs: move S_ISGID stripping into the vfs_*() helpers
838f5d0701d8 fs: add mode_strip_sgid() helper
d97172683641 squashfs: provide backing_dev_info in order to disable read-ahead
ed037d7be40c irq_work: use kasan_record_aux_stack_noalloc() record callstack
1363bd7dbde3 ixgbevf: add disable link state
e5601ae2bd24 ixgbe: add improvement for MDD response functionality
caa57cd80575 ixgbe: add the ability for the PF to disable VF link state
16a77bfcc7df Check /dev/console using init_stat()
04574fd5579a tracing/arm: Have max stack tracer handle the case of return address after data
0e51e5717018 gpiolib: cdev: Set lineevent_state::irq after IRQ register successfully
1e6b7da6ddba drivers/base: Fix unsigned comparison to -1 in CPUMAP_FILE_MAX_BYTES
493160901320 mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, release} to avoid race condition
04224f725aa3 irqchip/gic-v3-its: Skip HP notifier when no ITS is registered
6f6c2996a81c irqchip/gic-v3-its: Postpone LPI pending table freeing and memreserve
1fa94473423f irqchip/gic-v3-its: Give the percpu rdist struct its own flags field
6013d1ae5feb cert host tools: Stop complaining about deprecated OpenSSL functions
efe20512212b init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash
a40d2daf2795 pnmtologo: use relocatable file name
3b40d5b41155 of: configfs: remove unused variable overlay_lock
6c085baf1838 tools: use basename to identify file in gen-mach-types
2fca0fd71981 lib/build_OID_registry: fix reproducibility issues
0f586f4ee8ad vt/conmakehash: improve reproducibility
a75774679f28 OF: DT-Overlay configfs interface (v8)
d179c639b30b x86/boot: Wrap literal addresses in absolute_pointer()
856ec356cf91 ACPI: thermal: drop an always true check
7614af249993 xfs: Fix -Werror=dangling-pointer work-around for older GCC
41470215f97e xfs: Work around GCC 12 -Werror=dangling-pointer for xfs_attr_remote.o
44a445c1922d virtio-pci: Remove wrong address verification in vp_del_vqs()
77aa9e489eaf bpf: Disallow unprivileged bpf by default
ebfb1822e9f9 fs/aufs: fixup 5.15.36 fixups
4eba9348d3e2 Revert "Revert "fbdev: Hot-unplug firmware fb devices on forced removal""
5df6d1b00f95 jbd2: fix use-after-free of transaction_t race
2d83e8196487 jbd2: refactor wait logic for transaction updates into a common function
07a63f760793 netfilter: conntrack: avoid useless indirection during conntrack destruction
4e7122625996 Revert "fbdev: Hot-unplug firmware fb devices on forced removal"
7ba4cb36fd4f rcu: Avoid alloc_pages() when recording stack
f78574dee71e kasan: test: silence intentional read overflow warnings
d313cb89b6b1 kasan: arm64: fix pcpu_page_first_chunk crash with KASAN_VMALLOC
5e279d5647cc arm64: support page mapping percpu first chunk allocator
e5bf16752dca vmalloc: choose a better start address in vm_area_register_early()
660b3d21b46f kasan: test: bypass __alloc_size checks
00aa7573e53a kasan: test: add memcpy test that avoids out-of-bounds write
67becf0b1bd4 kasan: fix tag for large allocations when using CONFIG_SLAB
bedf1e033213 workqueue, kasan: avoid alloc_pages() when recording stack
7195b67ce69b kasan: generic: introduce kasan_record_aux_stack_noalloc()
bdff763f0e29 kasan: common: provide can_alloc in kasan_save_stack()
51423ebb36ad lib/stackdepot: introduce __stack_depot_save()
85373e66d847 lib/stackdepot: remove unused function argument
5b6cc9b251f3 lib/stackdepot: include gfp.h
c9f3902d8069 aufs: reduce overhead for "code present but disabled" use case.
b98d189df02c aufs: bugfix, umount passes NULL to ->parse_monolithic()
13b883cbbbd9 aufs standalone: cosmetic, missing copyright sentence
21f8b0d81898 aufs: 5.15.5-20220117 ---> 5.15.5-20220221
6199fd896645 aufs: tiny, headers after fs_context
8ddb40e31c29 aufs: fs_context 7/7, finally remount
69035f71c6fd aufs: fs_context 6/7, now mount
bc841b970697 aufs: fs_context 5/7, parse all other mount options
435188053da2 aufs: fs_context 4/7, parse xino options
9af1f1825cbd aufs: fs_context 3/7, parse the branch-management options
1c05eb767f8c aufs: fs_context 2/7, parse "br" mount option
a8488f603134 aufs: fs_context 1/7, skelton of the new shceme
8e32e0015564 aufs: pre fs_context, convert a static flag to a macro
f90cb4144aec aufs: pre fs_context, support the incomplete sb and sbinfo case
948762ef859c aufs: pre fs_context, convert the type of alloc_sbinfo()
77151a08776b aufs: 5.15.5-20211129 ---> 5.15.5-20220117
2539adbbbe1e aufs: 5.14-20211018 ---> 5.15.5-20211129
7d32b25193c4 aufs: for v5.15-rc1, sync_inode() is gone
66ec0c509225 aufs: for v5.15-rc1, new param 'rcu' for ->get_acl()
69709dc518cd aufs: for v5.15-rc1, no mand-lock anymore
ada8fe9543e5 aufs: 5.14-20210906 ---> 5.14-20211018
b77f7f3f394a Revert "aufs: adjust to v5.15 fs changes"
81bdce5b5876 tick/nohz: WARN_ON --> WARN_ON_ONCE to prevent console saturation
97c963889222 sched/isolation: really align nohz_full with rcu_nocbs
871f23ad3627 Revert "ARM: defconfig: Enable ax88796c driver for Exynos boards"
ffad0783dd5b ARM: config: multi v7: Regenerate defconifg
5c1e1a1ff2d3 ARM: config: multi v7: Add renamed symbols
badaf96564fe ARM: config: multi v7: Clean up enabled by default options
34996040fc9b ARM: config: multi v7: Drop unavailable options
7f685244afb3 powerpc/mm: Switch obsolete dssall to .long
20301aeb1a64 riscv: fix build with binutils 2.38
9df58d070506 powerpc/lib/sstep: fix 'ptesync' build error
720b61fc400b x86_64_defconfig: Fix warnings
02bf23d26bc4 arm64: defconfig: cleanup config options
05914e2c87e5 arm: defconfig: drop unused POWER_AVS option
ffb532fa19b9 aufs5: fix build against v5.15.3+
a4b3abf4d96d qemux86: add configuration symbol to select values
fee94ee09154 clear_warn_once: add a clear_warn_once= boot parameter
3d8762d900d9 clear_warn_once: bind a timer to written reset value
95faacac47e8 clear_warn_once: expand debugfs to include read support
de20c4240018 perf: perf can not parser the backtrace of app in the 32bit system and 64bit kernel.
0e4aacead9c1 perf: x86-32: explicitly include <errno.h>
9ad92c11468e perf: mips64: Convert __u64 to unsigned long long
09e7efe3e68a perf: fix bench numa compilation
e79becc44fa6 perf: add SLANG_INC for slang.h
b1033b588681 perf: add sgidefs.h to for mips builds
cf9db484ac0b perf: change --root to --prefix for python install
7fd052c2c562 perf: add 'libperl not found' warning
27a437cdd469 perf: force include of <stdbool.h>
3b99d21bec2f fat: don't use obsolete random32 call in namei_vfat
a7e9293b506b FAT: Added FAT_NO_83NAME
6fd0e71d9e5c FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES option
c379b0d324ae FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES option
538be0fdb124 aufs: adjust to v5.15 fs changes
f45da75c8759 aufs5: core
047f57e07e01 aufs5: standalone
029fc15574c8 aufs5: mmap
610d0192ee94 aufs5: base
d4e428d0ec5f aufs5: kbuild
eb067eca251a yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR and NULL
286af18d0875 yaffs: fix -Wstringop-overread compile warning in yaffs_fix_null_name
24d59a4e26a6 yaffs2: v5.12+ build fixups (not runtime tested)
22c73536d5d7 yaffs: include blkdev.h
506b7251bfb8 yaffs: fix misplaced variable declaration
a0e26ff364dc yaffs2: v5.6 build fixups
b10b1b2d169e yaffs2: fix memory leak when /proc/yaffs is read
ad9adccbb214 yaffs: add strict check when call yaffs_internal_read_super
2e3c3aec8279 yaffs: repair yaffs_get_mtd_device
d662538516a7 yaffs: Fix build failure by handling inode i_version with proper atomic API
70a6113ee2c7 yaffs2: fix memory leak in mount/umount
3378e4a9e404 yaffs: Avoid setting any ACL releated xattr
ec2284edddef Yaffs:check oob size before auto selecting Yaffs1
c2a49874051c fs: yaffs2: replace CURRENT_TIME by other appropriate apis
e9a5105a3e73 yaffs2: adjust to proper location of MS_RDONLY
608807406f13 yaffs2: import git revision b4ce1bb (jan, 2020)
89e660ece42c initramfs: allow an optional wrapper script around initramfs generation
b179dbc9aa10 iwlwifi: select MAC80211_LEDS conditionally
3fd5ca3673d0 net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119)
d1f6edbf0188 arm64/perf: Fix wrong cast that may cause wrong truncation
d202fb2caf33 defconfigs: drop obselete options
9a27e3b5f4e7 arm64/perf: fix backtrace for AAPCS with FP enabled
e20d8cf019b4 linux-yocto: Handle /bin/awk issues
b6d2a3dbbd3a uvesafb: provide option to specify timeout for task completion
adb40f1e6a1a uvesafb: print error message when task timeout occurs
f280a1ed0962 compiler.h: Undef before redefining __attribute_const__
4352732f268c vmware: include jiffies.h
7954a677968d Resolve jiffies wrapping about arp
5f28a1035d95 nfs: Allow default io size to be configured.
0d7260ad7106 check console device file on fs when booting
900a12e37e0a mount_root: clarify error messages for when no rootfs found
7b878cbea726 menuconfig,mconf-cfg: Allow specification of ncurses location
6604fc1763b3 modpost: mask trivial warnings
0d294adb09cb kbuild: exclude meta directory from distclean processing
a097cdd95a9e powerpc: serialize image targets
5db6ec39a0a3 arm: serialize build targets
cbabca27905e crtsavres: fixups for 5.4+
7fc7656ed403 powerpc/ptrace: Disable array-bounds warning with gcc8
a5faac5a19a2 powerpc: Disable attribute-alias warnings from gcc8
186c54665b67 powerpc: add crtsavres.o to archprepare for kbuild
d1ea862964ca powerpc: kexec fix for powerpc64
2ac35b89a0f9 powerpc: Add unwind information for SPE registers of E500 core
2e1c348a28bb mips: vdso: fix 'jalr $t9' crash in vdso code
ec57870b303a mips: Kconfig: add QEMUMIPS64 option
6a81b3c08107 4kc cache tlb hazard: tlbp cache coherency
74e3b2a21e54 malta uhci quirks: make allowance for slow 4k(e)c
22e65b63d3b4 arm/Makefile: Fix systemtap
b7f1ab59f19e vexpress: Pass LOADADDR to Makefile
ce2800c73bf7 arm: ARM EABI socketcall
019d142fd956 ARM: LPAE: Invalidate the TLB for module addresses during translation fault
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_5.15.bb | 6 ++---
.../linux/linux-yocto-tiny_5.15.bb | 6 ++---
meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++----------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index 426266e9a5..91bf0350d5 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "82bab3e1d1637710832e9fe0a222d876b5f9e9e2"
-SRCREV_meta ?= "1427f4d13f99b5b3811ef5f4207b6ff43cf1771a"
+SRCREV_machine ?= "f8d4297d452f7c832d90bfb992d90db2e30ffc23"
+SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.15.156"
+LINUX_VERSION ?= "5.15.157"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
index 1ea634f2e1..722523ced9 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
@@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.15.156"
+LINUX_VERSION ?= "5.15.157"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "a94a5a767e0b0014c4d1f4ac6587bd30af2b18d5"
-SRCREV_meta ?= "1427f4d13f99b5b3811ef5f4207b6ff43cf1771a"
+SRCREV_machine ?= "7a8fce8cbd9a8a7d68a0c2537141c85d63f6eda3"
+SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
index 0601353e1c..6784703ce2 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
@@ -14,24 +14,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base"
KBRANCH:qemux86-64 ?= "v5.15/standard/base"
KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "7125a4b2f341b906fa6ad96d7b5caab2fe031b40"
-SRCREV_machine:qemuarm64 ?= "a71076982c5b7d5f38a7c00ab4fd6f4f907e267d"
-SRCREV_machine:qemumips ?= "0d5ad939681fe4971f4895b909554d755ba72d66"
-SRCREV_machine:qemuppc ?= "46ff907d522c13b8f6fab5a0da95f7a9807e2595"
-SRCREV_machine:qemuriscv64 ?= "70388803a5a55f986721232d0160381bb8097ba3"
-SRCREV_machine:qemuriscv32 ?= "70388803a5a55f986721232d0160381bb8097ba3"
-SRCREV_machine:qemux86 ?= "70388803a5a55f986721232d0160381bb8097ba3"
-SRCREV_machine:qemux86-64 ?= "70388803a5a55f986721232d0160381bb8097ba3"
-SRCREV_machine:qemumips64 ?= "a1357daf3592cb612b67058e401d5b05aebde45e"
-SRCREV_machine ?= "70388803a5a55f986721232d0160381bb8097ba3"
-SRCREV_meta ?= "1427f4d13f99b5b3811ef5f4207b6ff43cf1771a"
+SRCREV_machine:qemuarm ?= "b844615e2b799c40eac746cd24e009b620114230"
+SRCREV_machine:qemuarm64 ?= "aeb63de10514b28d35049f285ae9a371d6d5ccd2"
+SRCREV_machine:qemumips ?= "3740052e902e15416c22ce7f2544de7afe83a845"
+SRCREV_machine:qemuppc ?= "167c9e8d0e760cfb299408647efe46214fd06ac0"
+SRCREV_machine:qemuriscv64 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
+SRCREV_machine:qemuriscv32 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
+SRCREV_machine:qemux86 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
+SRCREV_machine:qemux86-64 ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
+SRCREV_machine:qemumips64 ?= "d34e0789d8d5e0d7ab521889e80967edcac38dc6"
+SRCREV_machine ?= "f0d16a142e32a7934da39a12bd983a00e629bb48"
+SRCREV_meta ?= "21fd5becb1ed083a28e57af46709578f83dd2910"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "c52b9710c83d3b8ab63bb217cc7c8b61e13f12cd"
+SRCREV_machine:class-devupstream ?= "b925f60c6ee7ec871d2d48575d0fde3872129c20"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v5.15/base"
@@ -39,7 +39,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.15.156"
+LINUX_VERSION ?= "5.15.157"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.39.2
^ permalink raw reply related [relevance 3%]
* [OE-core][kirkstone 07/12] linux-yocto/5.15: update to v5.15.155
@ 2024-05-03 2:52 1% ` bruce.ashfield
2024-05-03 2:52 3% ` [OE-core][kirkstone 11/12] linux-yocto/5.15: update to v5.15.157 bruce.ashfield
1 sibling, 0 replies; 200+ results
From: bruce.ashfield @ 2024-05-03 2:52 UTC (permalink / raw)
To: steve; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.15 to the latest korg -stable release that comprises
the following commits:
fa3df276cd36 Linux 5.15.155
b54c4632946a Revert "ACPI: CPPC: Use access_width over bit_width for system memory accesses"
1793e6b2dae0 VMCI: Fix possible memcpy() run-time warning in vmci_datagram_invoke_guest_handler()
dd883e0138f1 Bluetooth: btintel: Fixe build regression
bb6b88270714 platform/x86: intel-vbtn: Update tablet mode switch at end of probe
dfb2ce952143 randomize_kstack: Improve entropy diffusion
7cfee26d1950 x86/mm/pat: fix VM_PAT handling in COW mappings
abfae420789a virtio: reenable config if freezing device failed
5d17986cbfd5 gcc-plugins/stackleak: Avoid .head.text section
7e0bd07ce965 gcc-plugins/stackleak: Ignore .noinstr.text and .entry.text
2d154a54c58f tty: n_gsm: require CAP_NET_ADMIN to attach N_GSM0710 ldisc
6cbbe1ba76ee netfilter: nf_tables: discard table flag update with pending basechain deletion
eb769ff4e281 netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
37fc2cde9d19 netfilter: nf_tables: release batch on table validation from abort path
48d6bcfc3175 fbmon: prevent division by zero in fb_videomode_from_videomode()
e2ce8625c321 drivers/nvme: Add quirks for device 126f:2262
871e695c08a3 fbdev: viafb: fix typo in hw_bitblt_1 and hw_bitblt_2
3beea96d4fc8 ASoC: soc-core.c: Skip dummy codec when adding platforms
eb7e92dbdc78 usb: sl811-hcd: only defined function checkdone if QUIRK2 is defined
e0db818c0871 usb: typec: tcpci: add generic tcpci fallback compatible
b6b12f4577a1 tools: iio: replace seekdir() in iio_generic_buffer
1d5276914eb7 ring-buffer: use READ_ONCE() to read cpu_buffer->commit_page in concurrent environment
39438227f888 ktest: force $buildonly = 1 for 'make_warnings_file' test type
72794acdd16b platform/x86: touchscreen_dmi: Add an extra entry for a variant of the Chuwi Vi8 tablet
18c51d97a242 Input: allocate keycode for Display refresh rate toggle
baf8a6d2cdd1 RDMA/cm: add timeout to cm_destroy_id wait
21e7d72d0cfc block: prevent division by zero in blk_rq_stat_sum()
be113e082b65 libperf evlist: Avoid out-of-bounds access
5dcded25c7e1 Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default"
504eb6b26ce8 SUNRPC: increase size of rpc_wait_queue.qlen from unsigned short to unsigned int
343586deb873 drm/amd/display: Fix nanosec stat overflow
ad207d1ca6d5 ext4: forbid commit inconsistent quota data when errors=remount-ro
19b7a1ff81b7 ext4: add a hint for block bitmap corrupt state in mb_groups
85f315792fac ALSA: firewire-lib: handle quirk to calculate payload quadlets as data block counter
09de9c3614ad media: sta2x11: fix irq handler cast
46e8711231b2 isofs: handle CDs with bad root inode but good Joliet root directory
7849e6f8410d scsi: lpfc: Fix possible memory leak in lpfc_rcv_padisc()
fd203d2c671b sysv: don't call sb_bread() with pointers_lock held
0b75d679e88f pinctrl: renesas: checker: Limit cfg reg enum checks to provided IDs
f917c66b1135 Input: synaptics-rmi4 - fail probing if memory allocation for "phys" fails
006936ecb4ed Bluetooth: btintel: Fix null ptr deref in btintel_read_version
b9117dc783c0 net/smc: reduce rtnl pressure in smc_pnet_create_pnetids_list()
2f6174fd4ccf btrfs: send: handle path ref underflow in header iterate_inode_ref()
a83c1f67a0f7 btrfs: export: handle invalid inode or root reference in btrfs_get_parent()
d1ffa4ae2d59 btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks()
805a1cdde82f wifi: ath11k: decrease MHI channel buffer length to 8KB
0f22f30f79a8 net: pcs: xpcs: Return EINVAL in the internal methods
9a16a0d03305 tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num()
0ff96ec22a84 pstore/zone: Add a null pointer check to the psz_kmsg_read
35f6b46eeb03 ionic: set adminq irq affinity
ba30ee96e87a arm64: dts: rockchip: fix rk3399 hdmi ports node
ba580534db14 arm64: dts: rockchip: fix rk3328 hdmi ports node
64a7694c851c cpuidle: Avoid potential overflow in integer multiplication
f4e70f422b76 panic: Flush kernel log buffer at the end
130b0cd06487 VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host()
9ab8e24e81b9 wifi: ath9k: fix LNA selection in ath_ant_try_scan()
ff45899e732e net: dsa: fix panic when DSA master device unbinds on shutdown
cbac7de1d990 amdkfd: use calloc instead of kzalloc to avoid integer overflow
cdfd0a7f0139 Linux 5.15.154
8d8dc7ee5b98 x86: set SPECTRE_BHI_ON as default
a976b129dc86 KVM: x86: Add BHI_NO
c2b9e038896f x86/bhi: Mitigate KVM by default
f825494f2c6f x86/bhi: Add BHI mitigation knob
aa6247c9da25 x86/bhi: Enumerate Branch History Injection (BHI) bug
a9ca0e34a406 x86/bhi: Define SPEC_CTRL_BHI_DIS_S
bd53ec80f218 x86/bhi: Add support for clearing branch history at syscall entry
55516b355b0c x86/syscall: Don't force use of indirect calls for system calls
276fb9a658d0 x86/bugs: Change commas to semicolons in 'spectre_v2' sysfs file
b9c5f7da76b1 nvme: fix miss command type check
d225b0ac96dc gro: fix ownership transfer
6564b014af92 mm/secretmem: fix GUP-fast succeeding on secretmem folios
a479b4de11dd mptcp: don't account accept() of non-MPC client as fallback to TCP
1f7e13d3e870 x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO
ff137c5c0dcf x86/bugs: Fix the SRSO mitigation on Zen3/4
dff6072124f6 riscv: process: Fix kernel gp leakage
fd9662109deb riscv: Fix spurious errors from __get/put_kernel_nofault
6135537e1e66 s390/entry: align system call table on 8 bytes
f860595512ff x86/mce: Make sure to grab mce_sysfs_mutex in set_bank()
3ee242410754 of: dynamic: Synchronize of_changeset_destroy() with the devlink removals
03c356860b8b driver core: Introduce device_link_wait_removal()
5e32c0cc476d ALSA: hda/realtek: Update Panasonic CF-SZ6 quirk to support headset with microphone
de48795233cc fs/pipe: Fix lockdep false-positive in watchqueue pipe_write()
eaaaa49593e9 openrisc: Fix pagewalk usage in arch_dma_{clear, set}_uncached
58e5349bb4ed HID: uhid: Use READ_ONCE()/WRITE_ONCE() for ->running
f7a3090bfd3b nfsd: hold a lighter-weight client reference over CB_RECALL_ANY
00f7576062a7 ata: sata_mv: Fix PCI device ID table declaration compilation warning
e0ad4c270670 scsi: mylex: Fix sysfs buffer lengths
117d7ef3190c ata: sata_sx4: fix pdc20621_get_from_dimm() on 64-bit
e9b71370cbc7 ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw
562adaf79df4 ASoC: rt711-sdw: fix locking sequence
bcf894d7eebe ASoC: rt711-sdca: fix locking sequence
b53cf951389c ASoC: rt5682-sdw: fix locking sequence
9df33e57f5c9 net: ravb: Always process TX descriptor ring
fcc739d7f034 net: fec: Set mac_managed_pm during probe
498cc233c460 drivers: net: convert to boolean for the mac_managed_pm flag
0985fbfbcb8f net: usb: asix: suspend embedded PHY if external is used
342cb04dcf2a i40e: Enforce software interrupt during busy-poll exit
c9bcd6465538 i40e: Remove _t suffix from enum type names
2a0a64c9d1d5 i40e: Store the irq number in i40e_q_vector
bf7396ec564f Revert "usb: phy: generic: Get the vbus supply"
506a9ec5d3f1 scsi: qla2xxx: Update manufacturer detail
315c4527cdd8 scsi: qla2xxx: Update manufacturer details
951d2748a2a8 i40e: fix vf may be used uninitialized in this function warning
8db472e17dec i40e: fix i40e_count_filters() to count only active/new filters
f53bea1c7971 octeontx2-pf: check negative error code in otx2_open()
ec694ca1567e octeontx2-af: Fix issue with loading coalesced KPU profiles
73a328df2c4a udp: prevent local UDP tunnel packets from being GROed
7223f4ee4f31 udp: do not transition UDP GRO fraglist partial checksums to unnecessary
d49ae15a5767 udp: do not accept non-tunnel GSO skbs landing in a tunnel
63a10b530e22 mlxbf_gige: stop interface during shutdown
40a344b2ddc0 ipv6: Fix infinite recursion in fib6_dump_done().
61f5b43bc04e selftests: reuseaddr_conflict: add missing new line at the end of the output
ee0088101bee erspan: make sure erspan_base_hdr is present in skb->head
3f9a8b794fc9 selftests: net: gro fwd: update vxlan GRO test expectations
457c832a0c5d net: stmmac: fix rx queue priority assignment
a097fc199ab5 net/sched: act_skbmod: prevent kernel-infoleak
d1e73fb19a4c bpf, sockmap: Prevent lock inversion deadlock in map delete elem
465abe8a7af4 vboxsf: Avoid an spurious warning if load_nls_xxx() fails
440e948cf0ef netfilter: validate user input for expected length
2485bcfe05ee netfilter: nf_tables: Fix potential data-race in __nft_flowtable_type_get()
f7e3c88cc2a9 netfilter: nf_tables: flush pending destroy work before exit_net release
8ba81dca416a netfilter: nf_tables: reject new basechain after table flag update
a9bd6bb6f02b KVM: x86: Mark target gfn of emulated atomic instruction as dirty
bd9a25a0228e KVM: x86: Bail to userspace if emulation of atomic user access faults
a7c6a643b25b thermal: devfreq_cooling: Fix perf state when calculate dfc res_util
8d7132a67eeb mm, vmscan: prevent infinite loop for costly GFP_NOIO | __GFP_RETRY_MAYFAIL allocations
b279ddce1030 Revert "x86/mm/ident_map: Use gbpages only where full GB page should be mapped."
a180ca336989 io_uring: ensure '0' is returned on file registration success
fe9df687e74a locking/rwsem: Disable preemption while trying for rwsem lock
d49fac38479b net/rds: fix possible cp null dereference
4143b9479caa xen-netfront: Add missing skb_mark_for_recycle
a8170af8b10e Bluetooth: Fix TOCTOU in HCI debugfs implementation
d6cfb0d7bb2d Bluetooth: hci_event: set the conn encrypted before conn establishes
96bd0de3915f arm64: dts: qcom: sc7180-trogdor: mark bluetooth address as broken
76299c3f11b4 x86/cpufeatures: Add CPUID_LNX_5 to track recently added Linux-defined word
571d80f8a458 x86/cpufeatures: Add new word for scattered features
9956d0504f0b r8169: fix issue caused by buggy BIOS on certain boards with RTL8168d
b8438db83732 dm integrity: fix out-of-range warning
bef3bc962dcc Octeontx2-af: fix pause frame configuration in GMP mode
37dc1718dc0c bpf: Protect against int overflow for stack access size
a583117668dd mlxbf_gige: call request_irq() after NAPI initialized
85c410f65b36 ACPICA: debugger: check status of acpi_evaluate_object() in acpi_db_walk_for_fields()
2e43d8eba6ed tcp: properly terminate timers for kernel sockets
744494dbb058 s390/qeth: handle deferred cc1
2fb283e2f3cc ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa()
28db0ae86cb9 wifi: iwlwifi: mvm: rfi: fix potential response leaks
254f1c252171 iwlwifi: mvm: rfi: use kmemdup() to replace kzalloc + memcpy
d60ff8e04b17 mlxbf_gige: stop PHY during open() error paths
ac68d9fa09e4 nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
5e1984aba37a USB: UAS: return ENODEV when submit urbs fail with device not attached
e38f1ea6cbc5 scsi: usb: Stop using the SCSI pointer
172800c69cd0 scsi: usb: Call scsi_done() directly
1b175bc579f4 USB: core: Fix deadlock in usb_deauthorize_interface()
ea8839e31942 scsi: lpfc: Correct size for wqe for memset()
0f608ce96520 PCI/DPC: Quirk PIO log size for Intel Ice Lake Root Ports
ff5305ec8c0e x86/cpu: Enable STIBP on AMD if Automatic IBRS is enabled
34c0786ef6c7 scsi: qla2xxx: Delay I/O Abort on PCI error
d37f3b14da07 scsi: qla2xxx: Change debug message during driver unload
b03e626bd6d3 scsi: qla2xxx: Fix double free of fcport
a859f6a8f423 scsi: qla2xxx: Fix command flush on cable pull
0bd653100a8e scsi: qla2xxx: NVME|FCP prefer flag not being honored
a139d643c5d6 scsi: qla2xxx: Split FCE|EFT trace control
002caa257783 scsi: qla2xxx: Fix N2N stuck connection
786121320183 scsi: qla2xxx: Prevent command send on chip reset
f18f5fcdaa8c usb: typec: ucsi: Clear UCSI_CCI_RESET_COMPLETE before reset
ad165b37fd4f usb: typec: ucsi: Ack unsupported commands
df5cbb908f16 usb: udc: remove warning when queue disabled ep
7de1df3212d8 usb: dwc2: gadget: LPM flow fix
2cf845a770d6 usb: dwc2: gadget: Fix exiting from clock gating
32d3f2f108eb usb: dwc2: host: Fix ISOC flow in DDMA mode
555be0cc2a2f usb: dwc2: host: Fix hibernation flow
3b1a9f852b4c usb: dwc2: host: Fix remote wakeup from hibernation
489e8064ac00 USB: core: Add hub_get() and hub_put() routines
7094516d7b30 staging: vc04_services: fix information leak in create_component()
77a46fbfe6ae staging: vc04_services: changen strncpy() to strscpy_pad()
cea234bb214b scsi: core: Fix unremoved procfs host directory regression
8c9902216816 ALSA: sh: aica: reorder cleanup operations to avoid UAF bugs
8bf22f8d1d53 drm/amd/display: Preserve original aspect ratio in create stream
9e6bb089649a drm/amdgpu: Use drm_mode_copy()
a86e54a34513 usb: cdc-wdm: close race between read and workqueue
ac9b6b3e8d12 drm/i915/gt: Reset queue_priority_hint on parking
553d294db94b net: ll_temac: platform_get_resource replaced by wrong function
81b8645feca0 mmc: core: Avoid negative index with array access
0ecd5689767b mmc: core: Initialize mmc_blk_ioc_data
f2bbbeb8287f hexagon: vmlinux.lds.S: handle attributes section
818e531cfb1d exec: Fix NOMMU linux_binprm::exec in transfer_args_to_stack()
c8bddbd91bc8 wifi: mac80211: check/clear fast rx for non-4addr sta VLAN changes
56e05d28c39b btrfs: zoned: use zone aware sb location for scrub
3f0cda401d6e init: open /initrd.image with O_LARGEFILE
c612edbc5ec6 mm/migrate: set swap entry values of THP tail pages properly.
e635f652696e serial: sc16is7xx: convert from _raw_ to _noinc_ regmap functions for FIFO
250219c6a556 vfio/fsl-mc: Block calling interrupt handler without trigger
cc5838f19d39 vfio/platform: Create persistent IRQ handlers
4cb0d7532126 vfio/pci: Create persistent INTx handler
26a6a1e0b4ec vfio: Introduce interface to flush virqfd inject workqueue
ec73e0797292 vfio/pci: Lock external INTx masking ops
b7a2f0955ffc vfio/pci: Disable auto-enable of exclusive INTx IRQ
c035ce9feb0c selftests: mptcp: diag: return KSFT_FAIL not test_cnt
dc394fe41d6b powerpc: xor_vmx: Add '-mhard-float' to CFLAGS
9bc9c11c151a efivarfs: Request at most 512 bytes for variable names
36b5c35d43aa perf/core: Fix reentry problem in perf_output_read_group()
ccd9fe71b9ee nfsd: Fix a regression in nfsd_setattr()
e90402fb0697 nfsd: don't call locks_release_private() twice concurrently
8b4fa191deed nfsd: don't take fi_lock in nfsd_break_deleg_cb()
c6f8b3fcc627 nfsd: fix RELEASE_LOCKOWNER
32c2cb2c0d37 nfsd: drop the nfsd_put helper
c52fee7a1f98 nfsd: call nfsd_last_thread() before final nfsd_put()
2267b2e84593 lockd: introduce safe async lock op
6e5fed48d8b7 NFSD: fix possible oops when nfsd/pool_stats is closed.
394d3f294a9a Documentation: Add missing documentation for EXPORT_OP flags
56e5eeff6cfa nfsd: separate nfsd_last_thread() from nfsd_put()
dec6b8bcac73 nfsd: Simplify code around svc_exit_thread() call in nfsd()
05b452e8748b nfsd: Fix creation time serialization order
760a6f755d94 NFSD: Add an nfsd4_encode_nfstime4() helper
663ec8f5ffc4 lockd: drop inappropriate svc_get() from locked_get()
9b405c0f84d9 nfsd: fix double fget() bug in __write_ports_addfd()
645c1b4b139b nfsd: make a copy of struct iattr before calling notify_change
4e6e49829151 NFSD: Fix problem of COMMIT and NFS4ERR_DELAY in infinite loop
786e3248d5ef nfsd: simplify the delayed disposal list code
a53d804930dc NFSD: Convert filecache to rhltable
b27ee0682437 nfsd: allow reaping files still under writeback
12f8f9fe1146 nfsd: update comment over __nfsd_file_cache_purge
ad9cf5b1d017 nfsd: don't take/put an extra reference when putting a file
b5a439e8b087 nfsd: add some comments to nfsd_file_do_acquire
83a019b049db nfsd: don't kill nfsd_files because of lease break error
55e429715edc nfsd: simplify test_bit return in NFSD_FILE_KEY_FULL comparator
9fff2daca45a nfsd: NFSD_FILE_KEY_INODE only needs to find GC'ed entries
bfa4a3996e73 nfsd: don't open-code clear_and_wake_up_bit
b11d8162c24a nfsd: call op_release, even when op_func returns an error
12eca509234a nfsd: don't replace page in rq_pages if it's a continuation of last page
8e469b994407 NFSD: Protect against filesystem freezing
17298e08006e NFSD: copy the whole verifier in nfsd_copy_write_verifier
4161b518e4a9 nfsd: don't fsync nfsd_files on last close
94e412c945e6 nfsd: fix courtesy client with deny mode handling in nfs4_upgrade_open
a0df1c3326e7 NFSD: fix problems with cleanup on errors in nfsd4_copy
22a0dd206a32 nfsd: don't hand out delegation on setuid files being opened for write
80a15dc4a021 NFSD: fix leaked reference count of nfsd4_ssc_umount_item
b3169b6ffe03 nfsd: clean up potential nfsd_file refcount leaks in COPY codepath
31d4aa4584cf nfsd: allow nfsd_file_get to sanely handle a NULL pointer
97522085eeec NFSD: enhance inter-server copy cleanup
005ef7285fb9 nfsd: don't destroy global nfs4_file table in per-net shutdown
0bc6d703109e nfsd: don't free files unconditionally in __nfsd_file_cache_purge
958294a3eb82 NFSD: replace delayed_work with work_struct for nfsd_client_shrinker
354eade5f278 NFSD: register/unregister of nfsd-client shrinker at nfsd startup/shutdown time
72906e8da982 NFSD: Use set_bit(RQ_DROPME)
d7cfba56fa75 Revert "SUNRPC: Use RMW bitops in single-threaded hot paths"
0b778361998d nfsd: fix handling of cached open files in nfsd4_open codepath
83a8aba1b725 nfsd: rework refcounting in filecache
43afef9fab65 NFSD: Avoid clashing function prototypes
1e9eac6a111c NFSD: Use only RQ_DROPME to signal the need to drop a reply
d8065d0f2121 NFSD: add CB_RECALL_ANY tracepoints
e18fc5fb2f00 NFSD: add delegation reaper to react to low memory condition
ed36015f7ef9 NFSD: add support for sending CB_RECALL_ANY
8766b38f54e9 NFSD: refactoring courtesy_client_reaper to a generic low memory shrinker
ce0b786b6ebf trace: Relocate event helper files
af7ee7ec1051 lockd: fix file selection in nlmsvc_cancel_blocked
eb0433d95c84 lockd: ensure we use the correct file descriptor when unlocking
281092cf3fc3 lockd: set missing fl_flags field when retrieving args
d561fe540e80 NFSD: Use struct_size() helper in alloc_session()
4e293f2d214c nfsd: return error if nfs4_setacl fails
2c1be5d65d76 NFSD: Add an nfsd_file_fsync tracepoint
8dafc6143041 nfsd: fix up the filecache laundrette scheduling
e8f25bd0e842 filelock: add a new locks_inode_context accessor function
dc468e079961 nfsd: reorganize filecache.c
6340d965599d nfsd: remove the pages_flushed statistic from filecache
99bf0850f399 NFSD: Fix licensing header in filecache.c
43cf59a34b34 NFSD: Use rhashtable for managing nfs4_file objects
323c83bde6d6 NFSD: Refactor find_file()
2b03fd9fe4bc NFSD: Clean up find_or_add_file()
d02c59ebe058 NFSD: Add a nfsd4_file_hash_remove() helper
0b4436381ee0 NFSD: Clean up nfsd4_init_file()
d78f7abe63fc NFSD: Update file_hashtbl() helpers
94f52a094c24 NFSD: Use const pointers as parameters to fh_ helpers
3d1af4319d25 NFSD: Trace delegation revocations
0cf54e35894c NFSD: Trace stateids returned via DELEGRETURN
cb966b357f01 NFSD: Clean up nfs4_preprocess_stateid_op() call sites
6baa3dfe404b NFSD: Flesh out a documenting comment for filecache.c
5fbeb6216e10 NFSD: Add an NFSD_FILE_GC flag to enable nfsd_file garbage collection
a08d9df51c52 NFSD: Revert "NFSD: NFSv4 CLOSE should release an nfsd_file immediately"
b34aa1a8c7a7 NFSD: Pass the target nfsd_file to nfsd_commit()
81c3ab9b95bf exportfs: use pr_debug for unreachable debug statements
10d55a17899a nfsd: allow disabling NFSv2 at compile time
4d1fa40d54ae nfsd: move nfserrno() to vfs.c
3b623a6a12b7 nfsd: ignore requests to disable unsupported versions
1c2f1a171bf0 NFSD: Finish converting the NFSv3 GETACL result encoder
98278765a215 NFSD: Remove redundant assignment to variable host_err
28798577f805 NFSD: Simplify READ_PLUS
19fbd8c2b53f nfsd: use locks_inode_context helper
b11f5d7bc0ea lockd: use locks_inode_context helper
071eb319ce4d NFSD: Fix reads with a non-zero offset that don't end on a page boundary
e4d787430855 NFSD: Fix trace_nfsd_fh_verify_err() crasher
3f439c7701d3 nfsd: put the export reference in nfsd4_verify_deleg_dentry
98d400fc2d09 nfsd: fix use-after-free in nfsd_file_do_acquire tracepoint
3ec2c9976c17 nfsd: fix net-namespace logic in __nfsd_file_cache_purge
f17c07f8ea77 nfsd: ensure we always call fh_verify_error tracepoint
15d01caf3587 NFSD: unregister shrinker when nfsd_init_net() fails
d1b0ceeac1dc nfsd: rework hashtable handling in nfsd_do_file_acquire
405ade5b561a nfsd: fix nfsd_file_unhash_and_dispose
dde8424b249c fanotify: Remove obsoleted fanotify_event_has_path()
a0ca9025c8be fsnotify: remove unused declaration
6029a4f7ad98 fs/notify: constify path
3af497e3f7cc nfsd: extra checks when freeing delegation stateids
e55378bce5f6 nfsd: make nfsd4_run_cb a bool return function
f6279fa0dc9d nfsd: fix comments about spinlock handling with delegations
ecb0eb07eeda nfsd: only fill out return pointer on success in nfsd4_lookup_stateid
4ad28d583e58 NFSD: Cap rsize_bop result based on send buffer size
4794c948de06 NFSD: Rename the fields in copy_stateid_t
0793ec49baaf nfsd: use DEFINE_SHOW_ATTRIBUTE to define nfsd_file_cache_stats_fops
815efd78cbe8 nfsd: use DEFINE_SHOW_ATTRIBUTE to define nfsd_reply_cache_stats_fops
861a163d4973 nfsd: use DEFINE_SHOW_ATTRIBUTE to define client_info_fops
25e0dd89d455 nfsd: use DEFINE_SHOW_ATTRIBUTE to define export_features_fops and supported_enctypes_fops
685d01c2b280 nfsd: use DEFINE_PROC_SHOW_ATTRIBUTE to define nfsd_proc_ops
82fbfbe92d4b NFSD: Pack struct nfsd4_compoundres
cd8bcaeeae6f NFSD: Remove unused nfsd4_compoundargs::cachetype field
ba3bd2bf0c74 NFSD: Remove "inline" directives on op_rsize_bop helpers
d8d3a672e159 NFSD: Clean up nfs4svc_encode_compoundres()
fc47f8ddfc85 NFSD: Clean up WRITE arg decoders
b3f3b21ed289 NFSD: Use xdr_inline_decode() to decode NFSv3 symlinks
cab5399262ec NFSD: Refactor common code out of dirlist helpers
07b68ff5c71c NFSD: Reduce amount of struct nfsd4_compoundargs that needs clearing
2005eba603e9 SUNRPC: Parametrize how much of argsize should be zeroed
9acc4812427e NFSD: add shrinker to reap courtesy clients on low memory condition
8c9e5ad10357 NFSD: keep track of the number of courtesy clients in the system
c65977020ba8 NFSD: Make nfsd4_remove() wait before returning NFS4ERR_DELAY
d1ee3403e098 NFSD: Make nfsd4_rename() wait before returning NFS4ERR_DELAY
50aa6a80d0a7 NFSD: Make nfsd4_setattr() wait before returning NFS4ERR_DELAY
9863ece99e95 NFSD: Refactor nfsd_setattr()
8a3c48cd5346 NFSD: Add a mechanism to wait for a DELEGRETURN
bcd4c7511593 NFSD: Add tracepoints to report NFSv4 callback completions
3fe32c519bef NFSD: Trace NFSv4 COMPOUND tags
62980365d6e8 NFSD: Replace dprintk() call site in fh_verify()
5118eb6c2926 nfsd: remove nfsd4_prepare_cb_recall() declaration
4440588b936c nfsd: clean up mounted_on_fileid handling
5f6f6b2a3bb1 NFSD: drop fname and flen args from nfsd_create_locked()
37f3b9c39895 NFSD: Increase NFSD_MAX_OPS_PER_COMPOUND
56ffc3ab884c nfsd: Propagate some error code returned by memdup_user()
371d2d25bf61 nfsd: Avoid some useless tests
211014047ec9 NFSD: remove redundant variable status
5b6441a5d371 NFSD enforce filehandle check for source file in COPY
285579928965 lockd: move from strlcpy with unused retval to strscpy
574ec47ac850 NFSD: move from strlcpy with unused retval to strscpy
460743da0e55 nfsd_splice_actor(): handle compound pages
c9cb32ad429c NFSD: fix regression with setting ACLs.
4b910dd7fe47 NFSD: discard fh_locked flag and fh_lock/fh_unlock
7538fc9cba84 NFSD: use (un)lock_inode instead of fh_(un)lock for file operations
e0335e7c4a51 NFSD: use explicit lock/unlock for directory ops
ebd1b016ad4d NFSD: reduce locking in nfsd_lookup()
ba4b518a23d3 NFSD: only call fh_unlock() once in nfsd_link()
ff01da71e484 NFSD: always drop directory lock in nfsd_unlink()
4655bcbce761 NFSD: change nfsd_create()/nfsd_symlink() to unlock directory before returning.
d52acd23a327 NFSD: add posix ACLs to struct nfsd_attrs
a3f27177c21b NFSD: add security label to struct nfsd_attrs
8a26a1b5c887 NFSD: set attributes when creating symlinks
183514794814 NFSD: introduce struct nfsd_attrs
162f99ff7b95 NFSD: verify the opened dentry after setting a delegation
3a5ab224a838 NFSD: drop fh argument from alloc_init_deleg
b6494b36b80c NFSD: Move copy offload callback arguments into a separate structure
8918b50537e9 NFSD: Add nfsd4_send_cb_offload()
bb1eb9755892 NFSD: Remove kmalloc from nfsd4_do_async_copy()
9cecf4772e8c NFSD: Refactor nfsd4_do_copy()
a48454785bc9 NFSD: Refactor nfsd4_cleanup_inter_ssc() (2/2)
4952fe668917 NFSD: Refactor nfsd4_cleanup_inter_ssc() (1/2)
6cb00ba23083 NFSD: Replace boolean fields in struct nfsd4_copy
6ff95a5f72eb NFSD: Make nfs4_put_copy() static
9a99c7f5d98b NFSD: Reorder the fields in struct nfsd4_op
7d1e44fd0637 NFSD: Shrink size of struct nfsd4_copy
24286575c674 NFSD: Shrink size of struct nfsd4_copy_notify
00eb5bd3844c NFSD: nfserrno(-ENOMEM) is nfserr_jukebox
9032c8e3aecb NFSD: Fix strncpy() fortify warning
0dfb19289614 NFSD: Clean up nfsd4_encode_readlink()
fc7380a198f2 NFSD: Use xdr_pad_size()
2528f487c825 NFSD: Simplify starting_len
7bc543311784 NFSD: Optimize nfsd4_encode_readv()
a70976ec89c2 NFSD: Add an nfsd4_read::rd_eof field
2540b7042998 NFSD: Clean up SPLICE_OK in nfsd4_encode_read()
3e7adac61db2 NFSD: Optimize nfsd4_encode_fattr()
0d6c82286ddf NFSD: Optimize nfsd4_encode_operation()
b9e6a5610b5c nfsd: silence extraneous printk on nfsd.ko insertion
650417956a22 NFSD: limit the number of v4 clients to 1024 per 1GB of system memory
59d35878294b NFSD: keep track of the number of v4 clients in the system
0f202977cad1 NFSD: refactoring v4 specific code to a helper in nfs4state.c
a52bb607abd0 NFSD: Ensure nf_inode is never dereferenced
e3befca679a9 NFSD: NFSv4 CLOSE should release an nfsd_file immediately
9be6499171fb NFSD: Move nfsd_file_trace_alloc() tracepoint
06d9c87204b2 NFSD: Separate tracepoints for acquire and create
4b338b528c43 NFSD: Clean up unused code after rhashtable conversion
1bea66c08890 NFSD: Convert the filecache to use rhashtable
208bd42a1a16 NFSD: Set up an rhashtable for the filecache
0b3a69057db2 NFSD: Replace the "init once" mechanism
76e2424c0d29 NFSD: Remove nfsd_file::nf_hashval
ec30a456359c NFSD: nfsd_file_hash_remove can compute hashval
7e8d4a933468 NFSD: Refactor __nfsd_file_close_inode()
2aa9fd1db009 NFSD: nfsd_file_unhash can compute hashval from nf->nf_inode
d6a23d45e2ef NFSD: Remove lockdep assertion from unhash_and_release_locked()
e97c2d5a71cf NFSD: No longer record nf_hashval in the trace log
1db19c3574f2 NFSD: Never call nfsd_file_gc() in foreground paths
81e3c7702799 NFSD: Fix the filecache LRU shrinker
ffb1a10a4405 NFSD: Leave open files out of the filecache LRU
175f88a6d509 NFSD: Trace filecache LRU activity
eed6df31603e NFSD: WARN when freeing an item still linked via nf_lru
16cbc64f9ce4 NFSD: Hook up the filecache stat file
4ade29dd0944 NFSD: Zero counters when the filecache is re-initialized
a880dcef74da NFSD: Record number of flush calls
ae76efbdfef7 NFSD: Report the number of items evicted by the LRU walk
5ce93c611c13 NFSD: Refactor nfsd_file_lru_scan()
5b6f8b083676 NFSD: Refactor nfsd_file_gc()
c162c99a29f7 NFSD: Add nfsd_file_lru_dispose_list() helper
4420d19ed4e4 NFSD: Report average age of filecache items
c18563275fbc NFSD: Report count of freed filecache items
b2dc4d30b0d8 NFSD: Report count of calls to nfsd_file_acquire()
0369b53886ec NFSD: Report filecache LRU size
f1785afc8946 NFSD: Demote a WARN to a pr_warn()
f87230a7dbe4 nfsd: remove redundant assignment to variable len
cad76843c768 NFSD: Fix space and spelling mistake
dcbebc868503 NFSD: Instrument fh_verify()
6345e92a9d0c NLM: Defend against file_lock changes after vfs_test_lock()
3482739bd413 fsnotify: Fix comment typo
b65b2d418759 fanotify: introduce FAN_MARK_IGNORE
c1f1797a8316 fanotify: cleanups for fanotify_mark() input validations
4c3723c53549 fanotify: prepare for setting event flags in ignore mask
cbe3bf6fcdf1 fs: inotify: Fix typo in inotify comment
f3222a6b66ae NFSD: Decode NFSv4 birth time attribute
0a160dc54991 fanotify: refine the validation checks on non-dir inode mask
47a1d1a2c1d5 NFS: restore module put when manager exits.
261eabe19cb2 NFSD: Fix potential use-after-free in nfsd_file_put()
ba68ab7d14dc NFSD: nfsd_file_put() can sleep
f55b83a598db NFSD: Add documenting comment for nfsd4_release_lockowner()
0775c8784e4c NFSD: Modernize nfsd4_release_lockowner()
5e4ee807e35a nfsd: Fix null-ptr-deref in nfsd_fill_super()
bf3182054995 nfsd: Unregister the cld notifier when laundry_wq create failed
3a66ad7ea7b1 SUNRPC: Use RMW bitops in single-threaded hot paths
7af208c9ea06 NFSD: Trace filecache opens
73d9eb9e19c6 NFSD: Move documenting comment for nfsd4_process_open2()
7dfad7f7da07 NFSD: Fix whitespace
b54f6a079ab2 NFSD: Remove dprintk call sites from tail of nfsd4_open()
106331a12b0f NFSD: Instantiate a struct file when creating a regular NFSv4 file
ce2296da5dad NFSD: Clean up nfsd_open_verified()
dabf24069b12 NFSD: Remove do_nfsd_create()
62bac33a70e8 NFSD: Refactor NFSv4 OPEN(CREATE)
ab407e0bf8d5 NFSD: Refactor NFSv3 CREATE
3bd0ae962ba8 NFSD: Refactor nfsd_create_setattr()
cf655c890bb6 NFSD: Avoid calling fh_drop_write() twice in do_nfsd_create()
55cb08630eb6 NFSD: Clean up nfsd3_proc_create()
2e0f8ee3c1ae NFSD: Show state of courtesy client in client info
6e56a5f75c55 NFSD: add support for lock conflict to courteous server
c3b2013544c8 fs/lock: add 2 callbacks to lock_manager_operations to resolve conflict
a8040fed13ed fs/lock: add helper locks_owner_has_blockers to check for blockers
d9fc2f8267e7 NFSD: move create/destroy of laundry_wq to init_nfsd and exit_nfsd
492634cbfe3d NFSD: add support for share reservation conflict to courteous server
26540b8940a2 NFSD: add courteous server support for thread with only delegation
56bc7e3821e8 NFSD: Clean up nfsd_splice_actor()
f14aa4a04472 fanotify: fix incorrect fmode_t casts
40ca5d91b578 fsnotify: consistent behavior for parent not watching children
f0628430d25d fsnotify: introduce mark type iterator
a97561b460c7 fanotify: enable "evictable" inode marks
c47bab4394a7 fanotify: use fsnotify group lock helpers
7fcef3285ade fanotify: implement "evictable" inode marks
33e91fb5eee5 fanotify: factor out helper fanotify_mark_update_flags()
5054f130f81f fanotify: create helper fanotify_mark_user_flags()
4f145b67c075 fsnotify: allow adding an inode mark without pinning inode
3c9dc688678b dnotify: use fsnotify group lock helpers
50612cd6a783 nfsd: use fsnotify group lock helpers
35f3fad0e30a inotify: use fsnotify group lock helpers
e419965d9323 fsnotify: create helpers for group mark_mutex lock
cdf89b045b30 fsnotify: make allow_dups a property of the group
ac51c087abd2 fsnotify: pass flags argument to fsnotify_alloc_group()
d032dd5a823b inotify: move control flags from mask to mark flags
93d2afc7d27c fs/lock: documentation cleanup. Replace inode->i_lock with flc_lock.
e19ec9acfbcb fanotify: do not allow setting dirent events in mask of non-dir
a98e5b3d958a nfsd: Clean up nfsd_file_put()
893fa2b80235 nfsd: Fix a write performance regression
091e4062ffd0 fsnotify: remove redundant parameter judgment
fd7de66b50b5 fsnotify: optimize FS_MODIFY events with no ignored masks
4bef66ca56d1 fsnotify: fix merge with parent's ignored mask
7dcd851cf863 nfsd: fix using the correct variable for sizeof()
bd0fee92b4e8 NFSD: Clean up _lm_ operation names
a028a32ab617 NFSD: Remove CONFIG_NFSD_V3
511360e1f526 NFSD: Move svc_serv_ops::svo_function into struct svc_serv
a5deac8754d6 NFSD: Remove svc_serv_ops::svo_module
7d94952cd5cf SUNRPC: Remove svc_shutdown_net()
c3fa9c2d3666 SUNRPC: Rename svc_close_xprt()
6c8231f0c289 SUNRPC: Rename svc_create_xprt()
4c9a56a70b4d SUNRPC: Remove svo_shutdown method
9d3cc211779a SUNRPC: Merge svc_do_enqueue_xprt() into svc_enqueue_xprt()
466562c48101 SUNRPC: Remove the .svo_enqueue_xprt method
61a9ecdb77c6 NFSD: Remove NFSD_PROC_ARGS_* macros
b42c9b5d9c84 NFSD: Streamline the rare "found" case
69e08eb5bf00 NFSD: Skip extra computation for RC_NOCACHE case
863aed522ef0 orDate: Thu Sep 30 19:19:57 2021 -0400
5b3110364f50 nfsd: Add support for the birth time attribute
392c68189565 NFSD: Deprecate NFS_OFFSET_MAX
91ec401bcd67 fsnotify: invalidate dcache before IN_DELETE event
8d5d1b4956a1 NFSD: Move fill_pre_wcc() and fill_post_wcc()
6be1619d4b05 NFSD: Trace boot verifier resets
d83ffc800f12 NFSD: Rename boot verifier functions
1510c051967e NFSD: Clean up the nfsd_net::nfssvc_boot field
5b2cfc4bb751 NFSD: Write verifier might go backwards
14d5c7263d42 nfsd: Add a tracepoint for errors in nfsd4_clone_file_range()
399451927d0e NFSD: De-duplicate net_generic(SVC_NET(rqstp), nfsd_net_id)
a330a794f428 NFSD: Clean up nfsd_vfs_write()
e7a3814a0029 nfsd: Retry once in nfsd_open on an -EOPENSTALE return
87e2bf374be2 nfsd: Add errno mapping for EREMOTEIO
92453b36fabc nfsd: map EBADF
1a197bcedf80 nfsd4: add refcount for nfsd4_blocked_lock
64ff32b8ad80 nfs: block notification on fs with its own ->lock
190a61768581 NFSD: De-duplicate nfsd4_decode_bitmap4()
30000dff921e nfsd: improve stateid access bitmask documentation
6f8664c6b50f NFSD: Combine XDR error tracepoints
3bc94fb44f10 NFSD: simplify per-net file cache management
fdf657bd7537 NFSD: Fix inconsistent indenting
19fbf344ba33 NFSD: Remove be32_to_cpu() from DRC hash function
018f6069471c NFS: switch the callback service back to non-pooled.
a11fe42af525 lockd: use svc_set_num_threads() for thread start and stop
f3f120852428 SUNRPC: always treat sv_nrpools==1 as "not pooled"
5c377f380120 SUNRPC: move the pool_map definitions (back) into svc.c
764ab3f970e6 lockd: rename lockd_create_svc() to lockd_get()
d38cc54be6f3 lockd: introduce lockd_put()
232cbc9b359d lockd: move svc_exit_thread() into the thread
3b068224105c lockd: move lockd_start_svc() call into lockd_create_svc()
ace565c3f246 lockd: simplify management of network status notifiers
d30ef2cf0656 lockd: introduce nlmsvc_serv
95364365f5b0 NFSD: simplify locking for network notifier.
c1ef7e9d72d4 SUNRPC: discard svo_setup and rename svc_set_num_threads_sync()
b11ea2be63b8 NFSD: Make it possible to use svc_set_num_threads_sync
091b6f516c50 NFSD: narrow nfsd_mutex protection in nfsd thread
dedfae92f9d7 SUNRPC: use sv_lock to protect updates to sv_nrthreads.
e6f08647c559 nfsd: make nfsd_stats.th_cnt atomic_t
c78050962735 SUNRPC: stop using ->sv_nrthreads as a refcount
c6f2b5942783 SUNRPC/NFSD: clean up get/put functions.
d021ef89a7de SUNRPC: change svc_get() to return the svc.
4fdd01ce33b6 NFSD: handle errors better in write_ports_addfd()
2049935c523e exit: Rename module_put_and_exit to module_put_and_kthread_exit
dd6663096680 exit: Implement kthread_exit
de7e2adfc784 fanotify: wire up FAN_RENAME event
a187e777d74d fanotify: report old and/or new parent+name in FAN_RENAME event
4b5743bdc592 fanotify: record either old name new name or both for FAN_RENAME
9acb63f955ca fanotify: record old and new parent and name in FAN_RENAME event
6a8facc4bd3e fanotify: support secondary dir fh and name in fanotify_info
c8d3ee69ee5d fanotify: use helpers to parcel fanotify_info buffer
3eec21b66085 fanotify: use macros to get the offset to fanotify_info buffer
932090b8abf6 fsnotify: generate FS_RENAME event with rich information
8bd3d40ea3df fanotify: introduce group flag FAN_REPORT_TARGET_FID
395ff6dc9ba3 fsnotify: separate mark iterator type from object type enum
f7d76fa9a881 fsnotify: clarify object type argument
a20d087cdffc ext4: fix error code saved on super block during file system abort
e11c8a6e8c92 nfsd4: remove obselete comment
60f18f40ca88 NFSD:fix boolreturn.cocci warning
0ca26103e06f nfsd: update create verifier comment
bf0416e0284b SUNRPC: Change return value type of .pc_encode
bd117f87569b SUNRPC: Replace the "__be32 *p" parameter to .pc_encode
b24695861020 NFSD: Save location of NFSv4 COMPOUND status
eadf587a2a25 SUNRPC: Change return value type of .pc_decode
85658caa8bbf SUNRPC: Replace the "__be32 *p" parameter to .pc_decode
10150232dcdd NFSD: Initialize pointer ni with NULL and not plain integer 0
767727a7e02f NFSD: simplify struct nfsfh
ed0815c8b7ca NFSD: drop support for ancient filehandles
f829bb3a0682 NFSD: move filehandle format declarations out of "uapi".
af12deba5335 NFSD: Optimize DRC bucket pruning
61116d723ea2 NFS: Move NFS protocol display macros to global header
53af55ba9ea2 NFS: Move generic FS show macros to global header
f78ab849df2b SUNRPC: Tracepoints should display tk_pid and cl_clid as a fixed-size field
20bbdbe31c0b NFS: Remove unnecessary TRACE_DEFINE_ENUM()s
45e16146c159 docs: Document the FAN_FS_ERROR event
b394c80e2c8d ext4: Send notifications on error
0e825bc84df7 fanotify: Allow users to request FAN_FS_ERROR events
c7c013dff4bd fanotify: Emit generic error info for error event
92eb45210b87 fanotify: Report fid info for file related file system errors
c8b6b09f3fb2 fanotify: WARN_ON against too large file handles
ebd89f7d0737 fanotify: Add helpers to decide whether to report FID/DFID
a83c3ed2e267 fanotify: Wrap object_fh inline space in a creator macro
7aafd61567a9 fanotify: Support merging of error events
c44d8071436c fanotify: Support enqueueing of error events
9258a9908b6d fanotify: Pre-allocate pool of error events
11280c7181b0 fanotify: Reserve UAPI bits for FAN_FS_ERROR
c0a6b12ecde7 fsnotify: Support FS_ERROR event type
965daffd0d15 fanotify: Require fid_mode for any non-fd event
1dad39ebf451 fanotify: Encode empty file handle when no inode is provided
5f34524dde58 fanotify: Allow file handle encoding for unhashed events
900fe4d70474 fanotify: Support null inode event in fanotify_dfid_inode
20bb62edd673 fsnotify: Pass group argument to free_event
84f904f03116 fsnotify: Protect fsnotify_handle_inode_event from no-inode events
4b6b5edcc701 fsnotify: Retrieve super block from the data field
8eb16abe8937 fsnotify: Add wrapper around fsnotify_add_event
e58d543a8cf2 fsnotify: Add helper to detect overflow_event
3e63bff7acdb inotify: Don't force FS_IN_IGNORED
dbeb08836b69 fanotify: Split fsid check from other fid mode checks
cce35a487832 fanotify: Fold event size calculation to its own function
8c7986c2bcc9 fsnotify: Don't insert unmergeable events in hashtable
18370157880b fsnotify: clarify contract for create event hooks
d92a8789fef6 fsnotify: pass dentry instead of inode data
7d5be4f79dac fsnotify: pass data_type to fsnotify_name()
764929accff3 x86/static_call: Add support for Jcc tail-calls
7339b1ce5ea6 x86/alternatives: Teach text_poke_bp() to patch Jcc.d32 instructions
f4ba357b0739 x86/alternatives: Introduce int3_emulate_jcc()
9b4eff016dea x86/asm: Differentiate between code and function alignment
ab8f581408c5 arch: Introduce CONFIG_FUNCTION_ALIGNMENT
2ae88e83f3b7 KVM/x86: Export RFDS_NO and RFDS_CLEAR to guests
2fb08b672eb7 x86/rfds: Mitigate Register File Data Sampling (RFDS)
4fa001418efd Documentation/hw-vuln: Add documentation for RFDS
a2b586df5546 x86/mmio: Disable KVM mitigation when X86_FEATURE_CLEAR_CPU_BUF is set
598fb2804482 KVM/VMX: Move VERW closer to VMentry for MDS mitigation
9fe80d3c1197 KVM/VMX: Use BT+JNC, i.e. EFLAGS.CF to select VMRESUME vs. VMLAUNCH
913ae894c2b0 x86/bugs: Use ALTERNATIVE() instead of mds_user_clear static key
d54de9f2a127 x86/entry_32: Add VERW just before userspace transition
eabab0a5f13e x86/entry_64: Add VERW just before userspace transition
f32b5db5fe35 x86/bugs: Add asm helpers for executing VERW
6b54d55bb3bc x86/asm: Add _ASM_RIP() macro for x86-64 (%rip) suffix
0a6f0f8702ea KVM: arm64: Limit stage2_apply_range() batch size to largest block
b4926c95ad0f KVM: arm64: Work out supported block level at compile time
142a01435c1e tty: serial: imx: Fix broken RS485
9bd2f11ac9ef printk: Update @console_may_schedule in console_trylock_spinning()
2280bb8577aa iommu/dma: Force swiotlb_max_mapping_size on an untrusted device
aa4cc17b3418 dma-iommu: add iommu_dma_opt_mapping_size()
f3e7d9471cc1 dma-mapping: add dma_opt_mapping_size()
685e8332deff swiotlb: Fix alignment checks when both allocation and DMA masks are present
cf716d5a0dd8 minmax: add umin(a, b) and umax(a, b)
f2ad3ce0b0b8 entry: Respect changes to system call number by trace_sys_enter()
2e2aadd6e175 clocksource/drivers/arm_global_timer: Fix maximum prescaler value
4949affd5288 ACPI: CPPC: Use access_width over bit_width for system memory accesses
ea592baf9e41 xen/events: close evtchn after mapping cleanup
b3914fee0955 i2c: i801: Avoid potential double call to gpiod_remove_lookup_table
4b12ff5edd14 tee: optee: Fix kernel panic caused by incorrect error handling
a71cba07783a fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion
0190d19d7651 vt: fix unicode buffer corruption when deleting characters
7dc4ed980968 mei: me: add arrow lake point H DID
e294f0eb3510 mei: me: add arrow lake point S DID
fed1f00e4834 tty: serial: fsl_lpuart: avoid idle preamble pending if CTS is enabled
a44c6c61af48 usb: port: Don't try to peer unused USB ports based on location
92b051b87658 usb: gadget: ncm: Fix handling of zero block length packets
6c1f36d92c0a USB: usb-storage: Prevent divide-by-0 error in isd200_ata_command
f4ffa18d2eb0 ALSA: hda/realtek - Fix headset Mic no show at resume back for Lenovo ALC897 platform
3e31af7c468b drm/i915: Check before removing mm notifier
898127d612a2 tracing: Use .flush() call to wake up readers
e126b508ed2e KVM: SVM: Flush pages under kvm->lock to fix UAF in svm_register_enc_region()
461a4f333c5a xfrm: Avoid clang fortify warning in copy_to_user_tmpl()
2fb9845251ce Drivers: hv: vmbus: Calculate ring buffer size for more efficient use of memory
9a92743d533e netfilter: nf_tables: reject constant set with timeout
7cdc1be24cc1 netfilter: nf_tables: disallow anonymous set with timeout flag
291cca35818b netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
f381224482ec cpufreq: brcmstb-avs-cpufreq: fix up "add check for cpufreq_cpu_get's return value"
df7889f78cc0 net: ravb: Add R-Car Gen4 support
1e7d2f14a24f x86/pm: Work around false positive kmemleak report in msr_build_context()
116562e804ff dm snapshot: fix lockup in dm_exception_table_exit
76c1568ac842 drm/amd/display: Fix noise issue on HDMI AV mute
efb754344932 drm/amd/display: Return the correct HDCP error code
5d5f1a7f3b10 drm/amdgpu: amdgpu_ttm_gart_bind set gtt bound flag
d69abe190a5f ahci: asm1064: asm1166: don't limit reported ports
205c06684a18 ahci: asm1064: correct count of reported ports
4be453271a88 wireguard: netlink: access device through ctx instead of peer
710a177f3472 wireguard: netlink: check for dangling peer via is_dead instead of empty list
3ff793aa0742 net: hns3: tracing: fix hclgevf trace event strings
81b9ddd44d3a NFSD: Fix nfsd_clid_class use of __string_len() macro
2031b61be8b7 x86/CPU/AMD: Update the Zenbleed microcode revisions
d8ae3bf07ebc cpufreq: dt: always allocate zeroed cpumask
ca581d237f3b nilfs2: prevent kernel bug at submit_bh_wbc()
2e2619ff5d0d nilfs2: fix failure to detect DAT corruption in btree and direct mappings
5a1729bc070f memtest: use {READ,WRITE}_ONCE in memory scanning
e8d993bd36b6 drm/vc4: hdmi: do not return negative values from .get_modes()
9ae98fc9fe4a drm/imx/ipuv3: do not return negative values from .get_modes()
912c149a52c3 drm/exynos: do not return negative values from .get_modes()
f781f0d82cf7 drm/panel: do not return negative error codes from drm_panel_get_modes()
a55677878b93 s390/zcrypt: fix reference counting on zcrypt card objects
9a3ca8292ce9 soc: fsl: qbman: Use raw spinlock for cgr_lock
d378c937131a soc: fsl: qbman: Add CGR update function
e25ceea9bc79 soc: fsl: qbman: Add helper for sanity checking cgr ops
e6378314bb92 soc: fsl: qbman: Always disable interrupts when taking cgr_lock
de0dcfa62306 ring-buffer: Use wait_event_interruptible() in ring_buffer_wait()
73becffc5d08 ring-buffer: Fix full_waiters_pending in poll
5a24b3a28d0c ring-buffer: Fix resetting of shortest_full
d3229afd170b ring-buffer: Do not set shortest_full when full target is hit
66fdf3a7cf52 ring-buffer: Fix waking up ring buffer readers
34cd4d5de121 ksmbd: retrieve number of blocks using vfs_getattr in set_file_allocation_info
f73c3e259593 vfio/platform: Disable virqfds on cleanup
fc92804048f3 PCI: dwc: endpoint: Fix advertised resizable BAR size
5273c56f3fd4 kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1
80d24b308b7e nfs: fix UAF in direct writes
a323e5e98f46 PCI/AER: Block runtime suspend when handling errors
967e74124f1e speakup: Fix 8bit characters from direct synth
eebe53270b4f usb: gadget: tegra-xudc: Fix USB3 PHY retrieval logic
fd8e9ef13ac7 phy: tegra: xusb: Add API to retrieve the port number of phy
4960561a6c36 slimbus: core: Remove usage of the deprecated ida_simple_xx() API
cf51c32c00c5 nvmem: meson-efuse: fix function pointer type mismatch
239c669edb2b ext4: fix corruption during on-line resize
d778917dd033 hwmon: (amc6821) add of_match table
a6c13d23d9e0 landlock: Warn once if a Landlock action is requested while disabled
6203f20d668c drm/etnaviv: Restore some id values
05ecc53f9480 mmc: core: Fix switch on gp3 partition
2da5568ee222 mm: swap: fix race between free_swap_and_cache() and swapoff()
86a08ddff8bb swap: comments get_swap_device() with usage rule
d3d858650933 mac802154: fix llsec key resources release in mac802154_llsec_key_del
a3b6004bfc2f dm-raid: fix lockdep waring in "pers->hot_add_disk"
125de155011c PCI/DPC: Quirk PIO log size for Intel Raptor Lake Root Ports
4e194de3a961 PCI/DPC: Quirk PIO log size for certain Intel Root Ports
ecbe3ca2ac9c PCI/ASPM: Make Intel DG2 L1 acceptable latency unlimited
25f6c4c440b6 PCI: Work around Intel I210 ROM BAR overlap defect
7cc94dd36e48 PCI/PM: Drain runtime-idle callbacks before driver removal
95e86a8f1c9e PCI: Drop pci_device_remove() test of pci_dev->driver
fa3762b45ea9 btrfs: fix off-by-one chunk length calculation at contains_pending_extent()
bbf72db11fe6 serial: Lock console when calling into driver before registration
63f8999cac33 printk/console: Split out code that enables default console
3f6a9daf0da4 usb: typec: ucsi: Clean up UCSI_CABLE_PROP macros
6eac5030fc97 fuse: don't unhash root
773783681d87 fuse: fix root lookup with nonzero generation
ede56884ccde mmc: tmio: avoid concurrent runs of mmc_request_done()
f3f867201bb8 PM: sleep: wakeirq: fix wake irq warning in system suspend
ad71f7bbd4c2 USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M
c1db6b1613ed USB: serial: option: add MeiG Smart SLM320 product
f9bad5759668 USB: serial: cp210x: add ID for MGP Instruments PDS100
1342e40c0779 USB: serial: add device ID for VeriFone adapter
60e9148baf12 USB: serial: ftdi_sio: add support for GMC Z216C Adapter IR-USB
c11808f4fb71 powerpc/fsl: Fix mfpmr build errors with newer binutils
4a49d24fdec0 usb: xhci: Add error handling in xhci_map_urb_for_dma
8f562f3b2517 clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays
3aedcf3755c7 clk: qcom: mmcc-apq8084: fix terminating of frequency table arrays
9de184d4e557 clk: qcom: gcc-ipq8074: fix terminating of frequency table arrays
b4527ee3de36 clk: qcom: gcc-ipq6018: fix terminating of frequency table arrays
18f1f468dd79 PM: suspend: Set mem_sleep_current during kernel command line setup
0552d5727e80 parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds
6a427a132e73 parisc: Fix csum_ipv6_magic on 64-bit systems
c38df21ec9a0 parisc: Fix csum_ipv6_magic on 32-bit systems
6817e1a1d650 parisc: Fix ip_fast_csum
a903a1e93f3b parisc: Avoid clobbering the C/B bits in the PSW with tophys and tovirt macros
60d6c5d40de9 mtd: rawnand: meson: fix scrambling mode value in command macro
6f203afea2dc ubi: correct the calculation of fastmap size
8ce982285414 ubi: Check for too small LEB size in VTBL code
f19b1023a375 ubifs: Set page uptodate in the correct place
b7fb63e807c6 fat: fix uninitialized field in nostale filehandles
d2a7a81088c6 bounds: support non-power-of-two CONFIG_NR_CPUS
218e2610b015 kasan/test: avoid gcc warning for intentional overflow
76645e0f5a2a kasan: test: add memcpy test that avoids out-of-bounds write
d05e6ba1b74a block: Clear zone limits for a non-zoned stacked queue
447753bdd69b ext4: correct best extent lstart adjustment logic
29d7089bed0d selftests/mqueue: Set timeout to 180 seconds
4ae5a97781ce crypto: qat - resolve race condition during AER recovery
b228e16a3ae1 crypto: qat - fix double free during reset
980cc81298c0 sparc: vDSO: fix return value of __setup handler
dc8c55b3ecbc sparc64: NMI watchdog: fix return value of __setup handler
83d3c5e30961 KVM: Always flush async #PF workqueue when vCPU is being destroyed
fec51819607f media: xc4000: Fix atomicity violation in xc4000_get_frequency
5e4b23e7a7b3 pci_iounmap(): Fix MMIO mapping leak
899e154f9546 drm/vmwgfx: Fix possible null pointer derefence with invalid contexts
29a327c4544a arm: dts: marvell: Fix maxium->maxim typo in brownstone dts
840e1b69081a smack: Handle SMACK64TRANSMUTE in smack_inode_setsecurity()
28b78c7b620e smack: Set SMACK64TRANSMUTE only for dirs in smack_inode_setxattr()
8b47e69ac83e clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd
0fa86b3b6a15 media: staging: ipu3-imgu: Set fields before media_entity_pads_init()
8c36205123dc wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach
2382f2e45c71 timers: Rename del_timer_sync() to timer_delete_sync()
2a873e61782f timers: Use del_timer_sync() even on UP
1c2f22864bcd timers: Update kernel-doc for various functions
85c3bdff671f KVM: x86: Use a switch statement and macros in __feature_translate()
01771ffad6f1 KVM: x86: Advertise CPUID.(EAX=7,ECX=2):EDX[5:0] to userspace
e99e8685fde5 KVM: x86: Update KVM-only leaf handling to allow for 100% KVM-only leafs
9ccce26837a8 x86/bugs: Use sysfs_emit()
4957fd741d61 x86/cpu: Support AMD Automatic IBRS
26445d9bb036 Documentation/hw-vuln: Update spectre doc
8d1bab770956 locking/rwsem: Disable preemption while trying for rwsem lock
7c82dac02886 block, loop: support partitions without scanning
45f504f301d4 bpftool: Fix pretty print dump for maps without BTF loaded
1f24338cb789 jbd2: Drop the merge conflicted hunk
e1d0e3c51bde tpm: tis_i2c: Limit write bursts to I2C_SMBUS_BLOCK_MAX (32) bytes
1abe841fe331 tpm: tis_i2c: Limit read bursts to I2C_SMBUS_BLOCK_MAX (32) bytes
6224acfc1d56 tpm: Add flag to use default cancellation policy
1cd19d48fb90 tpm: tis_i2c: Fix sanity check interrupt enable mask
a883da132fa8 tpm: Add tpm_tis_i2c backend for tpm_tis_core
a742ac8a1c51 tpm: Add tpm_tis_verify_crc to the tpm_tis_phy_ops protocol layer
ef495c5f45f2 tpm: Remove read16/read32/write32 calls from tpm_tis_phy_ops
1f3be2e23aa6 gcc-plugins: Reorganize gimple includes for GCC 13
24615a3b932a ata: ahci: fix enum constants for gcc-13
5d6cb145541a net: stmmac: Enable mac_managed_pm phylink config
fd93aabb4287 tools/resolve_btfids: Use pkg-config to locate libelf
130f9da78406 tools/resolve_btfids: Build with host flags
00f2f1a782f9 tools/resolve_btfids: Support cross-building the kernel with clang
17776a4ba9c2 tools/resolve_btfids: Install libbpf headers when building
7c9808380d70 libbpf: Make libbpf_version.h non-auto-generated
37ae1ba791ac libbpf: Add LIBBPF_DEPRECATED_SINCE macro for scheduling API deprecations
a2667e6d7314 drm/radeon: free iio for atombios when driver shutdown
f100c753aa1f powerpc: Fix reschedule bug in KUAP-unlocked user copy
da5513f30187 libbpf: Fix build warning on ref_ctr_off
4c5a089621a8 perf python: Account for multiple words in CC
1c5699ee85d4 fs: move S_ISGID stripping into the vfs_*() helpers
838f5d0701d8 fs: add mode_strip_sgid() helper
d97172683641 squashfs: provide backing_dev_info in order to disable read-ahead
ed037d7be40c irq_work: use kasan_record_aux_stack_noalloc() record callstack
1363bd7dbde3 ixgbevf: add disable link state
e5601ae2bd24 ixgbe: add improvement for MDD response functionality
caa57cd80575 ixgbe: add the ability for the PF to disable VF link state
16a77bfcc7df Check /dev/console using init_stat()
04574fd5579a tracing/arm: Have max stack tracer handle the case of return address after data
0e51e5717018 gpiolib: cdev: Set lineevent_state::irq after IRQ register successfully
1e6b7da6ddba drivers/base: Fix unsigned comparison to -1 in CPUMAP_FILE_MAX_BYTES
493160901320 mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, release} to avoid race condition
04224f725aa3 irqchip/gic-v3-its: Skip HP notifier when no ITS is registered
6f6c2996a81c irqchip/gic-v3-its: Postpone LPI pending table freeing and memreserve
1fa94473423f irqchip/gic-v3-its: Give the percpu rdist struct its own flags field
6013d1ae5feb cert host tools: Stop complaining about deprecated OpenSSL functions
efe20512212b init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash
a40d2daf2795 pnmtologo: use relocatable file name
3b40d5b41155 of: configfs: remove unused variable overlay_lock
6c085baf1838 tools: use basename to identify file in gen-mach-types
2fca0fd71981 lib/build_OID_registry: fix reproducibility issues
0f586f4ee8ad vt/conmakehash: improve reproducibility
a75774679f28 OF: DT-Overlay configfs interface (v8)
d179c639b30b x86/boot: Wrap literal addresses in absolute_pointer()
856ec356cf91 ACPI: thermal: drop an always true check
7614af249993 xfs: Fix -Werror=dangling-pointer work-around for older GCC
41470215f97e xfs: Work around GCC 12 -Werror=dangling-pointer for xfs_attr_remote.o
44a445c1922d virtio-pci: Remove wrong address verification in vp_del_vqs()
77aa9e489eaf bpf: Disallow unprivileged bpf by default
ebfb1822e9f9 fs/aufs: fixup 5.15.36 fixups
4eba9348d3e2 Revert "Revert "fbdev: Hot-unplug firmware fb devices on forced removal""
5df6d1b00f95 jbd2: fix use-after-free of transaction_t race
2d83e8196487 jbd2: refactor wait logic for transaction updates into a common function
07a63f760793 netfilter: conntrack: avoid useless indirection during conntrack destruction
4e7122625996 Revert "fbdev: Hot-unplug firmware fb devices on forced removal"
7ba4cb36fd4f rcu: Avoid alloc_pages() when recording stack
f78574dee71e kasan: test: silence intentional read overflow warnings
d313cb89b6b1 kasan: arm64: fix pcpu_page_first_chunk crash with KASAN_VMALLOC
5e279d5647cc arm64: support page mapping percpu first chunk allocator
e5bf16752dca vmalloc: choose a better start address in vm_area_register_early()
660b3d21b46f kasan: test: bypass __alloc_size checks
00aa7573e53a kasan: test: add memcpy test that avoids out-of-bounds write
67becf0b1bd4 kasan: fix tag for large allocations when using CONFIG_SLAB
bedf1e033213 workqueue, kasan: avoid alloc_pages() when recording stack
7195b67ce69b kasan: generic: introduce kasan_record_aux_stack_noalloc()
bdff763f0e29 kasan: common: provide can_alloc in kasan_save_stack()
51423ebb36ad lib/stackdepot: introduce __stack_depot_save()
85373e66d847 lib/stackdepot: remove unused function argument
5b6cc9b251f3 lib/stackdepot: include gfp.h
c9f3902d8069 aufs: reduce overhead for "code present but disabled" use case.
b98d189df02c aufs: bugfix, umount passes NULL to ->parse_monolithic()
13b883cbbbd9 aufs standalone: cosmetic, missing copyright sentence
21f8b0d81898 aufs: 5.15.5-20220117 ---> 5.15.5-20220221
6199fd896645 aufs: tiny, headers after fs_context
8ddb40e31c29 aufs: fs_context 7/7, finally remount
69035f71c6fd aufs: fs_context 6/7, now mount
bc841b970697 aufs: fs_context 5/7, parse all other mount options
435188053da2 aufs: fs_context 4/7, parse xino options
9af1f1825cbd aufs: fs_context 3/7, parse the branch-management options
1c05eb767f8c aufs: fs_context 2/7, parse "br" mount option
a8488f603134 aufs: fs_context 1/7, skelton of the new shceme
8e32e0015564 aufs: pre fs_context, convert a static flag to a macro
f90cb4144aec aufs: pre fs_context, support the incomplete sb and sbinfo case
948762ef859c aufs: pre fs_context, convert the type of alloc_sbinfo()
77151a08776b aufs: 5.15.5-20211129 ---> 5.15.5-20220117
2539adbbbe1e aufs: 5.14-20211018 ---> 5.15.5-20211129
7d32b25193c4 aufs: for v5.15-rc1, sync_inode() is gone
66ec0c509225 aufs: for v5.15-rc1, new param 'rcu' for ->get_acl()
69709dc518cd aufs: for v5.15-rc1, no mand-lock anymore
ada8fe9543e5 aufs: 5.14-20210906 ---> 5.14-20211018
b77f7f3f394a Revert "aufs: adjust to v5.15 fs changes"
81bdce5b5876 tick/nohz: WARN_ON --> WARN_ON_ONCE to prevent console saturation
97c963889222 sched/isolation: really align nohz_full with rcu_nocbs
871f23ad3627 Revert "ARM: defconfig: Enable ax88796c driver for Exynos boards"
ffad0783dd5b ARM: config: multi v7: Regenerate defconifg
5c1e1a1ff2d3 ARM: config: multi v7: Add renamed symbols
badaf96564fe ARM: config: multi v7: Clean up enabled by default options
34996040fc9b ARM: config: multi v7: Drop unavailable options
7f685244afb3 powerpc/mm: Switch obsolete dssall to .long
20301aeb1a64 riscv: fix build with binutils 2.38
9df58d070506 powerpc/lib/sstep: fix 'ptesync' build error
720b61fc400b x86_64_defconfig: Fix warnings
02bf23d26bc4 arm64: defconfig: cleanup config options
05914e2c87e5 arm: defconfig: drop unused POWER_AVS option
ffb532fa19b9 aufs5: fix build against v5.15.3+
a4b3abf4d96d qemux86: add configuration symbol to select values
fee94ee09154 clear_warn_once: add a clear_warn_once= boot parameter
3d8762d900d9 clear_warn_once: bind a timer to written reset value
95faacac47e8 clear_warn_once: expand debugfs to include read support
de20c4240018 perf: perf can not parser the backtrace of app in the 32bit system and 64bit kernel.
0e4aacead9c1 perf: x86-32: explicitly include <errno.h>
9ad92c11468e perf: mips64: Convert __u64 to unsigned long long
09e7efe3e68a perf: fix bench numa compilation
e79becc44fa6 perf: add SLANG_INC for slang.h
b1033b588681 perf: add sgidefs.h to for mips builds
cf9db484ac0b perf: change --root to --prefix for python install
7fd052c2c562 perf: add 'libperl not found' warning
27a437cdd469 perf: force include of <stdbool.h>
3b99d21bec2f fat: don't use obsolete random32 call in namei_vfat
a7e9293b506b FAT: Added FAT_NO_83NAME
6fd0e71d9e5c FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES option
c379b0d324ae FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES option
538be0fdb124 aufs: adjust to v5.15 fs changes
f45da75c8759 aufs5: core
047f57e07e01 aufs5: standalone
029fc15574c8 aufs5: mmap
610d0192ee94 aufs5: base
d4e428d0ec5f aufs5: kbuild
eb067eca251a yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR and NULL
286af18d0875 yaffs: fix -Wstringop-overread compile warning in yaffs_fix_null_name
24d59a4e26a6 yaffs2: v5.12+ build fixups (not runtime tested)
22c73536d5d7 yaffs: include blkdev.h
506b7251bfb8 yaffs: fix misplaced variable declaration
a0e26ff364dc yaffs2: v5.6 build fixups
b10b1b2d169e yaffs2: fix memory leak when /proc/yaffs is read
ad9adccbb214 yaffs: add strict check when call yaffs_internal_read_super
2e3c3aec8279 yaffs: repair yaffs_get_mtd_device
d662538516a7 yaffs: Fix build failure by handling inode i_version with proper atomic API
70a6113ee2c7 yaffs2: fix memory leak in mount/umount
3378e4a9e404 yaffs: Avoid setting any ACL releated xattr
ec2284edddef Yaffs:check oob size before auto selecting Yaffs1
c2a49874051c fs: yaffs2: replace CURRENT_TIME by other appropriate apis
e9a5105a3e73 yaffs2: adjust to proper location of MS_RDONLY
608807406f13 yaffs2: import git revision b4ce1bb (jan, 2020)
89e660ece42c initramfs: allow an optional wrapper script around initramfs generation
b179dbc9aa10 iwlwifi: select MAC80211_LEDS conditionally
3fd5ca3673d0 net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119)
d1f6edbf0188 arm64/perf: Fix wrong cast that may cause wrong truncation
d202fb2caf33 defconfigs: drop obselete options
9a27e3b5f4e7 arm64/perf: fix backtrace for AAPCS with FP enabled
e20d8cf019b4 linux-yocto: Handle /bin/awk issues
b6d2a3dbbd3a uvesafb: provide option to specify timeout for task completion
adb40f1e6a1a uvesafb: print error message when task timeout occurs
f280a1ed0962 compiler.h: Undef before redefining __attribute_const__
4352732f268c vmware: include jiffies.h
7954a677968d Resolve jiffies wrapping about arp
5f28a1035d95 nfs: Allow default io size to be configured.
0d7260ad7106 check console device file on fs when booting
900a12e37e0a mount_root: clarify error messages for when no rootfs found
7b878cbea726 menuconfig,mconf-cfg: Allow specification of ncurses location
6604fc1763b3 modpost: mask trivial warnings
0d294adb09cb kbuild: exclude meta directory from distclean processing
a097cdd95a9e powerpc: serialize image targets
5db6ec39a0a3 arm: serialize build targets
cbabca27905e crtsavres: fixups for 5.4+
7fc7656ed403 powerpc/ptrace: Disable array-bounds warning with gcc8
a5faac5a19a2 powerpc: Disable attribute-alias warnings from gcc8
186c54665b67 powerpc: add crtsavres.o to archprepare for kbuild
d1ea862964ca powerpc: kexec fix for powerpc64
2ac35b89a0f9 powerpc: Add unwind information for SPE registers of E500 core
2e1c348a28bb mips: vdso: fix 'jalr $t9' crash in vdso code
ec57870b303a mips: Kconfig: add QEMUMIPS64 option
6a81b3c08107 4kc cache tlb hazard: tlbp cache coherency
74e3b2a21e54 malta uhci quirks: make allowance for slow 4k(e)c
22e65b63d3b4 arm/Makefile: Fix systemtap
b7f1ab59f19e vexpress: Pass LOADADDR to Makefile
ce2800c73bf7 arm: ARM EABI socketcall
019d142fd956 ARM: LPAE: Invalidate the TLB for module addresses during translation fault
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_5.15.bb | 6 ++---
.../linux/linux-yocto-tiny_5.15.bb | 6 ++---
meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++----------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index 5ad7febb20..f6ff6ede18 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "bf104e8f5db008e45d982ff2d96b136e619be9ee"
-SRCREV_meta ?= "0b6359f487c6f8dc0d6adb061dd5afe476cc71a2"
+SRCREV_machine ?= "450d764329026c622d2fcc8e0841ee8c003deb48"
+SRCREV_meta ?= "9f60e205e8e28fdf90fbceb54c6ed2aec0b42ed3"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.15.153"
+LINUX_VERSION ?= "5.15.155"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
index a55ad58eaa..6e59eb6ceb 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
@@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.15.153"
+LINUX_VERSION ?= "5.15.155"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "4ef577ca14a247aa0c3283ad1fc3f5c9dcc80e63"
-SRCREV_meta ?= "0b6359f487c6f8dc0d6adb061dd5afe476cc71a2"
+SRCREV_machine ?= "b662753bbd1caacf51d1cef578eceb1b58a753f0"
+SRCREV_meta ?= "9f60e205e8e28fdf90fbceb54c6ed2aec0b42ed3"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
index 8026be18a8..b6d7fbf7c1 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
@@ -14,24 +14,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base"
KBRANCH:qemux86-64 ?= "v5.15/standard/base"
KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "019dfee2a419e087baacbfca08d7bbb2bfd26ec5"
-SRCREV_machine:qemuarm64 ?= "17269f6b7e7ddf2178fb957f7e3f4c038de10f51"
-SRCREV_machine:qemumips ?= "a0b4f69bd55db8f36a749febbe952ed635677faf"
-SRCREV_machine:qemuppc ?= "9768dfa1dde96b13c14a40a7abb936217d8ac1ef"
-SRCREV_machine:qemuriscv64 ?= "163500b871852fd7eb5f148948583ca7bed338db"
-SRCREV_machine:qemuriscv32 ?= "163500b871852fd7eb5f148948583ca7bed338db"
-SRCREV_machine:qemux86 ?= "163500b871852fd7eb5f148948583ca7bed338db"
-SRCREV_machine:qemux86-64 ?= "163500b871852fd7eb5f148948583ca7bed338db"
-SRCREV_machine:qemumips64 ?= "5a278da2a79b5b84ce6bb6a6e19af7b1f30af0b2"
-SRCREV_machine ?= "163500b871852fd7eb5f148948583ca7bed338db"
-SRCREV_meta ?= "0b6359f487c6f8dc0d6adb061dd5afe476cc71a2"
+SRCREV_machine:qemuarm ?= "699ce07e7326d5a4143655ab8416bf7b8d641260"
+SRCREV_machine:qemuarm64 ?= "1f8f9d20707574ce56ab3ada6554c2a9cbce55fb"
+SRCREV_machine:qemumips ?= "5eeedd87a05a973e797357c61564c2e82cff7755"
+SRCREV_machine:qemuppc ?= "5f854a0765bf57db2289780152651d2b463fb41e"
+SRCREV_machine:qemuriscv64 ?= "97a728f8e22ebd7ed35066e01060e97b4a89da05"
+SRCREV_machine:qemuriscv32 ?= "97a728f8e22ebd7ed35066e01060e97b4a89da05"
+SRCREV_machine:qemux86 ?= "97a728f8e22ebd7ed35066e01060e97b4a89da05"
+SRCREV_machine:qemux86-64 ?= "97a728f8e22ebd7ed35066e01060e97b4a89da05"
+SRCREV_machine:qemumips64 ?= "9aa2c6f70ea08ee03c53ed3a96b91907db782dd8"
+SRCREV_machine ?= "97a728f8e22ebd7ed35066e01060e97b4a89da05"
+SRCREV_meta ?= "9f60e205e8e28fdf90fbceb54c6ed2aec0b42ed3"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "9465fef4ae351749f7068da8c78af4ca27e61928"
+SRCREV_machine:class-devupstream ?= "fa3df276cd36c5dbbd9deb64129d0d0f14c35dc8"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v5.15/base"
@@ -39,7 +39,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.15.153"
+LINUX_VERSION ?= "5.15.155"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.39.2
^ permalink raw reply related [relevance 1%]
* [PATCH 11/12] linux-yocto/6.6: update to v6.6.29
2024-05-03 2:40 1% ` [PATCH 01/12] linux-yocto/6.6: update to v6.6.24 bruce.ashfield
2024-05-03 2:40 2% ` [PATCH 06/12] linux-yocto/6.6: update to v6.6.27 bruce.ashfield
@ 2024-05-03 2:40 4% ` bruce.ashfield
2 siblings, 0 replies; 200+ results
From: bruce.ashfield @ 2024-05-03 2:40 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/6.6 to the latest korg -stable release that comprises
the following commits:
a3463f081046 Linux 6.6.29
63cc4f14bb03 selftests: kselftest: Fix build failure with NOLIBC
c67f926ec870 thunderbolt: Reset only non-USB4 host routers in resume
b0f4478838be PCI/ASPM: Fix deadlock when enabling ASPM
3b629239773b ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
4cbb88351b55 ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
5c20b242d4fe ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
3160d9734453 ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
6355b468e2a7 powerpc/ftrace: Ignore ftrace locations in exit text sections
43a71c1b4b3a virtio_net: Do not send RSS key if it is not supported
bd41ee1efd47 net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
21b9d89d9342 net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
2382eae66b19 nilfs2: fix OOB in nilfs_set_de_type
e46d3be714ad bootconfig: use memblock_free_late to free xbc memory to buddy
a019b44b1bc6 nouveau: fix instmem race condition around ptr stores
5d2f587aef37 drm/vmwgfx: Fix crtc's atomic check conditional
f1769cb2c912 drm/vmwgfx: Sort primary plane formats by order of preference
65674218b43f drm/vmwgfx: Fix prime import/export
db74904a93a3 drm/amdgpu: remove invalid resource->start check v2
aa02d43367a9 drm/amdkfd: Fix memory leak in create_process failure
ef13eeca7c79 drm/amdgpu: validate the parameters of bo mapping operations more clearly
885d4c31a432 fuse: fix leaked ENOSYS error on first statx call
cc10db003033 mm/shmem: inline shmem_is_huge() for disabled transparent hugepages
882e1180c83f mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled
c85106fb08f4 mm,swapops: update check in is_pfn_swap_entry for hwpoison entries
db01bfbdddd8 mm/userfaultfd: allow hugetlb change protection upon poison entry
81cf85ae4f2d init/main.c: Fix potential static_command_line memory overflow
31f815cb4360 arm64: hibernate: Fix level3 translation fault in swsusp_save()
e972b6a70126 arm64/head: Disable MMU at EL2 before clearing HCR_EL2.E2H
cdf811a93747 KVM: x86/mmu: Write-protect L2 SPTEs in TDP MMU when clearing dirty status
947d518e0daf KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
037e48ceccf1 KVM: x86/pmu: Disable support for adaptive PEBS
bdda0c17fe90 KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
7fce9f0f4810 sched: Add missing memory barrier in switch_mm_cid
ac107356aabc fs: sysfs: Fix reference leak in sysfs_break_active_protection()
8defb1d22ba0 speakup: Avoid crash on very long word
2a19c2a5caf0 mei: me: disable RPL-S on SPS and IGN firmwares
f356fd0cbd9c usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
aa61f87fd18b usb: Disable USB3 LPM at shutdown
8a139fa44870 usb: dwc2: host: Fix dereference issue in DDMA completion flow.
2ff436b63998 Revert "usb: cdc-wdm: close race between read and workqueue"
d841a93b5a24 USB: serial: option: add Telit FN920C04 rmnet compositions
0772a60994ee USB: serial: option: add Rolling RW101-GL and RW135-GL support
b39ecc8c97ab USB: serial: option: support Quectel EM060K sub-models
aeb7de0a3840 USB: serial: option: add Lonsung U8300/U9300 product
f91606d71fab USB: serial: option: add support for Fibocom FM650/FG650
590d0e130757 USB: serial: option: add Fibocom FM135-GL variants
83290f9f0719 serial: core: Fix missing shutdown and startup for serial base port
7ae7104d5434 serial: core: Clearing the circular buffer before NULLifying it
12e9459ddaea serial: stm32: Reset .throttled state in .startup()
9f9be0ec3130 serial: stm32: Return IRQ_NONE in the ISR if no handling happend
52aaf1ff1462 serial/pmac_zilog: Remove flawed mitigation for rx irq flood
5f40fd6ca2cf serial: mxs-auart: add spinlock around changing cts state
59f33af97961 comedi: vmk80xx: fix incomplete endpoint checking
9954c514424f thunderbolt: Fix wake configurations after device unplug
3238b23e661e thunderbolt: Avoid notify PM core about runtime PM resume
1d7f1049035b binder: check offset alignment in binder_get_object()
ce2ec45c7817 ALSA: hda/realtek - Enable audio jacks of Haier Boyue G42 with ALC269VC
90782cf17e9c ALSA: hda/realtek: Add quirks for Huawei Matebook D14 NBLB-WAX9N
05e6bfd31b06 ALSA: hda/tas2781: Add new vendor_id and subsystem_id to support ThinkPad ICE-1
1da8f46f1332 ALSA: hda/tas2781: correct the register for pow calibrated data
02d32d5acb13 ALSA: seq: ump: Fix conversion from MIDI2 to MIDI1 UMP messages
388a7302beda net/mlx5: E-switch, store eswitch pointer before registering devlink_param
00cf046afe34 x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
5facc0428bd2 x86/bugs: Fix BHI retpoline check
c0dcd5c072e2 clk: mediatek: Do a runtime PM get on controllers during probe
2c077fdfd09d clk: Get runtime PM before walking tree for clk_summary
888a44f261ae clk: Show active consumers of clocks in debugfs
60ff482c4205 clk: Get runtime PM before walking tree during disable_unused
731ffd8dea1c clk: Initialize struct clk_core kref earlier
02a516cbda04 clk: Remove prepare_lock hold assertion in __clk_release()
d0d04efa2e36 interconnect: Don't access req_list while it's being manipulated
d7cc1d721564 platform/x86/amd/pmc: Extend Framework 13 quirk to more BIOSes
3adcbec4dc62 usb: new quirk to reduce the SET_ADDRESS request timeout
26cc5cb00310 usb: xhci: Add timeout argument in address_device USB HCD callback
ac1ddbed5b2e drm: panel-orientation-quirks: Add quirk for Lenovo Legion Go
771ad4dfbdbb ALSA: scarlett2: Rename scarlett_gen2 to scarlett2
4afc65cf78bd PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word()
d9a28916ff35 PCI/DPC: Use FIELD_GET()
4ef929059230 ALSA: scarlett2: Add Focusrite Clarett 2Pre and 4Pre USB support
92088c488e20 ALSA: scarlett2: Add Focusrite Clarett+ 2Pre and 4Pre support
2c57a5c68f49 ALSA: scarlett2: Add correct product series name to messages
9c48e24cb71b ALSA: scarlett2: Default mixer driver to enabled
3c1d704d9266 thunderbolt: Reset topology created by the boot firmware
90cdb98254ef thunderbolt: Make tb_switch_reset() support Thunderbolt 2, 3 and USB4 routers
dc32d754d7cc thunderbolt: Introduce tb_path_deactivate_hop()
6c24584aface thunderbolt: Introduce tb_port_reset()
ac630fb8dbb5 ASoC: ti: Convert Pandora ASoC to GPIO descriptors
a95f279ecd33 ALSA: scarlett2: Add support for Clarett 8Pre USB
a299e0bf4d2d ALSA: scarlett2: Move USB IDs out from device_info struct
259486b5bdc6 drm/radeon: make -fstrict-flex-arrays=3 happy
158010bf1a84 drm/panel: visionox-rm69299: don't unregister DSI device
6690cc2732e2 drm: nv04: Fix out of bounds access
2df56f4ea769 s390/cio: fix race condition during online processing
e43c12451a7d s390/qdio: handle deferred cc1
c418d7a675d8 perf lock contention: Add a missing NULL check
910be4f9f805 RDMA/mlx5: Fix port number for counter query in multi-port configuration
b42852826323 RDMA/cm: Print the old state when cm_destroy_id gets timeout
99a7ccc4e038 RDMA/rxe: Fix the problem "mutex_destroy missing"
75170320459a drm/i915/mst: Limit MST+DSC to TGL+
7ba7f7074006 net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
6855f724f196 net: ethernet: mtk_eth_soc: fix WED + wifi reset
cd81184797a0 gpiolib: swnode: Remove wrong header inclusion
121fb75414ab s390/ism: Properly fix receive message buffer allocation
f8de1b6208bf net: dsa: mt7530: fix port mirroring for MT7988 SoC switch
d1be39605392 net: dsa: mt7530: fix mirroring frames received on local port
40f4ced305c6 tun: limit printing rate when illegal packet received by tun dev
0ada9981cdfe ice: Fix checking for unsupported keys on non-tunnel device
8d2e34e4e20e ice: tc: allow zero flags in parsing tc flower
91efeadfa20e ice: tc: check src_vsi in case of traffic from VF
93d565ebe41f net: stmmac: Fix IP-cores specific MAC capabilities
178856bf1f50 net: stmmac: Fix max-speed being ignored on queue re-init
0580dcc53a7f net: stmmac: Apply half-duplex-less constraint for DW QoS Eth only
447e00fb04f7 octeontx2-pf: fix FLOW_DIS_IS_FRAGMENT implementation
622479d10047 net: change maximum number of UDP segments to 128
48c4bb81df19 net/mlx5e: Prevent deadlock while disabling aRFS
c7fbc7bb48fc net/mlx5: Lag, restore buckets number to default after hash LAG deactivation
ff928d7bb1d8 net: sparx5: flower: fix fragment flags handling
022d81a709cd af_unix: Don't peek OOB data without MSG_OOB.
aea3cb8cfb30 af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
4ed82dd368ad netfilter: flowtable: incorrect pppoe tuple
a2471d271042 netfilter: flowtable: validate pppoe header
ebf7c9746f07 netfilter: nft_set_pipapo: do not free live element
3f59ac29dea0 netfilter: br_netfilter: skip conntrack input hook for promisc packets
ad333578f736 netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
a9ebf340d123 netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
5562a51c6e4e scsi: ufs: qcom: Add missing interconnect bandwidth values for Gear 5
ac4ad513de4f arm64: tlb: Fix TLBI RANGE operand
663f72cf95ed arm64/mm: Modify range-based tlbi to decrement scale
bc835b838999 net: usb: ax88179_178a: avoid writing the mac address before first reading
37e14dbe8c8f scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING
998f52a86055 random: handle creditable entropy from atomic process context
9f39e9e367b3 selftests/ftrace: Limit length in subsystem-enable tests
5b84dab87cdb SUNRPC: Fix rpcgss_context trace event acceptor field
5e3eb862df9f drm/i915/vma: Fix UAF on destroy against retire race
63fb4af8a069 io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
390a71e361f4 media: videobuf2: request more buffers for vb2_read
bef71390ac37 drm/msm/dpu: populate SSPP scaler block version
fe09b8d26e1a selftests: timers: Fix posix_timers ksft_print_msg() warning
dbfb5232bd83 ceph: redirty page before returning AOP_WRITEPAGE_ACTIVATE
985b9ee8a2cf ceph: rename _to_client() to _to_fs_client()
2e2023e9a4c2 ceph: pass the mdsc to several helpers
a17236f99f49 drm/amd/display: Do not recursively call manual trigger programming
c626db7151bf selftests/timers/posix_timers: Reimplement check_timer_distribution()
b04cae49a5e7 selftests: timers: Convert posix_timers test to generate KTAP output
9d106175b7a0 drm/i915: Disable live M/N updates when using bigjoiner
ccb0934aeb3f drm/i915: Adjust seamless_m_n flag behaviour
deaeb5b64c5b drm/i915: Enable VRR later during fastsets
7e50ac4203d6 drm/i915: Extract intel_crtc_vblank_evade_scanlines()
e19dc8c49e97 drm/i915: Change intel_pipe_update_{start,end}() calling convention
51cc733fb48e drm/i915/cdclk: Fix voltage_level programming edge case
6711b0817a38 drm/i915/mst: Reject FEC+MST on ICL
6b625d2743b4 drm/i915: Fix FEC pipe A vs. DDI A mixup
488d4cbc6f28 smb: client: refresh referral without acquiring refpath_lock
645f332c6b63 smb: client: guarantee refcounted children from parent session
441786be0c19 smb3: show beginning time for per share stats
6202996a1c18 smb: client: fix UAF in smb2_reconnect_server()
fe1bad73d35f smb: client: remove extra @chan_count check in __cifs_put_smb_ses()
06644f0d7193 drm/tilcdc: Set preferred depth
ff7ae7b32324 crypto: jitter - add RCT/APT support for different OSRs
50cd24ddb6f0 arm64: defconfig: remove CONFIG_IPQ_APSS_5018
58e5c91d6701 x86/alternatives: Disable interrupts and sync when optimizing NOPs in place
c878fd2d4c79 x86/alternatives: Sync core before enabling interrupts
c2d64b9f52b6 qemux86: add configuration symbol to select values
630c33229e6d sched/isolation: really align nohz_full with rcu_nocbs
0e5e0f68e2e6 clear_warn_once: add a clear_warn_once= boot parameter
46934791b902 clear_warn_once: bind a timer to written reset value
cdee9e38ff32 clear_warn_once: expand debugfs to include read support
82b562b81841 tools: Remove some options from CLANG_CROSS_FLAGS
36dc380b776b libbpf: Fix build warning on ref_ctr_off
9e3e1fe20982 perf: perf can not parser the backtrace of app in the 32bit system and 64bit kernel.
e497a4a5da65 perf: x86-32: explicitly include <errno.h>
7b57ddd89565 perf: mips64: Convert __u64 to unsigned long long
1cfc19423dc7 perf: fix bench numa compilation
98bc2815fade perf: add SLANG_INC for slang.h
17209a70b9b3 perf: add sgidefs.h to for mips builds
9cd4258d910a perf: change --root to --prefix for python install
8110a4f26628 perf: add 'libperl not found' warning
bc89d5e08f77 perf: force include of <stdbool.h>
4f6c760cc876 fat: Replace prandom_u32() with get_random_u32()
bc53117b12b2 fat: don't use obsolete random32 call in namei_vfat
30b2236ab378 FAT: Added FAT_NO_83NAME
cef98d22b4ed FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES option
0bbd7daba9e1 FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES option
5883fc340084 aufs6: adapt to v6.6 i_op->ctime changes
c4342d979bf2 aufs6: fix magic.mk include path
35266bc2dc81 aufs6: adapt to v6.6
8edede4e98be aufs6: core
712248233ebe aufs6: standalone
3b71a8a848d8 aufs6: mmap
3e2924871f37 aufs6: base
7f4907a93101 aufs6: kbuild
d2f7b03e4aa7 yaffs2: update VFS ctime operations to 6.6+
bcd6cfcd1aa0 yaffs2: v6.5 fixups
cc615704b5f5 yaffs2: Fix miscalculation of devname buffer length
8ef2e22dcf91 yaffs2: convert user_namespace to mnt_idmap
c9c749f9f7d3 yaffs2: replace bdevname call with sprintf
395b01cdc39d yaffs2: convert read_page -> readfolio
d98b07e43ba6 yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR and NULL
613c6d50fdbe yaffs: fix -Wstringop-overread compile warning in yaffs_fix_null_name
622c4648936f yaffs2: v5.12+ build fixups (not runtime tested)
7562133d4090 yaffs: include blkdev.h
dbd44252cd59 yaffs: fix misplaced variable declaration
c223a10b1ac0 yaffs2: v5.6 build fixups
90f6007cfbf4 yaffs2: fix memory leak when /proc/yaffs is read
37ee169c5ea1 yaffs: add strict check when call yaffs_internal_read_super
b6e007b8abb6 yaffs: repair yaffs_get_mtd_device
fb98f65a466a yaffs: Fix build failure by handling inode i_version with proper atomic API
51e0aac75ea2 yaffs2: fix memory leak in mount/umount
2b74a0cae7b0 yaffs: Avoid setting any ACL releated xattr
ff4130a9c376 Yaffs:check oob size before auto selecting Yaffs1
ba95b409c67c fs: yaffs2: replace CURRENT_TIME by other appropriate apis
8fa35eba9056 yaffs2: adjust to proper location of MS_RDONLY
1eb5deaad8c4 yaffs2: import git revision b4ce1bb (jan, 2020)
4dce67c1e8c8 initramfs: allow an optional wrapper script around initramfs generation
2f603d83fcc4 pnmtologo: use relocatable file name
664a6a0a484b tools: use basename to identify file in gen-mach-types
9de64bc0c185 lib/build_OID_registry: fix reproducibility issues
ae9b80797295 vt/conmakehash: improve reproducibility
a972323151bd iwlwifi: select MAC80211_LEDS conditionally
15d2adcc0198 net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119)
5556a6c04b19 arm64/perf: Fix wrong cast that may cause wrong truncation
5552dc768ffc defconfigs: drop obselete options
00fe4152df31 arm64/perf: fix backtrace for AAPCS with FP enabled
3888d0652edf linux-yocto: Handle /bin/awk issues
3d55d299f23a uvesafb: provide option to specify timeout for task completion
23c068c080be uvesafb: print error message when task timeout occurs
edbfc939266e compiler.h: Undef before redefining __attribute_const__
c99ae7e2a19a vmware: include jiffies.h
572d84d928c8 Resolve jiffies wrapping about arp
fdcd47cac843 nfs: Allow default io size to be configured.
927d48801098 check console device file on fs when booting
57cc27f821dd mount_root: clarify error messages for when no rootfs found
1b53d82a8152 mconf: fix output of cflags and libraries
1811da09f42c menuconfig,mconf-cfg: Allow specification of ncurses location
83c2e0c6eb1f modpost: mask trivial warnings
6de673039484 kbuild: exclude meta directory from distclean processing
6decd32815f5 powerpc: serialize image targets
f6b683b38318 arm: serialize build targets
e798b09ebf57 mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, release} to avoid race condition
dc8a1e5a88f8 x86_64_defconfig: Fix warnings
68491e5f72b6 powerpc/ptrace: Disable array-bounds warning with gcc8
d71ebfce3004 powerpc: Disable attribute-alias warnings from gcc8
62f50884b8b1 powerpc: kexec fix for powerpc64
da6871c62c37 powerpc: Add unwind information for SPE registers of E500 core
f161c880c11d mips: make current_cpu_data preempt safe
5e94a8247ce7 mips: vdso: fix 'jalr $t9' crash in vdso code
19e36714b1c7 mips: Kconfig: add QEMUMIPS64 option
e2e537db3cbd 4kc cache tlb hazard: tlbp cache coherency
aee9870611e5 malta uhci quirks: make allowance for slow 4k(e)c
881948cd1517 drm/fb-helper: move zeroing code to drm_fb_helper_fill_var
98ec1963fcb7 arm64: defconfig: cleanup config options
f1727c537ba8 vexpress: Pass LOADADDR to Makefile
4474c32dc24a arm: ARM EABI socketcall
75e31a2b70fd ARM: LPAE: Invalidate the TLB for module addresses during translation fault
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.6.bb | 6 ++--
.../linux/linux-yocto-tiny_6.6.bb | 6 ++--
meta/recipes-kernel/linux/linux-yocto_6.6.bb | 28 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
index 2f3008140d..ea429692d8 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
@@ -14,13 +14,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "471a0c8db3216975eaf56a8fe3a19550a6210e27"
-SRCREV_meta ?= "1cd08f1fb2b33510783fa31c11150038a1ff8c42"
+SRCREV_machine ?= "99d3632c1cf7688066e57aea89f9adfe8d1a5ca5"
+SRCREV_meta ?= "a78c74a3510067017dda1926f88bd914f0a053b3"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
-LINUX_VERSION ?= "6.6.28"
+LINUX_VERSION ?= "6.6.29"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
index 05ce4c5713..bdad73bbbc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
# CVE exclusions
include recipes-kernel/linux/cve-exclusion_6.6.inc
-LINUX_VERSION ?= "6.6.28"
+LINUX_VERSION ?= "6.6.29"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "c59995318b24c6b5a9969d43c0ca0179612aac2d"
-SRCREV_meta ?= "1cd08f1fb2b33510783fa31c11150038a1ff8c42"
+SRCREV_machine ?= "6655dc03f5de7bb734da3ec8eb97f9be281dfbdb"
+SRCREV_meta ?= "a78c74a3510067017dda1926f88bd914f0a053b3"
PV = "${LINUX_VERSION}+git"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
index 2930343090..12197ba414 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.6/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.6/standard/base"
KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "c57230148694fc5902bdf9d157232c6ebb88dc1a"
-SRCREV_machine:qemuarm64 ?= "c59995318b24c6b5a9969d43c0ca0179612aac2d"
-SRCREV_machine:qemuloongarch64 ?= "c59995318b24c6b5a9969d43c0ca0179612aac2d"
-SRCREV_machine:qemumips ?= "997005f111bca244db370a8ecaa3bcb37302d800"
-SRCREV_machine:qemuppc ?= "c59995318b24c6b5a9969d43c0ca0179612aac2d"
-SRCREV_machine:qemuriscv64 ?= "c59995318b24c6b5a9969d43c0ca0179612aac2d"
-SRCREV_machine:qemuriscv32 ?= "c59995318b24c6b5a9969d43c0ca0179612aac2d"
-SRCREV_machine:qemux86 ?= "c59995318b24c6b5a9969d43c0ca0179612aac2d"
-SRCREV_machine:qemux86-64 ?= "c59995318b24c6b5a9969d43c0ca0179612aac2d"
-SRCREV_machine:qemumips64 ?= "262154440336f42524f03266bb0cc6e7ed62f9d6"
-SRCREV_machine ?= "c59995318b24c6b5a9969d43c0ca0179612aac2d"
-SRCREV_meta ?= "1cd08f1fb2b33510783fa31c11150038a1ff8c42"
+SRCREV_machine:qemuarm ?= "45982c347ee123883a88f220d1d9a740e2c2b959"
+SRCREV_machine:qemuarm64 ?= "6655dc03f5de7bb734da3ec8eb97f9be281dfbdb"
+SRCREV_machine:qemuloongarch64 ?= "6655dc03f5de7bb734da3ec8eb97f9be281dfbdb"
+SRCREV_machine:qemumips ?= "738f344ef6da38ebf6fcca87b701281c930b16e4"
+SRCREV_machine:qemuppc ?= "6655dc03f5de7bb734da3ec8eb97f9be281dfbdb"
+SRCREV_machine:qemuriscv64 ?= "6655dc03f5de7bb734da3ec8eb97f9be281dfbdb"
+SRCREV_machine:qemuriscv32 ?= "6655dc03f5de7bb734da3ec8eb97f9be281dfbdb"
+SRCREV_machine:qemux86 ?= "6655dc03f5de7bb734da3ec8eb97f9be281dfbdb"
+SRCREV_machine:qemux86-64 ?= "6655dc03f5de7bb734da3ec8eb97f9be281dfbdb"
+SRCREV_machine:qemumips64 ?= "7f4b889b7acb9fe36e290bf40c2e9b6cec523f6d"
+SRCREV_machine ?= "6655dc03f5de7bb734da3ec8eb97f9be281dfbdb"
+SRCREV_meta ?= "a78c74a3510067017dda1926f88bd914f0a053b3"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "ba151416051a45ffca565f708584b9cd5c971481"
+SRCREV_machine:class-devupstream ?= "a3463f08104612fc979c41fa54733e925205d3d7"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.6/base"
@@ -44,7 +44,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.6.28"
+LINUX_VERSION ?= "6.6.29"
PV = "${LINUX_VERSION}+git"
--
2.39.2
^ permalink raw reply related [relevance 4%]
* [PATCH 06/12] linux-yocto/6.6: update to v6.6.27
2024-05-03 2:40 1% ` [PATCH 01/12] linux-yocto/6.6: update to v6.6.24 bruce.ashfield
@ 2024-05-03 2:40 2% ` bruce.ashfield
2024-05-03 2:40 4% ` [PATCH 11/12] linux-yocto/6.6: update to v6.6.29 bruce.ashfield
2 siblings, 0 replies; 200+ results
From: bruce.ashfield @ 2024-05-03 2:40 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/6.6 to the latest korg -stable release that comprises
the following commits:
5e828009c8b3 Linux 6.6.27
5c1dc516f52a drm: Check polling initialized before enabling in drm_helper_probe_single_connector_modes
14ac934db851 Revert "drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init()"
91fb03cea0d5 VMCI: Fix possible memcpy() run-time warning in vmci_datagram_invoke_guest_handler()
b456cb98cbad net: mpls: error out if inner headers are not set
83890a450378 Bluetooth: btintel: Fixe build regression
ce64c26ba842 platform/x86: intel-vbtn: Update tablet mode switch at end of probe
300a2b9c2b28 randomize_kstack: Improve entropy diffusion
41671f0c0182 media: mediatek: vcodec: adding lock to protect encoder context list
0a2dc707aa42 media: mediatek: vcodec: adding lock to protect decoder context list
ec25fc3c2c1e media: mediatek: vcodec: Fix oops when HEVC init fails
a445eb1f630f selftests: mptcp: display simult in extra_msg
9dff96b8b3a4 gcc-plugins/stackleak: Avoid .head.text section
7365444cbd8f ALSA: hda/realtek: Add quirks for some Clevo laptops
3d4b909704bf fbmon: prevent division by zero in fb_videomode_from_videomode()
5e11bacff08b drivers/nvme: Add quirks for device 126f:2262
19e525ebbb88 modpost: fix null pointer dereference
21162ad2de74 io_uring: clear opcode specific data for an early failure
89f0cf6ac620 fbdev: viafb: fix typo in hw_bitblt_1 and hw_bitblt_2
4cd44fd34545 x86/xen: attempt to inflate the memory balloon on PVH
9afc9fde538b ASoC: soc-core.c: Skip dummy codec when adding platforms
d009236a37ae thermal/of: Assume polling-delay(-passive) 0 when absent
6712b758698b ASoC: amd: yc: Fix non-functional mic on ASUS M7600RE
fa5c8f2c88a9 usb: sl811-hcd: only defined function checkdone if QUIRK2 is defined
55b724b8f7ee usb: typec: tcpci: add generic tcpci fallback compatible
d8518f05ee82 thunderbolt: Keep the domain powered when USB4 port is in redrive mode
266f403ec475 usb: typec: ucsi: Limit read size on v1.2
0d52e1853bc1 usb: gadget: uvc: mark incomplete frames with UVC_STREAM_ERR
4b1f991bad56 kernfs: RCU protect kernfs_nodes and avoid kernfs_idr_lock in kernfs_find_and_get_node_by_id()
ac191bcb0fe0 bus: mhi: host: Add MHI_PM_SYS_ERR_FAIL state
bb72eb818d07 tools: iio: replace seekdir() in iio_generic_buffer
fb8579acacd0 ring-buffer: use READ_ONCE() to read cpu_buffer->commit_page in concurrent environment
80f175d0f352 Input: xpad - add support for Snakebyte GAMEPADs
fd067c8b3f86 ktest: force $buildonly = 1 for 'make_warnings_file' test type
60668872cca8 ALSA: hda/realtek: Add quirk for Lenovo Yoga 9 14IMH9
08aba129f542 perf/x86/amd/lbr: Discard erroneous branch entries
a9852cf5d7a1 platform/x86: touchscreen_dmi: Add an extra entry for a variant of the Chuwi Vi8 tablet
ed2f8b713a45 Input: allocate keycode for Display refresh rate toggle
dddc9f40ac8e Input: imagis - use FIELD_GET where applicable
2e90774fbbe0 RDMA/cm: add timeout to cm_destroy_id wait
5f7fd6aa4c48 block: prevent division by zero in blk_rq_stat_sum()
0662deae8bb8 drivers/perf: hisi: Enable HiSilicon Erratum 162700402 quirk for HIP09
44723bd493cd input/touchscreen: imagis: Correct the maximum touch area value
d0e2f7ae04bb libperf evlist: Avoid out-of-bounds access
a822f30afada Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default"
846611299931 PCI: Disable D3cold on Asus B1400 PCI-NVMe bridge
73bdf8d41cb5 SUNRPC: increase size of rpc_wait_queue.qlen from unsigned short to unsigned int
3d1b47e3a935 drm: Check output polling initialized before disabling
09d4600b9e99 drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init()
0f09e89e667e HID: input: avoid polling stylus battery on Chromebook Pompom
30930f0f4674 i2c: designware: Fix RX FIFO depth define on Wangxun 10Gb NIC
cd0a1835bf84 accel/habanalabs: increase HL_MAX_STR to 64 bytes to avoid warnings
953fee8160f1 drm/amd/display: Fix nanosec stat overflow
a5e76867714b ext4: forbid commit inconsistent quota data when errors=remount-ro
58546b2aa263 ext4: add a hint for block bitmap corrupt state in mb_groups
bd6b1c418bd6 ASoC: Intel: avs: Populate board selection with new I2S entries
f4a345e0aaf4 ALSA: firewire-lib: handle quirk to calculate payload quadlets as data block counter
cb9420142e50 media: sta2x11: fix irq handler cast
214a6c4a28c1 Julia Lawall reported this null pointer dereference, this should fix it.
24e5e1eff8ba rcu-tasks: Repair RCU Tasks Trace quiescence check
4d58c9fb45c7 rcu/nocb: Fix WARN_ON_ONCE() in the rcu_nocb_bypass_lock()
f4b6caeb3cfe ASoC: Intel: common: DMI remap for rebranded Intel NUC M15 (LAPRC710) laptops
d43a90294afe isofs: handle CDs with bad root inode but good Joliet root directory
07a2aa674fca scsi: lpfc: Fix possible memory leak in lpfc_rcv_padisc()
89e8524135a3 sysv: don't call sb_bread() with pointers_lock held
56f5e36dace6 pinctrl: renesas: checker: Limit cfg reg enum checks to provided IDs
852ad6a4f55c drm/ttm: return ENOSPC from ttm_bo_mem_space v3
02a3b0d58217 ASoC: SOF: amd: Optimize quirk for Valve Galileo
f19ad40352a8 drm: panel-orientation-quirks: Add quirk for GPD Win Mini
eafaec40d00f Input: synaptics-rmi4 - fail probing if memory allocation for "phys" fails
d6b2fe2db1d0 drm/vc4: don't check if plane->state->fb == state->fb
8677a14a8821 Bluetooth: Add new quirk for broken read key length on ATS2851
6d0950cf4313 Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922
ffdca0a62aba Bluetooth: btintel: Fix null ptr deref in btintel_read_version
a2e6bffc0388 net/smc: reduce rtnl pressure in smc_pnet_create_pnetids_list()
c926393dc344 ice: use relative VSI index for VFs instead of PF VSI number
c1363ed8867b btrfs: send: handle path ref underflow in header iterate_inode_ref()
30237d6764fe btrfs: export: handle invalid inode or root reference in btrfs_get_parent()
0d23b34c68c4 btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks()
5d7a8585fbb3 wifi: cfg80211: check A-MSDU format more carefully
95eec168c288 wifi: iwlwifi: Add missing MODULE_FIRMWARE() for *.pnvm
2618ab102c80 overflow: Allow non-type arg to type_max() and type_min()
3ba4aceb68f0 cpufreq: Don't unregister cpufreq cooling on CPU hotplug
138fdeac75fb wifi: ath11k: decrease MHI channel buffer length to 8KB
4031b72ca747 dma-direct: Leak pages on dma_set_decrypted() failure
9470114dfaf4 net: pcs: xpcs: Return EINVAL in the internal methods
cf21eb6a9fc2 tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num()
ec7256887d07 pstore/zone: Add a null pointer check to the psz_kmsg_read
a217b6135dab ACPI: x86: Move acpi_quirk_skip_serdev_enumeration() out of CONFIG_X86_ANDROID_TABLETS
1feb6fcfbac3 wifi: mt76: mt7996: add locking for accessing mapped registers
1152c2cd38e4 wifi: mt76: mt7996: disable AMSDU for non-data frames
891fd07da87b wifi: mt76: mt7915: add locking for accessing mapped registers
c39e75fae05c wifi: brcmfmac: Add DMI nvram filename quirk for ACEPC W5 Pro
5dc5f8c705c3 firmware: tegra: bpmp: Return directly after a failed kzalloc() in get_filename()
1b2b26595bb0 net: skbuff: add overflow debug check to pull/push helpers
b8dccb25c5dc ionic: set adminq irq affinity
9d3f959b4266 pmdomain: imx8mp-blk-ctrl: imx8mp_blk: Add fdcc clock to hdmimix domain
ce666cecc09c pmdomain: ti: Add a null pointer check to the omap_prm_domain_init
a7b862abe484 net: add netdev_lockdep_set_classes() to virtual drivers
fc1d1ca46d01 arm64: dts: rockchip: fix rk3399 hdmi ports node
5c014f039544 arm64: dts: rockchip: fix rk3328 hdmi ports node
bb8ca341f889 ARM: dts: rockchip: fix rk322x hdmi ports node
c795042eea78 ARM: dts: rockchip: fix rk3288 hdmi ports node
3f0a74728170 cpuidle: Avoid potential overflow in integer multiplication
750d44684a95 panic: Flush kernel log buffer at the end
a2e14cc2da40 printk: For @suppress_panic_printk check for other CPU in panic
dbd3c05d71e1 wifi: iwlwifi: pcie: Add the PCI device id for new hardware
dae70a575656 VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host()
0a6def05767c wifi: rtw89: pci: enlarge RX DMA buffer to consider size of RX descriptor
7a71f61ebf95 net: phy: phy_device: Prevent nullptr exceptions on ISR
2485beea14b3 net: stmmac: dwmac-starfive: Add support for JH7100 SoC
3dac6ab4d977 bnx2x: Fix firmware version string character counts
b34d64e9aa55 wifi: rtw89: fix null pointer access when abort scan
15df1981f0ed wifi: ath9k: fix LNA selection in ath_ant_try_scan()
315eb3c2df7e amdkfd: use calloc instead of kzalloc to avoid integer overflow
0ccfb8e07e79 Linux 6.6.26
6d9ef0c36980 x86: set SPECTRE_BHI_ON as default
cb238e95ee72 KVM: x86: Add BHI_NO
1c42ff893a8f x86/bhi: Mitigate KVM by default
d414b401f953 x86/bhi: Add BHI mitigation knob
118794d0a572 x86/bhi: Enumerate Branch History Injection (BHI) bug
c6e3d590d051 x86/bhi: Define SPEC_CTRL_BHI_DIS_S
eb36b0dce213 x86/bhi: Add support for clearing branch history at syscall entry
eb0f175b3428 x86/syscall: Don't force use of indirect calls for system calls
108feca9e47d x86/bugs: Change commas to semicolons in 'spectre_v2' sysfs file
046545314c79 x86/boot: Move mem_encrypt= parsing to the decompressor
ccde70aa54c4 x86/efistub: Remap kernel text read-only before dropping NX attribute
56408ed92903 x86/sev: Move early startup code into .head.text section
af90ced75242 x86/sme: Move early SME kernel encryption handling into .head.text
dc4cbf9e2df4 efi/libstub: Add generic support for parsing mem_encrypt=
5447cb97e9b2 x86/head/64: Move the __head definition to <asm/init.h>
876941f533e7 bpf: support deferring bpf_link dealloc to after RCU grace period
771690b7c31d bpf: put uprobe link's path and task in release callback
43eca11b7c73 mptcp: don't account accept() of non-MPC client as fallback to TCP
12f353fac65d mptcp: don't overwrite sock_ops in mptcp_is_tcpsk()
5b5ff82491a1 selftests: mptcp: connect: fix shellcheck warnings
e4a449368a2c of: module: prevent NULL pointer dereference in vsnprintf()
37b81aed6468 Revert "x86/mpparse: Register APIC address only once"
a7ff84a6fe5a drm/i915/gt: Enable only one CCS for compute workload
726ff623869d drm/i915/gt: Do not generate the command streamer for all the CCS
c1f7ce2a11a9 drm/i915/gt: Disable HW load balancing for CCS
2cfff2173213 smb: client: fix potential UAF in cifs_signal_cifsd_for_reconnect()
aa582b33f944 smb: client: fix potential UAF in smb2_is_network_name_deleted()
0a15ba88a32f smb: client: fix potential UAF in is_valid_oplock_break()
f92739fdd452 smb: client: fix potential UAF in smb2_is_valid_lease_break()
21fed37d2bdc smb: client: fix potential UAF in smb2_is_valid_oplock_break()
10e17ca4000e smb: client: fix potential UAF in cifs_dump_full_key()
c3cf8b74c579 smb: client: fix potential UAF in cifs_stats_proc_show()
cf03020c56d3 smb: client: fix potential UAF in cifs_stats_proc_write()
a65f2b56334b smb: client: fix potential UAF in cifs_debug_files_proc_show()
6f17163b9339 smb3: retrying on failed server close
ba55f8a995f6 smb: client: serialise cifs_construct_tcon() with cifs_mount_mutex
9b2ee27e8de5 smb: client: handle DFS tcons in cifs_construct_tcon()
00effef72c98 riscv: process: Fix kernel gp leakage
7a82963245eb riscv: Fix spurious errors from __get/put_kernel_nofault
3dcb2223b973 s390/entry: align system call table on 8 bytes
782baf52e7cb selftests/mm: include strings.h for ffsl
43fad1d0284d mm/secretmem: fix GUP-fast succeeding on secretmem folios
8a44119ca445 arm64/ptrace: Use saved floating point state type to determine SVE layout
92f32f108693 perf/x86/intel/ds: Don't clear ->pebs_data_cfg for the last PEBS event
453b5f2dec27 x86/coco: Require seeding RNG with RDRAND on CoCo systems
5a02df3e9247 x86/mce: Make sure to grab mce_sysfs_mutex in set_bank()
51b7841f3fe8 x86/mm/pat: fix VM_PAT handling in COW mappings
801c8b8ec5bf of: dynamic: Synchronize of_changeset_destroy() with the devlink removals
dfa655727688 driver core: Introduce device_link_wait_removal()
65938e81df21 io_uring/kbuf: hold io_buffer_list reference over mmap
6b9d49bcd97b io_uring: use private workqueue for exit work
b392402d29ab io_uring/kbuf: protect io_buffer_list teardown with a reference
4c0a5da0e70e io_uring/kbuf: get rid of bl->is_ready
d6e03f6d8bcc io_uring/kbuf: get rid of lower BGID lists
781477d729be ALSA: hda/realtek: Update Panasonic CF-SZ6 quirk to support headset with microphone
04d78aa05ae4 ALSA: hda/realtek - Fix inactive headset mic jack
67c477f3201c ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
a637fabac554 ksmbd: validate payload size in ipc response
a06562fd4ce2 ksmbd: don't send oplock break if rename fails
2f0262ac3a8c gpio: cdev: fix missed label sanitizing in debounce_setup()
d9f0804ab0b8 gpio: cdev: check for NULL labels when sanitizing them for irqs
63bd08629aee x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk
ac522af8db5c ice: fix typo in assignment
9d60e8ec996f nfsd: hold a lighter-weight client reference over CB_RECALL_ANY
6e307a6d9eb4 riscv: Disable preemption when using patch_map()
1ba1291172f9 SUNRPC: Fix a slow server-side memory leak with RPC-over-TCP
e12149dd9ba2 ASoC: SOF: amd: fix for false dsp interrupts
cbd080c30834 ata: sata_mv: Fix PCI device ID table declaration compilation warning
4b31a226097c spi: mchp-pci1xxx: Fix a possible null pointer dereference in pci1xxx_spi_probe
0fdada1ef5b1 cifs: Fix caching to try to do open O_WRONLY as rdwr on server
0f28afed9f9d Revert "ALSA: emu10k1: fix synthesizer sample playback position and caching"
f3e692c8c24a scsi: sd: Unregister device if device_add_disk() failed in sd_probe()
56de23eac65f scsi: mylex: Fix sysfs buffer lengths
4cad40d93665 ata: sata_sx4: fix pdc20621_get_from_dimm() on 64-bit
fce7a547b9c8 regmap: maple: Fix uninitialized symbol 'ret' warnings
04b52388c46d ASoC: amd: acp: fix for acp_init function error handling
3d3e148c7576 spi: s3c64xx: Use DMA mode from fifo size
5448a99c8096 spi: s3c64xx: determine the fifo depth only once
f8a6edd44903 spi: s3c64xx: allow full FIFO masks
6f9d907bee2a spi: s3c64xx: define a magic value
3fa0085f1052 spi: s3c64xx: remove else after return
56aeaed8c822 spi: s3c64xx: explicitly include <linux/bits.h>
0df4616ef533 spi: s3c64xx: sort headers alphabetically
bb3ee5fddac1 spi: s3c64xx: Extract FIFO depth calculation to a dedicated macro
80ca762f1bdd ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw
229c761b198e ASoC: rt722-sdca-sdw: fix locking sequence
1064108334bb ASoC: rt712-sdca-sdw: fix locking sequence
3bfbc530a658 ASoC: rt711-sdw: fix locking sequence
53c8045621c1 ASoC: rt711-sdca: fix locking sequence
8eea5ae23bab ASoC: rt5682-sdw: fix locking sequence
cc4d9f0597ee drm/prime: Unbreak virtgpu dma-buf export
692a51bebf45 nouveau/uvmm: fix addr/range calcs for remap operations
9e3941c90e46 drm/panfrost: fix power transition timeout warnings
4930d7a414c1 ALSA: hda: cs35l56: Add ACPI device match tables
3af6c5ac72dc regmap: maple: Fix cache corruption in regcache_maple_drop()
4e73748d5954 RISC-V: Update AT_VECTOR_SIZE_ARCH for new AT_MINSIGSTKSZ
b2ddeb7fb322 drivers/perf: riscv: Disable PERF_SAMPLE_BRANCH_* while not supported
3e1a29fb81c2 ASoC: wm_adsp: Fix missing mutex_lock in wm_adsp_write_ctl()
40613ea1d5ea 9p: Fix read/write debug statements to report server reply
f4a192cd7b25 fs/pipe: Fix lockdep false-positive in watchqueue pipe_write()
ab7a6fe9c1b5 KVM: SVM: Add support for allowing zero SEV ASIDs
79b79ea2b3bf KVM: SVM: Use unsigned integers when dealing with ASIDs
0a583b7ebb6f net: ravb: Always update error counters
1dd9204143d1 net: ravb: Always process TX descriptor ring
a9fb2f7463cd net: ravb: Let IP-specific receive function to interrogate descriptors
199a1314ef78 e1000e: move force SMBUS from enable ulp function to avoid PHY loss issue
eb96a5c02553 e1000e: Minor flow correction in e1000_shutdown function
1d16cd91cd31 e1000e: Workaround for sporadic MDI error on Meteor Lake systems
d5752c7bb1b2 intel: legacy: field get conversion
e383353b7992 intel: add bit macro includes where needed
e77220eec3ee i40e: Remove circular header dependencies and fix headers
59a9de1a9430 i40e: Split i40e_osdep.h
2ee5326d32c5 i40e: Move memory allocation structures to i40e_alloc.h
0ed115020ac4 i40e: Simplify memory allocation functions
0c52a50aec50 virtchnl: Add header dependencies
45116a7c2138 i40e: Refactor I40E_MDIO_CLAUSE* macros
f629cf15dcde i40e: Remove back pointer from i40e_hw structure
66ca011a5df5 i40e: Enforce software interrupt during busy-poll exit
e6d25dbd9243 i40e: Remove _t suffix from enum type names
3da10e91ecd2 drm/amd: Flush GFXOFF requests in prepare stage
da67a1139f05 drm/amd: Add concept of running prepare_suspend() sequence for IP blocks
8b5f720486ca drm/amd: Evict resources during PM ops prepare() callback
4356a2c3f296 drm/amd/display: Prevent crash when disable stream
8dc9a27589a9 drm/amd/display: Fix DPSTREAM CLK on and off sequence
113b12e16488 usb: typec: ucsi: Fix race between typec_switch and role_switch
0dcf573f9977 i40e: fix vf may be used uninitialized in this function warning
89e29416cf6b i40e: fix i40e_count_filters() to count only active/new filters
76c39cf84cd2 octeontx2-af: Add array index check
43b69da260af octeontx2-pf: check negative error code in otx2_open()
b08b0c7a66c9 octeontx2-af: Fix issue with loading coalesced KPU profiles
03b6f3692bae udp: prevent local UDP tunnel packets from being GROed
2a1b61d0cb9b udp: do not transition UDP GRO fraglist partial checksums to unnecessary
3001e7aa43d6 udp: do not accept non-tunnel GSO skbs landing in a tunnel
a5eae74f39c0 r8169: skip DASH fw status checks when DASH is disabled
36a1cb0371aa mlxbf_gige: stop interface during shutdown
f2dd75e57285 ipv6: Fix infinite recursion in fib6_dump_done().
74204bf9050f ax25: fix use-after-free bugs caused by ax25_ds_del_timer
8b88752d2b12 tcp: Fix bind() regression for v6-only wildcard and v4(-mapped-v6) non-wildcard addresses.
690e877ca2b6 selftests: reuseaddr_conflict: add missing new line at the end of the output
4e3fdeecec57 erspan: make sure erspan_base_hdr is present in skb->head
a03e138da771 i40e: Fix VF MAC filter removal
b9bd1498cdce ice: fix enabling RX VLAN filtering
fc126c1d51e9 gro: fix ownership transfer
39864092cff3 selftests: net: gro fwd: update vxlan GRO test expectations
23e1c6866e22 net: dsa: mv88e6xxx: fix usable ports on 88e6020
95c1016a2d92 net: phy: micrel: Fix potential null pointer dereference
f996e5ecf07f net: fec: Set mac_managed_pm during probe
22a44eeef781 net: txgbe: fix i2c dev name cannot match clkdev
1e304328d9c3 net: phy: micrel: lan8814: Fix when enabling/disabling 1-step timestamping
784a65669720 net: stmmac: fix rx queue priority assignment
c040b99461a5 net/sched: fix lockdep splat in qdisc_tree_reduce_backlog()
f4d1fa512b2a net: dsa: sja1105: Fix parameters order in sja1110_pcs_mdio_write_c45()
729ad2ac2a2c net/sched: act_skbmod: prevent kernel-infoleak
3dcaf25993a2 KVM: arm64: Ensure target address is granule-aligned for range TLBI
3ec21104c881 x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO
668b3074aa14 bpf, sockmap: Prevent lock inversion deadlock in map delete elem
55fabde8d9f4 vboxsf: Avoid an spurious warning if load_nls_xxx() fails
81d51b9b7c95 netfilter: validate user input for expected length
9627fd0c6ea1 netfilter: nf_tables: discard table flag update with pending basechain deletion
8b891153b2e4 netfilter: nf_tables: Fix potential data-race in __nft_flowtable_type_get()
333b5085522c netfilter: nf_tables: flush pending destroy work before exit_net release
420132bee3d0 netfilter: nf_tables: reject new basechain after table flag update
e40f32f17642 x86/bugs: Fix the SRSO mitigation on Zen3/4
93eae88e34f6 x86/nospec: Refactor UNTRAIN_RET[_*]
820a3626f3d7 x86/srso: Disentangle rethunk-dependent options
6b10edf91640 x86/srso: Improve i-cache locality for alias mitigation
065012bb7777 vsock/virtio: fix packet delivery to tap device
ca58927b0038 net: mana: Fix Rx DMA datasize and skb_over_panic
426366d577e9 net: usb: ax88179_178a: avoid the interface always configured as random address
92309bed3c5f net/rds: fix possible cp null dereference
27aa3e4b3088 xen-netfront: Add missing skb_mark_for_recycle
117eed2997bc selftests: mptcp: join: fix dev in check_endpoint
8038ee3c3e5b netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
b0b36dcbe0f2 netfilter: nf_tables: release batch on table validation from abort path
d75632d0db3c Bluetooth: Fix TOCTOU in HCI debugfs implementation
4a32840119d0 Bluetooth: hci_event: set the conn encrypted before conn establishes
57e089d33b96 Bluetooth: add quirk for broken address properties
1622e563b819 Bluetooth: qca: fix device-address endianness
b99d0617b698 arm64: dts: qcom: sc7180-trogdor: mark bluetooth address as broken
417c6cc9ef8c Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT"
3f9d57c77165 x86/bpf: Fix IP after emitting call depth accounting
4d47169ab691 x86/cpufeatures: Add CPUID_LNX_5 to track recently added Linux-defined word
b9906101f894 r8169: fix issue caused by buggy BIOS on certain boards with RTL8168d
477ed6789eb9 selinux: avoid dereference of garbage after mount failure
9e2af26c29c6 KVM: arm64: Fix host-programmed guest events in nVHE
651bf5b1d070 RISC-V: KVM: Fix APLIC in_clrip[x] read emulation
200cc2c71841 RISC-V: KVM: Fix APLIC setipnum_le/be write emulation
21bc9b158983 gpio: cdev: sanitize the label before requesting the interrupt
a2671601fa02 modpost: do not make find_tosym() return NULL
2bc92c61c541 modpost: Optimize symbol search from linear to binary search
55ed6c477872 perf/x86/amd/lbr: Use freeze based on availability
56e7373f9a67 x86/cpufeatures: Add new word for scattered features
69fe5f177ad3 perf/x86/amd/core: Update and fix stalled-cycles-* events for Zen 2 and later
d2be2f872fe7 x86/CPU/AMD: Add X86_FEATURE_ZEN1
54273025be0c x86/CPU/AMD: Get rid of amd_erratum_1054[]
824549816609 x86/CPU/AMD: Move the DIV0 bug detection to the Zen1 init function
702a65272da6 x86/CPU/AMD: Move Zenbleed check to the Zen2 init function
2577e2a7cae0 x86/CPU/AMD: Move erratum 1076 fix into the Zen1 init function
eae590201d4a x86/CPU/AMD: Carve out the erratum 1386 fix
936e59cb56ea x86/CPU/AMD: Add ZenX generations flags
49d640d2946c btrfs: fix race when detecting delalloc ranges during fiemap
8cc484e85e0c btrfs: ensure fiemap doesn't race with writes when FIEMAP_FLAG_SYNC is given
fbc0a833c055 Revert "x86/mm/ident_map: Use gbpages only where full GB page should be mapped."
907835e6dee6 mm/treewide: replace pud_large() with pud_leaf()
7cd73d90856d dm integrity: fix out-of-range warning
2564623ee0da drm/i915/mtl: Update workaround 14018575942
798781b43194 drm/i915/xelpg: Extend some workarounds/tuning to gfx version 12.74
338db8193cb2 drm/i915/mtl: Update workaround 14016712196
ec84b2a44b05 drm/i915: Replace several IS_METEORLAKE with proper IP version checks
b3749611a5e5 drm/i915: Eliminate IS_MTL_GRAPHICS_STEP
18e77951e14a drm/i915/xelpg: Call Xe_LPG workaround functions based on IP version
67f7fba8a086 drm/i915: Consolidate condition for Wa_22011802037
6b25099eea4b drm/i915: Tidy workaround definitions
0a9901fdb7bb drm/i915/dg2: Drop pre-production GT workarounds
f4877225313d inet: inet_defrag: prevent sk release while still in use
54720f68c4ad Octeontx2-af: fix pause frame configuration in GMP mode
74a78a00db8f net: lan743x: Add set RFE read fifo threshold for PCI1x1x chips
4bb7ad116be7 net: bcmasp: Bring up unimac after PHY link up
cf893953633d netfilter: nf_tables: skip netdev hook unregistration if table is dormant
2d0d1abe119a netfilter: nf_tables: reject table flag and netdev basechain updates
cddd0480a682 netfilter: nf_tables: reject destroy command to remove basechain hooks
614bc8c71ed5 cifs: Fix duplicate fscache cookie warnings
3f0784b2f1eb bpf: Protect against int overflow for stack access size
867a2f598af6 mlxbf_gige: call request_irq() after NAPI initialized
f1b7f14130d7 tls: get psock ref after taking rxlock to avoid leak
f19e995b4813 tls: adjust recv return with async crypto and failed copy to userspace
dc4bce20fa9e tls: recv: process_rx_list shouldn't use an offset with kvec
872f574f8860 net: hns3: mark unexcuted loopback test result as UNEXECUTED
1b550dae5590 net: hns3: fix kernel crash when devlink reload during pf initialization
b033da1461c1 net: hns3: fix index limit to support all queue stats
77ffc72b497e ACPICA: debugger: check status of acpi_evaluate_object() in acpi_db_walk_for_fields()
7fb8b3de7f22 selftests: vxlan_mdb: Fix failures with old libnet
2e22c9cb6187 net: wwan: t7xx: Split 64bit accesses to fix alignment issues
c1ae4d1e76ea tcp: properly terminate timers for kernel sockets
984c3d962c9e net: hsr: hsr_slave: Fix the promiscuous mode in offload mode
21dea1475fd4 s390/qeth: handle deferred cc1
1b1c0f6ce790 igc: Remove stale comment about Tx timestamping
4465b15ae5c5 ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa()
e40a02f06ceb ice: fix memory corruption bug with suspend and rebuild
feddf6c09c44 ice: realloc VSI stats arrays
493b29930f66 ice: Refactor FW data type and fix bitmap casting issue
0172edc572b0 ALSA: hda: cs35l56: Set the init_done flag before component_add()
dc1ec9c5efec wifi: iwlwifi: mvm: include link ID when releasing frames
13fd96c97596 wifi: iwlwifi: disable multi rx queue for 9000
c0a40f2f8eba wifi: iwlwifi: mvm: rfi: fix potential response leaks
84d30c56786a mlxbf_gige: stop PHY during open() error paths
5c05bdd95f0e tools: ynl: fix setting presence bits in simple nests
a946ebee45b0 nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
087dc50d8baf arm64: bpf: fix 32bit unconditional bswap
156c226cbbdc dma-buf: Fix NULL pointer dereference in sanitycheck()
aeecb678ec36 bpf, arm64: fix bug in BPF_LDX_MEMSX
c3062bdb859b s390/bpf: Fix bpf_plt pointer arithmetic
54d38a5ca0f7 scripts/bpf_doc: Use silent mode when exec make cmd
cc696ce93089 drm/i915: Pre-populate the cursor physical dma address
2c07e2437a3e drm/i915/display: Use i915_gem_object_get_dma_address to get dma address
06644f0d7193 drm/tilcdc: Set preferred depth
ff7ae7b32324 crypto: jitter - add RCT/APT support for different OSRs
50cd24ddb6f0 arm64: defconfig: remove CONFIG_IPQ_APSS_5018
58e5c91d6701 x86/alternatives: Disable interrupts and sync when optimizing NOPs in place
c878fd2d4c79 x86/alternatives: Sync core before enabling interrupts
c2d64b9f52b6 qemux86: add configuration symbol to select values
630c33229e6d sched/isolation: really align nohz_full with rcu_nocbs
0e5e0f68e2e6 clear_warn_once: add a clear_warn_once= boot parameter
46934791b902 clear_warn_once: bind a timer to written reset value
cdee9e38ff32 clear_warn_once: expand debugfs to include read support
82b562b81841 tools: Remove some options from CLANG_CROSS_FLAGS
36dc380b776b libbpf: Fix build warning on ref_ctr_off
9e3e1fe20982 perf: perf can not parser the backtrace of app in the 32bit system and 64bit kernel.
e497a4a5da65 perf: x86-32: explicitly include <errno.h>
7b57ddd89565 perf: mips64: Convert __u64 to unsigned long long
1cfc19423dc7 perf: fix bench numa compilation
98bc2815fade perf: add SLANG_INC for slang.h
17209a70b9b3 perf: add sgidefs.h to for mips builds
9cd4258d910a perf: change --root to --prefix for python install
8110a4f26628 perf: add 'libperl not found' warning
bc89d5e08f77 perf: force include of <stdbool.h>
4f6c760cc876 fat: Replace prandom_u32() with get_random_u32()
bc53117b12b2 fat: don't use obsolete random32 call in namei_vfat
30b2236ab378 FAT: Added FAT_NO_83NAME
cef98d22b4ed FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES option
0bbd7daba9e1 FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES option
5883fc340084 aufs6: adapt to v6.6 i_op->ctime changes
c4342d979bf2 aufs6: fix magic.mk include path
35266bc2dc81 aufs6: adapt to v6.6
8edede4e98be aufs6: core
712248233ebe aufs6: standalone
3b71a8a848d8 aufs6: mmap
3e2924871f37 aufs6: base
7f4907a93101 aufs6: kbuild
d2f7b03e4aa7 yaffs2: update VFS ctime operations to 6.6+
bcd6cfcd1aa0 yaffs2: v6.5 fixups
cc615704b5f5 yaffs2: Fix miscalculation of devname buffer length
8ef2e22dcf91 yaffs2: convert user_namespace to mnt_idmap
c9c749f9f7d3 yaffs2: replace bdevname call with sprintf
395b01cdc39d yaffs2: convert read_page -> readfolio
d98b07e43ba6 yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR and NULL
613c6d50fdbe yaffs: fix -Wstringop-overread compile warning in yaffs_fix_null_name
622c4648936f yaffs2: v5.12+ build fixups (not runtime tested)
7562133d4090 yaffs: include blkdev.h
dbd44252cd59 yaffs: fix misplaced variable declaration
c223a10b1ac0 yaffs2: v5.6 build fixups
90f6007cfbf4 yaffs2: fix memory leak when /proc/yaffs is read
37ee169c5ea1 yaffs: add strict check when call yaffs_internal_read_super
b6e007b8abb6 yaffs: repair yaffs_get_mtd_device
fb98f65a466a yaffs: Fix build failure by handling inode i_version with proper atomic API
51e0aac75ea2 yaffs2: fix memory leak in mount/umount
2b74a0cae7b0 yaffs: Avoid setting any ACL releated xattr
ff4130a9c376 Yaffs:check oob size before auto selecting Yaffs1
ba95b409c67c fs: yaffs2: replace CURRENT_TIME by other appropriate apis
8fa35eba9056 yaffs2: adjust to proper location of MS_RDONLY
1eb5deaad8c4 yaffs2: import git revision b4ce1bb (jan, 2020)
4dce67c1e8c8 initramfs: allow an optional wrapper script around initramfs generation
2f603d83fcc4 pnmtologo: use relocatable file name
664a6a0a484b tools: use basename to identify file in gen-mach-types
9de64bc0c185 lib/build_OID_registry: fix reproducibility issues
ae9b80797295 vt/conmakehash: improve reproducibility
a972323151bd iwlwifi: select MAC80211_LEDS conditionally
15d2adcc0198 net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119)
5556a6c04b19 arm64/perf: Fix wrong cast that may cause wrong truncation
5552dc768ffc defconfigs: drop obselete options
00fe4152df31 arm64/perf: fix backtrace for AAPCS with FP enabled
3888d0652edf linux-yocto: Handle /bin/awk issues
3d55d299f23a uvesafb: provide option to specify timeout for task completion
23c068c080be uvesafb: print error message when task timeout occurs
edbfc939266e compiler.h: Undef before redefining __attribute_const__
c99ae7e2a19a vmware: include jiffies.h
572d84d928c8 Resolve jiffies wrapping about arp
fdcd47cac843 nfs: Allow default io size to be configured.
927d48801098 check console device file on fs when booting
57cc27f821dd mount_root: clarify error messages for when no rootfs found
1b53d82a8152 mconf: fix output of cflags and libraries
1811da09f42c menuconfig,mconf-cfg: Allow specification of ncurses location
83c2e0c6eb1f modpost: mask trivial warnings
6de673039484 kbuild: exclude meta directory from distclean processing
6decd32815f5 powerpc: serialize image targets
f6b683b38318 arm: serialize build targets
e798b09ebf57 mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, release} to avoid race condition
dc8a1e5a88f8 x86_64_defconfig: Fix warnings
68491e5f72b6 powerpc/ptrace: Disable array-bounds warning with gcc8
d71ebfce3004 powerpc: Disable attribute-alias warnings from gcc8
62f50884b8b1 powerpc: kexec fix for powerpc64
da6871c62c37 powerpc: Add unwind information for SPE registers of E500 core
f161c880c11d mips: make current_cpu_data preempt safe
5e94a8247ce7 mips: vdso: fix 'jalr $t9' crash in vdso code
19e36714b1c7 mips: Kconfig: add QEMUMIPS64 option
e2e537db3cbd 4kc cache tlb hazard: tlbp cache coherency
aee9870611e5 malta uhci quirks: make allowance for slow 4k(e)c
881948cd1517 drm/fb-helper: move zeroing code to drm_fb_helper_fill_var
98ec1963fcb7 arm64: defconfig: cleanup config options
f1727c537ba8 vexpress: Pass LOADADDR to Makefile
4474c32dc24a arm: ARM EABI socketcall
75e31a2b70fd ARM: LPAE: Invalidate the TLB for module addresses during translation fault
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.6.bb | 6 ++--
.../linux/linux-yocto-tiny_6.6.bb | 6 ++--
meta/recipes-kernel/linux/linux-yocto_6.6.bb | 28 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
index be60bbee78..91dbbf55ca 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
@@ -14,13 +14,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "9f39c8adfc6025293e5ff131f7bb4f728edd0c99"
-SRCREV_meta ?= "00aab388b73211bf49b352e7475595aa2e5fbc44"
+SRCREV_machine ?= "5272561b019836f2ee2f175b23029649431d6fca"
+SRCREV_meta ?= "3bf5e5e5a7323795af0955da818c6e93215fd119"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
-LINUX_VERSION ?= "6.6.25"
+LINUX_VERSION ?= "6.6.27"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
index 559ca3563a..fba19c97df 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
# CVE exclusions
include recipes-kernel/linux/cve-exclusion_6.6.inc
-LINUX_VERSION ?= "6.6.25"
+LINUX_VERSION ?= "6.6.27"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "5ac0c93287792fba862b1f78e513dbaf10696a09"
-SRCREV_meta ?= "00aab388b73211bf49b352e7475595aa2e5fbc44"
+SRCREV_machine ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
+SRCREV_meta ?= "3bf5e5e5a7323795af0955da818c6e93215fd119"
PV = "${LINUX_VERSION}+git"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
index b0674348e8..f887e293b7 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.6/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.6/standard/base"
KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "e76632ff3899f47234405672a658156bb0079d52"
-SRCREV_machine:qemuarm64 ?= "5ac0c93287792fba862b1f78e513dbaf10696a09"
-SRCREV_machine:qemuloongarch64 ?= "5ac0c93287792fba862b1f78e513dbaf10696a09"
-SRCREV_machine:qemumips ?= "744b6e2f70062732f48de0918ca8c56f5de408dd"
-SRCREV_machine:qemuppc ?= "5ac0c93287792fba862b1f78e513dbaf10696a09"
-SRCREV_machine:qemuriscv64 ?= "5ac0c93287792fba862b1f78e513dbaf10696a09"
-SRCREV_machine:qemuriscv32 ?= "5ac0c93287792fba862b1f78e513dbaf10696a09"
-SRCREV_machine:qemux86 ?= "5ac0c93287792fba862b1f78e513dbaf10696a09"
-SRCREV_machine:qemux86-64 ?= "5ac0c93287792fba862b1f78e513dbaf10696a09"
-SRCREV_machine:qemumips64 ?= "936a9ceb126dfb2cc4b38229cab68636263ecfab"
-SRCREV_machine ?= "5ac0c93287792fba862b1f78e513dbaf10696a09"
-SRCREV_meta ?= "00aab388b73211bf49b352e7475595aa2e5fbc44"
+SRCREV_machine:qemuarm ?= "51c07ec56f85fbbfa9ea6944a4b14eee7e715566"
+SRCREV_machine:qemuarm64 ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
+SRCREV_machine:qemuloongarch64 ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
+SRCREV_machine:qemumips ?= "4bf661a8afc7323030a6af73fc5640ef4dabe01f"
+SRCREV_machine:qemuppc ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
+SRCREV_machine:qemuriscv64 ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
+SRCREV_machine:qemuriscv32 ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
+SRCREV_machine:qemux86 ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
+SRCREV_machine:qemux86-64 ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
+SRCREV_machine:qemumips64 ?= "d3abfe3c736d5869cb26f24c653b7e6eeafac715"
+SRCREV_machine ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
+SRCREV_meta ?= "3bf5e5e5a7323795af0955da818c6e93215fd119"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "e475741af1ebe2c92ee4a3f49e55749a84770a12"
+SRCREV_machine:class-devupstream ?= "5e828009c8b380739e13da92be847f10461c38b1"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.6/base"
@@ -44,7 +44,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.6.25"
+LINUX_VERSION ?= "6.6.27"
PV = "${LINUX_VERSION}+git"
--
2.39.2
^ permalink raw reply related [relevance 2%]
* [PATCH 01/12] linux-yocto/6.6: update to v6.6.24
@ 2024-05-03 2:40 1% ` bruce.ashfield
2024-05-03 2:40 2% ` [PATCH 06/12] linux-yocto/6.6: update to v6.6.27 bruce.ashfield
2024-05-03 2:40 4% ` [PATCH 11/12] linux-yocto/6.6: update to v6.6.29 bruce.ashfield
2 siblings, 0 replies; 200+ results
From: bruce.ashfield @ 2024-05-03 2:40 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/6.6 to the latest korg -stable release that comprises
the following commits:
9467d7a12f97 Linux 6.6.24
e87e08c94c95 drm/amdgpu: fix use-after-free bug
3a9569441b47 tools/resolve_btfids: fix build with musl libc
4338e40da808 x86/sev: Skip ROM range scans and validation for SEV-SNP guests
2048ff503f43 scsi: libsas: Fix disk not being scanned in after being removed
f23db7579283 scsi: libsas: Add a helper sas_get_sas_addr_and_dev_type()
76edb986c44b scsi: lpfc: Correct size for wqe for memset()
ac5b18f52858 scsi: lpfc: Correct size for cmdwqe/rspwqe for memset()
ff3cdff7c897 usb: dwc3: pci: Drop duplicate ID
70977e7d5e5f Revert "x86/bugs: Use fixed addressing for VERW operand"
367b4ce0d74d x86/bugs: Use fixed addressing for VERW operand
a492d6dad9af scsi: qla2xxx: Delay I/O Abort on PCI error
29520a334f3e scsi: qla2xxx: Change debug message during driver unload
f85af9f1aa5e scsi: qla2xxx: Fix double free of fcport
f14cee7a882c scsi: qla2xxx: Fix double free of the ha->vp_map pointer
8de1584ec4fe scsi: qla2xxx: Fix command flush on cable pull
adc9702642a0 scsi: qla2xxx: NVME|FCP prefer flag not being honored
b31a120b81ac scsi: qla2xxx: Update manufacturer detail
be895682c507 scsi: qla2xxx: Split FCE|EFT trace control
8ec0d55020f6 scsi: qla2xxx: Fix N2N stuck connection
ef23850940d9 scsi: qla2xxx: Prevent command send on chip reset
db4aaf281a5b usb: typec: ucsi: Clear UCSI_CCI_RESET_COMPLETE before reset
1f510af8dbc3 usb: typec: ucsi_acpi: Refactor and fix DELL quirk
5857494b5056 usb: typec: ucsi: Ack unsupported commands
68f57d013827 usb: typec: ucsi: Clear EVENT_PENDING under PPM lock
c708b704c26d usb: typec: Return size of buffer if pd_set operation succeeds
99731076722e usb: udc: remove warning when queue disabled ep
3e417f31b06a usb: dwc2: gadget: LPM flow fix
f047361fee44 usb: dwc2: gadget: Fix exiting from clock gating
8d310e5d702c usb: dwc2: host: Fix ISOC flow in DDMA mode
96dff759ef7d usb: dwc2: host: Fix hibernation flow
ba2951ec82e8 usb: dwc2: host: Fix remote wakeup from hibernation
f51849833705 USB: core: Fix deadlock in port "disable" sysfs attribute
8dbc001bba86 USB: core: Add hub_get() and hub_put() routines
122a06f1068b USB: core: Fix deadlock in usb_deauthorize_interface()
fd2304f4c0ae usb: dwc3: Properly set system wakeup
d12af9a1c59e staging: vc04_services: fix information leak in create_component()
98592a49956c staging: vc04_services: changen strncpy() to strscpy_pad()
d4c34782b6d7 scsi: core: Fix unremoved procfs host directory regression
a1f506af7ffe scsi: sd: Fix TCG OPAL unlock on system resume
61d4787692c1 ALSA: sh: aica: reorder cleanup operations to avoid UAF bugs
66aa5d95ea8c vfio/pds: Make sure migration file isn't accessed after reset
2ceddecdd0ef drm/amd/display: Clear OPTC mem select on disable
6a1cb68b9810 drm/amd/display: Disconnect phantom pipe OPP from OPTC being disabled
ae62f1dde66a drm/amd/display: Fix hang/underflow when transitioning to ODM4:1
ce748df0d570 USB: UAS: return ENODEV when submit urbs fail with device not attached
da3b75931bb7 usb: cdc-wdm: close race between read and workqueue
56c5145baef5 Revert "usb: phy: generic: Get the vbus supply"
9c74507e6c43 mtd: spinand: Add support for 5-byte IDs
9ae3954dd36b Bluetooth: hci_sync: Fix not checking error on hci_cmd_sync_cancel_sync
3b031e4fcb27 drm/i915/gt: Reset queue_priority_hint on parking
07c011e3351d drm/i915: Do not match JSL in ehl_combo_pll_div_frac_wa_needed()
69fa0e23a6a3 drm/i915/dsi: Go back to the previous INIT_OTP/DISPLAY_ON order, mostly
a891add409e3 drm/i915/bios: Tolerate devdata==NULL in intel_bios_encoder_supports_dp_dual_mode()
510c5f5e4837 drm/i915/hwmon: Fix locking inversion in sysfs getter
197f6d6987c5 drm/amdgpu: fix deadlock while reading mqd from debugfs
2684393685f7 drm/amdkfd: fix TLB flush after unmap for GFX9.4.2
042ef0afc40f drm/vmwgfx: Create debugfs ttm_resource_manager entry only if needed
476eed5f1c22 net: ll_temac: platform_get_resource replaced by wrong function
2a84744a037b nouveau/dmem: handle kcalloc() allocation failure
be4f3af178cb thermal: devfreq_cooling: Fix perf state when calculate dfc res_util
cc80b5d7fbef block: Do not force full zone append completion in req_bio_endio()
152799126327 sdhci-of-dwcmshc: disable PM runtime in dwcmshc_remove()
4466677dcabe mmc: core: Avoid negative index with array access
35ee8529eee7 mmc: core: Initialize mmc_blk_ioc_data
6810ebeb0975 mmc: sdhci-omap: re-tuning is needed after a pm transition to support emmc HS200 mode
07cf57eba52f selftests/mm: fix ARM related issue with fork after pthread_create
fe295de2d564 selftests/mm: sigbus-wp test requires UFFD_FEATURE_WP_HUGETLBFS_SHMEM
b79f9e1ff27c mm: cachestat: fix two shmem bugs
2e2f7a576b13 hexagon: vmlinux.lds.S: handle attributes section
c3639d87286a exec: Fix NOMMU linux_binprm::exec in transfer_args_to_stack()
78516979792d Revert "drm/amd/display: Fix sending VSC (+ colorimetry) packets for DP/eDP displays without PSR"
566e540b404f wifi: iwlwifi: fw: don't always use FW dump trig
3d7ac0250714 wifi: iwlwifi: mvm: disable MLO for the time being
6956ba7da71b wifi: cfg80211: add a flag to disable wireless extensions
6b948b54c8bd wifi: mac80211: check/clear fast rx for non-4addr sta VLAN changes
8ca8aac42bf7 btrfs: zoned: use zone aware sb location for scrub
7b5029e3f1b6 btrfs: zoned: don't skip block groups with 100% zone unusable
0427c8ef8bbb btrfs: fix race in read_extent_buffer_pages()
c7077f43f30d tmpfs: fix race on handling dquot rbtree
907efa8839cd ARM: prctl: reject PR_SET_MDWE on pre-ARMv6
a0071e3b0c24 prctl: generalize PR_SET_MDWE support check to be per-arch
5110da79d7d6 x86/efistub: Reinstate soft limit for initrd loading
90048007daea efi/libstub: Cast away type warning in use of max()
01666eece40e x86/efistub: Add missing boot_params for mixed mode compat entry
32e4750262e0 init: open /initrd.image with O_LARGEFILE
3f59182bcb4d ALSA: hda/tas2781: add locks to kcontrols
b999e77ecf3a ALSA: hda/tas2781: remove digital gain kcontrol
11b4dc6494b5 perf top: Use evsel's cpus to replace user_requested_cpus
78142322a1c3 selftests/mm: Fix build with _FORTIFY_SOURCE
ccf2d9d2ae95 selftests/mm: gup_test: conform test to TAP format output
674545b4852c pwm: img: fix pwm clock lookup
9114ba998750 efi: fix panic in kdump kernel
1acbca933313 x86/fpu: Keep xfd_state in sync with MSR_IA32_XFD
bebb5af001dc x86/mpparse: Register APIC address only once
31a6a791b046 efi/libstub: fix efi_random_alloc() to allocate memory at alloc_min or higher address
f13edd1871d4 kprobes/x86: Use copy_from_kernel_nofault() to read from unsafe address
455b94f95e49 irqchip/renesas-rzg2l: Prevent spurious interrupts when setting trigger type
e9b18e99938b irqchip/renesas-rzg2l: Rename rzg2l_irq_eoi()
ddec478fb711 irqchip/renesas-rzg2l: Rename rzg2l_tint_eoi()
ec5482d22c67 irqchip/renesas-rzg2l: Add macro to retrieve TITSR register offset based on register's index
9913a07850e0 irqchip/renesas-rzg2l: Flush posted write in irq_eoi()
c15a37e3f162 irqchip/renesas-rzg2l: Implement restriction when writing ISCR register
ea4c338cfefa printk: Update @console_may_schedule in console_trylock_spinning()
e07a16e6f5b1 iommu/dma: Force swiotlb_max_mapping_size on an untrusted device
c803069d4845 swiotlb: Fix alignment checks when both allocation and DMA masks are present
ae2f8dbe921e swiotlb: Honour dma_alloc_coherent() alignment in swiotlb_alloc()
3e7acd6e25ba swiotlb: Fix double-allocation of slots due to broken alignment handling
4da463081026 entry: Respect changes to system call number by trace_sys_enter()
0c027c2bad7f ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses
66689127f1a7 ARM: 9352/1: iwmmxt: Remove support for PJ4/PJ4B cores
df13f43686f3 clocksource/drivers/arm_global_timer: Fix maximum prescaler value
0982fd6bf0b8 x86/sev: Fix position dependent variable references in startup code
ecd16da39d44 x86/Kconfig: Remove CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
ee0bd4ad780d vfio/fsl-mc: Block calling interrupt handler without trigger
62d4e43a569b vfio/platform: Create persistent IRQ handlers
69276a555c74 vfio/pci: Create persistent INTx handler
2ee432d74043 vfio: Introduce interface to flush virqfd inject workqueue
ded566b4637f btrfs: fix deadlock with fiemap and extent locking
ea01221f95f3 xfs: remove conditional building of rt geometry validator functions
9efd84260f47 xfs: reset XFS_ATTR_INCOMPLETE filter on node removal
69252ab1d566 xfs: update dir3 leaf block metadata after swap
264e3509590c xfs: ensure logflagsp is initialized in xfs_bmap_del_extent_real
8a4566795552 xfs: fix perag leak when growfs fails
59b115a7e802 xfs: add lock protection when remove perag from radix tree
c4848932911b xfs: short circuit xfs_growfs_data_private() if delta is zero
47604cf2b803 xfs: initialise di_crc in xfs_log_dinode
b9358db0a811 xfs: add missing nrext64 inode flag check to scrub
1a48327c9e5a xfs: force all buffers to be written during btree bulk load
7bc086bbc977 xfs: fix an off-by-one error in xreap_agextent_binval
84cd4f79b4ce xfs: recompute growfsrtfree transaction reservation while growing rt volume
d6b65ed1cc5f xfs: remove unused fields from struct xbtree_ifakeroot
fb6e584e7471 xfs: make xchk_iget safer in the presence of corrupt inode btrees
3f6308034432 xfs: don't allow overly small or large realtime volumes
89e511a745be xfs: fix 32-bit truncation in xfs_compute_rextslog
0a31f1e8d8c6 xfs: make rextslog computation consistent with mkfs
680776e555f3 xfs: transfer recovered intent item ownership in ->iop_recover
87db24c8edd3 xfs: pass the xfs_defer_pending object to iop_recover
cd3c2cf35f7c xfs: use xfs_defer_pending objects to recover intent items
c0231292d059 xfs: don't leak recovered attri intent items
08bac45e02c6 xfs: consider minlen sized extents in xfs_rtallocate_extent_block
57a20b6150d3 xfs: convert rt bitmap extent lengths to xfs_rtbxlen_t
1a6d63f2418c xfs: move the xfs_rtbitmap.c declarations to xfs_rtbitmap.h
648b41f28181 wifi: rtw88: 8821cu: Fix connection failure
9fe75ad3c7e8 wifi: iwlwifi: pcie: fix RB status reading
3d0a7b23d688 ASoC: amd: yc: Revert "Fix non-functional mic on Lenovo 21J2"
930775060ca3 x86/efistub: Call mixed mode boot services on the firmware's stack
23b99c7bf6ec drm/amd/display: handle range offsets in VRR ranges
e21fee1035b9 drm/i915: Don't explode when the dig port we don't have an AUX CH
60b9d1887a35 iio: imu: inv_mpu6050: fix FIFO parsing when empty
3df5e345d6b4 iio: imu: inv_mpu6050: fix frequency setting when chip is off
d017ec50fac9 i2c: i801: Avoid potential double call to gpiod_remove_lookup_table
21e985684216 iio: accel: adxl367: fix I2C FIFO data register
73d42ed41182 iio: accel: adxl367: fix DEVID read after reset
d97be07a0027 arm64: dts: qcom: sc8280xp-x13s: limit pcie4 link speed
27cd25e3b3bc mm, vmscan: prevent infinite loop for costly GFP_NOIO | __GFP_RETRY_MAYFAIL allocations
b1c10caf752c ARM: imx_v6_v7_defconfig: Restore CONFIG_BACKLIGHT_CLASS_DEVICE
520f79c110ff tee: optee: Fix kernel panic caused by incorrect error handling
bccaba16db96 ALSA: hda/realtek: fix mute/micmute LEDs for HP EliteBook
6971e0592314 ALSA: hda/realtek - Add Headset Mic supported Acer NB platform
c01ed748847f fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion
ed56f3cfbe6f Revert "tty: serial: simplify qcom_geni_serial_send_chunk_fifo()"
7529cbd8b5f6 vt: fix unicode buffer corruption when deleting characters
68b988933885 mei: me: add arrow lake point H DID
e86a87a4bea8 mei: me: add arrow lake point S DID
434beb66368d serial: port: Don't suspend if the port is still busy
a62a30ccf721 misc: fastrpc: Pass proper arguments to scm call
997ca4153846 misc: lis3lv02d_i2c: Fix regulators getting en-/dis-abled twice on suspend/resume
16eac1126d6a tty: serial: fsl_lpuart: avoid idle preamble pending if CTS is enabled
cc31dba9afa6 xhci: Fix failure to detect ring expansion need.
a4eff9198449 usb: port: Don't try to peer unused USB ports based on location
a0f77b5d6067 usb: gadget: ncm: Fix handling of zero block length packets
4a22aeac24d0 usb: typec: altmodes/displayport: create sysfs nodes as driver's default device attribute group
871fd7b10b56 USB: usb-storage: Prevent divide-by-0 error in isd200_ata_command
a125ee2c06b0 ALSA: hda/realtek - Fix headset Mic no show at resume back for Lenovo ALC897 platform
a30c36bc0cfc drm/i915: Check before removing mm notifier
24b5eff43ec2 tty: serial: imx: Fix broken RS485
6f3c1dabe8d0 drm/amdgpu/pm: Fix the error of pwm1_enable setting
274f0b1a6b97 tracing: Use .flush() call to wake up readers
4577036353fa SEV: disable SEV-ES DebugSwap by default
12f8e32a5a38 KVM: SVM: Flush pages under kvm->lock to fix UAF in svm_register_enc_region()
9d1b22e573a3 KVM: x86: Mark target gfn of emulated atomic instruction as dirty
43c70cbc2502 firewire: ohci: prevent leak of left-over IRQ on unbind
a5b60c8b9a9e init/Kconfig: lower GCC version check for -Warray-bounds
4c9f70c73ddb Input: xpad - add additional HyperX Controller Identifiers
d9f400dc3e89 cgroup/cpuset: Fix retval in update_cpumask()
0f952b1bb048 usb: typec: tpcm: Fix PORT_RESET behavior for self powered devices
bae5b98dcf63 selftests: mptcp: diag: return KSFT_FAIL not test_cnt
b93494329656 mm, mmap: fix vma_merge() case 7 with vma_ops->close
b475226733f1 xfrm: Avoid clang fortify warning in copy_to_user_tmpl()
dc60b25540c8 crypto: sun8i-ce - Fix use after free in unprepare
48dd260fdb72 crypto: rk3288 - Fix use after free in unprepare
c288a61a48dd drm/nouveau: fix stale locked mutex in nouveau_gem_ioctl_pushbuf
6887314f5356 nouveau: lock the client object tree.
ba29cffccfea Drivers: hv: vmbus: Calculate ring buffer size for more efficient use of memory
7332d7389b5e netfilter: nf_tables: reject constant set with timeout
c0c2176d1814 netfilter: nf_tables: disallow anonymous set with timeout flag
b2d6f9a5b1cf netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
56712f74b704 net: fix IPSTATS_MIB_OUTPKGS increment in OutForwDatagrams.
95232806972a drm/amd/display: Use freesync when `DRM_EDID_FEATURE_CONTINUOUS_FREQ` found
8b934390272d workqueue: Shorten events_freezable_power_efficient name
47ccb849a023 drm/bridge: lt8912b: do not return negative values from .get_modes()
d5a81e981769 drm/bridge: lt8912b: clear the EDID property on failures
a7d980a9f70e drm/bridge: lt8912b: use drm_bridge_edid_read()
2b6aaf7b193b drm/bridge: add ->edid_read hook and drm_bridge_edid_read()
de125efb3bae drm/ttm: Make sure the mapped tt pages are decrypted when needed
0436d691d216 wifi: brcmfmac: Demote vendor-specific attach/detach messages to info
8d59a64cbec8 wifi: brcmfmac: cfg80211: Use WSEC to set SAE password
47b563297a48 wifi: brcmfmac: add per-vendor feature detection callback
73520eeea49d x86/pm: Work around false positive kmemleak report in msr_build_context()
e50f83061ac2 dm snapshot: fix lockup in dm_exception_table_exit
066bbc430644 drm/amd/display: Fix noise issue on HDMI AV mute
c7c855fd3d5a drm/amd/display: Return the correct HDCP error code
6fcd12cb9088 drm/amdgpu: amdgpu_ttm_gart_bind set gtt bound flag
4992f44a3b05 ahci: asm1064: asm1166: don't limit reported ports
836af9a25b2d ahci: asm1064: correct count of reported ports
49391e9f1e14 wireguard: selftests: set RISCV_ISA_FALLBACK on riscv{32,64}
c991567e6c63 wireguard: netlink: access device through ctx instead of peer
13d107794304 wireguard: netlink: check for dangling peer via is_dead instead of empty list
7f1005dd39d2 LoongArch/crypto: Clean up useless assignment operations
d7d7c6cdea87 LoongArch: Define the __io_aw() hook as mmiowb()
f3f5d7a5049d LoongArch: Change __my_cpu_offset definition to avoid mis-optimization
3d26a2d80181 virtio: reenable config if freezing device failed
8a2e2336b8cf cxl/trace: Properly initialize cxl_poison region name
a66885b840d6 net: hns3: tracing: fix hclgevf trace event strings
9aa7a53c4733 drm/i915: Add missing ; to __assign_str() macros in tracepoint code
6244036a07ae NFSD: Fix nfsd_clid_class use of __string_len() macro
8291b4eac429 net: esp: fix bad handling of pages from page_pool
d0caabe6fe76 x86/CPU/AMD: Update the Zenbleed microcode revisions
f8a2a55a0b82 cpufreq: dt: always allocate zeroed cpumask
037414669414 mtd: rawnand: Constrain even more when continuous reads are enabled
26a4eee38f8c mtd: rawnand: Fix and simplify again the continuous read derivations
da2911798f25 cifs: open_cached_dir(): add FILE_READ_EA to desired access
997b0c26d3fa cifs: reduce warning log level for server not advertising interfaces
0845cb6bbf15 cifs: make cifs_chan_update_iface() a void function
4501f9cd36c1 cifs: delete unnecessary NULL checks in cifs_chan_update_iface()
db3a3e6fa33e cifs: do not let cifs_chan_update_iface deallocate channels
66c2940c9614 cifs: make sure server interfaces are requested only for SMB3+
407ced4e770e cifs: add xid to query server interface call
0c8aa4cfda4e nilfs2: prevent kernel bug at submit_bh_wbc()
f69e81396aea nilfs2: fix failure to detect DAT corruption in btree and direct mappings
6966586c2f77 f2fs: truncate page cache before clearing flags when aborting atomic write
99d1fd81d341 f2fs: mark inode dirty for FI_ATOMIC_COMMITTED flag
9a31f4b61448 Revert "block/mq-deadline: use correct way to throttling write requests"
f1d93b2a010c memtest: use {READ,WRITE}_ONCE in memory scanning
b483eff0bd19 drm/vc4: hdmi: do not return negative values from .get_modes()
fd79a093bb23 drm/imx/ipuv3: do not return negative values from .get_modes()
b71ae5fb2dd3 drm/exynos: do not return negative values from .get_modes()
a686732df6ce drm/panel: do not return negative error codes from drm_panel_get_modes()
12bbe2c25cdb drm/probe-helper: warn about negative .get_modes()
a64ab862e84e s390/zcrypt: fix reference counting on zcrypt card objects
54d26adf64c0 soc: fsl: qbman: Use raw spinlock for cgr_lock
0e6521b0f93f soc: fsl: qbman: Always disable interrupts when taking cgr_lock
700ed41bf63e dlm: fix user space lkb refcounting
b31301a1fa61 ring-buffer: Use wait_event_interruptible() in ring_buffer_wait()
7bcd58e8096a ring-buffer: Fix full_waiters_pending in poll
b87a7e108e6d ring-buffer: Fix resetting of shortest_full
73dae1a5d489 ring-buffer: Do not set shortest_full when full target is hit
b82dbe74ee31 ring-buffer: Fix waking up ring buffer readers
1241052e158d io_uring: clean rings on NO_MMAP alloc fail
e8fc78a1c70f platform/x86/intel/tpmi: Change vsec offset to u64
ed3fb2e2fe87 ksmbd: retrieve number of blocks using vfs_getattr in set_file_allocation_info
c8f7ad2df083 ksmbd: replace generic_fillattr with vfs_getattr
ef309589f01c server: convert to new timestamp accessors
1d7317d5b636 tpm,tpm_tis: Avoid warning splat at shutdown
74c564b7f008 vfio/platform: Disable virqfds on cleanup
04a4a017b9ff vfio/pci: Lock external INTx masking ops
2a4a666c4510 vfio/pci: Disable auto-enable of exclusive INTx IRQ
fe750e274442 thermal/drivers/mediatek: Fix control buffer enablement on MT7896
7e8cffa4f85e cifs: allow changing password during remount
9179aa27039a cifs: prevent updating file size from server if we have a read/write lease
b9e741ac2b7c smb: client: stop revalidating reparse points unnecessarily
db5f1f1fb8c1 PCI: hv: Fix ring buffer size calculation
cebb4baed803 PCI: dwc: endpoint: Fix advertised resizable BAR size
7aeca6f44cb6 PCI: qcom: Enable BDF to SID translation properly
52f86f3e091c kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1
71739da67085 NFS: Read unlock folio on nfs_page_create_from_folio() error
e25447c35f87 nfs: fix UAF in direct writes
7293dd0bd34a sparc32: Fix parport build with sparc32
0f314c3be7d9 io_uring: fix mshot io-wq checks
f55ecbd9a78c io_uring/net: correctly handle multishot recvmsg retry setup
1a6efd4c286c PCI/AER: Block runtime suspend when handling errors
cc3519b818c1 speakup: Fix 8bit characters from direct synth
a973ef25f144 usb: gadget: tegra-xudc: Fix USB3 PHY retrieval logic
3dd6e0faa75d phy: tegra: xusb: Add API to retrieve the port number of phy
0ef9d78ba7e7 slimbus: core: Remove usage of the deprecated ida_simple_xx() API
63c7a5cf228e nvmem: meson-efuse: fix function pointer type mismatch
37b6a3ba793b ext4: fix corruption during on-line resize
27715371c162 hwmon: (amc6821) add of_match table
100d83b0da07 landlock: Warn once if a Landlock action is requested while disabled
bc8e5fda787b drm/etnaviv: Restore some id values
10f2af1af8ab leds: trigger: netdev: Fix kernel panic on interface rename trig notify
d4e2365b07f1 Bluetooth: btnxpuart: Fix btnxpuart_close
985edff78e80 mmc: core: Fix switch on gp3 partition
0f98f6d2fb5f mm: swap: fix race between free_swap_and_cache() and swapoff()
20d3e1c8a184 mac802154: fix llsec key resources release in mac802154_llsec_key_del
7d3765550374 block: Fix page refcounts for unaligned buffers in __bio_release_pages()
653d51504f41 powerpc: xor_vmx: Add '-mhard-float' to CFLAGS
dc9702acfb4f dm-raid: fix lockdep waring in "pers->hot_add_disk"
31ead1845c37 PCI/DPC: Quirk PIO log size for Intel Raptor Lake Root Ports
d86ad8c3e152 PCI/PM: Drain runtime-idle callbacks before driver removal
0bfe6b29d6ac wifi: rtw88: Add missing VID/PIDs for 8811CU and 8821CU
51dad05f1835 btrfs: fix off-by-one chunk length calculation at contains_pending_extent()
40a24160cf3c btrfs: qgroup: always free reserved space for extent records
4cc3e2ed6759 serial: Lock console when calling into driver before registration
6f12c54fa09d serial: core: only stop transmit when HW fifo is empty
1846bd4fc1bb usb: dwc3-am62: Disable wakeup at remove
7dfed9855397 usb: dwc3-am62: fix module unload/reload behavior
4a1f0678d15e usb: typec: ucsi: Clean up UCSI_CABLE_PROP macros
8b86779ade3a fuse: don't unhash root
777ba18929b5 fuse: fix root lookup with nonzero generation
3d304dd6b29d fuse: replace remaining make_bad_inode() with fuse_make_bad()
bd169abd394e mmc: tmio: avoid concurrent runs of mmc_request_done()
677aa47e3e43 PM: sleep: wakeirq: fix wake irq warning in system suspend
3c3df979e9b7 USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M
28f719670f00 KVM: x86/xen: inject vCPU upcall vector when local APIC is enabled
5cf342a13d49 USB: serial: option: add MeiG Smart SLM320 product
07a8b301818f USB: serial: cp210x: add ID for MGP Instruments PDS100
515159ca62a8 USB: serial: add device ID for VeriFone adapter
58bb229d9714 USB: serial: ftdi_sio: add support for GMC Z216C Adapter IR-USB
816ae3cf3dcb powerpc/fsl: Fix mfpmr build errors with newer binutils
620b6cf2f1a2 usb: xhci: Add error handling in xhci_map_urb_for_dma
7e9926fef71e clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays
9b4c4546dd61 clk: qcom: mmcc-apq8084: fix terminating of frequency table arrays
0204247cf366 clk: qcom: gcc-ipq9574: fix terminating of frequency table arrays
b6b31b4c67ea clk: qcom: gcc-ipq8074: fix terminating of frequency table arrays
421b135aceac clk: qcom: gcc-ipq6018: fix terminating of frequency table arrays
b0cf3d200e8a clk: qcom: gcc-ipq5018: fix terminating of frequency table arrays
245c318cdad0 vfio/pds: Always clear the save/restore FDs on reset
35c1cdd504a3 PM: suspend: Set mem_sleep_current during kernel command line setup
ed87a423756a cpufreq: Limit resolving a frequency to policy min/max
66e2c41b0c80 docs: Restore "smart quotes" for quotes
f77c8c1603bb iio: adc: rockchip_saradc: use mask for write_enable bitfield
7ed675cfaf51 iio: adc: rockchip_saradc: fix bitmask for channels on SARADCv2
8ec4a68a25a2 md/raid5: fix atomicity violation in raid5_cache_count
644604e6f014 parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds
d4b71ff9c918 parisc: Fix csum_ipv6_magic on 64-bit systems
cabe3343acce parisc: Fix csum_ipv6_magic on 32-bit systems
d31c8d0ca8bf parisc: Fix ip_fast_csum
6bd42452713e parisc: Avoid clobbering the C/B bits in the PSW with tophys and tovirt macros
51408b47f8af parisc/unaligned: Rewrite 64-bit inline assembly of emulate_ldd()
f9f67e87e4b7 x86/nmi: Fix the inverse "in NMI handler" check
736ad6c577a3 md/md-bitmap: fix incorrect usage for sb_index
d8ea3e788b5a mtd: rawnand: meson: fix scrambling mode value in command macro
1a3487cdf8dc ubi: correct the calculation of fastmap size
d1b505c988b7 ubi: Check for too small LEB size in VTBL code
fc99f4e2d2f1 ubifs: Set page uptodate in the correct place
ab8f9df10694 fuse: fix VM_MAYSHARE and direct_io_allow_mmap
03a7e3f2ba3c fat: fix uninitialized field in nostale filehandles
b46c822f8b55 bounds: support non-power-of-two CONFIG_NR_CPUS
d6e646b86085 kasan/test: avoid gcc warning for intentional overflow
fe86d01ce7db block: Clear zone limits for a non-zoned stacked queue
ba191200a1ae ext4: correct best extent lstart adjustment logic
9a06d17abc16 selftests/mqueue: Set timeout to 180 seconds
8a5a7611ccc7 crypto: qat - resolve race condition during AER recovery
e8ac80031809 sparc: vDSO: fix return value of __setup handler
61798d3cb53a sparc64: NMI watchdog: fix return value of __setup handler
a0b9f4f8e22b powerpc/smp: Increase nr_cpu_ids to include the boot CPU
68a9c41f0167 powerpc/smp: Adjust nr_cpu_ids to cover all threads of a core
7f6282665dd7 powercap: intel_rapl_tpmi: Fix System Domain probing
b5cbb42fb658 powercap: intel_rapl_tpmi: Fix a register bug
d6c83ee705a1 powercap: intel_rapl: Fix locking in TPMI RAPL
c4c2f7e672e7 sched: Simplify tg_set_cfs_bandwidth()
0641908b906a powercap: intel_rapl: Fix a NULL pointer dereference
9df6a7a3c951 thermal/intel: Fix intel_tcc_get_temp() to support negative CPU temperature
868e3264f236 cpufreq: amd-pstate: Fix min_perf assignment in amd_pstate_adjust_perf()
e056484f189b arm64: dts: qcom: sm8550-mtp: correct WCD9385 TX port mapping
6eacb2ec2e79 arm64: dts: qcom: sm8550-qrd: correct WCD9385 TX port mapping
a75afe480d43 KVM: Always flush async #PF workqueue when vCPU is being destroyed
88efc3095b6d media: nxp: imx8-isi: Mark all crossbar sink pads as MUST_CONNECT
d0e3440dab0d media: mc: Expand MUST_CONNECT flag to always require an enabled link
3b6ccc91dcc4 media: mc: Rename pad variable to clarify intent
ebb6fb7f6265 media: mc: Add num_links flag to media_pad
c95318607fbe media: nxp: imx8-isi: Check whether crossbar pad is non-NULL before access
0a7690224714 media: mc: Fix flags handling when creating pad links
cc088ebf8b4a media: mc: Add local pad to pipeline regardless of the link state
dc5e4f240473 media: xc4000: Fix atomicity violation in xc4000_get_frequency
b5d40f02e722 pci_iounmap(): Fix MMIO mapping leak
86cb706a40b7 drm/vmwgfx: Fix the lifetime of the bo cursor memory
2160ad6861c4 serial: max310x: fix NULL pointer dereference in I2C instantiation
ff41e0d4f3fa drm/vmwgfx: Fix possible null pointer derefence with invalid contexts
01fad74090a0 arm: dts: marvell: Fix maxium->maxim typo in brownstone dts
3677d01c55bc smack: Handle SMACK64TRANSMUTE in smack_inode_setsecurity()
c6fc44595491 smack: Set SMACK64TRANSMUTE only for dirs in smack_inode_setxattr()
a1a8d40182e2 clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd
2c26984759bb remoteproc: virtio: Fix wdg cannot recovery remote processor
779af170f1db arm64: dts: qcom: sc7280: Add additional MSI interrupts
1992f2af6444 media: staging: ipu3-imgu: Set fields before media_entity_pads_init()
e76f6b9618e8 wifi: brcmfmac: avoid invalid list operation when vendor attach fails
190794848e2b wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach
0a23f95af7f2 drm/vmwgfx: Unmap the surface before resetting it on a plane state
51138f1f3564 KVM: x86: Use a switch statement and macros in __feature_translate()
688313fb139e KVM: x86: Advertise CPUID.(EAX=7,ECX=2):EDX[5:0] to userspace
06644f0d7193 drm/tilcdc: Set preferred depth
ff7ae7b32324 crypto: jitter - add RCT/APT support for different OSRs
50cd24ddb6f0 arm64: defconfig: remove CONFIG_IPQ_APSS_5018
58e5c91d6701 x86/alternatives: Disable interrupts and sync when optimizing NOPs in place
c878fd2d4c79 x86/alternatives: Sync core before enabling interrupts
c2d64b9f52b6 qemux86: add configuration symbol to select values
630c33229e6d sched/isolation: really align nohz_full with rcu_nocbs
0e5e0f68e2e6 clear_warn_once: add a clear_warn_once= boot parameter
46934791b902 clear_warn_once: bind a timer to written reset value
cdee9e38ff32 clear_warn_once: expand debugfs to include read support
82b562b81841 tools: Remove some options from CLANG_CROSS_FLAGS
36dc380b776b libbpf: Fix build warning on ref_ctr_off
9e3e1fe20982 perf: perf can not parser the backtrace of app in the 32bit system and 64bit kernel.
e497a4a5da65 perf: x86-32: explicitly include <errno.h>
7b57ddd89565 perf: mips64: Convert __u64 to unsigned long long
1cfc19423dc7 perf: fix bench numa compilation
98bc2815fade perf: add SLANG_INC for slang.h
17209a70b9b3 perf: add sgidefs.h to for mips builds
9cd4258d910a perf: change --root to --prefix for python install
8110a4f26628 perf: add 'libperl not found' warning
bc89d5e08f77 perf: force include of <stdbool.h>
4f6c760cc876 fat: Replace prandom_u32() with get_random_u32()
bc53117b12b2 fat: don't use obsolete random32 call in namei_vfat
30b2236ab378 FAT: Added FAT_NO_83NAME
cef98d22b4ed FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES option
0bbd7daba9e1 FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES option
5883fc340084 aufs6: adapt to v6.6 i_op->ctime changes
c4342d979bf2 aufs6: fix magic.mk include path
35266bc2dc81 aufs6: adapt to v6.6
8edede4e98be aufs6: core
712248233ebe aufs6: standalone
3b71a8a848d8 aufs6: mmap
3e2924871f37 aufs6: base
7f4907a93101 aufs6: kbuild
d2f7b03e4aa7 yaffs2: update VFS ctime operations to 6.6+
bcd6cfcd1aa0 yaffs2: v6.5 fixups
cc615704b5f5 yaffs2: Fix miscalculation of devname buffer length
8ef2e22dcf91 yaffs2: convert user_namespace to mnt_idmap
c9c749f9f7d3 yaffs2: replace bdevname call with sprintf
395b01cdc39d yaffs2: convert read_page -> readfolio
d98b07e43ba6 yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR and NULL
613c6d50fdbe yaffs: fix -Wstringop-overread compile warning in yaffs_fix_null_name
622c4648936f yaffs2: v5.12+ build fixups (not runtime tested)
7562133d4090 yaffs: include blkdev.h
dbd44252cd59 yaffs: fix misplaced variable declaration
c223a10b1ac0 yaffs2: v5.6 build fixups
90f6007cfbf4 yaffs2: fix memory leak when /proc/yaffs is read
37ee169c5ea1 yaffs: add strict check when call yaffs_internal_read_super
b6e007b8abb6 yaffs: repair yaffs_get_mtd_device
fb98f65a466a yaffs: Fix build failure by handling inode i_version with proper atomic API
51e0aac75ea2 yaffs2: fix memory leak in mount/umount
2b74a0cae7b0 yaffs: Avoid setting any ACL releated xattr
ff4130a9c376 Yaffs:check oob size before auto selecting Yaffs1
ba95b409c67c fs: yaffs2: replace CURRENT_TIME by other appropriate apis
8fa35eba9056 yaffs2: adjust to proper location of MS_RDONLY
1eb5deaad8c4 yaffs2: import git revision b4ce1bb (jan, 2020)
4dce67c1e8c8 initramfs: allow an optional wrapper script around initramfs generation
2f603d83fcc4 pnmtologo: use relocatable file name
664a6a0a484b tools: use basename to identify file in gen-mach-types
9de64bc0c185 lib/build_OID_registry: fix reproducibility issues
ae9b80797295 vt/conmakehash: improve reproducibility
a972323151bd iwlwifi: select MAC80211_LEDS conditionally
15d2adcc0198 net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119)
5556a6c04b19 arm64/perf: Fix wrong cast that may cause wrong truncation
5552dc768ffc defconfigs: drop obselete options
00fe4152df31 arm64/perf: fix backtrace for AAPCS with FP enabled
3888d0652edf linux-yocto: Handle /bin/awk issues
3d55d299f23a uvesafb: provide option to specify timeout for task completion
23c068c080be uvesafb: print error message when task timeout occurs
edbfc939266e compiler.h: Undef before redefining __attribute_const__
c99ae7e2a19a vmware: include jiffies.h
572d84d928c8 Resolve jiffies wrapping about arp
fdcd47cac843 nfs: Allow default io size to be configured.
927d48801098 check console device file on fs when booting
57cc27f821dd mount_root: clarify error messages for when no rootfs found
1b53d82a8152 mconf: fix output of cflags and libraries
1811da09f42c menuconfig,mconf-cfg: Allow specification of ncurses location
83c2e0c6eb1f modpost: mask trivial warnings
6de673039484 kbuild: exclude meta directory from distclean processing
6decd32815f5 powerpc: serialize image targets
f6b683b38318 arm: serialize build targets
e798b09ebf57 mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, release} to avoid race condition
dc8a1e5a88f8 x86_64_defconfig: Fix warnings
68491e5f72b6 powerpc/ptrace: Disable array-bounds warning with gcc8
d71ebfce3004 powerpc: Disable attribute-alias warnings from gcc8
62f50884b8b1 powerpc: kexec fix for powerpc64
da6871c62c37 powerpc: Add unwind information for SPE registers of E500 core
f161c880c11d mips: make current_cpu_data preempt safe
5e94a8247ce7 mips: vdso: fix 'jalr $t9' crash in vdso code
19e36714b1c7 mips: Kconfig: add QEMUMIPS64 option
e2e537db3cbd 4kc cache tlb hazard: tlbp cache coherency
aee9870611e5 malta uhci quirks: make allowance for slow 4k(e)c
881948cd1517 drm/fb-helper: move zeroing code to drm_fb_helper_fill_var
98ec1963fcb7 arm64: defconfig: cleanup config options
f1727c537ba8 vexpress: Pass LOADADDR to Makefile
4474c32dc24a arm: ARM EABI socketcall
75e31a2b70fd ARM: LPAE: Invalidate the TLB for module addresses during translation fault
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.6.bb | 6 ++--
.../linux/linux-yocto-tiny_6.6.bb | 6 ++--
meta/recipes-kernel/linux/linux-yocto_6.6.bb | 28 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
index a44a08451a..2f788667f0 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
@@ -14,13 +14,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "19813826de57a6425518c7b3daf8dd6a04d2321f"
-SRCREV_meta ?= "f7f00b22efcfcae6489e9ec7db7002685fbc078b"
+SRCREV_machine ?= "7290738691e931c361f5391a47189e40477cc2a2"
+SRCREV_meta ?= "03ec143a0ca70ff92968bc4ea919e936ab9e8572"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
-LINUX_VERSION ?= "6.6.23"
+LINUX_VERSION ?= "6.6.24"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
index db9e252572..4f9474efae 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
# CVE exclusions
include recipes-kernel/linux/cve-exclusion_6.6.inc
-LINUX_VERSION ?= "6.6.23"
+LINUX_VERSION ?= "6.6.24"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "2d01bc1d4eeade12518371139dd24a21438f523c"
-SRCREV_meta ?= "f7f00b22efcfcae6489e9ec7db7002685fbc078b"
+SRCREV_machine ?= "2f64879b557ec6baccf27afdd4d02a46051b65bc"
+SRCREV_meta ?= "03ec143a0ca70ff92968bc4ea919e936ab9e8572"
PV = "${LINUX_VERSION}+git"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
index 43696db59b..65a3e9a97d 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.6/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.6/standard/base"
KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "ceb94a85299b59d8840ed7ed392b1d3e4c727678"
-SRCREV_machine:qemuarm64 ?= "2d01bc1d4eeade12518371139dd24a21438f523c"
-SRCREV_machine:qemuloongarch64 ?= "2d01bc1d4eeade12518371139dd24a21438f523c"
-SRCREV_machine:qemumips ?= "c79ffc89f8909f60de52005ef258db9752634eda"
-SRCREV_machine:qemuppc ?= "2d01bc1d4eeade12518371139dd24a21438f523c"
-SRCREV_machine:qemuriscv64 ?= "2d01bc1d4eeade12518371139dd24a21438f523c"
-SRCREV_machine:qemuriscv32 ?= "2d01bc1d4eeade12518371139dd24a21438f523c"
-SRCREV_machine:qemux86 ?= "2d01bc1d4eeade12518371139dd24a21438f523c"
-SRCREV_machine:qemux86-64 ?= "2d01bc1d4eeade12518371139dd24a21438f523c"
-SRCREV_machine:qemumips64 ?= "b0a73fa83073c8d7d7bc917bcbeac88d296ebe38"
-SRCREV_machine ?= "2d01bc1d4eeade12518371139dd24a21438f523c"
-SRCREV_meta ?= "f7f00b22efcfcae6489e9ec7db7002685fbc078b"
+SRCREV_machine:qemuarm ?= "47c23d5ba2db28b76e62e152bf4601f30ffbb1a6"
+SRCREV_machine:qemuarm64 ?= "2f64879b557ec6baccf27afdd4d02a46051b65bc"
+SRCREV_machine:qemuloongarch64 ?= "2f64879b557ec6baccf27afdd4d02a46051b65bc"
+SRCREV_machine:qemumips ?= "d433ef0d8830772213f0d667478d675e778cfbc1"
+SRCREV_machine:qemuppc ?= "2f64879b557ec6baccf27afdd4d02a46051b65bc"
+SRCREV_machine:qemuriscv64 ?= "2f64879b557ec6baccf27afdd4d02a46051b65bc"
+SRCREV_machine:qemuriscv32 ?= "2f64879b557ec6baccf27afdd4d02a46051b65bc"
+SRCREV_machine:qemux86 ?= "2f64879b557ec6baccf27afdd4d02a46051b65bc"
+SRCREV_machine:qemux86-64 ?= "2f64879b557ec6baccf27afdd4d02a46051b65bc"
+SRCREV_machine:qemumips64 ?= "480ddad109153a5cadd6c625d93044d7d93ce8bd"
+SRCREV_machine ?= "2f64879b557ec6baccf27afdd4d02a46051b65bc"
+SRCREV_meta ?= "03ec143a0ca70ff92968bc4ea919e936ab9e8572"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "5c7587f69194bc9fc714953ab4c7203e6e68885b"
+SRCREV_machine:class-devupstream ?= "9467d7a12f970e7f12adcba143b0c9b9d1a9e72d"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.6/base"
@@ -44,7 +44,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.6.23"
+LINUX_VERSION ?= "6.6.24"
PV = "${LINUX_VERSION}+git"
--
2.39.2
^ permalink raw reply related [relevance 1%]
* Re: [RFC PATCH net-next 0/5] net: In-kernel QUIC implementation with Userspace handshake
2024-04-29 15:20 0% ` Stefan Metzmacher
@ 2024-05-02 18:08 6% ` Xin Long
0 siblings, 0 replies; 200+ results
From: Xin Long @ 2024-05-02 18:08 UTC (permalink / raw)
To: Stefan Metzmacher
Cc: network dev, davem, kuba, Eric Dumazet, Paolo Abeni,
Steve French, Namjae Jeon, Chuck Lever III, Jeff Layton,
Sabrina Dubroca, Tyler Fanelli, Pengtao He, linux-cifs,
Samba Technical
On Mon, Apr 29, 2024 at 11:20 AM Stefan Metzmacher <metze@samba.org> wrote:
>
> Hi Xin Long,
>
> >>
> > Just confirmed from other ebpf experts, there are no in-kernel interfaces
> > for loading and interacting with BPF maps/programs(other than from BPF itself).
> >
> > It seems that we have to do this match in QUIC stack. In the latest QUIC
> > code, I added quic_packet_get_alpn(), a 59-line function, to parse ALPNs
> > and then it will search for the listen sock with these ALPNs in
> > quic_sock_lookup().
> >
> > I introduced 'alpn_match' module param, and it can be enabled when loading
> > the module QUIC by:
> >
> > # modprobe quic alpn_match=1
> >
> > You can test it by tests/sample_test in the latest code:
> >
> > Start 3 servers:
> >
> > # ./sample_test server 0.0.0.0 1234 \
> > ./keys/server-key.pem ./keys/server-cert.pem smbd
> > # ./sample_test server 0.0.0.0 1234 \
> > ./keys/server-key.pem ./keys/server-cert.pem h3
> > # ./sample_test server 0.0.0.0 1234 \
> > ./keys/server-key.pem ./keys/server-cert.pem ksmbd
> >
> > Try to connect on clients with:
> >
> > # ./sample_test client 127.0.0.1 1234 ksmbd
> > # ./sample_test client 127.0.0.1 1234 smbd
> > # ./sample_test client 127.0.0.1 1234 h3
> >
> > to see if the corresponding server responds.
> >
> > There might be some concerns but it's also a useful feature that can not
> > be implemented in userland QUICs. The commit is here:
> >
> > https://github.com/lxin/quic/commit/de82f8135f4e9196b503b4ab5b359d88f2b2097f
> >
> > Please check if this is enough for SMB applications.
>
> It look great thanks!
>
> > Note as a listen socket is now identified by [address + port + ALPN] when
> > alpn_match=1, this feature does NOT require SO_REUSEPORT socket option to
> > be set, unless one wants multiple sockets to listen to
> > the same [address + port + ALPN].
>
> I'd argue that this should be the default and be required before listen()
> or maybe before bind(), so that it can return EADDRINUSE. As EADDRINUSE should only
> happen for servers it might be useful to have a QUIC_SOCKOPT_LISTEN_ALPN instead of
> QUIC_SOCKOPT_ALPN. As QUIC_SOCKOPT_ALPN on a client socket should not generate let
> bind() care about the alpn value at all.
The latest patches have made it always do alpn_match in kernel, and also
support multiple ALPNs(split by ',' when setting it via sockopt) on both
server and client side. Feel free to check.
Note that:
1. As you expected, setsockopt(QUIC_SOCKOPT_ALPN) must be called before
listen(), and it will return EADDRINUSE if there's a socket already
listening to the same IP + PORT + ALPN.
2. ALPN bind/match is a *listening* sockets thing, so it checks ALPN only
when adding listening sockets in quic_hash(), and it does ALPN only
when looking up listening sockets in quic_sock_lookup().
By setting ALPNs in client sockets it will ONLY pack these ALPNs into
the Client Initial Packet when starting connecting, no bind/match for
these regular sockets, as these sockets can be found by 4-tuple or
a source_connection_id. bind() doesn't need to care about ALPN for
client/regular socket either.
So it's fine to use QUIC_SOCKOPT_ALPN sockopt for both listen and
regular/client sockets, as in kernel it acts differently on ALPNs
for listening and regular sockets. (sorry for confusing, I could
have moved created another hashtable for listening sockets)
In other word, a listen socket is identified by
local_ip + local_port + ALPN(s)
while a regular socket (represents a quic connection) is identified by:
local_ip + local_port + remote_ip + remote_port
or any of those
source_connection_ids.
3. SO_REUSEPORT is still applied to do some load balance between multiple
processes listening to the same IP + PORT + ALPN, like:
on server:
process A: skA = listen(127.0.0.1:1234:smbd)
process B: skB = listen(127.0.0.1:1234:smbd)
process C: skC = listen(127.0.0.1:1234:smbd)
on client:
connect(127.0.0.1:1234:smbd)
connect(127.0.0.1:1234:smbd)
...
on server it will select the sk among (skA, skB and skC) based on the
source address + port in the request from client.
4. Not sure if multiple ALPNs support are useful to you, here is some
example about how it works:
- Without SO_REUSEPORT set:
On server:
process A: skA = listen(127.0.0.1:1234:smbd,h3,ksmbd)
process B: skB = listen(127.0.0.1:1234:smbd,h3,ksmbd)
listen() in process B fails and returns EADDRINUSE.
- with SO_REUSEPORT set:
On server:
process A: skA = listen(127.0.0.1:1234:smbd,h3,ksmbd)
process B: skB = listen(127.0.0.1:1234:smbd,h3,ksmbd)
listen() in process B works.
- with or without SO_REUSEPORT set:
On server:
process A: skA = listen(127.0.0.1:1234:h3,ksmbd)
process B: skB = listen(127.0.0.1:1234:h3,smbd).
(there's overlap on ALPN list but not exact the same ALPNs)
listen() in process B fails and returns EADDRINUSE.
- the match priority for multiple ALPNs is based on the order on the
client ALPN list:
On server:
process A: skA = listen(127.0.0.1:1234:smbd)
process B: skB = listen(127.0.0.1:1234:h3)
process C: skC = listen(127.0.0.1:1234:ksmbd)
On client:
process X: skX = connect(27.0.0.1:1234:h3,ksmbd,smbd)
skB will be the one selected to accept the connection, as h3 is the
1st ALPN on the client ALPN list 'h3,ksmbd,smbd'.
>
> For listens on tcp you also need to specify an explicit port (at least in order
> to be useful).
>
> And it would mean that all application would use it and not block other applications
> from using an explicit alpn.
>
> Also an module parameter for this means the administrator would have to take care
> of it, which means it might be unuseable if loaded with it.
Agree, already dropped this param.
>
> I hope to find some time in the next weeks to play with this.
> Should be relatively trivial create a prototype for samba's smbd.
Sounds Cool!
Thanks.
^ permalink raw reply [relevance 6%]
* [PATCH 4/4] ksmbd: do not grant v2 lease if parent lease key and epoch are not set
2024-05-02 12:14 8% [PATCH 1/4] ksmbd: off ipv6only for both ipv4/ipv6 binding Namjae Jeon
2024-05-02 12:14 8% ` [PATCH 2/4] ksmbd: avoid to send duplicate lease break notifications Namjae Jeon
2024-05-02 12:14 3% ` [PATCH 3/4] ksmbd: use rwsem instead of rwlock for lease break Namjae Jeon
@ 2024-05-02 12:14 9% ` Namjae Jeon
2 siblings, 0 replies; 200+ results
From: Namjae Jeon @ 2024-05-02 12:14 UTC (permalink / raw)
To: linux-cifs; +Cc: smfrench, senozhatsky, tom, atteh.mailbox, Namjae Jeon
This patch fix xfstests generic/070 test with smb2 leases = yes.
cifs.ko doesn't set parent lease key and epoch in create context v2 lease.
ksmbd suppose that parent lease and epoch are vaild if data length is
v2 lease context size and handle directory lease using this values.
ksmbd should hanle it as v1 lease not v2 lease if parent lease key and
epoch are not set in create context v2 lease.
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
---
fs/smb/server/oplock.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c
index c2abf109010d..b9d9116fc2b3 100644
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -1201,7 +1201,9 @@ int smb_grant_oplock(struct ksmbd_work *work, int req_op_level, u64 pid,
/* Only v2 leases handle the directory */
if (S_ISDIR(file_inode(fp->filp)->i_mode)) {
- if (!lctx || lctx->version != 2)
+ if (!lctx || lctx->version != 2 ||
+ (lctx->flags != SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET_LE &&
+ !lctx->epoch))
return 0;
}
@@ -1466,8 +1468,9 @@ void create_lease_buf(u8 *rbuf, struct lease *lease)
buf->lcontext.LeaseFlags = lease->flags;
buf->lcontext.Epoch = cpu_to_le16(lease->epoch);
buf->lcontext.LeaseState = lease->state;
- memcpy(buf->lcontext.ParentLeaseKey, lease->parent_lease_key,
- SMB2_LEASE_KEY_SIZE);
+ if (lease->flags == SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET_LE)
+ memcpy(buf->lcontext.ParentLeaseKey, lease->parent_lease_key,
+ SMB2_LEASE_KEY_SIZE);
buf->ccontext.DataOffset = cpu_to_le16(offsetof
(struct create_lease_v2, lcontext));
buf->ccontext.DataLength = cpu_to_le32(sizeof(struct lease_context_v2));
@@ -1526,8 +1529,9 @@ struct lease_ctx_info *parse_lease_state(void *open_req)
lreq->flags = lc->lcontext.LeaseFlags;
lreq->epoch = lc->lcontext.Epoch;
lreq->duration = lc->lcontext.LeaseDuration;
- memcpy(lreq->parent_lease_key, lc->lcontext.ParentLeaseKey,
- SMB2_LEASE_KEY_SIZE);
+ if (lreq->flags == SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET_LE)
+ memcpy(lreq->parent_lease_key, lc->lcontext.ParentLeaseKey,
+ SMB2_LEASE_KEY_SIZE);
lreq->version = 2;
} else {
struct create_lease *lc = (struct create_lease *)cc;
--
2.25.1
^ permalink raw reply related [relevance 9%]
* [PATCH 3/4] ksmbd: use rwsem instead of rwlock for lease break
2024-05-02 12:14 8% [PATCH 1/4] ksmbd: off ipv6only for both ipv4/ipv6 binding Namjae Jeon
2024-05-02 12:14 8% ` [PATCH 2/4] ksmbd: avoid to send duplicate lease break notifications Namjae Jeon
@ 2024-05-02 12:14 3% ` Namjae Jeon
2024-05-02 12:14 9% ` [PATCH 4/4] ksmbd: do not grant v2 lease if parent lease key and epoch are not set Namjae Jeon
2 siblings, 0 replies; 200+ results
From: Namjae Jeon @ 2024-05-02 12:14 UTC (permalink / raw)
To: linux-cifs; +Cc: smfrench, senozhatsky, tom, atteh.mailbox, Namjae Jeon
lease break wait for lease break acknowledgment.
rwsem is more suitable than unlock while traversing the list for parent
lease break in ->m_op_list.
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
---
fs/smb/server/oplock.c | 30 +++++++++++-------------------
fs/smb/server/smb2pdu.c | 4 ++--
fs/smb/server/smb_common.c | 4 ++--
fs/smb/server/vfs_cache.c | 28 ++++++++++++++--------------
fs/smb/server/vfs_cache.h | 2 +-
5 files changed, 30 insertions(+), 38 deletions(-)
diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c
index 6fd8cb7064dc..c2abf109010d 100644
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -207,9 +207,9 @@ static void opinfo_add(struct oplock_info *opinfo)
{
struct ksmbd_inode *ci = opinfo->o_fp->f_ci;
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_add_rcu(&opinfo->op_entry, &ci->m_op_list);
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
}
static void opinfo_del(struct oplock_info *opinfo)
@@ -221,9 +221,9 @@ static void opinfo_del(struct oplock_info *opinfo)
lease_del_list(opinfo);
write_unlock(&lease_list_lock);
}
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_del_rcu(&opinfo->op_entry);
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
}
static unsigned long opinfo_count(struct ksmbd_file *fp)
@@ -526,21 +526,18 @@ static struct oplock_info *same_client_has_lease(struct ksmbd_inode *ci,
* Compare lease key and client_guid to know request from same owner
* of same client
*/
- read_lock(&ci->m_lock);
+ down_read(&ci->m_lock);
list_for_each_entry(opinfo, &ci->m_op_list, op_entry) {
if (!opinfo->is_lease || !opinfo->conn)
continue;
- read_unlock(&ci->m_lock);
lease = opinfo->o_lease;
ret = compare_guid_key(opinfo, client_guid, lctx->lease_key);
if (ret) {
m_opinfo = opinfo;
/* skip upgrading lease about breaking lease */
- if (atomic_read(&opinfo->breaking_cnt)) {
- read_lock(&ci->m_lock);
+ if (atomic_read(&opinfo->breaking_cnt))
continue;
- }
/* upgrading lease */
if ((atomic_read(&ci->op_count) +
@@ -570,9 +567,8 @@ static struct oplock_info *same_client_has_lease(struct ksmbd_inode *ci,
lease_none_upgrade(opinfo, lctx->req_state);
}
}
- read_lock(&ci->m_lock);
}
- read_unlock(&ci->m_lock);
+ up_read(&ci->m_lock);
return m_opinfo;
}
@@ -1114,7 +1110,7 @@ void smb_send_parent_lease_break_noti(struct ksmbd_file *fp,
if (!p_ci)
return;
- read_lock(&p_ci->m_lock);
+ down_read(&p_ci->m_lock);
list_for_each_entry(opinfo, &p_ci->m_op_list, op_entry) {
if (opinfo->conn == NULL || !opinfo->is_lease)
continue;
@@ -1132,13 +1128,11 @@ void smb_send_parent_lease_break_noti(struct ksmbd_file *fp,
continue;
}
- read_unlock(&p_ci->m_lock);
oplock_break(opinfo, SMB2_OPLOCK_LEVEL_NONE);
opinfo_conn_put(opinfo);
- read_lock(&p_ci->m_lock);
}
}
- read_unlock(&p_ci->m_lock);
+ up_read(&p_ci->m_lock);
ksmbd_inode_put(p_ci);
}
@@ -1159,7 +1153,7 @@ void smb_lazy_parent_lease_break_close(struct ksmbd_file *fp)
if (!p_ci)
return;
- read_lock(&p_ci->m_lock);
+ down_read(&p_ci->m_lock);
list_for_each_entry(opinfo, &p_ci->m_op_list, op_entry) {
if (opinfo->conn == NULL || !opinfo->is_lease)
continue;
@@ -1173,13 +1167,11 @@ void smb_lazy_parent_lease_break_close(struct ksmbd_file *fp)
atomic_dec(&opinfo->conn->r_count);
continue;
}
- read_unlock(&p_ci->m_lock);
oplock_break(opinfo, SMB2_OPLOCK_LEVEL_NONE);
opinfo_conn_put(opinfo);
- read_lock(&p_ci->m_lock);
}
}
- read_unlock(&p_ci->m_lock);
+ up_read(&p_ci->m_lock);
ksmbd_inode_put(p_ci);
}
diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index 30229161b346..b6c5a8ea3887 100644
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -3376,9 +3376,9 @@ int smb2_open(struct ksmbd_work *work)
* after daccess, saccess, attrib_only, and stream are
* initialized.
*/
- write_lock(&fp->f_ci->m_lock);
+ down_write(&fp->f_ci->m_lock);
list_add(&fp->node, &fp->f_ci->m_fp_list);
- write_unlock(&fp->f_ci->m_lock);
+ up_write(&fp->f_ci->m_lock);
/* Check delete pending among previous fp before oplock break */
if (ksmbd_inode_pending_delete(fp)) {
diff --git a/fs/smb/server/smb_common.c b/fs/smb/server/smb_common.c
index fcaf373cc008..474dadf6b7b8 100644
--- a/fs/smb/server/smb_common.c
+++ b/fs/smb/server/smb_common.c
@@ -646,7 +646,7 @@ int ksmbd_smb_check_shared_mode(struct file *filp, struct ksmbd_file *curr_fp)
* Lookup fp in master fp list, and check desired access and
* shared mode between previous open and current open.
*/
- read_lock(&curr_fp->f_ci->m_lock);
+ down_read(&curr_fp->f_ci->m_lock);
list_for_each_entry(prev_fp, &curr_fp->f_ci->m_fp_list, node) {
if (file_inode(filp) != file_inode(prev_fp->filp))
continue;
@@ -722,7 +722,7 @@ int ksmbd_smb_check_shared_mode(struct file *filp, struct ksmbd_file *curr_fp)
break;
}
}
- read_unlock(&curr_fp->f_ci->m_lock);
+ up_read(&curr_fp->f_ci->m_lock);
return rc;
}
diff --git a/fs/smb/server/vfs_cache.c b/fs/smb/server/vfs_cache.c
index 030f70700036..6cb599cd287e 100644
--- a/fs/smb/server/vfs_cache.c
+++ b/fs/smb/server/vfs_cache.c
@@ -165,7 +165,7 @@ static int ksmbd_inode_init(struct ksmbd_inode *ci, struct ksmbd_file *fp)
ci->m_fattr = 0;
INIT_LIST_HEAD(&ci->m_fp_list);
INIT_LIST_HEAD(&ci->m_op_list);
- rwlock_init(&ci->m_lock);
+ init_rwsem(&ci->m_lock);
ci->m_de = fp->filp->f_path.dentry;
return 0;
}
@@ -261,14 +261,14 @@ static void __ksmbd_inode_close(struct ksmbd_file *fp)
}
if (atomic_dec_and_test(&ci->m_count)) {
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
if (ci->m_flags & (S_DEL_ON_CLS | S_DEL_PENDING)) {
ci->m_flags &= ~(S_DEL_ON_CLS | S_DEL_PENDING);
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
ksmbd_vfs_unlink(filp);
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
}
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
ksmbd_inode_free(ci);
}
@@ -289,9 +289,9 @@ static void __ksmbd_remove_fd(struct ksmbd_file_table *ft, struct ksmbd_file *fp
if (!has_file_id(fp->volatile_id))
return;
- write_lock(&fp->f_ci->m_lock);
+ down_write(&fp->f_ci->m_lock);
list_del_init(&fp->node);
- write_unlock(&fp->f_ci->m_lock);
+ up_write(&fp->f_ci->m_lock);
write_lock(&ft->lock);
idr_remove(ft->idr, fp->volatile_id);
@@ -523,17 +523,17 @@ struct ksmbd_file *ksmbd_lookup_fd_inode(struct dentry *dentry)
if (!ci)
return NULL;
- read_lock(&ci->m_lock);
+ down_read(&ci->m_lock);
list_for_each_entry(lfp, &ci->m_fp_list, node) {
if (inode == file_inode(lfp->filp)) {
atomic_dec(&ci->m_count);
lfp = ksmbd_fp_get(lfp);
- read_unlock(&ci->m_lock);
+ up_read(&ci->m_lock);
return lfp;
}
}
atomic_dec(&ci->m_count);
- read_unlock(&ci->m_lock);
+ up_read(&ci->m_lock);
return NULL;
}
@@ -705,13 +705,13 @@ static bool session_fd_check(struct ksmbd_tree_connect *tcon,
conn = fp->conn;
ci = fp->f_ci;
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_for_each_entry_rcu(op, &ci->m_op_list, op_entry) {
if (op->conn != conn)
continue;
op->conn = NULL;
}
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
fp->conn = NULL;
fp->tcon = NULL;
@@ -801,13 +801,13 @@ int ksmbd_reopen_durable_fd(struct ksmbd_work *work, struct ksmbd_file *fp)
fp->tcon = work->tcon;
ci = fp->f_ci;
- write_lock(&ci->m_lock);
+ down_write(&ci->m_lock);
list_for_each_entry_rcu(op, &ci->m_op_list, op_entry) {
if (op->conn)
continue;
op->conn = fp->conn;
}
- write_unlock(&ci->m_lock);
+ up_write(&ci->m_lock);
__open_id(&work->sess->file_table, fp, OPEN_ID_TYPE_VOLATILE_ID);
if (!has_file_id(fp->volatile_id)) {
diff --git a/fs/smb/server/vfs_cache.h b/fs/smb/server/vfs_cache.h
index ed44fb4e18e7..5a225e7055f1 100644
--- a/fs/smb/server/vfs_cache.h
+++ b/fs/smb/server/vfs_cache.h
@@ -47,7 +47,7 @@ struct stream {
};
struct ksmbd_inode {
- rwlock_t m_lock;
+ struct rw_semaphore m_lock;
atomic_t m_count;
atomic_t op_count;
/* opinfo count for streams */
--
2.25.1
^ permalink raw reply related [relevance 3%]
* [PATCH 2/4] ksmbd: avoid to send duplicate lease break notifications
2024-05-02 12:14 8% [PATCH 1/4] ksmbd: off ipv6only for both ipv4/ipv6 binding Namjae Jeon
@ 2024-05-02 12:14 8% ` Namjae Jeon
2024-05-02 12:14 3% ` [PATCH 3/4] ksmbd: use rwsem instead of rwlock for lease break Namjae Jeon
2024-05-02 12:14 9% ` [PATCH 4/4] ksmbd: do not grant v2 lease if parent lease key and epoch are not set Namjae Jeon
2 siblings, 0 replies; 200+ results
From: Namjae Jeon @ 2024-05-02 12:14 UTC (permalink / raw)
To: linux-cifs; +Cc: smfrench, senozhatsky, tom, atteh.mailbox, Namjae Jeon
This patch fixes generic/011 when enable smb2 leases.
if ksmbd sends multiple notifications for a file, cifs increments
the reference count of the file but it does not decrement the count by
the failure of queue_work.
So even if the file is closed, cifs does not send a SMB2_CLOSE request.
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
---
fs/smb/server/oplock.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c
index 4978edfb15f9..6fd8cb7064dc 100644
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -613,13 +613,23 @@ static int oplock_break_pending(struct oplock_info *opinfo, int req_op_level)
if (opinfo->op_state == OPLOCK_CLOSING)
return -ENOENT;
- else if (!opinfo->is_lease && opinfo->level <= req_op_level)
- return 1;
+ else if (opinfo->level <= req_op_level) {
+ if (opinfo->is_lease &&
+ opinfo->o_lease->state !=
+ (SMB2_LEASE_HANDLE_CACHING_LE |
+ SMB2_LEASE_READ_CACHING_LE))
+ return 1;
+ }
}
- if (!opinfo->is_lease && opinfo->level <= req_op_level) {
- wake_up_oplock_break(opinfo);
- return 1;
+ if (opinfo->level <= req_op_level) {
+ if (opinfo->is_lease &&
+ opinfo->o_lease->state !=
+ (SMB2_LEASE_HANDLE_CACHING_LE |
+ SMB2_LEASE_READ_CACHING_LE)) {
+ wake_up_oplock_break(opinfo);
+ return 1;
+ }
}
return 0;
}
@@ -887,7 +897,6 @@ static int oplock_break(struct oplock_info *brk_opinfo, int req_op_level)
struct lease *lease = brk_opinfo->o_lease;
atomic_inc(&brk_opinfo->breaking_cnt);
-
err = oplock_break_pending(brk_opinfo, req_op_level);
if (err)
return err < 0 ? err : 0;
--
2.25.1
^ permalink raw reply related [relevance 8%]
* [PATCH 1/4] ksmbd: off ipv6only for both ipv4/ipv6 binding
@ 2024-05-02 12:14 8% Namjae Jeon
2024-05-02 12:14 8% ` [PATCH 2/4] ksmbd: avoid to send duplicate lease break notifications Namjae Jeon
` (2 more replies)
0 siblings, 3 replies; 200+ results
From: Namjae Jeon @ 2024-05-02 12:14 UTC (permalink / raw)
To: linux-cifs
Cc: smfrench, senozhatsky, tom, atteh.mailbox, Namjae Jeon,
ΕΛΕΝΗ
ΤΖΑΒΕΛΛΑ
ΕΛΕΝΗ reported that ksmbd binds to the IPV6 wildcard (::) by default for
ipv4 and ipv6 binding. So IPV4 connections are successful only when
the Linux system parameter bindv6only is set to 0 [default value].
If this parameter is set to 1, then the ipv6 wildcard only represents
any IPV6 address. Samba creates different sockets for ipv4 and ipv6
by default. This patch off sk_ipv6only to support IPV4/IPV6 connections
without creating two sockets.
Reported-by: ΕΛΕΝΗ ΤΖΑΒΕΛΛΑ <helentzavellas@yahoo.gr>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
---
fs/smb/server/transport_tcp.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fs/smb/server/transport_tcp.c b/fs/smb/server/transport_tcp.c
index 002a3f0dc7c5..6633fa78e9b9 100644
--- a/fs/smb/server/transport_tcp.c
+++ b/fs/smb/server/transport_tcp.c
@@ -448,6 +448,10 @@ static int create_socket(struct interface *iface)
sin6.sin6_family = PF_INET6;
sin6.sin6_addr = in6addr_any;
sin6.sin6_port = htons(server_conf.tcp_port);
+
+ lock_sock(ksmbd_socket->sk);
+ ksmbd_socket->sk->sk_ipv6only = false;
+ release_sock(ksmbd_socket->sk);
}
ksmbd_tcp_nodelay(ksmbd_socket);
--
2.25.1
^ permalink raw reply related [relevance 8%]
* linux-next: Tree for May 2
@ 2024-05-02 6:47 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-02 6:47 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 39636 bytes --]
Hi all,
Changes since 20240501:
The mm tree still had its build failure for which I revreted 2 commits.
The v4l-dvb-next tree still had its build failure so I used the version
from next-20240430.
The bluetooth tree lost its build failure.
The dmi tree still had its build failure for which I reverted a commit.
The kvm tree gained a semantic conflict against the tip tree.
The slab tree lost its build failure.
Non-merge commits (relative to Linus' tree): 9401
9250 files changed, 666970 insertions(+), 232407 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (0106679839f7 Merge tag 'regulator-fix-v6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (bcf28f9e63d4 selftests/vDSO: fix runtime errors on LoongArch)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (e783331c7720 arm64/mm: pmd_mkinvalid() must handle swap pmds)
Merging arm-soc-fixes/arm/fixes (e845bcc8cfda Merge tag 'riscv-soc-fixes-for-v6.9-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (da7c622cddd4 s390/cio: Ensure the copied buf is NUL terminated)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (8953285d7bd6 rxrpc: Clients must accept conn from any address)
Merging bpf/master (3e9bc0472b91 Merge branch 'bpf: Add BPF_PROG_TYPE_CGROUP_SKB attach type enforcement in BPF_LINK_CREATE')
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs/main (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging wireless/for-next (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (9b3c22ab3929 ALSA: hda/realtek: Fix build error without CONFIG_PM)
Merging sound-asoc-fixes/for-linus (c5782bb5468a ASoC: meson: tdm fixes)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (ff33132605c1 regulator: change devm_regulator_get_enable_optional() stub to return Ok)
Merging spi-fixes/for-linus (4756fa529b2f spi: fix null pointer dereference within spi_sync)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging usb.current/usb-linus (ae11f04b452b usb: typec: tcpm: Check for port partner validity before consuming it)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (4108a30f1097 mei: me: add lunar lake point M DID)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (00e7d3bea2ce dyndbg: fix old BUG_ON in >control parser)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (16c20208b9c2 Merge tag 'kvmarm-fixes-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (052f3ec54799 Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (515a3c3a5489 platform/x86: ISST: Add Grand Ridge to HPM CPU list)
Merging samsung-krzk-fixes/fixes (da244c16ac58 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (e67572cd2204 Linux 6.9-rc6)
Merging drm-intel-fixes/for-linux-next-fixes (e67572cd2204 Linux 6.9-rc6)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (c714fcdf5b75 Merge tag 'intel-gpio-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-current)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (e67572cd2204 Linux 6.9-rc6)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()")
aacb99de1099 ("clk: samsung: Revert "clk: Use device_get_match_data()"")
Merging drm-misc-fixes/for-linux-next-fixes (a37ef7613c00 drm/vmwgfx: Fix invalid reads in fence signaled events)
Merging mm-stable/mm-stable (72801513b2bf mm: set pageblock_order to HPAGE_PMD_ORDER in case with !CONFIG_HUGETLB_PAGE but THP enabled)
Merging mm-nonmm-stable/mm-nonmm-stable (e02577872ff5 crash: add prefix for crash dumping messages)
Merging mm/mm-everything (3c2a0d2f0ca0 foo)
Applying: Revert "mm/vmscan: avoid split lazyfree THP during shrink_folio_list()"
Applying: Revert "mm/rmap: integrate PMD-mapped folio splitting into pagewalk loop"
Merging kbuild/for-next (060ef2b42249 kconfig: remove 'optional' property support)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (8c618b58c89c perf test: Reintroduce -p/--parallel and make -S/--sequential the default)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (77ea103519fa Merge branches 'amba', 'cfi', 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (7befe2ef9384 Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (4052ce07d5d7 perf/arm-spe: Assign parents for event_source device)
Merging arm-soc/for-next (c2e516e61f14 soc: document merges)
Merging amlogic/for-next (2b952b1d0a54 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (565222d01f1e ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
dc260f505bd5 ("ARM: dts: aspeed: Add vendor prefixes to lm25066 compat strings")
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (7f6f45a762c3 Merge branches 'v6.9-next/soc' and 'v6.9-next/dts64' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (1d0a6cdb7d77 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (8dabf52bd8db Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (7a6a71ac50cb Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (f532f2375771 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (1bcbd94049b4 Merge branch 'clk-fixes' into clk-next)
Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (f3334ebb8a2a LoongArch: Lately init pmu after smp is online)
Merging m68k/for-next (bd622532f7b3 m68k: amiga: Use str_plural() to fix Coccinelle warning)
Merging m68knommu/for-next (2595108e5842 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (487fa28fa8b6 parisc: Define sigset_t in parisc uapi header)
Merging powerpc/next (dda32e37d397 selftests/powerpc: Install tests in sub-directories)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (849599b702ef powerpc/crash: add crash memory hotplug support)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (88e2486b6863 RISC-V: add Milkv Mars board devicetree)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (6612b2328ab4 Merge branch 'features' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (48d85acdaa52 sparc: chmc: Convert to platform remove callback returning void)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (36c2e90c4a0b bcachefs: bch2_dev_have_ref())
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (e9f5aff094ee Merge branch 'for-next-next-v6.9-20240430' into for-next-20240430)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (8f03ed91d75e smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (7ca906c7f7e5 Pull ext2 and isofs removal to PageError bit.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (3763f9effcdc f2fs: use helper to print zone condition)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (fa7e19337908 fuse: Add initial support for fs-verity)
Merging gfs2/for-next (1e86044402c4 gfs2: Remove and replace gfs2_glock_queue_work)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (bc642d7bfdac ksmbd: fix uninitialized symbol 'share' in smb2_tree_connect())
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (06cd86b25b98 SUNRPC: Remove comment for sp_lock)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (e58ac1770ded xfs: refactor dir format helpers)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (eea3260250ea Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (ccd0bdb57e31 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5deb5b56bccb i2c: smbus: fix NULL function pointer dereference)
Merging i2c-host/i2c/i2c-host (8a603d2c41de i2c: ali15x3: remove printout on handled timeouts)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (868577e6bfe1 firmware: dmi: Stop decoding on broken entry)
Applying: Revert "firmware: dmi: Stop decoding on broken entry"
Merging hwmon-staging/hwmon-next (1d4d6733594d hwmon: (npcm750-pwm-fan) Remove another unused field in struct npcm7xx_cooling_device)
Merging jc_docs/docs-next (fcb5bcefdbfb Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging v4l-dvb-next/master (a1c6d2242150 media: staging: max96712: fix copy-paste error)
$ git reset --hard HEAD^
Merging next-20240430 version of v4l-dvb-next
Merging pm/linux-next (92af2d44b4c3 Merge branch 'thermal-core' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (0cebf7cb2d70 pmdomain: core: Don't clear suspended_count at genpd_prepare())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (734b5def91b5 thermal/drivers/loongson2: Add Loongson-2K2000 support)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (f847e840157b RDMA/efa: Add shutdown notifier)
Merging net-next/main (496bc5861c73 selftests: netfilter: nft_concat_range.sh: reduce debug kernel run time)
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/filter.h
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in kernel/bpf/core.c
Merging bpf-next/for-next (ac2f438c2a85 bpf: crypto: fix build when CONFIG_CRYPTO=m)
Merging ipsec-next/master (aeb48a428d7d udpencap: Remove Obsolete UDP_ENCAP_ESPINUDP_NON_IKE Support)
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (e8dda7907df8 Bluetooth: compute LE flow credits based on recvbuf space)
Merging wireless-next/for-next (cc1380dd1882 wifi: brcmfmac: remove unused brcmf_usb_image struct)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (ed265f7fd9a6 crypto: x86/aes-gcm - simplify GCM hash subkey derivation)
Merging drm/drm-next (4a56c0ed5aa0 Merge tag 'amd-drm-next-6.10-2024-04-26' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
Merging drm-exynos/for-linux-next (2236a61bd491 Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next)
Merging drm-misc/for-linux-next (235e60653f8d drm/debugfs: Drop conditionals around of_node pointers)
Merging amdgpu/drm-next (5fa7d540d95d drm/amd/pm: fix uninitialized variable warnings for vega10_hwmgr)
Merging drm-intel/for-linux-next (6f1923f54d77 drm/i915/dpio: Extract vlv_dpio_phy_regs.h)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (a1ea30b69e02 drm/xe/gsc: define GSCCS for LNL)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (e7aeb238026c ALSA: aoa: soundbus: i2sbus: pcm: use 'time_left' variable with wait_for_completion_timeout())
Merging ieee1394/for-next (e01f7a2a3ad9 firewire: core: add tracepoint event for handling bus reset)
Merging sound-asoc/for-next (ea1aac8c37ae Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (3c2c250cb3a5 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (7b4e0b39182c Input: cyapa - add missing input core locking to suspend/resume functions)
Merging block/for-next (a9af3696fa17 Merge branch 'for-6.10/io_uring' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (83637d9017b2 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (e38063b94324 mmc: atmel-mci: Switch to use dev_err_probe())
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (3c6488537b45 Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (67889688e05b MAINTAINERS: update the LSM file list)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (3c6e94beeacd Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (ef6e717d93c7 Merge branches 'arm/renesas', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (9b4a5ae6be9b dt-bindings: Drop unnecessary quotes on keys)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (d37fd46e9b72 Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (3bbfa480a115 Merge branch into tip/master: 'x86/timers')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (03db22b93a01 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (e7d6f9dff52c rcu/nocb: Remove buggy bypass lock contention mitigation)
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kvm/next (a96cb3bf390e Merge x86 bugfixes from Linux 6.9-rc3)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Applying: fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code"
Merging kvm-arm/next (5099601bb8df Merge branch kvm-arm64/pkvm-6.10 into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (2489e6c9ebb5 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/aarch64/psci_test.c
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (5c94664cf279 platform/x86: asus-laptop: Use sysfs_emit() and sysfs_emit_at() to replace sprintf())
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (e5019b14230a Merge 6.9-rc5 into driver-core-next)
Merging usb/usb-next (32965a3b8275 USB: fix up for "usb: misc: onboard_hub: rename to onboard_dev")
CONFLICT (content): Merge conflict in drivers/usb/dwc3/core.c
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (660a70809856 Merge 6.9-rc5 into tty-next)
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (33075a03f47b Merge tag 'mhi-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-next)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (8877ef45ef9e coresight: tmc: Enable SG capability on ACPI based SoC-400 TMC ETR devices)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (9900e7a54764 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging phy-next/next (9c79b779643e phy: rockchip: fix CONFIG_TYPEC dependency)
Merging soundwire/next (a36ec5f7625d soundwire: intel_ace2x: simplify check_wake())
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (848e447e000c vfio/cdx: add interrupt support)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (539a47de89d6 spmi: pmic-arb: Fix of_irq_get_byname() error checking)
Merging staging/staging-next (75ff53c44f5e staging: vc04_services: Drop completed TODO item)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (700b2e1eccb4 dmaengine: xilinx: xdma: fix module autoloading)
Merging cgroup/for-next (b7d56d953a67 cgroup/cpuset: Remove outdated comment in sched_partition_write())
Merging scsi/for-next (8c5220c43ba0 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (aca061774bc4 scsi: mpi3mr: Fix some kernel-doc warnings in scsi_bsg_mpi3mr.h)
Merging vhost/linux-next (88199634e516 vduse: enable Virtio-net device type)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (0496190c4d42 Merge branches 'rproc-next' and 'rpmsg-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (5539287ca656 gpio: brcmstb: add support for gpio-ranges)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (077895d14a6b Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (b664fc60d7f8 dt-bindings: pwm: snps,dw-apb-timers: Do not require pwm-cells twice)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (693fe2f6a9ea selftests: kselftest: Make ksft_exit functions return void instead of int)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (2168e528f867 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (eedb1dd62a7e cxl/cper: Fix non-ACPI-APEI-GHES build)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (7ea716a17f1f Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (046892f93be4 MAINTAINERS: Add Günther Noack as Landlock reviewer)
Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature)
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (10e29251be0e binfmt_elf_fdpic: fix /proc/<pid>/auxv)
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (450331b73381 string: Add additional __realloc_size() annotations for "dup" helpers)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (6b9cd589464f tools/power turbostat: version 2024.04.27)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
^ permalink raw reply [relevance 2%]
* [kernel-cve-report] New CVE entries this week
@ 2024-05-02 3:10 2% Masami Ichikawa
0 siblings, 0 replies; 200+ results
From: Masami Ichikawa @ 2024-05-02 3:10 UTC (permalink / raw)
To: cip-dev
Hi!
It's this week's CVE report.
This week reported 207 new CVEs and 10 updated CVEs.
* New CVEs
CVE-2024-26926: binder: check offset alignment in binder_get_object()
Announce: https://lore.kernel.org/linux-cve-announce/20240424232709.718930-2-lee@kernel.org/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 6d98eb9 ("binder: avoid potential data leakage
when copying txn") in v5.17-rc1.
This commit was backported to 5.10, 5.15, and 5.4. Linux 4.x is not affected.
Fixed in v6.9-rc5.
Fixed status
mainline: [aaef73821a3b0194a01bd23ca77774f704a04d40]
CVE-2023-52646: aio: fix mremap after fork null-deref
Announce: https://lore.kernel.org/linux-cve-announce/2024042655-CVE-2023-52646-3ebb@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit e4a0d3e ("aio: Make it possible to remap aio
ring") in v3.19-rc1.
All stable kernels are fixed.
Fixed in v6.2.
Fixed status
cip/4.4: [1cb8592e28e1a99474a831820b9c8f4ba67f5e7a]
cip/4.4-rt: [1cb8592e28e1a99474a831820b9c8f4ba67f5e7a]
cip/4.4-st: [1cb8592e28e1a99474a831820b9c8f4ba67f5e7a]
mainline: [81e9d6f8647650a7bead74c5f926e29970e834d1]
stable/4.19: [d8dca1bfe9adcae38b35add64977818c0c13dd22]
stable/5.10: [c261f798f7baa8080cf0214081d43d5f86bb073f]
stable/5.15: [178993157e8c50aef7f35d7d6d3b44bb428199e1]
stable/5.4: [4326d0080f7e84fba775da41d158f46cf9d3f1c2]
stable/6.1: [af126acf01a12bdb04986fd26fc2eb3b40249e0d]
CVE-2022-48631: ext4: fix bug in extents parsing when eh_entries == 0
and eh_depth > 0
Announce: https://lore.kernel.org/linux-cve-announce/2024042851-CVE-2022-48631-cab6@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.0-rc7.
It seems as if 4.x may be affected.
Fixed status
mainline: [29a5b8a137ac8eb410cc823653a29ac0e7b7e1b0]
stable/5.10: [958b0ee23f5ac106e7cc11472b71aa2ea9a033bc]
stable/5.15: [be4df018c0be5ebecf1ca510feacc23be415cefc]
stable/5.4: [bb7eb3ca4b3b0d2c7872cf1a41c30f5e5bd65df0]
CVE-2022-48632: i2c: mlxbf: prevent stack overflow in
mlxbf_i2c_smbus_start_transaction()
Announce: https://lore.kernel.org/linux-cve-announce/2024042854-CVE-2022-48632-465f@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit b5b5b32 ("i2c: mlxbf: I2C SMBus driver for
Mellanox BlueField SoC") in v5.10-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [de24aceb07d426b6f1c59f33889d6a964770547b]
stable/5.10: [48ee0a864d1af02eea98fc825cc230d61517a71e]
stable/5.15: [dc2a0c587006f29b724069740c48654b9dcaebd2]
CVE-2022-48633: drm/gma500: Fix WARN_ON(lock->magic != lock) error
Announce: https://lore.kernel.org/linux-cve-announce/2024042854-CVE-2022-48633-f726@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.0-rc6.
Fixed status
mainline: [b6f25c3b94f2aadbf5cbef954db4073614943d74]
CVE-2022-48634: drm/gma500: Fix BUG: sleeping function called from
invalid context errors
Announce: https://lore.kernel.org/linux-cve-announce/2024042854-CVE-2022-48634-af99@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.0-rc6.
It looks as if commit f76c22ce ("drm/gma500: Add page flip support on
psb/cdv") in 5.6-rc1 is the first introduced commit.
Fixed status
mainline: [63e37a79f7bd939314997e29c2f5a9f0ef184281]
stable/5.10: [c5812807e416618477d1bb0049727ce8bb8292fd]
stable/5.15: [e5ae504c8623476e13032670f1a6d6344d53ec9b]
CVE-2022-48635: fsdax: Fix infinite loop in dax_iomap_rw()
Announce: https://lore.kernel.org/linux-cve-announce/2024042854-CVE-2022-48635-6286@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit ca289e0 ("fsdax: switch dax_iomap_rw to use
iomap_iter") in v5.15-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [17d9c15c9b9e7fb285f7ac5367dfb5f00ff575e3]
stable/5.15: [929ef155e1da41c06f4d8ca86ae12b851a83a744]
CVE-2022-48636: s390/dasd: fix Oops in dasd_alias_get_start_dev due to
missing pavgroup
Announce: https://lore.kernel.org/linux-cve-announce/2024042855-CVE-2022-48636-52a7@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 8e09f21 ("[S390] dasd: add hyper PAV support to
DASD device driver, part 1") in v2.6.25-rc1.
Fixed in v6.0-rc7.
Fixed status
mainline: [db7ba07108a48c0f95b74fabbfd5d63e924f992d]
stable/4.19: [aaba5ff2742043705bc4c02fd0b2b246e2e16da1]
stable/5.10: [f5fcc9d6d71d9ff7fdbdd4b89074e6e24fffc20b]
stable/5.15: [d3a67c21b18f33c79382084af556557c442f12a6]
stable/5.4: [2e473351400e3dd66f0b71eddcef82ee45a584c1]
CVE-2022-48637: bnxt: prevent skb UAF after handing over to PTP worker
Announce: https://lore.kernel.org/linux-cve-announce/2024042855-CVE-2022-48637-d149@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 83bb623 ("bnxt_en: Transmit and retrieve packet
timestamps") in v5.14-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [c31f26c8f69f776759cbbdfb38e40ea91aa0dd65]
stable/5.15: [08483e4c0c83b221b8891434a04cec405dee94a6]
CVE-2022-48638: cgroup: cgroup_get_from_id() must check the looked-up
kn is a directory
Announce: https://lore.kernel.org/linux-cve-announce/2024042855-CVE-2022-48638-e1bd@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 6b658c4 ("scsi: cgroup: Add
cgroup_get_from_id()") in v5.14-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [df02452f3df069a59bc9e69c84435bf115cb6e37]
stable/5.15: [8484a356cee8ce3d6a8e6266ff99be326e9273ad]
CVE-2022-48639: net: sched: fix possible refcount leak in tc_new_tfilter()
Announce: https://lore.kernel.org/linux-cve-announce/2024042855-CVE-2022-48639-be80@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 7d5509f ("net: sched: extend proto ops with 'put'
callback") in v5.1-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [c2e1cfefcac35e0eea229e148c8284088ce437b5]
stable/5.10: [8844c750eeb03452e2b3319c27a526f447b82596]
stable/5.15: [f8162aed962be8fa07445b2b5928e84ab40dd8d7]
stable/5.4: [903f7d322c17d8e306d766404b4604e81653902a]
CVE-2022-48640: bonding: fix NULL deref in bond_rr_gen_slave_id
Announce: https://lore.kernel.org/linux-cve-announce/2024042855-CVE-2022-48640-feee@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 848ca91 ("net: bonding: Use per-cpu
rr_tx_counter") in v5.14-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [0e400d602f46360752e4b32ce842dba3808e15e6]
stable/5.15: [ec3a6f4ffe556a28f6f5028bf7c4412557e7051b]
CVE-2022-48641: netfilter: ebtables: fix memory leak when blob is malformed
Announce: https://lore.kernel.org/linux-cve-announce/2024042856-CVE-2022-48641-531f@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
This bug was introduced by commit 7997eff8 ("netfilter: ebtables:
reject blobs that don't provide all entry points") in 6.0-rc3.
This commit was backported to older stable kernels except 4.4.
Fixed in 6.0-rc7.
Fixed status
mainline: [62ce44c4fff947eebdf10bb582267e686e6835c9]
stable/4.19: [1e98318af2f163eadaff815abcef38d27ca92c1e]
stable/5.10: [ebd97dbe3c55d68346b9c5fb00634a7f5b10bbee]
stable/5.15: [d5917b7af7cae0e2804f9d127a03268035098b7f]
stable/5.4: [11ebf32fde46572b0aaf3c2bdd97d923ef5a03ab]
CVE-2022-48642: netfilter: nf_tables: fix percpu memory leak at
nf_tables_addchain()
Announce: https://lore.kernel.org/linux-cve-announce/2024042856-CVE-2022-48642-b65b@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 3bc158f ("netfilter: nf_tables: map basechain
priority to hardware priority") in v5.3-rc6.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [9a4d6dd554b86e65581ef6b6638a39ae079b17ac]
stable/5.10: [b043a525a3f5520abb676a7cd8f6328fdf959e88]
stable/5.15: [08d7524f366a886b99b1630a24a27dd6e0d7f852]
CVE-2022-48643: netfilter: nf_tables: fix nft_counters_enabled
underflow at nf_tables_addchain()
Announce: https://lore.kernel.org/linux-cve-announce/2024042856-CVE-2022-48643-7d4b@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
This bug was introduced by commit 43eb8949 ("netfilter: nf_tables: do
not leave chain stats enabled on error") in Fixed in 6.0-rc3.
This commit was backported to 5.10 and 5.15.
Fixed in 6.0-rc7.
Fixed status
mainline: [921ebde3c0d22c8cba74ce8eb3cc4626abff1ccd]
stable/5.10: [710e3f526bd23a0d33435dedc52c3144de284378]
stable/5.15: [91aa52652f4b37089aff3cb53e83049d826fef6d]
CVE-2022-48644: net/sched: taprio: avoid disabling offload when it was
never enabled
Announce: https://lore.kernel.org/linux-cve-announce/2024042856-CVE-2022-48644-757e@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 9c66d15 ("taprio: Add support for hardware
offloading") in v5.4-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [db46e3a88a09c5cf7e505664d01da7238cd56c92]
stable/5.10: [586def6ebed195f3594a4884f7c5334d0e1ad1bb]
stable/5.15: [f58e43184226e5e9662088ccf1389e424a3a4cbd]
stable/5.4: [d12a1eb07003e597077329767c6aa86a7e972c76]
CVE-2022-48645: net: enetc: deny offload of tc-based TSN features on
VF interfaces
Announce: https://lore.kernel.org/linux-cve-announce/2024042857-CVE-2022-48645-2325@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 34c6adf ("enetc: Configure the Time-Aware
Scheduler via tc-taprio offload") in v5.5-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [5641c751fe2f92d3d9e8a8e03c1263ac8caa0b42]
stable/5.15: [510e703e4ed0e011db860bc21228aff48fc9eea7]
CVE-2022-48646: sfc/siena: fix null pointer dereference in efx_hard_start_xmit
Announce: https://lore.kernel.org/linux-cve-announce/2024042857-CVE-2022-48646-35f2@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 1280479 ("sfc: decouple TXQ type from label") in v5.10-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [589c6eded10c77a12b7b2cf235b6b19a2bdb91fa]
CVE-2022-48647: sfc: fix TX channel offset when using legacy interrupts
Announce: https://lore.kernel.org/linux-cve-announce/2024042857-CVE-2022-48647-4a4d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit c308dfd ("sfc: fix wrong tx channel offset with
efx_separate_tx_channels") in v5.19-rc1.
This commit was backported to 5.10 and 5.15.
Fixed in v6.0-rc7.
Fixed status
mainline: [f232af4295653afa4ade3230462b3be15ad16419]
stable/5.10: [b4afd3878f961d3517f27b3213730fceef77945c]
stable/5.15: [360910b88d1466a90644a4e0533803b594344a2b]
CVE-2022-48648: sfc: fix null pointer dereference in efx_hard_start_xmit
Announce: https://lore.kernel.org/linux-cve-announce/2024042857-CVE-2022-48648-eaf8@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 1280479 ("sfc: decouple TXQ type from label") in v5.10-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [0a242eb2913a4aa3d6fbdb86559f27628e9466f3]
stable/5.10: [b3b41d4d95d3822b2e459ecbc80d030ea6aec5e7]
stable/5.15: [8547c7bfc0617e7184e4da65b9b96681fcfe9998]
CVE-2022-48649: mm/slab_common: fix possible double free of kmem_cache
Announce: https://lore.kernel.org/linux-cve-announce/2024042858-CVE-2022-48649-82c3@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 0495e337b ("mm/slab_common: Deleting kobject in
kmem_cache_destroy() without holding slab_mutex/cpu_hotplug_lock") in
6.0-rc4.
This commit is not backported to older stable kernels.
Fixed in 6.0-rc7.
Fixed status
mainline: [d71608a877362becdc94191f190902fac1e64d35]
CVE-2022-48650: scsi: qla2xxx: Fix memory leak in __qlt_24xx_handle_abts()
Announce: https://lore.kernel.org/linux-cve-announce/2024042858-CVE-2022-48650-c4f0@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 8f394da ("scsi: qla2xxx: Drop
TARGET_SCF_LOOKUP_LUN_FROM_TAG") in v5.11-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [601be20fc6a1b762044d2398befffd6bf236cebf]
stable/5.15: [89df49e561b4a8948521fc3f8a013012eaa08f82]
CVE-2022-48651: ipvlan: Fix out-of-bound bugs caused by unset skb->mac_header
Announce: https://lore.kernel.org/linux-cve-announce/2024042858-CVE-2022-48651-ac9e@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 2ad7bf3 ("ipvlan: Initial check-in of the IPVLAN
driver.") in v3.19-rc1.
Fixed in v6.0-rc7.
Fixed status
cip/4.4: [764ab4e0a887160281881a9496f3b2704f4450a0]
cip/4.4-rt: [764ab4e0a887160281881a9496f3b2704f4450a0]
cip/4.4-st: [764ab4e0a887160281881a9496f3b2704f4450a0]
mainline: [81225b2ea161af48e093f58e8dfee6d705b16af4]
stable/4.19: [bffcdade259c05ab3436b5fab711612093c275ef]
stable/5.10: [ab4a733874ead120691e8038272d22f8444d3638]
stable/5.15: [8d06006c7eb75587d986da46c48ba9274f94e8e7]
stable/5.4: [346e94aa4a99378592c46d6a34c72703a32bd5be]
CVE-2022-48652: ice: Fix crash by keep old cfg when update TCs more than queues
Announce: https://lore.kernel.org/linux-cve-announce/2024042858-CVE-2022-48652-438f@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit a632b2a ("ice: ethtool: Prohibit improper channel
config for DCB") in v5.19-rc4.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [a509702cac95a8b450228a037c8542f57e538e5b]
CVE-2022-48653: ice: Don't double unplug aux on peer initiated reset
Announce: https://lore.kernel.org/linux-cve-announce/2024042858-CVE-2022-48653-b6e7@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit f9f5301 ("ice: Register auxiliary device to
provide RDMA") in v5.14-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [23c619190318376769ad7b61504c2ea0703fb783]
stable/5.15: [34447d64b8d28e4d6a73d73f07c879959d68fbfe]
CVE-2022-48654: netfilter: nfnetlink_osf: fix possible bogus match in
nf_osf_find()
Announce: https://lore.kernel.org/linux-cve-announce/2024042859-CVE-2022-48654-e107@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 22c7652 ("netfilter: nft_osf: Add version option
support") in v5.2-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [559c36c5a8d730c49ef805a72b213d3bba155cc8]
stable/5.10: [5d75fef3e61e797fab5c3fbba88caa74ab92ad47]
stable/5.15: [816eab147e5c6f6621922b8515ad9010ceb1735e]
stable/5.4: [721ea8ac063d70c2078c4e762212705de6151764]
CVE-2022-48655: firmware: arm_scmi: Harden accesses to the reset domains
Announce: https://lore.kernel.org/linux-cve-announce/2024042859-CVE-2022-48655-5feb@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.0-rc7.
It looks like this bug was introduced by commit 95a15d80 ("firmware:
arm_scmi: Add RESET protocol in SCMI v2.0") in 5.4-rc1.
Fixed status
mainline: [e9076ffbcaed5da6c182b144ef9f6e24554af268]
stable/5.15: [1f08a1b26cfc53b7715abc46857c6023bb1b87de]
CVE-2022-48656: dmaengine: ti: k3-udma-private: Fix refcount leak bug
in of_xudma_dev_get()
Announce: https://lore.kernel.org/linux-cve-announce/2024042859-CVE-2022-48656-1d7a@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit d702419 ("dmaengine: ti: k3-udma: Add glue layer
for non DMAengine users") in v5.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [f9fdb0b86f087c2b7f6c6168dd0985a3c1eda87e]
stable/5.10: [aa11dae059a439af82bae541b134f8f53ac177b5]
stable/5.15: [dd5a6c5a08752b613e83ad2cb5133e72a64b876d]
CVE-2022-48657: arm64: topology: fix possible overflow in amu_fie_setup()
Announce: https://lore.kernel.org/linux-cve-announce/2024042859-CVE-2022-48657-d23e@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit cd0ed03 ("arm64: use activity monitors for
frequency invariance") in v5.7-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [d4955c0ad77dbc684fc716387070ac24801b8bca]
stable/5.10: [904f881b57360cf85de962d84d8614d94431f60e]
stable/5.15: [3c3edb82d67b2be9231174ac2af4af60d4af7549]
CVE-2022-48658: mm: slub: fix flush_cpu_slab()/__free_slab()
invocations in task context.
Announce: https://lore.kernel.org/linux-cve-announce/2024042800-CVE-2022-48658-4c9c@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 5a836bf ("mm: slub: move flush_cpu_slab()
invocations __free_slab() invocations out of IRQ context") in
v5.15-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [e45cc288724f0cfd497bb5920bcfa60caa335729]
stable/5.15: [61703b248be993eb4997b00ae5d3318e6d8f3c5b]
CVE-2022-48659: mm/slub: fix to return errno if kmalloc() fails
Announce: https://lore.kernel.org/linux-cve-announce/2024042800-CVE-2022-48659-8ccb@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 81819f0 ("SLUB core") in v2.6.22-rc1.
Fixed in v6.0-rc7.
Fixed status
cip/4.4: [e5377a5cc97a1a8d6357b42aafa06e2713930828]
cip/4.4-rt: [e5377a5cc97a1a8d6357b42aafa06e2713930828]
cip/4.4-st: [e5377a5cc97a1a8d6357b42aafa06e2713930828]
mainline: [7e9c323c52b379d261a72dc7bd38120a761a93cd]
stable/4.19: [e996821717c5cf8aa1e1abdb6b3d900a231e3755]
stable/5.10: [379ac7905ff3f0a6a4e507d3e9f710ec4fab9124]
stable/5.15: [2d6e55e0c03804e1e227b80a5746e086d6c6696c]
stable/5.4: [016b150992eebc32c4a18f783cf2bb6e2545a3d9]
CVE-2022-48660: gpiolib: cdev: Set lineevent_state::irq after IRQ
register successfully
Announce: https://lore.kernel.org/linux-cve-announce/2024042800-CVE-2022-48660-4fb8@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 4682427 ("gpiolib: cdev: refactor lineevent
cleanup into lineevent_free") in v5.9-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [69bef19d6b9700e96285f4b4e28691cda3dcd0d1]
stable/5.10: [657803b918e097e47d99d1489da83a603c36bcdd]
stable/5.15: [97da736cd11ae73bdf2f5e21e24446b8349e0168]
CVE-2022-48661: gpio: mockup: Fix potential resource leakage when
register a chip
Announce: https://lore.kernel.org/linux-cve-announce/2024042800-CVE-2022-48661-1b6c@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 6fda593 ("gpio: mockup: Convert to use software
nodes") in v5.15-rc6.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [02743c4091ccfb246f5cdbbe3f44b152d5d12933]
stable/5.15: [9b26723e058faaf11b532fb4aa16d6849d581790]
CVE-2022-48662: drm/i915/gem: Really move i915_gem_context.link under
ref protection
Announce: https://lore.kernel.org/linux-cve-announce/2024042801-CVE-2022-48662-3a84@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit f8246cf ("drm/i915/gem: Drop free_work for GEM
contexts") in v5.12-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [d119888b09bd567e07c6b93a07f175df88857e02]
stable/5.15: [713fa3e4591f65f804bdc88e8648e219fabc9ee1]
CVE-2022-48663: gpio: mockup: fix NULL pointer dereference when removing debugfs
Announce: https://lore.kernel.org/linux-cve-announce/2024042801-CVE-2022-48663-397d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 303e6da ("gpio: mockup: remove gpio debugfs when
remove device") in 6.0-rc4.
This commit was backported to 5.10 and 5.15.
Fixed in 6.0-rc7.
Fixed status
mainline: [b7df41a6f79dfb18ba2203f8c5f0e9c0b9b57f68]
stable/5.10: [bdea98b98f844bd8a983ca880893e509a8b4162f]
stable/5.15: [18352095a0d581f6aeb1e9fc9d68cc0152cd64b4]
CVE-2022-48664: btrfs: fix hang during unmount when stopping a space
reclaim worker
Announce: https://lore.kernel.org/linux-cve-announce/2024042801-CVE-2022-48664-d281@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit d6fd0ae ("Btrfs: fix missing delayed iputs on
unmount") in v4.20-rc2.
This commit was backported to 4.19.
Fixed in v6.0-rc7.
Fixed status
mainline: [a362bb864b8db4861977d00bd2c3222503ccc34b]
stable/5.10: [6ac5b52e3f352f9cb270c89e6e1d4dadb564ddb8]
stable/5.15: [d8a76a2e514fbbb315a6dfff2d342de2de833994]
CVE-2022-48665: exfat: fix overflow for large capacity partition
Announce: https://lore.kernel.org/linux-cve-announce/2024042801-CVE-2022-48665-527d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 1b61383 ("exfat: reduce block requests when
zeroing a cluster") in v5.19-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc7.
Fixed status
mainline: [2e9ceb6728f1dc2fa4b5d08f37d88cbc49a20a62]
CVE-2022-48666: scsi: core: Fix a use-after-free
Announce: https://lore.kernel.org/linux-cve-announce/2024042801-CVE-2022-48666-4916@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 65ca846 ("scsi: core: Introduce
{init,exit}_cmd_priv()") in v5.7-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc5.
Fixed status
mainline: [8fe4ce5836e932f5766317cb651c1ff2a4cd0506]
CVE-2022-48667: smb3: fix temporary data corruption in insert range
Announce: https://lore.kernel.org/linux-cve-announce/2024042802-CVE-2022-48667-0aa2@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 7fe6fe9 ("cifs: add FALLOC_FL_INSERT_RANGE
support") in v5.13-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc4.
Fixed status
mainline: [9c8b7a293f50253e694f19161c045817a938e551]
CVE-2022-48668: smb3: fix temporary data corruption in collapse range
Announce: https://lore.kernel.org/linux-cve-announce/2024042802-CVE-2022-48668-3790@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 5476b5d ("cifs: add support for
FALLOC_FL_COLLAPSE_RANGE") in v5.13-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.0-rc4.
Fixed status
mainline: [fa30a81f255a56cccd89552cd6ce7ea6e8d8acc4]
CVE-2024-26927: ASoC: SOF: Add some bounds checking to firmware data
Announce: https://lore.kernel.org/linux-cve-announce/2024042844-CVE-2024-26927-3374@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit d2458ba ("ASoC: SOF: ipc3-loader: Implement
firmware parsing and loading") in v5.19-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [98f681b0f84cfc3a1d83287b77697679e0398306]
stable/6.1: [d133d67e7e724102d1e53009c4f88afaaf3e167c]
stable/6.6: [ced7df8b3c5c4751244cad79011e86cf1f809153]
stable/6.8: [9eeb8e1231f6450c574c1db979122e171a1813ab]
CVE-2024-26928: smb: client: fix potential UAF in cifs_debug_files_proc_show()
Announce: https://lore.kernel.org/linux-cve-announce/2024042849-CVE-2024-26928-e543@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc3.
It looks as if commit dfe33f9abc ("smb3: allow more detailed protocol
info on open files for debugging") in 4.20-rc1 is first introduced
commit.
This commit added cifs_debug_files_proc_show().
Fixed status
mainline: [ca545b7f0823f19db0f1148d59bc5e1a56634502]
stable/6.1: [229042314602db62559ecacba127067c22ee7b88]
stable/6.6: [a65f2b56334ba4dc30bd5ee9ce5b2691b973344d]
stable/6.8: [3402faf78b2516b0af1259baff50cc8453ef0bd1]
CVE-2022-48669: powerpc/pseries: Fix potential memleak in papr_get_attr()
Announce: https://lore.kernel.org/linux-cve-announce/2024050131-CVE-2022-48669-15cf@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 3c14b73 ("powerpc/pseries: Interface to represent
PAPR firmware attributes") in v5.18-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [cda9c0d556283e2d4adaa9960b2dc19b16156bae]
stable/6.1: [a3f22feb2220a945d1c3282e34199e8bcdc5afc4]
stable/6.6: [1699fb915b9f61794d559b55114c09a390aaf234]
stable/6.8: [d0647c3e81eff62b66d46fd4e475318cb8cb3610]
CVE-2023-52647: media: nxp: imx8-isi: Check whether crossbar pad is
non-NULL before access
Announce: https://lore.kernel.org/linux-cve-announce/2024050119-CVE-2023-52647-82e4@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit cf21f32 ("media: nxp: Add i.MX8 ISI driver") in v6.4-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [eb2f932100288dbb881eadfed02e1459c6b9504c]
stable/6.6: [c95318607fbe8fdd44991a8dad2e44118e6b8812]
stable/6.8: [91c8ce42fcde09f1da24acab9013b3e19cb88a4e]
CVE-2023-52648: drm/vmwgfx: Unmap the surface before resetting it on a
plane state
Announce: https://lore.kernel.org/linux-cve-announce/2024050122-CVE-2023-52648-4e0d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 485d98d ("drm/vmwgfx: Add support for CursorMob
and CursorBypass 4") in v5.19-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [27571c64f1855881753e6f33c3186573afbab7ba]
stable/6.6: [0a23f95af7f28dae7c0f7c82578ca5e1a239d461]
stable/6.8: [75baad63c033b3b900d822bffbc96c9d3649bc75]
CVE-2023-52649: drm/vkms: Avoid reading beyond LUT array
Announce: https://lore.kernel.org/linux-cve-announce/2024050109-CVE-2023-52649-4614@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit db1f254 ("drm/vkms: Add support to 1D gamma LUT")
in v6.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [2fee84030d12d9fddfa874e4562d71761a129277]
stable/6.6: [9556c167673057d48ce4a0da675026fe046654c1]
stable/6.8: [92800aaeff51b8358d1e0a7eb74daf8aa2d7ce9d]
CVE-2023-52650: drm/tegra: dsi: Add missing check for of_find_device_by_node
Announce: https://lore.kernel.org/linux-cve-announce/2024050109-CVE-2023-52650-e2d1@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit e94236c ("drm/tegra: dsi: Add ganged mode
support") in v3.19-rc1.
Fixed in v6.9-rc1.
Fixed status
cip/4.4: [a51b1e781aff4fae622e1c1d24d6ae3391e06a97]
cip/4.4-st: [a51b1e781aff4fae622e1c1d24d6ae3391e06a97]
mainline: [afe6fcb9775882230cd29b529203eabd5d2a638d]
stable/4.19: [47a13d0b9d8527518639ab5c39667f69d6203e80]
stable/5.10: [92003981a6df5dc84af8a5904f8ee112fa324129]
stable/5.15: [93128052bf832359531c3c0a9e3567b2b8682a2d]
stable/5.4: [f05631a8525c3b5e5994ecb1304d2d878956c0f5]
stable/6.1: [50c0ad785a780c72a2fdaba10b38c645ffb4eae6]
stable/6.6: [52aa507148c4aad41436e2005d742ffcafad9976]
stable/6.8: [3169eaf1365541fd8e521091010c44fbe14691fc]
CVE-2023-52651: wifi: ath10k: fix NULL pointer dereference in
ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev()
Announce: https://lore.kernel.org/linux-cve-announce/2024050110-CVE-2023-52651-5907@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit dc40515 ("ath10k: handle mgmt tx completion
event") in v4.19-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [ad25ee36f00172f7d53242dc77c69fff7ced0755]
stable/4.19: [0cd3b0a1dc987697cba1fe93c784365aa1f8a230]
stable/5.10: [e1dc7aa814a95aeeb1b2c05be2b62af8423b15cc]
stable/5.15: [4c4e592266b6eec748ce90e82bd9cbc9838f3633]
stable/5.4: [88a9dffaec779504ab3680d33cf677741c029420]
stable/6.1: [90f089d77e38db1c48629f111f3c8c336be1bc38]
stable/6.6: [10a342fa2fe4c4dd22f2c8fe917d3b1929582076]
stable/6.8: [835c5d37f4b0ba99e9ec285ffa645bc532714191]
CVE-2023-52652: NTB: fix possible name leak in ntb_register_device()
Announce: https://lore.kernel.org/linux-cve-announce/2024050131-CVE-2023-52652-9e84@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit a1bd3ba ("NTB: Add NTB hardware abstraction
layer") in v4.2-rc1.
Fixed in v6.9-rc1.
Fixed status
mainline: [aebfdfe39b9327a3077d0df8db3beb3160c9bdd0]
stable/5.15: [a62b9f3d7bbfac874cc0c638bc1776dcf1f8ec06]
stable/6.1: [6632a54ac8057cc0b0d789c6f73883e871bcd25c]
stable/6.6: [a039690d323221eb5865f1f31db3ec264e7a14b6]
stable/6.8: [913421f9f7fd8324dcc41753d0f28b52e177ef04]
CVE-2023-52653: SUNRPC: fix a memleak in gss_import_v2_context
Announce: https://lore.kernel.org/linux-cve-announce/2024050131-CVE-2023-52653-a5c2@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 47d8480 ("gss_krb5: handle new context format
from gssd") in v2.6.35-rc1.
Fixed in v6.9-rc1.
Fixed status
mainline: [e67b652d8e8591d3b1e569dbcdfcee15993e91fa]
stable/6.6: [99044c01ed5329e73651c054d8a4baacdbb1a27c]
stable/6.8: [d111e30d9cd846bb368faf3637dc0f71fcbcf822]
CVE-2024-26929: scsi: qla2xxx: Fix double free of fcport
Announce: https://lore.kernel.org/linux-cve-announce/2024050122-CVE-2024-26929-07f0@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc2.
The qla2x00_els_dcmd_sp_free(), qla24xx_els_dcmd_iocb(), and
qla24xx_els_dcmd_iocb() were
introduced by commit 6eb54715 ("qla2xxx: Added interface to send
explicit LOGO.") in 4.5-rc1 so Linux 4.4 is not affected.
Other stable kernels might be affected.
Fixed status
mainline: [82f522ae0d97119a43da53e0f729275691b9c525]
stable/5.15: [b03e626bd6d3f0684f56ee1890d70fc9ca991c04]
stable/6.1: [282877633b25d67021a34169c5b5519b1d4ef65e]
stable/6.6: [f85af9f1aa5e2f53694a6cbe72010f754b5ff862]
stable/6.8: [846fb9f112f618ec6ae181d8dae7961652574774]
CVE-2024-26930: scsi: qla2xxx: Fix double free of the ha->vp_map pointer
Announce: https://lore.kernel.org/linux-cve-announce/2024050122-CVE-2024-26930-4f3e@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc2.
The fail_free_vp_map label was introduced by commit 430eef0 ("scsi:
qla2xxx: Relocate/rename vp map") in 6.3-rc1.
Fixed status
mainline: [e288285d47784fdcf7c81be56df7d65c6f10c58b]
stable/6.6: [f14cee7a882cb79528f17a2335f53e9fd1848467]
stable/6.8: [825d63164a2e6bacb059a9afb5605425b485413f]
CVE-2024-26931: scsi: qla2xxx: Fix command flush on cable pull
Announce: https://lore.kernel.org/linux-cve-announce/2024050123-CVE-2024-26931-01d9@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc2.
Fixed status
mainline: [a27d4d0e7de305def8a5098a614053be208d1aa1]
stable/4.19: [b73377124f56d2fec154737c2f8d2e839c237d5a]
stable/5.10: [67b2d35853c2da25a8ca1c4190a5e96d3083c2ac]
stable/5.15: [a859f6a8f4234b8ef62862bf7a92f1af5f8cd47a]
stable/5.4: [d7a68eee87b05d4e29419e6f151aef99314970a9]
stable/6.1: [09c0ac18cac206ed1218b1fe6c1a0918e5ea9211]
stable/6.6: [8de1584ec4fe0ebea33c273036e7e0a05e65c81d]
stable/6.8: [ec7587eef003cab15a13446d67c3adb88146a150]
CVE-2024-26932: usb: typec: tcpm: fix double-free issue in
tcpm_port_unregister_pd()
Announce: https://lore.kernel.org/linux-cve-announce/2024050123-CVE-2024-26932-587d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit cd099cd ("usb: typec: tcpm: Support multiple
capabilities") in v6.8-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc2.
Fixed status
mainline: [b63f90487bdf93a4223ce7853d14717e9d452856]
stable/6.8: [242e425ed580b2f4dbcb86c8fc03a410a4084a69]
CVE-2024-26933: USB: core: Fix deadlock in port "disable" sysfs attribute
Announce: https://lore.kernel.org/linux-cve-announce/2024050123-CVE-2024-26933-c18d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc2.
Vulnerable functions were introduced by commit f061f43d ("usb: hub:
port: add sysfs entry to switch port power") in 6.0-rc1.
This commit is not backported to older stable kernels.
Fixed status
mainline: [f4d1960764d8a70318b02f15203a1be2b2554ca1]
stable/6.1: [9dac54f08198147f5ec0ec52fcf1bc8ac899ac05]
stable/6.6: [f51849833705dea5b4f9b0c8de714dd87bd6c95c]
stable/6.8: [73d1589b91f2099e5f6534a8497b7c6b527e064e]
CVE-2024-26934: USB: core: Fix deadlock in usb_deauthorize_interface()
Announce: https://lore.kernel.org/linux-cve-announce/2024050123-CVE-2024-26934-e2fc@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 310d2b4 ("usb: interface authorization: SysFS
part of USB interface authorization") in v4.4-rc1.
Fixed in v6.9-rc2.
Fixed status
mainline: [80ba43e9f799cbdd83842fc27db667289b3150f5]
stable/4.19: [8cbdd324b41528994027128207fae8100dff094f]
stable/5.10: [e451709573f8be904a8a72d0775bf114d7c291d9]
stable/5.15: [1b175bc579f46520b11ecda443bcd2ee4904f66a]
stable/5.4: [12d6a5681a0a5cecc2af7860f0a1613fa7c6e947]
stable/6.1: [ab062fa3dc69aea88fe62162c5881ba14b50ecc5]
stable/6.6: [122a06f1068bf5e39089863f4f60b1f5d4273384]
stable/6.8: [07acf979da33c721357ff27129edf74c23c036c6]
CVE-2024-26935: scsi: core: Fix unremoved procfs host directory regression
Announce: https://lore.kernel.org/linux-cve-announce/2024050124-CVE-2024-26935-8b4e@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit be03df3 ("scsi: core: Fix a procfs host directory
removal regression") in v6.3-rc3.
This commitwas backported to 5.10, 5.15, 5.4, and 6.1. So 4.x is not affected.
Fixed in v6.9-rc2.
Fixed status
mainline: [f23a4d6e07570826fe95023ca1aa96a011fa9f84]
stable/5.10: [5c2386ba80e779a92ec3bb64ccadbedd88f779b1]
stable/5.15: [cea234bb214b17d004dfdccce4491e6ff57c96ee]
stable/5.4: [0053f15d50d50c9312d8ab9c11e2e405812dfcac]
stable/6.1: [3678cf67ff7136db1dd3bf63c361650db5d92889]
stable/6.6: [d4c34782b6d7b1e68d18d9549451b19433bd4c6c]
stable/6.8: [f4ff08fab66eb5c0b97e1a24edac052fb40bf5d7]
CVE-2024-26936: ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
Announce: https://lore.kernel.org/linux-cve-announce/2024050141-CVE-2024-26936-0264@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc6.
The ksmbd was introduced in 5.10 so prior to 5.15 kernels aren't affected.
Fixed status
mainline: [17cf0c2794bdb6f39671265aa18aea5c22ee8c4a]
stable/6.1: [21ff9d7d223c5c19cb4334009e4c0c83a2f4d674]
stable/6.6: [5c20b242d4fed73a93591e48bfd9772e2322fb11]
stable/6.8: [2c27a64a2bc47d9bfc7c3cf8be14be53b1ee7cb6]
CVE-2024-26937: drm/i915/gt: Reset queue_priority_hint on parking
Announce: https://lore.kernel.org/linux-cve-announce/2024050124-CVE-2024-26937-3d21@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 22b7a42 ("drm/i915/execlists: Preempt-to-busy")
in v5.4-rc1.
Thic commit is not backported to older stable kernels.
Fixed in v6.9-rc2.
Fixed status
mainline: [4a3859ea5240365d21f6053ee219bb240d520895]
stable/5.10: [fe34587acc995e7b1d7a5d3444a0736721ec32b3]
stable/5.15: [ac9b6b3e8d1237136c8ebf0fa1ce037dd7e2948f]
stable/5.4: [67944e6db656bf1e986aa2a359f866f851091f8a]
stable/6.1: [7eab7b021835ae422c38b968d5cc60e99408fb62]
stable/6.6: [3b031e4fcb2740988143c303f81f69f18ce86325]
stable/6.8: [8fd9b0ce8c26533fe4d5d15ea15bbf7b904b611c]
CVE-2024-26938: drm/i915/bios: Tolerate devdata==NULL in
intel_bios_encoder_supports_dp_dual_mode()
Announce: https://lore.kernel.org/linux-cve-announce/2024050124-CVE-2024-26938-b3f9@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc2.
It seems to be commit 044cbc7 ("drm/i915/bios: Nuke
DEVICE_TYPE_DP_DUAL_MODE_BITS") in 5.18-rc1 is suspicious.
Fixed status
mainline: [32e39bab59934bfd3f37097d4dd85ac5eb0fd549]
stable/6.1: [72e4d3fb72e9f0f016946158a7d95304832768e6]
stable/6.6: [a891add409e3bc381f4f68c2ce9d953f1865cb1f]
stable/6.8: [94cf2fb6feccd625e5b4e23e1b70f39a206f82ac]
CVE-2024-26939: drm/i915/vma: Fix UAF on destroy against retire race
Announce: https://lore.kernel.org/linux-cve-announce/2024050124-CVE-2024-26939-5314@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit d939397 ("drm/i915: Remove the vma refcount") in v5.19-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc2.
Fixed status
mainline: [0e45882ca829b26b915162e8e86dbb1095768e9e]
stable/6.1: [704edc9252f4988ae1ad7dafa23d0db8d90d7190]
stable/6.6: [5e3eb862df9f972ab677fb19e0d4b9b1be8db7b5]
stable/6.8: [59b2626dd8c8a2e13f18054b3530e0c00073d79f]
CVE-2024-26940: drm/vmwgfx: Create debugfs ttm_resource_manager entry
only if needed
Announce: https://lore.kernel.org/linux-cve-announce/2024050125-CVE-2024-26940-1785@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit af4a25b ("drm/vmwgfx: Add debugfs entries for
various ttm resource managers") in v5.19-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc2.
Fixed status
mainline: [4be9075fec0a639384ed19975634b662bfab938f]
stable/6.1: [016119154981d81c9e8f2ea3f56b9e2b4ea14500]
stable/6.6: [042ef0afc40fa1a22b3608f22915b91ce39d128f]
stable/6.8: [eb08db0fc5354fa17b7ed66dab3c503332423451]
CVE-2024-26941: drm/dp: Fix divide-by-zero regression on DP MST unplug
with nouveau
Announce: https://lore.kernel.org/linux-cve-announce/2024050125-CVE-2024-26941-7c68@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit c1d6a22 ("drm/dp: Add helpers to calculate the
link BW overhead") in v6.8-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc2.
Fixed status
mainline: [9cbd1dae842737bfafa4b10a87909fa209dde250]
stable/6.8: [828862071a6ca0c52655e6e62ac7abfef3e5c578]
CVE-2024-26942: net: phy: qcom: at803x: fix kernel panic with at8031_probe
Announce: https://lore.kernel.org/linux-cve-announce/2024050125-CVE-2024-26942-2f72@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 25d2ba9 ("net: phy: at803x: move specific at8031
probe mode check to dedicated probe") in v6.8-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc2.
Fixed status
mainline: [6a4aee277740d04ac0fd54cfa17cc28261932ddc]
stable/6.8: [a8a296ad9957b845b89bcf48be1cf8c74875ecc3]
CVE-2024-26943: nouveau/dmem: handle kcalloc() allocation failure
Announce: https://lore.kernel.org/linux-cve-announce/2024050125-CVE-2024-26943-9ea5@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 2498812 ("nouveau/dmem: evict device private
memory during release") in v6.1-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc2.
Fixed status
mainline: [16e87fe23d4af6df920406494ced5c0f4354567b]
stable/6.1: [9acfd8b083a0ffbd387566800d89f55058a68af2]
stable/6.6: [2a84744a037b8a511d6a9055f3defddc28ff4a4d]
stable/6.8: [3e82f7383e0b82a835e6b6b06a348b2bc4e2c2ee]
CVE-2024-26944: btrfs: zoned: fix use-after-free in do_zone_finish()
Announce: https://lore.kernel.org/linux-cve-announce/2024050125-CVE-2024-26944-598c@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc2.
Fixed status
mainline: [1ec17ef59168a1a6f1105f5dc517f783839a5302]
stable/6.8: [34ca809e055eca5cfe63d9c7efbf80b7c21b4e57]
CVE-2024-26945: crypto: iaa - Fix nr_cpus < nr_iaa case
Announce: https://lore.kernel.org/linux-cve-announce/2024050126-CVE-2024-26945-bf47@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc2.
It looks as if commit f57bf3f7 ("crypto: iaa - Add per-cpu workqueue
table with rebalancing") in 6.8-rc1 introduced this bug.
Fixed status
mainline: [5a7e89d3315d1be86aff8a8bf849023cda6547f7]
stable/6.8: [a5ca1be7f9817de4e93085778b3ee2219bdc2664]
CVE-2024-26946: kprobes/x86: Use copy_from_kernel_nofault() to read
from unsafe address
Announce: https://lore.kernel.org/linux-cve-announce/2024050126-CVE-2024-26946-ad5d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit cc66bb9 ("x86/ibt,kprobes: Cure sym+0 equals
fentry woes") in v5.18-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [4e51653d5d871f40f1bd5cf95cc7f2d8b33d063b]
stable/6.1: [6417684315087904fffe8966d27ca74398c57dd6]
stable/6.6: [f13edd1871d4fb4ab829aff629d47914e251bae3]
stable/6.8: [b69f577308f1070004cafac106dd1a44099e5483]
CVE-2024-26947: ARM: 9359/1: flush: check if the folio is reserved for
no-mapping addresses
Announce: https://lore.kernel.org/linux-cve-announce/2024050126-CVE-2024-26947-c9b8@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit a4d5613 ("arm: extend pfn_valid to take into
account freed memory map alignment") in v5.14-rc1.
This commit was backported to 5.10 and 5.4. Linux 4.x is not affected.
Fixed in v6.9-rc1.
Fixed status
mainline: [0c66c6f4e21cb22220cbd8821c5c73fc157d20dc]
stable/6.6: [0c027c2bad7f5111c51a358b5d392e1a695dabff]
stable/6.8: [fb3a122a978626b33de3367ee1762da934c0f512]
CVE-2024-26948: drm/amd/display: Add a dc_state NULL check in dc_state_release
Announce: https://lore.kernel.org/linux-cve-announce/2024050126-CVE-2024-26948-43bb@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc1.
It looks as if commit 09a4ec5da ("drm/amd/display: Refactor dc_state
interface") in 6.8-rc1 was introduced this bug.
Fixed status
mainline: [334b56cea5d9df5989be6cf1a5898114fa70ad98]
stable/6.8: [d37a08f840485995e3fb91dad95e441b9d28a269]
CVE-2024-26949: drm/amdgpu/pm: Fix NULL pointer dereference when get power limit
Announce: https://lore.kernel.org/linux-cve-announce/2024050127-CVE-2024-26949-cf74@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 7968e97 ("drm/amdgpu/pm: Fix the power1_min_cap
value") in v6.8-rc7.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [08ae9ef829b8055c2fdc8cfee37510c1f4721a07]
stable/6.8: [b8eaa8ef1f1157a9f330e36e66bdd7a693309948]
CVE-2024-26950: wireguard: netlink: access device through ctx instead of peer
Announce: https://lore.kernel.org/linux-cve-announce/2024050127-CVE-2024-26950-4424@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit e7096c1 ("net: WireGuard secure network tunnel")
in v5.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [71cbd32e3db82ea4a74e3ef9aeeaa6971969c86f]
stable/5.10: [493aa6bdcffd90a4f82aa614fe4f4db0641b4068]
stable/5.15: [4be453271a882c8ebc28df3dbf9e4d95e6ac42f5]
stable/6.1: [09c3fa70f65175861ca948cb2f0f791e666c90e5]
stable/6.6: [c991567e6c638079304cc15dff28748e4a3c4a37]
stable/6.8: [d44bd323d8bb8031eef4bdc44547925998a11e47]
CVE-2024-26951: wireguard: netlink: check for dangling peer via
is_dead instead of empty list
Announce: https://lore.kernel.org/linux-cve-announce/2024050127-CVE-2024-26951-5cbe@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit e7096c1 ("net: WireGuard secure network tunnel")
in v5.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [55b6c738673871c9b0edae05d0c97995c1ff08c4]
stable/5.10: [f52be46e3e6ecefc2539119784324f0cbc09620a]
stable/5.15: [710a177f347282eea162aec8712beb1f42d5ad87]
stable/6.1: [b7cea3a9af0853fdbb1b16633a458f991dde6aac]
stable/6.6: [13d107794304306164481d31ce33f8fdb25a9c04]
stable/6.8: [302b2dfc013baca3dea7ceda383930d9297d231d]
CVE-2024-26952: ksmbd: fix potencial out-of-bounds when buffer offset is invalid
Announce: https://lore.kernel.org/linux-cve-announce/2024050127-CVE-2024-26952-7f65@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc1.
It looks as if this bug was introduced by commit e2f34481b ("cifsd:
add server-side procedures for SMB3") in 5.15-rc1.
Fixed status
mainline: [c6cd2e8d2d9aa7ee35b1fa6a668e32a22a9753da]
stable/6.8: [0c5541b4c980626fa3cab16ba1a451757778bbb5]
CVE-2024-26953: net: esp: fix bad handling of pages from page_pool
Announce: https://lore.kernel.org/linux-cve-announce/2024050128-CVE-2024-26953-8304@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 6a5bcd8 ("page_pool: Allow drivers to hint on SKB
recycling") in v5.14-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [c3198822c6cb9fb588e446540485669cc81c5d34]
stable/6.6: [8291b4eac429c480386669444c6377573f5d8664]
stable/6.8: [f278ff9db67264715d0d50e3e75044f8b78990f4]
CVE-2024-26954: ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
Announce: https://lore.kernel.org/linux-cve-announce/2024050128-CVE-2024-26954-18d5@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc1.
It looks as if commit d10c7787 ("ksmbd: fix slab-out-of-bounds in
smb_strndup_from_utf16()") in 6.7-rc8 introduced this bug.
This commit was backported to 5.15, 6.1, and 6.6.
Fixed status
mainline: [a80a486d72e20bd12c335bcd38b6e6f19356b0aa]
stable/6.8: [4f97e6a9d62cb1fce82fbf4baff44b83221bc178]
CVE-2024-26955: nilfs2: prevent kernel bug at submit_bh_wbc()
Announce: https://lore.kernel.org/linux-cve-announce/2024050128-CVE-2024-26955-3205@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 1f5abe7 ("nilfs2: replace BUG_ON and BUG calls
triggerable from ioctl") in v2.6.30-rc1.
Fixed in v6.9-rc1.
Fixed status
cip/4.4: [000f2bf0e2d314ae3c76a4f8f845b3056d6374ca]
cip/4.4-st: [000f2bf0e2d314ae3c76a4f8f845b3056d6374ca]
mainline: [269cdf353b5bdd15f1a079671b0f889113865f20]
stable/4.19: [91e4c4595fae5e87069e44687ae879091783c183]
stable/5.10: [f0fe7ad5aff4f0fcf988913313c497de85f1e186]
stable/5.15: [ca581d237f3b8539c044205bb003de71d75d227c]
stable/5.4: [32eaee72e96590a75445c8a6c7c1057673b47e07]
stable/6.1: [192e9f9078c96be30b31c4b44d6294b24520fce5]
stable/6.6: [0c8aa4cfda4e4adb15d5b6536d155eca9c9cd44c]
stable/6.8: [76ffbe911e2798c7296968f5fd72f7bf67207a8d]
CVE-2024-26956: nilfs2: fix failure to detect DAT corruption in btree
and direct mappings
Announce: https://lore.kernel.org/linux-cve-announce/2024050128-CVE-2024-26956-94b7@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit c3a7abf ("nilfs2: support contiguous lookup of
blocks") in v2.6.31-rc1.
Fixed in v6.9-rc1.
Fixed status
cip/4.4: [bde10c01a7966debaaba115700bc3de40d3d40ef]
cip/4.4-st: [bde10c01a7966debaaba115700bc3de40d3d40ef]
mainline: [f2f26b4a84a0ef41791bd2d70861c8eac748f4ba]
stable/4.19: [b67189690eb4b7ecc84ae16fa1e880e0123eaa35]
stable/5.10: [c3b5c5c31e723b568f83d8cafab8629d9d830ffb]
stable/5.15: [2e2619ff5d0def4bb6c2037a32a6eaa28dd95c84]
stable/5.4: [9cbe1ad5f4354f4df1445e5f4883983328cd6d8e]
stable/6.1: [46b832e09d43b394ac0f6d9485d2b1a06593f0b7]
stable/6.6: [f69e81396aea66304d214f175aa371f1b5578862]
stable/6.8: [82827ca21e7c8a91384c5baa656f78a5adfa4ab4]
CVE-2024-26957: s390/zcrypt: fix reference counting on zcrypt card objects
Announce: https://lore.kernel.org/linux-cve-announce/2024050129-CVE-2024-26957-9e6b@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc1.
The zcrypt_pick_queue() was introduced by commit e28d2af
("s390/zcrypt: add multi domain support") in 4.10-rc1.
Fixed status
mainline: [50ed48c80fecbe17218afed4f8bed005c802976c]
stable/4.19: [7e500849fa558879a1cde43f80c7c048c2437058]
stable/5.10: [6470078ab3d8f222115e11c4ec67351f3031b3dd]
stable/5.15: [a55677878b93e9ebc31f66d0e2fb93be5e7836a6]
stable/5.4: [9daddee03de3f231012014dab8ab2b277a116a55]
stable/6.1: [b7f6c3630eb3f103115ab0d7613588064f665d0d]
stable/6.6: [a64ab862e84e3e698cd351a87cdb504c7fc575ca]
stable/6.8: [394b6d8bbdf9ddee6d5bcf3e1f3e9f23eecd6484]
CVE-2024-26958: nfs: fix UAF in direct writes
Announce: https://lore.kernel.org/linux-cve-announce/2024050129-CVE-2024-26958-6c15@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc1.
It looks all stable kernels are affected. However, nfs_commit_begin()
and nfs_commit_end() are introduced
by commit af7cf0579 ("NFS: Allow multiple commit requests in flight
per file") in 4.5-rc1.
So, backporting this fix to 4.4 also needs backport commit af7cf0579 too.
Fixed status
mainline: [17f46b803d4f23c66cacce81db35fef3adb8f2af]
stable/5.10: [4595d90b5d2ea5fa4d318d13f59055aa4bf3e7f5]
stable/5.15: [80d24b308b7ee7037fc90d8ac99f6f78df0a256f]
stable/6.1: [3abc2d160ed8213948b147295d77d44a22c88fa3]
stable/6.6: [e25447c35f8745337ea8bc0c9697fcac14df8605]
stable/6.8: [cf54f66e1dd78990ec6b32177bca7e6ea2144a95]
CVE-2024-26959: Bluetooth: btnxpuart: Fix btnxpuart_close
Announce: https://lore.kernel.org/linux-cve-announce/2024050129-CVE-2024-26959-cbbc@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 689ca16 ("Bluetooth: NXP: Add protocol support
for NXP Bluetooth chipsets") in v6.4-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [664130c0b0309b360bc5bdd40a30604a9387bde8]
stable/6.6: [d4e2365b07f1ae1f811a915b514caef5b2d6581e]
stable/6.8: [74bcf708775c405f7fb6ed776ccd3e1957f38a52]
CVE-2024-26960: mm: swap: fix race between free_swap_and_cache() and swapoff()
Announce: https://lore.kernel.org/linux-cve-announce/2024050129-CVE-2024-26960-ad6b@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 7c00baf ("mm/swap: free swap slots in batch") in v4.11-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [82b1c07a0af603e3c47b906c8e991dc96f01688e]
stable/5.10: [d85c11c97ecf92d47a4b29e3faca714dc1f18d0d]
stable/5.15: [2da5568ee222ce0541bfe446a07998f92ed1643e]
stable/6.1: [1ede7f1d7eed1738d1b9333fd1e152ccb450b86a]
stable/6.6: [0f98f6d2fb5fad00f8299b84b85b6bc1b6d7d19a]
stable/6.8: [363d17e7f7907c8e27a9e86968af0eaa2301787b]
CVE-2024-26961: mac802154: fix llsec key resources release in
mac802154_llsec_key_del
Announce: https://lore.kernel.org/linux-cve-announce/2024050129-CVE-2024-26961-408d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 5d637d5 ("mac802154: add llsec structures and
mutators") in v3.16-rc1.
Fixed in v6.9-rc1.
Fixed status
mainline: [e8a1e58345cf40b7b272e08ac7b32328b2543e40]
stable/5.10: [068ab2759bc0b4daf0b964de61b2731449c86531]
stable/5.15: [d3d858650933d44ac12c1f31337e7110c2071821]
stable/6.1: [dcd51ab42b7a0431575689c5f74b8b6efd45fc2f]
stable/6.6: [20d3e1c8a1847497269f04d874b2a5818ec29e2d]
stable/6.8: [49c8951680d7b76fceaee89dcfbab1363fb24fd1]
CVE-2024-26962: dm-raid456, md/raid456: fix a deadlock for dm-raid456
while io concurrent with reshape
Announce: https://lore.kernel.org/linux-cve-announce/2024050130-CVE-2024-26962-cbb0@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc1.
It seems as if commit c467e97 (" md/raid6: use valid sector values to
determine if an I/O should wait on the reshape") in 6.7-rc5 introduced
this bug.
This commit was backported to 6.1 and 6.8.
Fixed status
mainline: [41425f96d7aa59bc865f60f5dda3d7697b555677]
stable/6.8: [a8d249d770cb357d16a2097b548d2e4c1c137304]
CVE-2024-26963: usb: dwc3-am62: fix module unload/reload behavior
Announce: https://lore.kernel.org/linux-cve-announce/2024050130-CVE-2024-26963-3eac@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit e8784c0 ("drivers: usb: dwc3: Add AM62 USB
wrapper driver") in v5.19-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [6661befe41009c210efa2c1bcd16a5cc4cff8a06]
stable/6.1: [6c6a45645a2e6a272dfde14eddbb6706de63c25d]
stable/6.6: [7dfed9855397d0df4c6f748d1f66547ab3bad766]
stable/6.8: [3895780fabd120d0fbd54354014e85207b25687c]
CVE-2024-26964: usb: xhci: Add error handling in xhci_map_urb_for_dma
Announce: https://lore.kernel.org/linux-cve-announce/2024050130-CVE-2024-26964-54c8@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 2017a1e ("usb: xhci: Use temporary buffer to
consolidate SG") in v5.11-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [be95cc6d71dfd0cba66e3621c65413321b398052]
stable/5.15: [4a49d24fdec0a802aa686a567a3989a9fdf4e5dd]
stable/6.1: [b2c898469dfc388f619c6c972a28466cbb1442ea]
stable/6.6: [620b6cf2f1a270f48d38e6b8ce199c1acb3e90f4]
stable/6.8: [7b6cc33593d7ccfc3011b290849cfa899db46757]
CVE-2024-26965: clk: qcom: mmcc-msm8974: fix terminating of frequency
table arrays
Announce: https://lore.kernel.org/linux-cve-announce/2024050130-CVE-2024-26965-a43f@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit d8b2120 ("clk: qcom: Add support for MSM8974's
multimedia clock controller (MMCC)") in v3.14-rc1.
Fixed in v6.9-rc1.
Fixed status
cip/4.4: [3cca1982cbcd70f6656e47339e497041d62f8322]
cip/4.4-st: [3cca1982cbcd70f6656e47339e497041d62f8322]
mainline: [e2c02a85bf53ae86d79b5fccf0a75ac0b78e0c96]
stable/4.19: [99740c4791dc8019b0d758c5389ca6d1c0604d95]
stable/5.10: [3ff4a0f6a8f0ad4b4ee9e908bdfc3cacb7be4060]
stable/5.15: [8f562f3b25177c2055b20fd8cf000496f6fa9194]
stable/5.4: [86bf75d9158f511db7530bc82a84b19a5134d089]
stable/6.1: [537040c257ab4cd0673fbae048f3940c8ea2e589]
stable/6.6: [7e9926fef71e514b4a8ea9d11d5a84d52b181362]
stable/6.8: [ca2cf98d46748373e830a13d85d215d64a2d9bf2]
CVE-2024-26966: clk: qcom: mmcc-apq8084: fix terminating of frequency
table arrays
Announce: https://lore.kernel.org/linux-cve-announce/2024050131-CVE-2024-26966-1afc@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 2b46cd2 ("clk: qcom: Add APQ8084 Multimedia Clock
Controller (MMCC) support") in v3.17-rc1.
Fixed in v6.9-rc1.
Fixed status
cip/4.4: [b112d88ea7c5551b113e4712f42815a94fcac58c]
cip/4.4-st: [b112d88ea7c5551b113e4712f42815a94fcac58c]
mainline: [a903cfd38d8dee7e754fb89fd1bebed99e28003d]
stable/4.19: [5533686e99b04994d7c4877dc0e4282adc9444a2]
stable/5.10: [a09aecb6cb482de88301c43bf00a6c8726c4d34f]
stable/5.15: [3aedcf3755c74dafc187eb76acb04e3e6348b1a9]
stable/5.4: [b2dfb216f32627c2f6a8041f2d9d56d102ab87c0]
stable/6.1: [185de0b7cdeaad8b89ebd4c8a258ff2f21adba99]
stable/6.6: [9b4c4546dd61950e80ffdca1bf6925f42b665b03]
stable/6.8: [5638330150db2cc30b53eed04e481062faa3ece8]
CVE-2024-26967: clk: qcom: camcc-sc8280xp: fix terminating of
frequency table arrays
Announce: https://lore.kernel.org/linux-cve-announce/2024050131-CVE-2024-26967-3ccc@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit ff93872 ("clk: qcom: camcc-sc8280xp: Add sc8280xp
CAMCC") in v6.8-rc1.
Fixed in v6.9-rc1.
Fixed status
mainline: [6a3d70f7802a98e6c28a74f997a264118b9f50cd]
stable/6.8: [93ff48729211dae55df5d216023be4528d29babb]
CVE-2024-26968: clk: qcom: gcc-ipq9574: fix terminating of frequency
table arrays
Announce: https://lore.kernel.org/linux-cve-announce/2024050131-CVE-2024-26968-bd35@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit d75b82c ("clk: qcom: Add Global Clock Controller
driver for IPQ9574") in v6.4-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [bd2b6395671d823caa38d8e4d752de2448ae61e1]
stable/6.6: [0204247cf3669b6021fb745c3b7f37ae392ab19c]
stable/6.8: [604f2d7c46727c5e24fc7faddc980bc1cc0b1011]
CVE-2024-26969: clk: qcom: gcc-ipq8074: fix terminating of frequency
table arrays
Announce: https://lore.kernel.org/linux-cve-announce/2024050131-CVE-2024-26969-13cf@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 9607f62 ("clk: qcom: ipq8074: add PCIE, USB and
SDCC clocks") in v4.16-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [1040ef5ed95d6fd2628bad387d78a61633e09429]
stable/4.19: [e117c6e2d1617520f5f7d7f6f6b395f01d8b5a27]
stable/5.10: [851cc19bdb02556fb13629b3e4fef6f2bdb038fe]
stable/5.15: [9de184d4e557d550fb0b7b833b676bda4f269e4f]
stable/5.4: [83fe1bbd9e259ad109827ccfbfc2488e0dea8e94]
stable/6.1: [dd92b159c506804ac57adf3742d9728298bb1255]
stable/6.6: [b6b31b4c67ea6bd9222e5b73b330554c57f2f90d]
stable/6.8: [be9e2752d823eca1d5af67014a1844a9176ff566]
CVE-2024-26970: clk: qcom: gcc-ipq6018: fix terminating of frequency
table arrays
Announce: https://lore.kernel.org/linux-cve-announce/2024050132-CVE-2024-26970-ad9a@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit d9db07f ("clk: qcom: Add ipq6018 Global Clock
Controller support") in v5.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [cdbc6e2d8108bc47895e5a901cfcaf799b00ca8d]
stable/5.10: [ae60e3342296f766f88911d39199f77b05f657a6]
stable/5.15: [b4527ee3de365a742215773d20f07db3e2c06f3b]
stable/6.1: [852db52b45ea96dac2720f108e7c7331cd3738bb]
stable/6.6: [421b135aceace99789c982f6a77ce9476564fb52]
stable/6.8: [db4066e3ab6b3d918ae2b92734a89c04fe82cc1d]
CVE-2024-26971: clk: qcom: gcc-ipq5018: fix terminating of frequency
table arrays
Announce: https://lore.kernel.org/linux-cve-announce/2024050132-CVE-2024-26971-6e28@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit e3fdbef ("clk: qcom: Add Global Clock controller
(GCC) driver for IPQ5018") in v6.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [90ad946fff70f312b8d23226afc38c13ddd88c4b]
stable/6.6: [b0cf3d200e8a72b6d28e6e088c062b4a98cb5eaf]
stable/6.8: [50c3acd460551cdf9d8ac6fe0c04f2de0e8e0872]
CVE-2024-26972: ubifs: ubifs_symlink: Fix memleak of inode->i_link in error path
Announce: https://lore.kernel.org/linux-cve-announce/2024050132-CVE-2024-26972-bf6c@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 2c58d54 ("fscrypt: cache decrypted symlink target
in ->i_link") in v5.2-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [6379b44cdcd67f5f5d986b73953e99700591edfa]
stable/6.8: [62b5ae00c2b835639002ce898ccb5d82c51073ae]
CVE-2024-26973: fat: fix uninitialized field in nostale filehandles
Announce: https://lore.kernel.org/linux-cve-announce/2024050132-CVE-2024-26973-54a3@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit ea3983a ("fat: restructure export_operations") in
v3.10-rc1.
Fixed in v6.9-rc1.
Fixed status
cip/4.4: [3dee18ecb83d8f2881438721a9f519a07fabe35f]
cip/4.4-st: [3dee18ecb83d8f2881438721a9f519a07fabe35f]
mainline: [fde2497d2bc3a063d8af88b258dbadc86bd7b57c]
stable/4.19: [9840d1897e28f8733cc1e38f97e044f987dc0a63]
stable/5.10: [a276c595c3a629170b0f052a3724f755d7c6adc6]
stable/5.15: [b7fb63e807c6dadf7ecc1d43448c4f1711d7eeee]
stable/5.4: [f52d7663a10a1266a2d3871a6dd8fd111edc549f]
stable/6.1: [c8cc05de8e6b5612b6e9f92c385c1a064b0db375]
stable/6.6: [03a7e3f2ba3ca25f1da1d3898709a08db14c1abb]
stable/6.8: [cdd33d54e789d229d6d5007cbf3f53965ca1a5c6]
CVE-2024-26974: crypto: qat - resolve race condition during AER recovery
Announce: https://lore.kernel.org/linux-cve-announce/2024050132-CVE-2024-26974-13eb@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit d8cba25 ("crypto: qat - Intel(R) QAT driver
framework") in v3.17-rc1.
Fixed in v6.9-rc1.
Fixed status
cip/4.4: [e30f053113cfc576201b3b666d9258466e692ffb]
cip/4.4-st: [e30f053113cfc576201b3b666d9258466e692ffb]
mainline: [7d42e097607c4d246d99225bf2b195b6167a210c]
stable/4.19: [daba62d9eeddcc5b1081be7d348ca836c83c59d7]
stable/5.10: [d03092550f526a79cf1ade7f0dfa74906f39eb71]
stable/5.15: [4ae5a97781ce7d6ecc9c7055396535815b64ca4f]
stable/5.4: [8e81cd58aee14a470891733181a47d123193ba81]
stable/6.1: [226fc408c5fcd23cc4186f05ea3a09a7a9aef2f7]
stable/6.6: [8a5a7611ccc7b1fba8d933a9f22a2e76859d94dc]
stable/6.8: [bb279ead42263e9fb09480f02a4247b2c287d828]
CVE-2024-26975: powercap: intel_rapl: Fix a NULL pointer dereference
Announce: https://lore.kernel.org/linux-cve-announce/2024050133-CVE-2024-26975-d184@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 1488ac9 ("powercap: intel_rapl: Allow probing
without CPUID match") in v6.5-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [2d1f5006ff95770da502f8cee2a224a1ff83866e]
stable/6.6: [0641908b906a133f1494c312a71f9fecbe2b6c78]
stable/6.8: [2f73cf2ae5e0f4e629db5be3a4380ff7807148e6]
CVE-2024-26976: KVM: Always flush async #PF workqueue when vCPU is
being destroyed
Announce: https://lore.kernel.org/linux-cve-announce/2024050133-CVE-2024-26976-60d4@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit af585b9 ("KVM: Halt vcpu if page it tries to
access is swapped out") in v2.6.38-rc1.
Fixed in v6.9-rc1.
Fixed status
cip/4.4: [b795785f4f94c38971e329d43d6cbaab7f2a0b82]
cip/4.4-st: [b795785f4f94c38971e329d43d6cbaab7f2a0b82]
mainline: [3d75b8aa5c29058a512db29da7cbee8052724157]
stable/4.19: [ab2c2f5d9576112ad22cfd3798071cb74693b1f5]
stable/5.10: [f8730d6335e5f43d09151fca1f0f41922209a264]
stable/5.15: [83d3c5e309611ef593e2fcb78444fc8ceedf9bac]
stable/5.4: [82e25cc1c2e93c3023da98be282322fc08b61ffb]
stable/6.1: [b54478d20375874aeee257744dedfd3e413432ff]
stable/6.6: [a75afe480d4349c524d9c659b1a5a544dbc39a98]
stable/6.8: [caa9af2e27c275e089d702cfbaaece3b42bca31b]
CVE-2024-26977: pci_iounmap(): Fix MMIO mapping leak
Announce: https://lore.kernel.org/linux-cve-announce/2024050133-CVE-2024-26977-cf63@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 316e8d7 ("pci_iounmap'2: Electric Boogaloo: try
to make sense of it all") in v5.15-rc2.
This commit is not backported to older kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [7626913652cc786c238e2dd7d8740b17d41b2637]
stable/5.15: [5e4b23e7a7b33a1e56bfa3e5598138a2234d55b6]
stable/6.1: [6d21d0356aa44157a62e39c0d1a13d4c69a8d0c8]
stable/6.6: [b5d40f02e7222da032c2042aebcf2a07de9b342f]
stable/6.8: [af280e137e273935f2e09f4d73169998298792ed]
CVE-2024-26978: serial: max310x: fix NULL pointer dereference in I2C
instantiation
Announce: https://lore.kernel.org/linux-cve-announce/2024050133-CVE-2024-26978-cc0d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 2e1f2d9 ("serial: max310x: implement I2C
support") in v6.0-rc1.
This commit was backported to 5.10 and 5.4.
Fixed in v6.9-rc1.
Fixed status
mainline: [0d27056c24efd3d63a03f3edfbcfc4827086b110]
stable/5.10: [c45e53c27b78afd6c81fc25608003576f27b5735]
stable/5.4: [7d271b798add90c6196539167c019d0817285cf0]
stable/6.1: [12609c76b755dbeb1645c0aacc0f0f4743b2eff3]
stable/6.6: [2160ad6861c4a21d3fa553d7b2aaec6634a37f8a]
stable/6.8: [aeca49661fd02fd56fb026768b580ce301b45733]
CVE-2024-26979: drm/vmwgfx: Fix possible null pointer derefence with
invalid contexts
Announce: https://lore.kernel.org/linux-cve-announce/2024050134-CVE-2024-26979-43e8@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 9c079b8 ("drm/vmwgfx: Adapt execbuf to the new
validation api") in v4.20-rc1.
This commit was backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [517621b7060096e48e42f545fa6646fc00252eac]
stable/5.10: [c560327d900bab968c2e1b4cd7fa2d46cd429e3d]
stable/5.15: [899e154f9546fcae18065d74064889d08fff62c2]
stable/6.1: [07c3fe923ff7eccf684fb4f8c953d0a7cc8ded73]
stable/6.6: [ff41e0d4f3fa10d7cdd7d40f8026bea9fcc8b000]
stable/6.8: [585fec7361e7850bead21fada49a7fcde2f2e791]
CVE-2024-26980: ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
Announce: https://lore.kernel.org/linux-cve-announce/2024050141-CVE-2024-26980-4b16@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc6.
It looks this bug was introduced by commit 0626e66 ("cifsd: add server
handler for central processing and tranport layers") in 5.15-rc1.
Fixed status
mainline: [c119f4ede3fa90a9463f50831761c28f989bfb20]
stable/6.1: [b80ba648714e6d790d69610cf14656be222d0248]
stable/6.6: [3160d9734453a40db248487f8204830879c207f1]
stable/6.8: [0977f89722eceba165700ea384f075143f012085]
CVE-2024-26981: nilfs2: fix OOB in nilfs_set_de_type
Announce: https://lore.kernel.org/linux-cve-announce/2024050141-CVE-2024-26981-db53@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 2ba466d ("nilfs2: directory entry operations") in
v2.6.30-rc1.
Fixed in v6.9-rc5.
Fixed status
mainline: [c4a7dc9523b59b3e73fd522c73e95e072f876b16]
stable/5.15: [bdbe483da21f852c93b22557b146bc4d989260f0]
stable/6.1: [897ac5306bbeb83e90c437326f7044c79a17c611]
stable/6.6: [2382eae66b196c31893984a538908c3eb7506ff9]
stable/6.8: [90823f8d9ecca3d5fa6b102c8e464c62f416975f]
CVE-2024-26982: Squashfs: check the inode number is not the invalid
value of zero
Announce: https://lore.kernel.org/linux-cve-announce/2024050141-CVE-2024-26982-8675@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc5.
It seems to be all stable kernels are affected.
Fixed status
mainline: [9253c54e01b6505d348afbc02abaa4d9f8a01395]
stable/6.8: [7def00ebc9f2d6a581ddf46ce4541f84a10680e5]
CVE-2024-26983: bootconfig: use memblock_free_late to free xbc memory to buddy
Announce: https://lore.kernel.org/linux-cve-announce/2024050142-CVE-2024-26983-9424@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 40caa12 ("init: bootconfig: Remove all bootconfig
data when the init memory is removed") in v5.15-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [89f9a1e876b5a7ad884918c03a46831af202c8a0]
stable/6.1: [1e7feb31a18c197d63a5e606025ed63c762f8918]
stable/6.6: [e46d3be714ad9652480c6db129ab8125e2d20ab7]
stable/6.8: [5a7dfb8fcd3f29fc93161100179b27f24f3d5f35]
CVE-2024-26984: nouveau: fix instmem race condition around ptr stores
Announce: https://lore.kernel.org/linux-cve-announce/2024050142-CVE-2024-26984-3028@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit be55287 ("drm/nouveau/imem/nv50: embed
nvkm_instobj directly into nv04_instobj") in v4.15-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [fff1386cc889d8fb4089d285f883f8cba62d82ce]
stable/5.15: [3ab056814cd8ab84744c9a19ef51360b2271c572]
stable/6.1: [ad74d208f213c06d860916ad40f609ade8c13039]
stable/6.6: [a019b44b1bc6ed224c46fb5f88a8a10dd116e525]
stable/6.8: [21ca9539f09360fd83654f78f2c361f2f5ddcb52]
CVE-2024-26985: drm/xe: Fix bo leak in intel_fb_bo_framebuffer_init
Announce: https://lore.kernel.org/linux-cve-announce/2024050142-CVE-2024-26985-37ac@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 44e6949 ("drm/xe/display: Implement display
support") in v6.8-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [652ead9b746a63e4e79d7ad66d3edf0a8a5b0c2f]
stable/6.8: [7d8ac0942c312abda43b407eff72d31747a7b472]
CVE-2024-26986: drm/amdkfd: Fix memory leak in create_process failure
Announce: https://lore.kernel.org/linux-cve-announce/2024050142-CVE-2024-26986-4650@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 0ab2d75 ("drm/amdkfd: prepare per-process debug
enable and disable") in v6.5-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [18921b205012568b45760753ad3146ddb9e2d4e2]
stable/6.6: [aa02d43367a9adf8c85fb382fea4171fb266c8d0]
stable/6.8: [0dcd876411644da98a6b4d5a18d32ca94c15bdb5]
CVE-2024-26987: mm/memory-failure: fix deadlock when
hugetlb_optimize_vmemmap is enabled
Announce: https://lore.kernel.org/linux-cve-announce/2024050143-CVE-2024-26987-507c@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit a6b4085 ("mm: hugetlb: replace
hugetlb_free_vmemmap_enabled with a static_key") in v5.18-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [1983184c22dd84a4d95a71e5c6775c2638557dc7]
stable/6.1: [5ef7ba2799a3b5ed292b8f6407376e2c25ef002e]
stable/6.6: [882e1180c83f5b75bae03d0ccc31ccedfe5159de]
stable/6.8: [49955b24002dc16a0ae2e83a57a2a6c863a1845c]
CVE-2024-26988: init/main.c: Fix potential static_command_line memory overflow
Announce: https://lore.kernel.org/linux-cve-announce/2024050143-CVE-2024-26988-c304@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit f5c7310 ("init/main: add checks for the return
value of memblock_alloc*()") in v5.1-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [46dad3c1e57897ab9228332f03e1c14798d2d3b9]
stable/5.15: [0dc727a4e05400205358a22c3d01ccad2c8e1fe4]
stable/6.1: [76c2f4d426a5358fced5d5990744d46f10a4ccea]
stable/6.6: [81cf85ae4f2dd5fa3e43021782aa72c4c85558e8]
stable/6.8: [936a02b5a9630c5beb0353c3085cc49d86c57034]
CVE-2024-26989: arm64: hibernate: Fix level3 translation fault in swsusp_save()
Announce: https://lore.kernel.org/linux-cve-announce/2024050143-CVE-2024-26989-851d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit a7d9f30 ("arm64: drop pfn_valid_within() and
simplify pfn_valid()") in v5.14-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [50449ca66cc5a8cbc64749cf4b9f3d3fc5f4b457]
stable/5.15: [813f5213f2c612dc800054859aaa396ec8ad7069]
stable/6.1: [f7e71a7cf399f53ff9fc314ca3836dc913b05bd6]
stable/6.6: [31f815cb436082e72d34ed2e8a182140a73ebdf4]
stable/6.8: [022b19ebc31cce369c407617041a3db810db23b3]
CVE-2024-26990: KVM: x86/mmu: Write-protect L2 SPTEs in TDP MMU when
clearing dirty status
Announce: https://lore.kernel.org/linux-cve-announce/2024050143-CVE-2024-26990-0a1f@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 5982a53 ("KVM: x86/mmu: Use kvm_ad_enabled() to
determine if TDP MMU SPTEs need wrprot") in v6.4-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [2673dfb591a359c75080dd5af3da484b89320d22]
stable/6.6: [cdf811a937471af2d1facdf8ae80e5e68096f1ed]
stable/6.8: [e20bff0f1b2de9cfe303dd35ff46470104a87404]
CVE-2024-26991: KVM: x86/mmu: x86: Don't overflow lpage_info when
checking attributes
Announce: https://lore.kernel.org/linux-cve-announce/2024050144-CVE-2024-26991-f6d3@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 90b4fe1 ("KVM: x86: Disallow hugepages when
memory attributes are mixed") in v6.8-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [992b54bd083c5bee24ff7cc35991388ab08598c4]
stable/6.8: [048cc4a028e635d339687ed968985d2d1669494c]
CVE-2024-26992: KVM: x86/pmu: Disable support for adaptive PEBS
Announce: https://lore.kernel.org/linux-cve-announce/2024050144-CVE-2024-26992-4f0e@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit c59a1f1 ("KVM: x86/pmu: Add IA32_PEBS_ENABLE MSR
emulation for extended PEBS") in v6.0-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [9e985cbf2942a1bb8fcef9adc2a17d90fd7ca8ee]
stable/6.1: [0fb74c00d140a66128afc0003785dcc57e69d312]
stable/6.6: [037e48ceccf163899374b601afb6ae8d0bf1d2ac]
stable/6.8: [7a7650b3ac23e5fc8c990f00e94f787dc84e3175]
CVE-2024-26993: fs: sysfs: Fix reference leak in sysfs_break_active_protection()
Announce: https://lore.kernel.org/linux-cve-announce/2024050144-CVE-2024-26993-fe52@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 2afc916 ("scsi: sysfs: Introduce
sysfs_{un,}break_active_protection()") in v4.19-rc1.
This commit was backported to 4.4.
Fixed in v6.9-rc5.
Fixed status
mainline: [a90bca2228c0646fc29a72689d308e5fe03e6d78]
stable/5.15: [43f00210cb257bcb0387e8caeb4b46375d67f30c]
stable/6.1: [5d43e072285e81b0b63cee7189b3357c7768a43b]
stable/6.6: [ac107356aabc362aaeb77463e814fc067a5d3957]
stable/6.8: [a4c99b57d43bab45225ba92d574a8683f9edc8e4]
CVE-2024-26994: speakup: Avoid crash on very long word
Announce: https://lore.kernel.org/linux-cve-announce/2024050144-CVE-2024-26994-43c6@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit c6e3fd2 ("Staging: add speakup to the staging
directory") in v2.6.37-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [c8d2f34ea96ea3bce6ba2535f867f0d4ee3b22e1]
stable/5.15: [0d130158db29f5e0b3893154908cf618896450a8]
stable/6.1: [89af25bd4b4bf6a71295f07e07a8ae7dc03c6595]
stable/6.6: [8defb1d22ba0395b81feb963b96e252b097ba76f]
stable/6.8: [0efb15c14c493263cb3a5f65f5ddfd4603d19a76]
CVE-2024-26995: usb: typec: tcpm: Correct the PDO counting in pd_set
Announce: https://lore.kernel.org/linux-cve-announce/2024050144-CVE-2024-26995-ac9b@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit cd099cd ("usb: typec: tcpm: Support multiple
capabilities") in v6.8-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [c4128304c2169b4664ed6fb6200f228cead2ab70]
stable/6.8: [f3da3192cdd3fefe213390e976eec424a8e270b5]
CVE-2024-26996: usb: gadget: f_ncm: Fix UAF ncm object at re-bind
after usb ep transport error
Announce: https://lore.kernel.org/linux-cve-announce/2024050145-CVE-2024-26996-ff2f@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.9-rc5.
It looks as if all stable kernels are affected.
Fixed status
mainline: [6334b8e4553cc69f51e383c9de545082213d785e]
stable/5.15: [7f67c2020cb08499c400abf0fc32c65e4d9a09ca]
stable/6.1: [0588bbbd718a8130b98c54518f1e0b569ce60a93]
stable/6.6: [f356fd0cbd9c9cbd0854657a80d1608d0d732db3]
stable/6.8: [7250326cbb1f4f90391ac511a126b936cefb5bb7]
CVE-2024-26997: usb: dwc2: host: Fix dereference issue in DDMA completion flow.
Announce: https://lore.kernel.org/linux-cve-announce/2024050145-CVE-2024-26997-b8bf@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit b258e42 ("usb: dwc2: host: Fix ISOC flow in DDMA
mode") in v6.9-rc2.
This commit was backported to stable kernels except 4.4.
Fixed in v6.9-rc5.
Fixed status
mainline: [eed04fa96c48790c1cce73c8a248e9d460b088f8]
stable/5.15: [8aa5c28ac65cb5e7f1b9c0c3238c00b661dd2b8c]
stable/6.1: [9de10b59d16880a0a3ae2876c142fe54ce45d816]
stable/6.6: [8a139fa44870e84ac228b7b76423a49610e5ba9a]
stable/6.8: [55656b2afd5f1efcec4245f3e7e814c2a9ef53f6]
CVE-2024-26998: serial: core: Clearing the circular buffer before NULLifying it
Announce: https://lore.kernel.org/linux-cve-announce/2024050145-CVE-2024-26998-2262@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 43066e3 ("serial: port: Don't suspend if the port
is still busy") in v6.8.
This commit was backported to 6.6.
Fixed in v6.9-rc5.
Fixed status
mainline: [9cf7ea2eeb745213dc2a04103e426b960e807940]
stable/6.6: [7ae7104d54342433a3a73975f6569beefdd86350]
stable/6.8: [bb1118905e875c111d7ccef9aee86ac5e4e7f985]
CVE-2024-26999: serial/pmac_zilog: Remove flawed mitigation for rx irq flood
Announce: https://lore.kernel.org/linux-cve-announce/2024050145-CVE-2024-26999-057f@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 1da177e ("Linux-2.6.12-rc2") in v2.6.12.
Fixed in v6.9-rc5.
Fixed status
mainline: [1be3226445362bfbf461c92a5bcdb1723f2e4907]
stable/5.15: [7a3bbe41efa55323b6ea3c35fa15941d4dbecdef]
stable/6.1: [bbaafbb4651fede8d3c3881601ecaa4f834f9d3f]
stable/6.6: [52aaf1ff14622a04148dbb9ccce6d9de5d534ea7]
stable/6.8: [ca09dfc3cfdf89e6af3ac24e1c6c0be5c575a729]
CVE-2024-27000: serial: mxs-auart: add spinlock around changing cts state
Announce: https://lore.kernel.org/linux-cve-announce/2024050146-CVE-2024-27000-c789@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 4d90bb1 ("serial: core: Document and assert lock
requirements for irq helpers") in v3.18-rc1.
Fixed in v6.9-rc5.
Fixed status
mainline: [54c4ec5f8c471b7c1137a1f769648549c423c026]
stable/6.1: [2c9b943e9924cf1269e44289bc5e60e51b0f5270]
stable/6.6: [5f40fd6ca2cf0bfbc5a5c9e403dfce8ca899ba37]
stable/6.8: [94b0e65c75f4af888ab2dd6c90f060f762924e86]
CVE-2024-27001: comedi: vmk80xx: fix incomplete endpoint checking
Announce: https://lore.kernel.org/linux-cve-announce/2024050146-CVE-2024-27001-16ca@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 49253d5 ("staging: comedi: vmk80xx: factor out
usb endpoint detection") in v3.9-rc1.
Fixed in v6.9-rc5.
Fixed status
mainline: [d1718530e3f640b7d5f0050e725216eab57a85d8]
stable/5.15: [b0b268eeb087e324ef3ea71f8e6cabd07630517f]
stable/6.1: [ac882d6b21bffecb57bcc4486701239eef5aa67b]
stable/6.6: [59f33af9796160f851641d960bd93937f282c696]
stable/6.8: [6ec3514a7d35ad9cfab600187612c29f669069d2]
CVE-2024-27002: clk: mediatek: Do a runtime PM get on controllers during probe
Announce: https://lore.kernel.org/linux-cve-announce/2024050146-CVE-2024-27002-3b11@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit acddfc2 ("clk: mediatek: Add MT8183 clock
support") in v5.2-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [2f7b1d8b5505efb0057cd1ab85fca206063ea4c3]
stable/6.1: [165d226472575b213dd90dfda19d1605dd7c19a8]
stable/6.6: [c0dcd5c072e2a3fff886f673e6a5d9bf8090c4cc]
stable/6.8: [b62ed25feb342eab052822eff0c554873799a4f5]
CVE-2024-27003: clk: Get runtime PM before walking tree for clk_summary
Announce: https://lore.kernel.org/linux-cve-announce/2024050146-CVE-2024-27003-c862@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 1bb294a ("clk: Enable/Disable runtime PM for
clk_summary") in v5.17-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [9d1e795f754db1ac3344528b7af0b17b8146f321]
stable/6.1: [83ada89e4a86e2b28ea2b5113c76d6dc7560a4d0]
stable/6.6: [2c077fdfd09dffb31a890e5095c8ab205138a42e]
stable/6.8: [b457105309d388e4081c716cf7b81d517ff74db4]
CVE-2024-27004: clk: Get runtime PM before walking tree during disable_unused
Announce: https://lore.kernel.org/linux-cve-announce/2024050147-CVE-2024-27004-c429@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 9a34b45 ("clk: Add support for runtime PM") in v4.15-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [e581cf5d216289ef292d1a4036d53ce90e122469]
stable/5.15: [a29ec0465dce0b871003698698ac6fa92c9a5034]
stable/6.1: [a424e713e0cc33d4b969cfda25b9f46df4d7b5bc]
stable/6.6: [60ff482c4205a5aac3b0595ab794cfd62295dab5]
stable/6.8: [115554862294397590088ba02f11f2aba6d5016c]
CVE-2024-27005: interconnect: Don't access req_list while it's being manipulated
Announce: https://lore.kernel.org/linux-cve-announce/2024050147-CVE-2024-27005-e630@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit af42269 ("interconnect: Fix locking for runpm vs
reclaim") in v6.6-rc1.
This commit is backported to 5.15 and 6.1.
Fixed in v6.9-rc5.
Fixed status
mainline: [de1bf25b6d771abdb52d43546cf57ad775fb68a1]
stable/6.6: [d0d04efa2e367921654b5106cc5c05e3757c2b42]
stable/6.8: [4c65507121ea8e0b47fae6d2049c8688390d46b6]
CVE-2024-27006: thermal/debugfs: Add missing count increment to
thermal_debug_tz_trip_up()
Announce: https://lore.kernel.org/linux-cve-announce/2024050147-CVE-2024-27006-3b6f@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 7ef01f2 ("thermal/debugfs: Add thermal debugfs
information for mitigation episodes") in v6.8-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [b552f63cd43735048bbe9bfbb7a9dcfce166fbdd]
stable/6.8: [9c8215d32e730b597c809a9d2090bf8ec1b79fcf]
CVE-2024-27007: userfaultfd: change src_folio after ensuring it's
unpinned in UFFDIO_MOVE
Announce: https://lore.kernel.org/linux-cve-announce/2024050147-CVE-2024-27007-686b@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit adef440 ("userfaultfd: UFFDIO_MOVE uABI") in v6.8-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [c0205eaf3af9f5db14d4b5ee4abacf4a583c3c50]
stable/6.8: [df5f6e683e7f21a15d8be6e7a0c7a46436963ebe]
CVE-2024-27008: drm: nv04: Fix out of bounds access
Announce: https://lore.kernel.org/linux-cve-announce/2024050148-CVE-2024-27008-5964@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 2e5702a ("drm/nouveau: fabricate DCB encoder
table for iMac G4") in v2.6.38-rc1.
Introduced by commit 670820c ("drm/nouveau: Workaround incorrect DCB
entry on a GeForce3 Ti 200.") in v2.6.38-rc3.
Fixed in v6.9-rc5.
Fixed status
mainline: [cf92bb778eda7830e79452c6917efa8474a30c1e]
stable/5.15: [df0991da7db846f7fa4ec6740350f743d3b69b04]
stable/6.1: [5fd4b090304e450aa0e7cc9cc2b4873285c6face]
stable/6.6: [6690cc2732e2a8d0eaca44dcbac032a4b0148042]
stable/6.8: [26212da39ee14a52c76a202c6ae5153a84f579a5]
CVE-2024-27009: s390/cio: fix race condition during online processing
Announce: https://lore.kernel.org/linux-cve-announce/2024050148-CVE-2024-27009-d63d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 2297791 ("s390/cio: dont unregister subchannel
from child-drivers") in v5.15-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [2d8527f2f911fab84aec04df4788c0c23af3df48]
stable/5.15: [3076b3c38a704e10df5e143c213653309d532538]
stable/6.1: [559f3a6333397ab6cd4a696edd65a70b6be62c6e]
stable/6.6: [2df56f4ea769ff81e51bbb05699989603bde9c49]
stable/6.8: [a4234decd0fe429832ca81c4637be7248b88b49e]
CVE-2024-27010: net/sched: Fix mirred deadlock on device recursion
Announce: https://lore.kernel.org/linux-cve-announce/2024050148-CVE-2024-27010-5a68@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 3bcb846 ("net: get rid of spin_trylock() in
net_tx_action()") in v4.8-rc1.
Introduced by commit e578d9c ("net: sched: use counter to break
reclassify loops") in v4.2-rc1.
Fixed in v6.9-rc5.
Fixed status
mainline: [0f022d32c3eca477fbf79a205243a6123ed0fe11]
stable/6.8: [e6b90468da4dae2281a6e381107f411efb48b0ef]
CVE-2024-27011: netfilter: nf_tables: fix memleak in map from abort path
Announce: https://lore.kernel.org/linux-cve-announce/2024050148-CVE-2024-27011-2c70@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 5910544 ("netfilter: nf_tables: revisit
chain/object refcounting from elements") in v4.12-rc3.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [86a1471d7cde792941109b93b558b5dc078b9ee9]
stable/6.8: [49d0e656d19dfb2d4d7c230e4a720d37b3decff6]
CVE-2024-27012: netfilter: nf_tables: restore set elements when delete set fails
Announce: https://lore.kernel.org/linux-cve-announce/2024050148-CVE-2024-27012-5564@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 628bd3e ("netfilter: nf_tables: drop map element
references from preparation phase") in v6.4.
This commit was backported to 5.10, 5.15, 5.4, and 6.1.
Fixed in v6.9-rc5.
Fixed status
mainline: [e79b47a8615d42c68aaeb68971593333667382ed]
stable/6.8: [86658fc7414d4b9e25c2699d751034537503d637]
CVE-2024-27013: tun: limit printing rate when illegal packet received by tun dev
Announce: https://lore.kernel.org/linux-cve-announce/2024050149-CVE-2024-27013-2c26@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit ef3db4a ("tun: avoid BUG, dump packet on GSO
errors") in v2.6.35.
Fixed in v6.9-rc5.
Fixed status
mainline: [f8bbc07ac535593139c875ffa19af924b1084540]
stable/5.15: [a50dbeca28acf7051dfa92786b85f704c75db6eb]
stable/6.1: [62e27ef18eb4f0d33bbae8e9ef56b99696a74713]
stable/6.6: [40f4ced305c6c47487d3cd8da54676e2acc1a6ad]
stable/6.8: [52854101180beccdb9dc2077a3bea31b6ad48dfa]
CVE-2024-27014: net/mlx5e: Prevent deadlock while disabling aRFS
Announce: https://lore.kernel.org/linux-cve-announce/2024050149-CVE-2024-27014-d2dc@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 45bf454 ("net/mlx5e: Enabling aRFS mechanism") in v4.7-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [fef965764cf562f28afb997b626fc7c3cec99693]
stable/6.1: [46efa4d5930cf3c2af8c01f75e0a47e4fc045e3b]
stable/6.6: [48c4bb81df19402d4346032353d0795260255e3b]
stable/6.8: [0080bf99499468030248ebd25dd645e487dcecdc]
CVE-2024-27015: netfilter: flowtable: incorrect pppoe tuple
Announce: https://lore.kernel.org/linux-cve-announce/2024050149-CVE-2024-27015-9ce1@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 72efd58 ("netfilter: flowtable: add pppoe
support") in v5.13-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [6db5dc7b351b9569940cd1cf445e237c42cd6d27]
stable/5.15: [e719b52d0c56989b0f3475a03a6d64f182c85b56]
stable/6.1: [f1c3c61701a0b12f4906152c1626a5de580ea3d2]
stable/6.6: [4ed82dd368ad883dc4284292937b882f044e625d]
stable/6.8: [e3f078103421642fcd5f05c5e70777feb10f000d]
CVE-2024-27016: netfilter: flowtable: validate pppoe header
Announce: https://lore.kernel.org/linux-cve-announce/2024050149-CVE-2024-27016-5114@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 72efd58 ("netfilter: flowtable: add pppoe
support") in v5.13-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [87b3593bed1868b2d9fe096c01bcdf0ea86cbebf]
stable/5.15: [d06977b9a4109f8738bb276125eb6a0b772bc433]
stable/6.1: [8bf7c76a2a207ca2b4cfda0a279192adf27678d7]
stable/6.6: [a2471d271042ea18e8a6babc132a8716bb2f08b9]
stable/6.8: [cf366ee3bc1b7d1c76a882640ba3b3f8f1039163]
CVE-2024-27017: netfilter: nft_set_pipapo: walk over current view on
netlink dump
Announce: https://lore.kernel.org/linux-cve-announce/2024050150-CVE-2024-27017-d867@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 2b84e21 ("netfilter: nft_set_pipapo: .walk does
not deal with generations") in v6.4.
This commit was backported to 5.10, 5.15, and 6.1.
Fixed in v6.9-rc5.
Fixed status
mainline: [29b359cf6d95fd60730533f7f10464e95bd17c73]
stable/6.8: [721715655c72640567e8742567520c99801148ed]
CVE-2024-27018: netfilter: br_netfilter: skip conntrack input hook for
promisc packets
Announce: https://lore.kernel.org/linux-cve-announce/2024050150-CVE-2024-27018-d8a7@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 62e7151 ("netfilter: bridge: confirm multicast
packets before passing them up the stack") in v6.8-rc7.
This commit was backported to 5.15, 6.1, and 6.6.
Fixed in v6.9-rc5.
Fixed status
mainline: [751de2012eafa4d46d8081056761fa0e9cc8a178]
stable/5.15: [dceb683ab87ca3666a9bb5c0158528b646faedc4]
stable/6.1: [b13db0d16bc7b2a52abcf5cb71334f63faa5dbd6]
stable/6.6: [3f59ac29dea0921637053908fe99268d157bbb9d]
stable/6.8: [43193174510ea4f3ce09b796e559a2fd9f148615]
CVE-2024-27019: netfilter: nf_tables: Fix potential data-race in
__nft_obj_type_get()
Announce: https://lore.kernel.org/linux-cve-announce/2024050150-CVE-2024-27019-e3d4@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit e500924 ("netfilter: nf_tables: add stateful
objects") in v4.10-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [d78d867dcea69c328db30df665be5be7d0148484]
stable/5.15: [379bf7257bc5f2a1b1ca8514e08a871b7bf6d920]
stable/6.1: [df7c0fb8c2b9f9cac65659332581b19682a71349]
stable/6.6: [ad333578f736d56920e090d7db1f8dec891d815e]
stable/6.8: [4ca946b19caf655a08d5e2266d4d5526025ebb73]
CVE-2024-27020: netfilter: nf_tables: Fix potential data-race in
__nft_expr_type_get()
Announce: https://lore.kernel.org/linux-cve-announce/2024050150-CVE-2024-27020-5158@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit ef1f7df ("netfilter: nf_tables: expression ops
overloading") in v3.13-rc1.
Fixed in v6.9-rc5.
Fixed status
mainline: [f969eb84ce482331a991079ab7a5c4dc3b7f89bf]
stable/5.15: [0b6de00206adbbfc6373b3ae38d2a6f197987907]
stable/6.1: [8d56bad42ac4c43c6c72ddd6a654a2628bf839c5]
stable/6.6: [a9ebf340d123ae12582210407f879d6a5a1bc25b]
stable/6.8: [01f1a678b05ade4b1248019c2dcca773aebbeb7f]
CVE-2024-27021: r8169: fix LED-related deadlock on module removal
Announce: https://lore.kernel.org/linux-cve-announce/2024050151-CVE-2024-27021-6a83@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 18764b8 ("r8169: add support for LED's on
RTL8168/RTL8101") in v6.8-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc4.
Fixed status
mainline: [19fa4f2a85d777a8052e869c1b892a2f7556569d]
stable/6.8: [53d986f39acd8ea11c9e460732bfa5add66360d9]
CVE-2024-27022: fork: defer linking file vma until vma is fully initialized
Announce: https://lore.kernel.org/linux-cve-announce/2024050143-CVE-2024-27022-4325@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 8d9bfb2 ("hugetlb: add vma based lock for pmd
sharing") in v6.1-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc5.
Fixed status
mainline: [35e351780fa9d8240dd6f7e4f245f9ea37e96c19]
stable/6.8: [abdb88dd272bbeb93efe01d8e0b7b17e24af3a34]
CVE-2024-27023: md: Fix missing release of 'active_io' for flush
Announce: https://lore.kernel.org/linux-cve-announce/2024050105-CVE-2024-27023-4810@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit fa2bbff ("md: synchronize flush io with array
reconfiguration") in 6.8-rc1.
This commit was backported to 6.1 and 6.6.
Fixed in 6.8-rc6.
Fixed status
mainline: [855678ed8534518e2b428bcbcec695de9ba248e8]
stable/6.1: [6b2ff10390b19a2364af622b6666b690443f9f3f]
stable/6.6: [02dad157ba11064d073f5499dc33552b227d5d3a]
CVE-2024-27024: net/rds: fix WARNING in rds_conn_connect_if_down
Announce: https://lore.kernel.org/linux-cve-announce/2024050107-CVE-2024-27024-efbd@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 584a827 ("RDS: RDMA: return appropriate error on
rdma map failures") in v4.11-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.8.
Fixed status
mainline: [c055fc00c07be1f0df7375ab0036cebd1106ed38]
stable/4.19: [786854141057751bc08eb26f1b02e97c1631c8f4]
stable/5.10: [9dfc15a10dfd44f8ff7f27488651cb5be6af83c2]
stable/5.15: [b562ebe21ed9adcf42242797dd6cb75beef12bf0]
stable/5.4: [997efea2bf3a4adb96c306b9ad6a91442237bf5b]
stable/6.1: [998fd719e6d6468b930ac0c44552ea9ff8b07b80]
stable/6.6: [2b505d05280739ce31d5708da840f42df827cb85]
stable/6.8: [c055fc00c07be1f0df7375ab0036cebd1106ed38]
CVE-2024-27025: nbd: null check for nla_nest_start
Announce: https://lore.kernel.org/linux-cve-announce/2024050107-CVE-2024-27025-babd@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 47d902b ("nbd: add a status netlink command") in v4.12-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [31edf4bbe0ba27fd03ac7d87eb2ee3d2a231af6d]
stable/5.10: [4af837db0fd3679fabc7b7758397090b0c06dced]
stable/5.15: [98e60b538e66c90b9a856828c71d4e975ebfa797]
stable/5.4: [44214d744be32a4769faebba764510888f1eb19e]
stable/6.1: [96436365e5d80d0106ea785a4f80a58e7c9edff8]
stable/6.6: [b7f5aed55829f376e4f7e5ea5b80ccdcb023e983]
stable/6.8: [ba6a9970ce9e284cbc04099361c58731e308596a]
CVE-2024-27026: vmxnet3: Fix missing reserved tailroom
Announce: https://lore.kernel.org/linux-cve-announce/2024050108-CVE-2024-27026-189b@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 54f00cc ("vmxnet3: Add XDP support.") in v6.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [e127ce7699c1e05279ee5ee61f00893e7bfa9671]
stable/6.6: [aba8659caf88017507419feea06069f529329ea6]
stable/6.8: [91d017d19d5a9ad153e2dc23ed3c0e2e79ef5262]
CVE-2024-27027: dpll: fix dpll_xa_ref_*_del() for multiple registrations
Announce: https://lore.kernel.org/linux-cve-announce/2024050108-CVE-2024-27027-ba6a@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 9431063 ("dpll: core: Add DPLL framework base
functions") in v6.7-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [b446631f355ece73b13c311dd712c47381a23172]
stable/6.8: [b27e32e9367dac024cd6f61f22655714f483fd67]
CVE-2024-27028: spi: spi-mt65xx: Fix NULL pointer access in interrupt handler
Announce: https://lore.kernel.org/linux-cve-announce/2024050110-CVE-2024-27028-42f0@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 1ce2486 ("spi: mediatek: Only do dma for 4-byte
aligned buffers") in v4.11-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [a20ad45008a7c82f1184dc6dee280096009ece55]
stable/4.19: [2342b05ec5342a519e00524a507f7a6ea6791a38]
stable/5.10: [bcfcdf19698024565eff427706ebbd8df65abd11]
stable/5.15: [c10fed329c1c104f375a75ed97ea3abef0786d62]
stable/5.4: [55f8ea6731aa64871ee6aef7dba53ee9f9f3b2f6]
stable/6.1: [766ec94cc57492eab97cbbf1595bd516ab0cb0e4]
stable/6.6: [62b1f837b15cf3ec2835724bdf8577e47d14c753]
stable/6.8: [1784053cf10a14c4ebd8a890bad5cfe1bee51713]
CVE-2024-27029: drm/amdgpu: fix mmhub client id out-of-bounds access
Announce: https://lore.kernel.org/linux-cve-announce/2024050110-CVE-2024-27029-69f0@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit aba2be4 ("drm/amdgpu: add mmhub 3.3.0 support")
in v6.7-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [6540ff6482c1a5a6890ae44b23d0852ba1986d9e]
stable/6.8: [1f24b3040f2b6ffcb97151fabb3070328254d923]
CVE-2024-27030: octeontx2-af: Use separate handlers for interrupts
Announce: https://lore.kernel.org/linux-cve-announce/2024050110-CVE-2024-27030-d75a@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 7304ac4 ("octeontx2-af: Add mailbox IRQ and msg
handlers") in v4.20-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [50e60de381c342008c0956fd762e1c26408f372c]
stable/5.10: [766c2627acb2d9d1722cce2e24837044d52d888a]
stable/5.15: [772f18ded0e240cc1fa2b7020cc640e3e5c32b70]
stable/5.4: [94cb17e5cf3a3c484063abc0ce4b8a2b2e8c1cb2]
stable/6.1: [29d2550d79a8cbd31e0fbaa5c0e2a2efdc444e44]
stable/6.6: [dc29dd00705a62c77de75b6d752259b869aac49d]
stable/6.8: [4fedae8f9eafa2ac8cdaca58e315f52a7e2a8701]
CVE-2024-27031: NFS: Fix nfs_netfs_issue_read() xarray locking for
writeback interrupt
Announce: https://lore.kernel.org/linux-cve-announce/2024050110-CVE-2024-27031-2e85@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 000dbe0 ("NFS: Convert buffered read paths to use
netfs when fscache is enabled") in v6.4-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [fd5860ab6341506004219b080aea40213b299d2e]
stable/6.6: [ad27382f8495f8ef6d2c66c413d756bfd13c0598]
stable/6.8: [8a2e5977cecd3cde6a0e3e86b7b914d00240e5dc]
CVE-2024-27032: f2fs: fix to avoid potential panic during recovery
Announce: https://lore.kernel.org/linux-cve-announce/2024050111-CVE-2024-27032-97a9@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 956fa1d ("f2fs: fix to check return value of
f2fs_reserve_new_block()") in v6.8-rc1.
This commit was backported to older stable kernels except 4.4.
Fixed in v6.9-rc1.
Fixed status
mainline: [21ec68234826b1b54ab980a8df6e33c74cfbee58]
stable/6.1: [fe4de493572a4263554903bf9c3afc5c196e15f0]
stable/6.6: [8844b2f8a3f0c428b74672f9726f9950b1a7764c]
stable/6.8: [f26091a981318b5b7451d61f99bc073a6af8db67]
CVE-2024-27033: f2fs: fix to remove unnecessary f2fs_bug_on() to avoid panic
Announce: https://lore.kernel.org/linux-cve-announce/2024050111-CVE-2024-27033-d152@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 18792e6 ("f2fs: support fault injection for
f2fs_is_valid_blkaddr()") in v6.2-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [b896e302f79678451a94769ddd9e52e954c64fbb]
stable/6.6: [0386408036bfc8b50296d9e544ff91c4d52af2db]
stable/6.8: [abe98a05e7162f64759bf9111108ebcb11322dec]
CVE-2024-27034: f2fs: compress: fix to cover normal cluster write with cp_rwsem
Announce: https://lore.kernel.org/linux-cve-announce/2024050111-CVE-2024-27034-5872@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 4c8ff70 ("f2fs: support data compression") in v5.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [fd244524c2cf07b5f4c3fe8abd6a99225c76544b]
stable/5.15: [7d420eaaa18ec8e2bb4eeab8c65c00492ef6f416]
stable/6.1: [542c8b3c774a480bfd0804291a12f6f2391b0cd1]
stable/6.6: [75abfd61392b1db391bde6d738a30d685b843286]
stable/6.8: [52982edfcefd475cc34af663d5c47c0cddaa5739]
CVE-2024-27035: f2fs: compress: fix to guarantee persisting compressed
blocks by CP
Announce: https://lore.kernel.org/linux-cve-announce/2024050111-CVE-2024-27035-1628@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 4c8ff70 ("f2fs: support data compression") in v5.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [8a430dd49e9cb021372b0ad91e60aeef9c6ced00]
stable/6.1: [e54cce8137258a550b49cae45d09e024821fb28d]
stable/6.6: [82704e598d7b33c7e45526e34d3c585426319bed]
stable/6.8: [57e8b17d0522c8f4daf0c4d9969b4d7358033532]
CVE-2024-27036: cifs: Fix writeback data corruption
Announce: https://lore.kernel.org/linux-cve-announce/2024050111-CVE-2024-27036-6ba3@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit d08089f ("cifs: Change the I/O paths to use an
iterator rather than a page list") in v6.3-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [f3dc1bdb6b0b0693562c7c54a6c28bafa608ba3c]
stable/6.6: [e45deec35bf7f1f4f992a707b2d04a8c162f2240]
stable/6.8: [844b4e132f57f1333dc79feaa035075a096762e4]
CVE-2024-27037: clk: zynq: Prevent null pointer dereference caused by
kmalloc failure
Announce: https://lore.kernel.org/linux-cve-announce/2024050112-CVE-2024-27037-d54a@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 0ee52b1 ("clk: zynq: Add clock controller
driver") in v3.11-rc1.
Fixed in v6.9-rc1.
Fixed status
mainline: [7938e9ce39d6779d2f85d822cc930f73420e54a6]
stable/5.15: [01511ac7be8e45f80e637f6bf61af2d3d2dee9db]
stable/6.1: [8c4889a9ea861d7be37463c10846eb75e1b49c9d]
stable/6.6: [0801c893fd48cdba66a3c8f44c3fe43cc67d3b85]
stable/6.8: [58a946ab43501f2eba058d24d96af0ad1122475b]
CVE-2024-27038: clk: Fix clk_core_get NULL dereference
Announce: https://lore.kernel.org/linux-cve-announce/2024050112-CVE-2024-27038-3af3@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit dde4eff ("clk: Look for parents with clkdev based
clk_lookups") in v5.2-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [e97fe4901e0f59a0bfd524578fe3768f8ca42428]
stable/5.10: [239174535dba11f7b83de0eaaa27909024f8c185]
stable/5.15: [0efb9ef6fb95384ba631d6819e66f10392aabfa2]
stable/5.4: [d7ae7d1265686b55832a445b1db8cdd69738ac07]
stable/6.1: [a8b2b26fdd011ebe36d68a9a321ca45801685959]
stable/6.6: [a5d9b1aa61b401867b9066d54086b3e4ee91f8ed]
stable/6.8: [6f073b24a9e2becd25ac4505a9780a87e621bb51]
CVE-2024-27039: clk: hisilicon: hi3559a: Fix an erroneous devm_kfree()
Announce: https://lore.kernel.org/linux-cve-announce/2024050112-CVE-2024-27039-3730@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 6c81966 ("clk: hisilicon: Add clock driver for
hi3559A SoC") in v5.14-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [64c6a38136b74a2f18c42199830975edd9fbc379]
stable/5.15: [3f8445f1c746fda180a7f75372ed06b24e9cefe2]
stable/6.1: [e0b0d1c46a2ce1e46b79d004a7270fdef872e097]
stable/6.6: [95d1f1228c1bb54803ae57525b76db60e99b37e4]
stable/6.8: [d575765b1b62e8bdb00af11caa1aabeb01763d9f]
CVE-2024-27040: drm/amd/display: Add 'replay' NULL check in
'edp_set_replay_allow_active()'
Announce: https://lore.kernel.org/linux-cve-announce/2024050112-CVE-2024-27040-e45b@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit c7ddc0a ("drm/amd/display: Add Functions to
enable Freesync Panel Replay") in v6.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [f6aed043ee5d75b3d1bfc452b1a9584b63c8f76b]
stable/6.6: [f610c46771ef1047e46d61807aa7c69cd29e63d8]
stable/6.8: [d0e94f4807ff0df66cf447d6b4bbb8ac830e99c3]
CVE-2024-27041: drm/amd/display: fix NULL checks for adev->dm.dc in
amdgpu_dm_fini()
Announce: https://lore.kernel.org/linux-cve-announce/2024050112-CVE-2024-27041-7bf4@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 81927e2 ("drm/amd/display: Support for DMUB AUX")
in v5.14-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [2a3cfb9a24a28da9cc13d2c525a76548865e182c]
stable/6.6: [e040f1fbe9abae91b12b074cfc3bbb5367b79811]
stable/6.8: [1c62697e4086de988b31124fb8c79c244ea05f2b]
CVE-2024-27042: drm/amdgpu: Fix potential out-of-bounds access in
'amdgpu_discovery_reg_base_init()'
Announce: https://lore.kernel.org/linux-cve-announce/2024050113-CVE-2024-27042-e812@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit a0ccc71 ("drm/amdgpu/discovery: validate VCN and
SDMA instances") in v5.19-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [cdb637d339572398821204a1142d8d615668f1e9]
stable/6.6: [8f3e68c6a3fff53c2240762a47a0045d89371775]
stable/6.8: [8db10cee51e3e11a6658742465edc21986cf1e8d]
CVE-2024-27043: media: edia: dvbdev: fix a use-after-free
Announce: https://lore.kernel.org/linux-cve-announce/2024050113-CVE-2024-27043-f2fb@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit b619010 ("V4L/DVB (5244): Dvbdev: fix illegal
re-usage of fileoperations struct") in v2.6.21-rc2.
Fixed in v6.9-rc1.
Fixed status
cip/4.4: [d87c1e726012e3ef1f738814267fd6f4bd5bc22b]
cip/4.4-st: [d87c1e726012e3ef1f738814267fd6f4bd5bc22b]
mainline: [8c64f4cdf4e6cc5682c52523713af8c39c94e6d5]
stable/4.19: [d0f5c28333822f9baa5280d813124920720fd856]
stable/5.10: [096237039d00c839f3e3a5fe6d001bf0db45b644]
stable/5.15: [0d3fe80b6d175c220b3e252efc6c6777e700e98e]
stable/5.4: [f20c3270f3ed5aa6919a87e4de9bf6c05fb57086]
stable/6.1: [437a111f79a2f5b2a5f21e27fdec6f40c8768712]
stable/6.6: [779e8db7efb22316c8581d6c229636d2f5694a62]
stable/6.8: [b7586e902128e4fb7bfbb661cb52e4215a65637b]
CVE-2024-27044: drm/amd/display: Fix potential NULL pointer
dereferences in 'dcn10_set_output_transfer_func()'
Announce: https://lore.kernel.org/linux-cve-announce/2024050113-CVE-2024-27044-7e0e@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit ddef02d ("drm/amd/display: add null checks before
logging") in v5.4-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [9ccfe80d022df7c595f1925afb31de2232900656]
stable/5.10: [330caa061af53ea6d287d7c43d0703714e510e08]
stable/5.15: [6ac7c7a3a9ab57aba0fe78ecb922d2b20e16efeb]
stable/5.4: [e019d87e02f1e539ae48b99187f253847744ca7a]
stable/6.1: [29fde8895b2fcc33f44aea28c644ce2d9b62f9e0]
stable/6.6: [2d9fe7787af01188dc470a649bdbb842d6511fd7]
stable/6.8: [7874ab3105ca4657102fee1cc14b0af70883c484]
CVE-2024-27045: drm/amd/display: Fix a potential buffer overflow in
'dp_dsc_clock_en_read()'
Announce: https://lore.kernel.org/linux-cve-announce/2024050113-CVE-2024-27045-6680@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit c06e09b ("drm/amd/display: Add DSC parameters
logging to debugfs") in v5.9-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [4b09715f1504f1b6e8dff0e9643630610bc05141]
stable/5.10: [ff28893c96c5e0927a4da10cd24a3522ca663515]
stable/5.15: [440f059837418fac1695b65d3ebc6080d33be877]
stable/6.1: [d346b3e5b25c95d504478507eb867cd3818775ab]
stable/6.6: [ad76fd30557d6a106c481e4606a981221ca525f7]
stable/6.8: [cf114d8d4a8d78df272116a745bb43b48cef65f4]
CVE-2024-27046: nfp: flower: handle acti_netdevs allocation failure
Announce: https://lore.kernel.org/linux-cve-announce/2024050113-CVE-2024-27046-4694@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit bb9a8d0 ("nfp: flower: monitor and offload LAG
groups") in v4.18-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [84e95149bd341705f0eca6a7fcb955c548805002]
stable/4.19: [d746889db75a76aeee95fb705b8e1ac28c684a2e]
stable/5.10: [928705e341010dd910fdece61ccb974f494a758f]
stable/5.15: [0d387dc503f9a53e6d1f6e9dd0292d38f083eba5]
stable/5.4: [3b1e8a617eb0f4cdc19def530047a95b5abde07d]
stable/6.1: [c9b4e220dd18f79507803f38a55d53b483f6c9c3]
stable/6.6: [408ba7fd04f959c61b50db79c983484312fea642]
stable/6.8: [9d8eb1238377cd994829f9162ae396a84ae037b2]
CVE-2024-27047: net: phy: fix phy_get_internal_delay accessing an empty array
Announce: https://lore.kernel.org/linux-cve-announce/2024050114-CVE-2024-27047-8aad@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 92252ee ("net: phy: Add a helper to return the
index for of the internal delay") in v5.9-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [4469c0c5b14a0919f5965c7ceac96b523eb57b79]
stable/5.10: [06dd21045a7e8bc8701b0ebedcd9a30a6325878b]
stable/5.15: [0e939a002c8a7d66e60bd0ea6b281fb39d713c1a]
stable/6.1: [2a2ff709511617de9c6c072eeee82bcbbdfecaf8]
stable/6.6: [589ec16174dd9378953b8232ae76fad0a96e1563]
stable/6.8: [0307cf443308ecc6be9b2ca312bb31bae5e5a7ad]
CVE-2024-27048: wifi: brcm80211: handle pmk_op allocation failure
Announce: https://lore.kernel.org/linux-cve-announce/2024050114-CVE-2024-27048-016f@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit a96202a ("wifi: brcmfmac: cfg80211: Add support
for PMKID_V3 operations") in v6.4-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [b4152222e04cb8afeeca239c90e3fcaf4c553b42]
stable/6.6: [df62e22c2e27420e8990a4f09e30d7bf56c2036f]
stable/6.8: [6138a82f3bccfc67ed7ac059493579fc326c02e5]
CVE-2024-27049: wifi: mt76: mt7925e: fix use-after-free in free_irq()
Announce: https://lore.kernel.org/linux-cve-announce/2024050114-CVE-2024-27049-a5a1@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit c948b5d ("wifi: mt76: mt7925: add Mediatek Wi-Fi7
driver for mt7925 chips") in v6.7-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [a5a5f4413d91f395cb2d89829d376d7393ad48b9]
stable/6.8: [6d9930096e1f13cf6d9aabfbf95d0e05fb04144f]
CVE-2024-27050: libbpf: Use OPTS_SET() macro in bpf_xdp_query()
Announce: https://lore.kernel.org/linux-cve-announce/2024050114-CVE-2024-27050-b829@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 13ce2da ("xsk: add new netlink attribute
dedicated for ZC max frags") in v6.6-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [92a871ab9fa59a74d013bc04f321026a057618e7]
stable/6.6: [fa5bef5e80c6a3321b2b1a7070436f3bc5daf07c]
stable/6.8: [cd3be9843247edb8fc6fcd8d8237cbce2bc19f5e]
CVE-2024-27051: cpufreq: brcmstb-avs-cpufreq: add check for
cpufreq_cpu_get's return value
Announce: https://lore.kernel.org/linux-cve-announce/2024050114-CVE-2024-27051-07ce@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit de322e0 ("cpufreq: brcmstb-avs-cpufreq: AVS
CPUfreq driver for Broadcom STB SoCs") in v4.10-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [f661017e6d326ee187db24194cabb013d81bc2a6]
stable/5.10: [9127599c075caff234359950117018a010dd01db]
stable/5.15: [d951cf510fb0df91d3abac0121a59ebbc63c0567]
stable/6.1: [e72160cb6e23b78b41999d6885a34ce8db536095]
stable/6.6: [b25b64a241d769e932a022e5c780cf135ef56035]
stable/6.8: [e6e3e51ffba0784782b1a076d7441605697ea3c6]
CVE-2024-27052: wifi: rtl8xxxu: add cancel_work_sync() for c2hcmd_work
Announce: https://lore.kernel.org/linux-cve-announce/2024050115-CVE-2024-27052-fb6d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit e542e66 ("rtl8xxxu: add bluetooth co-existence
support for single antenna") in v5.5-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [1213acb478a7181cd73eeaf00db430f1e45b1361]
stable/5.10: [dddedfa3b29a63c2ca4336663806a6128b8545b4]
stable/5.15: [ac512507ac89c01ed6cd4ca53032f52cdb23ea59]
stable/6.1: [3518cea837de4d106efa84ddac18a07b6de1384e]
stable/6.6: [156012667b85ca7305cb363790d3ae8519a6f41e]
stable/6.8: [58fe3bbddfec10c6b216096d8c0e517cd8463e3a]
CVE-2024-27053: wifi: wilc1000: fix RCU usage in connect path
Announce: https://lore.kernel.org/linux-cve-announce/2024050115-CVE-2024-27053-a8e9@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit c460495 ("staging: wilc1000: fix incorrent type
in initializer") in v5.1-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [205c50306acf58a335eb19fa84e40140f4fe814f]
stable/5.10: [b4bbf38c350acb6500cbe667b1e2e68f896e4b38]
stable/5.15: [d80fc436751cfa6b02a8eda74eb6cce7dadfe5a2]
stable/5.4: [e556006de4ea93abe2b46cba202a2556c544b8b2]
stable/6.1: [745003b5917b610352f52fe0d11ef658d6471ec2]
stable/6.6: [4bfd20d5f5c62b5495d6c0016ee6933bd3add7ce]
stable/6.8: [dd50d3ead6e3707bb0a5df7cc832730c93ace3a7]
CVE-2024-27054: s390/dasd: fix double module refcount decrement
Announce: https://lore.kernel.org/linux-cve-announce/2024050115-CVE-2024-27054-b0ff@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit c020d72 ("s390/dasd: fix panic during offline
processing") in v4.9-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [c3116e62ddeff79cae342147753ce596f01fcf06]
stable/5.15: [edbdb0d94143db46edd373cc93e433832d29fe19]
stable/6.1: [ad999aa18103fa038787b6a8a55020abcf34df1a]
stable/6.6: [ec09bcab32fc4765e0cc97e1b72cdd067135f37e]
stable/6.8: [ebc5a3bd79e54f98c885c26f0862a27a02c487c5]
CVE-2024-27055: workqueue: Don't call cpumask_test_cpu() with -1 CPU
in wq_update_node_max_active()
Announce: https://lore.kernel.org/linux-cve-announce/2024050115-CVE-2024-27055-449e@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 5797b1c ("workqueue: Implement system-wide
nr_active enforcement for unbound workqueues") in 6.9-rc1.
This commit was backported to 6.6 and 6.8.
Fixed in 6.9-rc1.
Fixed status
mainline: [15930da42f8981dc42c19038042947b475b19f47]
stable/6.6: [7df62b8cca38aa452b508b477b16544cba615084]
stable/6.8: [a75ac2693d734d20724f0e10e039ca85f1fcfc4e]
CVE-2024-27056: wifi: iwlwifi: mvm: ensure offloading TID queue exists
Announce: https://lore.kernel.org/linux-cve-announce/2024050115-CVE-2024-27056-98c0@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.8-rc7.
Fixed status
mainline: [78f65fbf421a61894c14a1b91fe2fb4437b3fe5f]
CVE-2024-27057: ASoC: SOF: ipc4-pcm: Workaround for crashed firmware
on system suspend
Announce: https://lore.kernel.org/linux-cve-announce/2024050116-CVE-2024-27057-c0fb@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.8-rc5.
It seems as if it was introduced by commit 2d271af ("ASoC: SOF:
ipc4-pcm: Use the PCM stream's pipeline_info during trigger") in
6.3-rc1.
This commit is not backported to older stable kernels.
Fixed status
mainline: [c40aad7c81e5fba34b70123ed7ce3397fa62a4d2]
stable/6.6: [3cac6eebea9b4bc5f041e157e45c76e212ad6759]
CVE-2024-27058: tmpfs: fix race on handling dquot rbtree
Announce: https://lore.kernel.org/linux-cve-announce/2024050130-CVE-2024-27058-e8f6@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit eafc474 ("shmem: prepare shmem quota
infrastructure") in v6.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc2.
Fixed status
mainline: [0a69b6b3a026543bc215ccc866d0aea5579e6ce2]
stable/6.6: [c7077f43f30d817d10a9f8245e51576ac114b2f0]
stable/6.8: [f82f184874d2761ebaa60dccf577921a0dbb3810]
CVE-2024-27059: USB: usb-storage: Prevent divide-by-0 error in
isd200_ata_command
Announce: https://lore.kernel.org/linux-cve-announce/2024050130-CVE-2024-27059-baaa@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 1da177e ("Linux-2.6.12-rc2") in v2.6.12.
Fixed in v6.8.
Fixed status
cip/4.4: [3b252232c2204c18e7c75b33f1c3725cf9239512]
cip/4.4-st: [3b252232c2204c18e7c75b33f1c3725cf9239512]
mainline: [014bcf41d946b36a8f0b8e9b5d9529efbb822f49]
stable/4.19: [9968c701cba7eda42e5f0052b040349d6222ae34]
stable/5.10: [284fb1003d5da111019b9e0bf99b084fd71ac133]
stable/5.15: [6c1f36d92c0a8799569055012665d2bb066fb964]
stable/5.4: [eb7b01ca778170654e1c76950024270ba74b121f]
stable/6.1: [f42ba916689f5c7b1642092266d2f53cf527aaaa]
stable/6.6: [871fd7b10b56d280990b7e754f43d888382ca325]
stable/6.8: [014bcf41d946b36a8f0b8e9b5d9529efbb822f49]
CVE-2024-27060: thunderbolt: Fix NULL pointer dereference in
tb_port_update_credits()
Announce: https://lore.kernel.org/linux-cve-announce/2024050130-CVE-2024-27060-8a1c@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 81af295 ("thunderbolt: Add support for asymmetric
link") in v6.7-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.8.
Fixed status
mainline: [d3d17e23d1a0d1f959b4fa55b35f1802d9c584fa]
stable/6.8: [d3d17e23d1a0d1f959b4fa55b35f1802d9c584fa]
CVE-2024-27061: crypto: sun8i-ce - Fix use after free in unprepare
Announce: https://lore.kernel.org/linux-cve-announce/2024050130-CVE-2024-27061-fef2@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 4136212 ("crypto: sun8i-ce - Remove
prepare/unprepare request") in v6.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.8.
Fixed status
mainline: [183420038444547c149a0fc5f58e792c2752860c]
stable/6.6: [dc60b25540c82fc4baa95d1458ae96ead21859e0]
stable/6.8: [183420038444547c149a0fc5f58e792c2752860c]
CVE-2024-27062: nouveau: lock the client object tree.
Announce: https://lore.kernel.org/linux-cve-announce/2024050130-CVE-2024-27062-3291@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced commit is not determined.Fixed in v6.8.
It looks as if commit 110cccf ("drm/nouveau/core/object: support
lookup of specific object types") in 4.11-rc1 introduced this bug.
Linux 4.4 doesn't have vulnerable functions.
Fixed status
mainline: [b7cc4ff787a572edf2c55caeffaa88cd801eb135]
stable/6.6: [6887314f5356389fc219b8152e951ac084a10ef7]
stable/6.8: [b7cc4ff787a572edf2c55caeffaa88cd801eb135]
CVE-2024-27063: leds: trigger: netdev: Fix kernel panic on interface
rename trig notify
Announce: https://lore.kernel.org/linux-cve-announce/2024050131-CVE-2024-27063-c356@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit d5e0126 ("leds: trigger: netdev: add additional
specific link speed mode") in v6.5-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [415798bc07dd1c1ae3a656aa026580816e0b9fe8]
stable/6.6: [10f2af1af8ab8a7064f193446abd5579d3def7e3]
stable/6.8: [3f360227cb46edb2cd2494128e1e06ed5768a62e]
CVE-2024-27064: netfilter: nf_tables: Fix a memory leak in nf_tables_updchain
Announce: https://lore.kernel.org/linux-cve-announce/2024050132-CVE-2024-27064-8046@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit b9703ed ("netfilter: nf_tables: support for
adding new devices to an existing netdev chain") in v6.4-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [7eaf837a4eb5f74561e2486972e7f5184b613f6e]
stable/6.6: [79846fdcc548d617b0b321addc6a3821d3b75b20]
stable/6.8: [e77a6b53a3a547b6dedfc40c37cee4f310701090]
CVE-2024-27065: netfilter: nf_tables: do not compare internal table
flags on updates
Announce: https://lore.kernel.org/linux-cve-announce/2024050132-CVE-2024-27065-8c9d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 179d9ba ("netfilter: nf_tables: fix table flag
updates") in v5.13-rc5.
This commit was backported to 5.10 and 5.4.
Fixed in v6.9-rc1.
Fixed status
mainline: [4a0e7f2decbf9bd72461226f1f5f7dcc4b08f139]
stable/5.10: [fcf32a5bfcb8a57ac0ce717fcfa4d688c91f1005]
stable/5.15: [640dbf688ba955e83e03de84fbdda8e570b7cce4]
stable/5.4: [2531f907d3e40a6173090f10670ae76d117ab27b]
stable/6.1: [9683cb6c2c6c0f45537bf0b8868b5d38fcb63fc7]
stable/6.6: [4d37f12707ee965d338028732575f0b85f6d9e4f]
stable/6.8: [df257c435e51651c43b86326d112ddadda76350e]
CVE-2024-27066: virtio: packed: fix unmap leak for indirect desc table
Announce: https://lore.kernel.org/linux-cve-announce/2024050132-CVE-2024-27066-686a@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit b319940 ("virtio_ring: skip unmap for premapped")
in v6.6-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [d5c0ed17fea60cca9bc3bf1278b49ba79242bbcd]
stable/6.6: [e142169aca5546ae6619c39a575cda8105362100]
stable/6.8: [51bacd9d29bf98c3ebc65e4a0477bb86306b4140]
CVE-2024-27067: xen/evtchn: avoid WARN() when unbinding an event channel
Announce: https://lore.kernel.org/linux-cve-announce/2024050132-CVE-2024-27067-38e7@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 9e90e58 ("xen: evtchn: Allow shared registration
of IRQ handers") in v6.7-rc1.
This commit is backported to 6.6.
Fixed in v6.9-rc1.
Fixed status
mainline: [51c23bd691c0f1fb95b29731c356c6fd69925d17]
stable/6.6: [99e425032c6ec13584d3cd33846e0c7307501b47]
stable/6.8: [9e2d4b58c1da48a32905802aaeadba7084b46895]
CVE-2024-27068: thermal/drivers/mediatek/lvts_thermal: Fix a memory
leak in an error handling path
Announce: https://lore.kernel.org/linux-cve-announce/2024050132-CVE-2024-27068-c844@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit f5f633b ("thermal/drivers/mediatek: Add the Low
Voltage Thermal Sensor driver") in v6.3-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [ca93bf607a44c1f009283dac4af7df0d9ae5e357]
stable/6.6: [2db869da91afd48e5b9ec76814709be49662b07d]
stable/6.8: [9b02197596671800dd934609384b1aca7c6ad218]
CVE-2024-27069: ovl: relax WARN_ON in ovl_verify_area()
Announce: https://lore.kernel.org/linux-cve-announce/2024050133-CVE-2024-27069-5b70@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit ca7ab48 ("ovl: add permission hooks outside of
do_splice_direct()") in v6.8-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [77a28aa476873048024ad56daf8f4f17d58ee48e]
stable/6.8: [c3c85aefc0da1e5074a06c682542a54ccc99bdca]
CVE-2024-27070: f2fs: fix to avoid use-after-free issue in f2fs_filemap_fault
Announce: https://lore.kernel.org/linux-cve-announce/2024050133-CVE-2024-27070-a43e@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 87f3afd ("f2fs: add tracepoint for
f2fs_vm_page_mkwrite()") in v6.8-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [eb70d5a6c932d9d23f4bb3e7b83782c21ac4b064]
stable/6.8: [8186e16a766d709a08f188d2f4e84098f364bea1]
CVE-2024-27071: backlight: hx8357: Fix potential NULL pointer dereference
Announce: https://lore.kernel.org/linux-cve-announce/2024050133-CVE-2024-27071-3b1b@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 7d84a63 ("backlight: hx8357: Convert to agnostic
GPIO API") in v6.8-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [b1ba8bcb2d1ffce11b308ce166c9cc28d989e3b9]
stable/6.8: [67e578c8ff2d7df03bf8ca9a7f5436b1796f6ad1]
CVE-2024-27072: media: usbtv: Remove useless locks in usbtv_video_free()
Announce: https://lore.kernel.org/linux-cve-announce/2024050133-CVE-2024-27072-301d@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit c838530 ("media: media videobuf2: Be more
flexible on the number of queue stored buffers") in v6.8-rc1.
Introduced by commit f3d27f3 ("[media] usbtv: Add driver for Fushicai
USBTV007 video frame grabber") in v3.11-rc1.
Fixed in v6.9-rc1.
Fixed status
mainline: [65e6a2773d655172143cc0b927cdc89549842895]
stable/6.8: [3e7d82ebb86e94643bdb30b0b5b077ed27dce1c2]
CVE-2024-27073: media: ttpci: fix two memleaks in budget_av_attach
Announce: https://lore.kernel.org/linux-cve-announce/2024050133-CVE-2024-27073-967c@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 1da177e ("Linux-2.6.12-rc2") in v2.6.12.
Fixed in v6.9-rc1.
Fixed status
mainline: [d0b07f712bf61e1a3cf23c87c663791c42e50837]
stable/5.10: [910363473e4bf97da3c350e08d915546dd6cc30b]
stable/5.15: [24e51d6eb578b82ff292927f14b9f5ec05a46beb]
stable/5.4: [af37aed04997e644f7e1b52b696b62dcae3cc016]
stable/6.1: [55ca0c7eae8499bb96f4e5d9b26af95e89c4e6a0]
stable/6.6: [7393c681f9aa05ffe2385e8716989565eed2fe06]
stable/6.8: [656b8cc123d7635dd399d9f02594f27aa797ac3c]
CVE-2024-27074: media: go7007: fix a memleak in go7007_load_encoder
Announce: https://lore.kernel.org/linux-cve-announce/2024050133-CVE-2024-27074-a9b3@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 95ef394 ("[media] go7007: remember boot
firmware") in v3.10-rc1.
Fixed in v6.9-rc1.
Fixed status
cip/4.4: [01173c381edc48d33487a9f6a1e306ed41fda472]
cip/4.4-st: [01173c381edc48d33487a9f6a1e306ed41fda472]
mainline: [b9b683844b01d171a72b9c0419a2d760d946ee12]
stable/4.19: [7f11dd3d165b178e738fe73dfeea513e383bedb5]
stable/5.10: [b49fe84c6cefcc1c2336d793b53442e716c95073]
stable/5.15: [790fa2c04dfb9f095ec372bf17909424d6e864b3]
stable/5.4: [291cda0b805fc0d6e90d201710311630c8667159]
stable/6.1: [e04d15c8bb3e111dd69f98894acd92d63e87aac3]
stable/6.6: [f31c1cc37411f5f7bcb266133f9a7e1b4bdf2975]
stable/6.8: [7405a0d4442792988e9ae834e7d84f9d163731a4]
CVE-2024-27075: media: dvb-frontends: avoid stack overflow warnings with clang
Announce: https://lore.kernel.org/linux-cve-announce/2024050134-CVE-2024-27075-5e4f@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 3cd890d ("media: dvb-frontends: fix i2c access
helpers for KASAN") in v4.16-rc1.
This commit was backported to 4.4
Fixed in v6.9-rc1.
Fixed status
mainline: [7a4cf27d1f0538f779bf31b8c99eda394e277119]
stable/4.19: [c073c8cede5abd3836e83d70d72606d11d0759d4]
stable/5.10: [fb07104a02e87c06c39914d13ed67fd8f839ca82]
stable/5.15: [d20b64f156de5d10410963fe238d82a4e7e97a2f]
stable/5.4: [fa8b472952ef46eb632825051078c21ce0cafe55]
stable/6.1: [107052a8cfeff3a97326277192b4f052e4860a8a]
stable/6.6: [8fad9c5bb00d3a9508d18bbfe832e33a47377730]
stable/6.8: [ed514ecf4f29c80a2f09ae3c877059b401efe893]
CVE-2024-27076: media: imx: csc/scaler: fix v4l2_ctrl_handler memory leak
Announce: https://lore.kernel.org/linux-cve-announce/2024050134-CVE-2024-27076-5a2e@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit a8ef048 ("media: imx: add csc/scaler mem2mem
device") in v5.4-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [4797a3dd46f220e6d83daf54d70c5b33db6deb01]
stable/5.10: [5d9fe604bf9b5b09d2215225df55f22a4cbbc684]
stable/5.15: [b1d0eebaf87cc9ccd05f779ec4a0589f95d6c18b]
stable/5.4: [8c2e4efe1278cd2b230cdbf90a6cefbf00acc282]
stable/6.1: [8df9a3c7044b847e9c4dc7e683fd64c6b873f328]
stable/6.6: [d164ddc21e986dd9ad614b4b01746e5457aeb24f]
stable/6.8: [6c92224721a439d6350db5933a1060768dcd565e]
CVE-2024-27077: media: v4l2-mem2mem: fix a memleak in v4l2_m2m_register_entity
Announce: https://lore.kernel.org/linux-cve-announce/2024050134-CVE-2024-27077-3482@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit be2fff6 ("media: add helpers for memory-to-memory
media controller") in v4.19-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [8f94b49a5b5d386c038e355bef6347298aabd211]
stable/4.19: [3dd8abb0ed0e0a7c66d6d677c86ccb188cc39333]
stable/5.10: [afd2a82fe300032f63f8be5d6cd6981e75f8bbf2]
stable/5.15: [dc866b69cc51af9b8509b4731b8ce2a4950cd0ef]
stable/5.4: [0175f2d34c85744f9ad6554f696cf0afb5bd04e4]
stable/6.1: [0c9550b032de48d6a7fa6a4ddc09699d64d9300d]
stable/6.6: [90029b9c979b60de5cb2b70ade4bbf61d561bc5d]
stable/6.8: [9c23ef30e840fedc66948299509f6c2777c9cf4f]
CVE-2024-27078: media: v4l2-tpg: fix some memleaks in tpg_alloc
Announce: https://lore.kernel.org/linux-cve-announce/2024050134-CVE-2024-27078-6a54@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 63881df ("[media] vivid: add the Test Pattern
Generator") in v3.18-rc1.
Fixed in v6.9-rc1.
Fixed status
mainline: [8cf9c5051076e0eb958f4361d50d8b0c3ee6691c]
stable/4.19: [0de691ff547d86dd54c24b40a81f9c925df8dd77]
stable/5.10: [94303a06e1852a366e9671fff46d19459f88cb28]
stable/5.15: [770a57922ce36a8476c43f7400b6501c554ea511]
stable/5.4: [8269ab16415f2065cd792c49b0475543936cbd79]
stable/6.1: [6bf5c2fade8ed53b2d26fa9875e5b04f36c7145d]
stable/6.6: [4c86c772fef06f5d7a66151bac42366825db0941]
stable/6.8: [622b1cf38521569869c8f7b9fbe9e4f1a289add7]
CVE-2024-27079: iommu/vt-d: Fix NULL domain on device release
Announce: https://lore.kernel.org/linux-cve-announce/2024050134-CVE-2024-27079-f478@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 586081d ("iommu/vt-d: Remove
DEFER_DEVICE_DOMAIN_INFO") in v5.18-rc1.
This commit is not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [81e921fd321614c2ad8ac333b041aae1da7a1c6d]
stable/6.8: [333fe86968482ca701c609af590003bcea450e8f]
CVE-2024-27080: btrfs: fix race when detecting delalloc ranges during fiemap
Announce: https://lore.kernel.org/linux-cve-announce/2024050135-CVE-2024-27080-46f0@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit b0ad381 ("btrfs: fix deadlock with fiemap and
extent locking") in v6.8-rc6.
This commit was backported to 6.6.
Fixed in v6.9-rc1.
Fixed status
mainline: [978b63f7464abcfd364a6c95f734282c50f3decf]
stable/6.6: [49d640d2946c35a17b051d54171a032dd95b0f50]
stable/6.8: [ced63fffd63072c0ca55d5a451010d71bf08c0b3]
CVE-2024-27388: SUNRPC: fix some memleaks in gssx_dec_option_array
Announce: https://lore.kernel.org/linux-cve-announce/2024050135-CVE-2024-27388-04eb@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 1d65833 ("SUNRPC: Add RPC based upcall mechanism
for RPCGSS auth") in v3.10-rc1.
Fixed in v6.9-rc1.
Fixed status
cip/4.4: [fd2507f998926b304ebe36d812747858526148b9]
cip/4.4-st: [fd2507f998926b304ebe36d812747858526148b9]
mainline: [3cfcfc102a5e57b021b786a755a38935e357797d]
stable/4.19: [b97c37978ca825557d331c9012e0c1ddc0e42364]
stable/5.10: [bb336cd8d5ecb69c430ebe3e7bcff68471d93fa8]
stable/5.15: [dd292e884c649f9b1c18af0ec75ca90b390cd044]
stable/5.4: [bfa9d86d39a0fe4685f90c3529aa9bd62a9d97a8]
stable/6.1: [934212a623cbab851848b6de377eb476718c3e4c]
stable/6.6: [5e6013ae2c8d420faea553d363935f65badd32c3]
stable/6.8: [996997d1fb2126feda550d6adcedcbd94911fc69]
CVE-2024-27389: pstore: inode: Only d_invalidate() is needed
Announce: https://lore.kernel.org/linux-cve-announce/2024050135-CVE-2024-27389-fb3a@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 609e28b ("pstore: Remove filesystem records when
backend is unregistered") in v5.8-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [a43e0fc5e9134a46515de2f2f8d4100b74e50de3]
stable/6.1: [db6e5e16f1ee9e3b01d2f71c7f0ba945f4bf0f4e]
stable/6.6: [4cdf9006fc095af71da80e9b5f48a32e991b9ed3]
stable/6.8: [340682ed1932b8e3bd0bfc6c31a0c6354eb57cc6]
CVE-2024-27390: ipv6: mcast: remove one synchronize_net() barrier in
ipv6_mc_down()
Announce: https://lore.kernel.org/linux-cve-announce/2024050135-CVE-2024-27390-e55f@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit f185de2 ("mld: add new workqueues for process mld
events") in v5.13-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [17ef8efc00b34918b966388b2af0993811895a8c]
stable/5.15: [9d159d6637ccce25f879d662a480541ef4ba3a50]
stable/6.1: [a03ede2282ebbd181bd6f5c38cbfcb5765afcd04]
stable/6.6: [26d4bac55750d535f1f0b8790dc26daf6089e373]
stable/6.8: [5da9a218340a2bc804dc4327e5804392e24a0b88]
CVE-2024-27391: wifi: wilc1000: do not realloc workqueue everytime an
interface is added
Announce: https://lore.kernel.org/linux-cve-announce/2024050135-CVE-2024-27391-6014@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit 09ed8bf ("wilc1000: Rename workqueue from
"WILC_wq" to "NETDEV-wq"") in v5.17-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [328efda22af81130c2ad981c110518cb29ff2f1d]
stable/6.1: [515cc676dfbce40d93c92b1ff3c1070e917f4e52]
stable/6.6: [4041c60a9d543b3ad50225385b072ba68e96166e]
stable/6.8: [9ab0c303ccabfd6bdce14432792d41090070008c]
CVE-2024-27392: nvme: host: fix double-free of struct nvme_id_ns in
ns_update_nuse()
Announce: https://lore.kernel.org/linux-cve-announce/2024050136-CVE-2024-27392-b84b@gregkh/
CVSS v3(NIST): N/A
CVSS v3(CNA): N/A
Introduced by commit a1a825a ("nvme: add csi, ms and nuse to sysfs")
in v6.8-rc1.
This commit was not backported to older stable kernels.
Fixed in v6.9-rc1.
Fixed status
mainline: [8d0d2447394b13fb22a069f0330f9c49b7fff9d3]
stable/6.8: [534f9dc7fe495b3f9cc84363898ac50c5a25fccb]
* Updated CVEs
CVE-2024-26605: PCI/ASPM: Fix deadlock when enabling ASPM
stable 6.1 and 6.6 were fixed.
Fixed status
mainline: [1e560864159d002b453da42bd2c13a1805515a20]
stable/6.1: [0f7908a016c092cfdaa16d785fa5099d867bc1a3]
stable/6.6: [b0f4478838be1f1d330061201898fef65bf8fd7c]
stable/6.7: [ef90508574d7af48420bdc5f7b9a4f1cdd26bc70]
CVE-2024-26811: ksmbd: validate payload size in ipc response
stable 5.15 was fixed.
Fixed status
mainline: [a677ebd8ca2f2632ccdecbad7b87641274e15aac]
stable/5.15: [88b7f1143b15b29cccb8392b4f38e75b7bb3e300]
stable/6.1: [51a6c2af9d20203ddeeaf73314ba8854b38d01bd]
stable/6.6: [a637fabac554270a851033f5ab402ecb90bc479c]
stable/6.8: [76af689a45aa44714b46d1a7de4ffdf851ded896]
CVE-2024-26922: drm/amdgpu: validate the parameters of bo mapping
operations more clearly
stable 5.15, 6.1, 6.6, and 6.8 were fixed.
Fixed status
mainline: [6fef2d4c00b5b8561ad68dd2b68173f5c6af1e75]
stable/5.15: [8b12fc7b032633539acdf7864888b0ebd49e90f2]
stable/6.1: [212e3baccdb1939606420d88f7f52d346b49a284]
stable/6.6: [ef13eeca7c79136bc38e21eb67322c1cbd5c40ee]
stable/6.8: [b1f04b9b1c5317f562a455384c5f7473e46bdbaa]
CVE-2024-26924: netfilter: nft_set_pipapo: do not free live element
stable 5.15, 6.1, 6.6, and 6.8 were fixed.
Fixed status
mainline: [3cfc9ec039af60dbd8965ae085b2c2ccdcfbe1cc]
stable/5.15: [7a1679e2d9bfa3b5f8755c2c7113e54b7d42bd46]
stable/6.1: [41d8fdf3afaff312e17466e4ab732937738d5644]
stable/6.6: [ebf7c9746f073035ee26209e38c3a1170f7b349a]
stable/6.8: [14b001ba221136c15f894577253e8db535b99487]
CVE-2024-26926: binder: check offset alignment in binder_get_object()
stable 5.15, 6.1, 6.6, and 6.8 were fixed.
Fixed status
mainline: [aaef73821a3b0194a01bd23ca77774f704a04d40]
stable/5.15: [a2fd6dbc98be1105a1d8e9e31575da8873ef115c]
stable/6.1: [a6d2a8b211c874971ee4cf3ddd167408177f6e76]
stable/6.6: [1d7f1049035b2060342f11eff957cf567d810bdc]
stable/6.8: [f01d6619045704d78613b14e2e0420bfdb7f1c15]
Currently tracking CVEs
CVE-2021-31615: Unencrypted Bluetooth Low Energy baseband links in
Bluetooth Core Specifications 4.0 through 5.2
There is no fix information.
CVE-2020-26556: kernel: malleable commitment Bluetooth Mesh Provisioning
No fix information.
CVE-2020-26557: kernel: predictable Authvalue in Bluetooth Mesh
Provisioning Leads to MITM
No fix information.
CVE-2020-26559: kernel: Authvalue leak in Bluetooth Mesh Provisioning
No fix information.
CVE-2020-26560: kernel: impersonation attack in Bluetooth Mesh Provisioning
No fix information.
Regards,
--
Masami Ichikawa
Cybertrust Japan Co., Ltd.
Email :masami.ichikawa@cybertrust.co.jp
:masami.ichikawa@miraclelinux.com
^ permalink raw reply [relevance 2%]
* linux-next: Tree for May 1
@ 2024-05-01 10:21 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-05-01 10:21 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 40205 bytes --]
Hi all,
Changes since 20240430:
The mm tree still had its build failure for which I revreted 2 commits.
The uml tree gained a conflict against the mm tree.
The vfs-brauner tree gained a conflict the btrfs tree.
The v4l-dvb-next tree gained a build failure so I used the version from
next-20240430.
The bluetooth tree gained a build failure so I used the version from
next-20240430.
The modules tree lots its boot failure.
The dmi tree still had its build failure for which I reverted a commit.
The slab tree gained a build failure, so I have used the version from
next-20240430.
Non-merge commits (relative to Linus' tree): 9103
9062 files changed, 658268 insertions(+), 228507 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (18daea77cca6 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (bcf28f9e63d4 selftests/vDSO: fix runtime errors on LoongArch)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (e783331c7720 arm64/mm: pmd_mkinvalid() must handle swap pmds)
Merging arm-soc-fixes/arm/fixes (e845bcc8cfda Merge tag 'riscv-soc-fixes-for-v6.9-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE)
Merging s390-fixes/fixes (da7c622cddd4 s390/cio: Ensure the copied buf is NUL terminated)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (ba1cb99b559e Merge branch 'vxlan-stats')
Merging bpf/master (3e9bc0472b91 Merge branch 'bpf: Add BPF_PROG_TYPE_CGROUP_SKB attach type enforcement in BPF_LINK_CREATE')
Merging ipsec/master (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment)
Merging netfilter/main (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs/main (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging wireless/for-next (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (39815cdfc8d4 ALSA: hda/realtek: Fix conflicting PCI SSID 17aa:386f for Lenovo Legion models)
Merging sound-asoc-fixes/for-linus (fbd741f09932 ASoC: cs35l56: fix usages of device_get_named_child_node())
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (ff33132605c1 regulator: change devm_regulator_get_enable_optional() stub to return Ok)
Merging spi-fixes/for-linus (7430764f5a85 spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging usb.current/usb-linus (ae11f04b452b usb: typec: tcpm: Check for port partner validity before consuming it)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (3c324a40b7c3 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (00e7d3bea2ce dyndbg: fix old BUG_ON in >control parser)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging input-current/for-linus (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (16c20208b9c2 Merge tag 'kvmarm-fixes-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (052f3ec54799 Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (515a3c3a5489 platform/x86: ISST: Add Grand Ridge to HPM CPU list)
Merging samsung-krzk-fixes/fixes (da244c16ac58 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (e67572cd2204 Linux 6.9-rc6)
Merging drm-intel-fixes/for-linux-next-fixes (e67572cd2204 Linux 6.9-rc6)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
54435d1f21b3 ("fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card")
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (c714fcdf5b75 Merge tag 'intel-gpio-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-current)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (e67572cd2204 Linux 6.9-rc6)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (f8981b0d5295 Merge tag 'qcom-clk-fixes-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-fixes)
Merging drm-misc-fixes/for-linux-next-fixes (a37ef7613c00 drm/vmwgfx: Fix invalid reads in fence signaled events)
Merging mm-stable/mm-stable (72801513b2bf mm: set pageblock_order to HPAGE_PMD_ORDER in case with !CONFIG_HUGETLB_PAGE but THP enabled)
Merging mm-nonmm-stable/mm-nonmm-stable (e02577872ff5 crash: add prefix for crash dumping messages)
Merging mm/mm-everything (3c2a0d2f0ca0 foo)
Applying: Revert "mm/vmscan: avoid split lazyfree THP during shrink_folio_list()"
Applying: Revert "mm/rmap: integrate PMD-mapped folio splitting into pagewalk loop"
Merging kbuild/for-next (060ef2b42249 kconfig: remove 'optional' property support)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (8c618b58c89c perf test: Reintroduce -p/--parallel and make -S/--sequential the default)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (7befe2ef9384 Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (4052ce07d5d7 perf/arm-spe: Assign parents for event_source device)
Merging arm-soc/for-next (c2e516e61f14 soc: document merges)
Merging amlogic/for-next (2b952b1d0a54 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (7ad71c3ab70c ARM: dts: aspeed: Remove Facebook Cloudripper dts)
2fa83625243b ("ARM: dts: aspeed: Add vendor prefixes to lm25066 compat strings")
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (7f6f45a762c3 Merge branches 'v6.9-next/soc' and 'v6.9-next/dts64' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (99376e9b6f12 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (8dabf52bd8db Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (7a6a71ac50cb Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (9cedf91ec112 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (92e92dc84e17 Merge branch 'clk-scmi' into clk-next)
Merging clk-imx/for-next (5224b189462f clk: imx: add i.MX95 BLK CTL clk driver)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (f3334ebb8a2a LoongArch: Lately init pmu after smp is online)
Merging m68k/for-next (bd622532f7b3 m68k: amiga: Use str_plural() to fix Coccinelle warning)
Merging m68knommu/for-next (2595108e5842 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (487fa28fa8b6 parisc: Define sigset_t in parisc uapi header)
Merging powerpc/next (dda32e37d397 selftests/powerpc: Install tests in sub-directories)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (849599b702ef powerpc/crash: add crash memory hotplug support)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (88e2486b6863 RISC-V: add Milkv Mars board devicetree)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (e57f5e1df560 Merge branch 'shared-zeropage' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (48d85acdaa52 sparc: chmc: Convert to platform remove callback returning void)
Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void)
CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (bc1e73b327bb bcachefs: x-macroize journal flags enums)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (e9f5aff094ee Merge branch 'for-next-next-v6.9-20240430' into for-next-20240430)
6d31c0d2309d ("btrfs: set correct ram_bytes when splitting ordered extent")
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (8f03ed91d75e smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (7ca906c7f7e5 Pull ext2 and isofs removal to PageError bit.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (3763f9effcdc f2fs: use helper to print zone condition)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (fa7e19337908 fuse: Add initial support for fs-verity)
Merging gfs2/for-next (1e86044402c4 gfs2: Remove and replace gfs2_glock_queue_work)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (bc642d7bfdac ksmbd: fix uninitialized symbol 'share' in smb2_tree_connect())
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (06cd86b25b98 SUNRPC: Remove comment for sp_lock)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (e58ac1770ded xfs: refactor dir format helpers)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (eea3260250ea Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (ccd0bdb57e31 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5deb5b56bccb i2c: smbus: fix NULL function pointer dereference)
Merging i2c-host/i2c/i2c-host (8a603d2c41de i2c: ali15x3: remove printout on handled timeouts)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (868577e6bfe1 firmware: dmi: Stop decoding on broken entry)
Applying: Revert "firmware: dmi: Stop decoding on broken entry"
Merging hwmon-staging/hwmon-next (8b3aa2c48865 hwmon: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging jc_docs/docs-next (fcb5bcefdbfb Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging v4l-dvb-next/master (a1c6d2242150 media: staging: max96712: fix copy-paste error)
$ git reset --hard HEAD^
Merging next-20240430 version of v4l-dvb-next
Merging pm/linux-next (92af2d44b4c3 Merge branch 'thermal-core' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (0cebf7cb2d70 pmdomain: core: Don't clear suspended_count at genpd_prepare())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (734b5def91b5 thermal/drivers/loongson2: Add Loongson-2K2000 support)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (f847e840157b RDMA/efa: Add shutdown notifier)
Merging net-next/main (b45176703647 Merge branch 'selftests-net-page_poll-allocation-error-injection')
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/filter.h
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in kernel/bpf/core.c
Merging bpf-next/for-next (06ebfd11678a Merge branch 'bpf-introduce-kprobe_multi-session-attach')
Merging ipsec-next/master (aeb48a428d7d udpencap: Remove Obsolete UDP_ENCAP_ESPINUDP_NON_IKE Support)
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (aa63c8b7b1c2 Bluetooth: qca: generalise device address check)
$ git reset --hard HEAD^
Merging next-20240430 version of bluetooth
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.c
[master d18986763520] next-20240430/bluetooth
Merging wireless-next/for-next (cc1380dd1882 wifi: brcmfmac: remove unused brcmf_usb_image struct)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64())
Merging crypto/master (ed265f7fd9a6 crypto: x86/aes-gcm - simplify GCM hash subkey derivation)
Merging drm/drm-next (4a56c0ed5aa0 Merge tag 'amd-drm-next-6.10-2024-04-26' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
Merging drm-exynos/for-linux-next (2236a61bd491 Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next)
Merging drm-misc/for-linux-next (13d56abef172 drm/vmwgfx: Remove duplicate vmwgfx_vkms.h header)
Merging amdgpu/drm-next (5fa7d540d95d drm/amd/pm: fix uninitialized variable warnings for vega10_hwmgr)
Merging drm-intel/for-linux-next (6f1923f54d77 drm/i915/dpio: Extract vlv_dpio_phy_regs.h)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (e29a7a34c3cf drm/xe: Remove uninitialized end var from xe_gt_tlb_invalidation_range())
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (ac2f4bc41d06 ALSA: hda: cs35l41: Add support for ASUS ROG 2024 Laptops)
Merging ieee1394/for-next (3b584ccc2316 firewire: core: add tracepoints event for asynchronous inbound phy packet)
Merging sound-asoc/for-next (894eabffb178 Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (3c2c250cb3a5 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (7b4e0b39182c Input: cyapa - add missing input core locking to suspend/resume functions)
Merging block/for-next (9db6dacf9174 Merge branch 'for-6.10/io_uring' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (83637d9017b2 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (e38063b94324 mmc: atmel-mci: Switch to use dev_err_probe())
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (3c6488537b45 Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (74560bb3685b lsm: remove the now superfluous sentinel element from ctl_table array)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (3c6e94beeacd Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (ef6e717d93c7 Merge branches 'arm/renesas', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (9b4a5ae6be9b dt-bindings: Drop unnecessary quotes on keys)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's)
Merging spi/for-next (cecfc48904cf Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (10dc478115c5 Merge branch into tip/master: 'x86/timers')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (03db22b93a01 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (b93b7b4635f1 ftrace: Asynchronous grace period for register_ftrace_direct())
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kvm/next (a96cb3bf390e Merge x86 bugfixes from Linux 6.9-rc3)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging kvm-arm/next (135c8fabdedd Merge branch kvm-arm64/lpi-xa-cache into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (2489e6c9ebb5 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/aarch64/psci_test.c
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (5c94664cf279 platform/x86: asus-laptop: Use sysfs_emit() and sysfs_emit_at() to replace sprintf())
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (e5019b14230a Merge 6.9-rc5 into driver-core-next)
Merging usb/usb-next (32965a3b8275 USB: fix up for "usb: misc: onboard_hub: rename to onboard_dev")
CONFLICT (content): Merge conflict in drivers/usb/dwc3/core.c
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (660a70809856 Merge 6.9-rc5 into tty-next)
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (1ddfcad01d44 Merge tag 'fpga-for-6.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (2d7e8a64a1e7 coresight: Docs/ABI/testing/sysfs-bus-coresight-devices: Fix spelling errors)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (80721776c5af iio: adc: axi-adc: make sure AXI clock is enabled)
CONFLICT (content): Merge conflict in drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
Merging phy-next/next (9c79b779643e phy: rockchip: fix CONFIG_TYPEC dependency)
Merging soundwire/next (a36ec5f7625d soundwire: intel_ace2x: simplify check_wake())
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (848e447e000c vfio/cdx: add interrupt support)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (ee2098c0b512 spmi: pmic-arb: Add multi bus support)
Merging staging/staging-next (75ff53c44f5e staging: vc04_services: Drop completed TODO item)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (700b2e1eccb4 dmaengine: xilinx: xdma: fix module autoloading)
Merging cgroup/for-next (b7d56d953a67 cgroup/cpuset: Remove outdated comment in sched_partition_write())
Merging scsi/for-next (8c5220c43ba0 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (aca061774bc4 scsi: mpi3mr: Fix some kernel-doc warnings in scsi_bsg_mpi3mr.h)
Merging vhost/linux-next (24ddee0ff8c3 Merge tag 'stable/vduse-virtio-net' into vhost)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (0496190c4d42 Merge branches 'rproc-next' and 'rpmsg-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (5539287ca656 gpio: brcmstb: add support for gpio-ranges)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (077895d14a6b Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment)
Merging pwm/pwm/for-next (32c44e1fa921 pwm: meson: Use mul_u64_u64_div_u64() for frequency calculating)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (693fe2f6a9ea selftests: kselftest: Make ksft_exit functions return void instead of int)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (aa892c2e7919 kunit: string-stream-test: use KUNIT_DEFINE_ACTION_WRAPPER)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (1c987cf22d6b cxl/region: Fix cxlr_pmem leaks)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (8acbdbf0106c Merge branch 'slab/for-6.10/cleanup' into slab/for-next)
$ git reset --hard HEAD^
Merging next-20240430 version of slab
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (046892f93be4 MAINTAINERS: Add Günther Noack as Landlock reviewer)
Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature)
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (10e29251be0e binfmt_elf_fdpic: fix /proc/<pid>/auxv)
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (207fa4298699 kunit/fortify: Add memcpy() tests)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (6b9cd589464f tools/power turbostat: version 2024.04.27)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* CVE-2024-26936: ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
@ 2024-05-01 5:30 8% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-01 5:30 UTC (permalink / raw)
To: linux-cve-announce; +Cc: Greg Kroah-Hartman
Description
===========
In the Linux kernel, the following vulnerability has been resolved:
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
The response buffer should be allocated in smb2_allocate_rsp_buf
before validating request. But the fields in payload as well as smb2 header
is used in smb2_allocate_rsp_buf(). This patch add simple buffer size
validation to avoid potencial out-of-bounds in request buffer.
The Linux kernel CVE team has assigned CVE-2024-26936 to this issue.
Affected and fixed versions
===========================
Fixed in 6.1.88 with commit 21ff9d7d223c
Fixed in 6.6.29 with commit 5c20b242d4fe
Fixed in 6.8.8 with commit 2c27a64a2bc4
Fixed in 6.9-rc6 with commit 17cf0c2794bd
Please see https://www.kernel.org for a full list of currently supported
kernel versions by the kernel community.
Unaffected versions might change over time as fixes are backported to
older supported kernel versions. The official CVE entry at
https://cve.org/CVERecord/?id=CVE-2024-26936
will be updated if fixes are backported, please check that for the most
up to date information about this issue.
Affected files
==============
The file(s) affected by this issue are:
fs/smb/server/smb2pdu.c
Mitigation
==========
The Linux kernel CVE team recommends that you update to the latest
stable kernel version for this, and many other bugfixes. Individual
changes are never tested alone, but rather are part of a larger kernel
release. Cherry-picking individual commits is not recommended or
supported by the Linux kernel community at all. If however, updating to
the latest release is impossible, the individual changes to resolve this
issue can be found at these commits:
https://git.kernel.org/stable/c/21ff9d7d223c5c19cb4334009e4c0c83a2f4d674
https://git.kernel.org/stable/c/5c20b242d4fed73a93591e48bfd9772e2322fb11
https://git.kernel.org/stable/c/2c27a64a2bc47d9bfc7c3cf8be14be53b1ee7cb6
https://git.kernel.org/stable/c/17cf0c2794bdb6f39671265aa18aea5c22ee8c4a
^ permalink raw reply [relevance 8%]
* CVE-2024-26980: ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
@ 2024-05-01 5:30 8% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-01 5:30 UTC (permalink / raw)
To: linux-cve-announce; +Cc: Greg Kroah-Hartman
Description
===========
In the Linux kernel, the following vulnerability has been resolved:
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
If ->ProtocolId is SMB2_TRANSFORM_PROTO_NUM, smb2 request size
validation could be skipped. if request size is smaller than
sizeof(struct smb2_query_info_req), slab-out-of-bounds read can happen in
smb2_allocate_rsp_buf(). This patch allocate response buffer after
decrypting transform request. smb3_decrypt_req() will validate transform
request size and avoid slab-out-of-bound in smb2_allocate_rsp_buf().
The Linux kernel CVE team has assigned CVE-2024-26980 to this issue.
Affected and fixed versions
===========================
Fixed in 6.1.88 with commit b80ba648714e
Fixed in 6.6.29 with commit 3160d9734453
Fixed in 6.8.8 with commit 0977f89722ec
Fixed in 6.9-rc6 with commit c119f4ede3fa
Please see https://www.kernel.org for a full list of currently supported
kernel versions by the kernel community.
Unaffected versions might change over time as fixes are backported to
older supported kernel versions. The official CVE entry at
https://cve.org/CVERecord/?id=CVE-2024-26980
will be updated if fixes are backported, please check that for the most
up to date information about this issue.
Affected files
==============
The file(s) affected by this issue are:
fs/smb/server/server.c
Mitigation
==========
The Linux kernel CVE team recommends that you update to the latest
stable kernel version for this, and many other bugfixes. Individual
changes are never tested alone, but rather are part of a larger kernel
release. Cherry-picking individual commits is not recommended or
supported by the Linux kernel community at all. If however, updating to
the latest release is impossible, the individual changes to resolve this
issue can be found at these commits:
https://git.kernel.org/stable/c/b80ba648714e6d790d69610cf14656be222d0248
https://git.kernel.org/stable/c/3160d9734453a40db248487f8204830879c207f1
https://git.kernel.org/stable/c/0977f89722eceba165700ea384f075143f012085
https://git.kernel.org/stable/c/c119f4ede3fa90a9463f50831761c28f989bfb20
^ permalink raw reply [relevance 8%]
* CVE-2024-26954: ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
@ 2024-05-01 5:21 8% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-01 5:21 UTC (permalink / raw)
To: linux-cve-announce; +Cc: Greg Kroah-Hartman
Description
===========
In the Linux kernel, the following vulnerability has been resolved:
ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
If ->NameOffset of smb2_create_req is smaller than Buffer offset of
smb2_create_req, slab-out-of-bounds read can happen from smb2_open.
This patch set the minimum value of the name offset to the buffer offset
to validate name length of smb2_create_req().
The Linux kernel CVE team has assigned CVE-2024-26954 to this issue.
Affected and fixed versions
===========================
Fixed in 6.7.12 with commit 3b8da67191e9
Fixed in 6.8.3 with commit 4f97e6a9d62c
Fixed in 6.9-rc1 with commit a80a486d72e2
Please see https://www.kernel.org for a full list of currently supported
kernel versions by the kernel community.
Unaffected versions might change over time as fixes are backported to
older supported kernel versions. The official CVE entry at
https://cve.org/CVERecord/?id=CVE-2024-26954
will be updated if fixes are backported, please check that for the most
up to date information about this issue.
Affected files
==============
The file(s) affected by this issue are:
fs/smb/server/smb2misc.c
Mitigation
==========
The Linux kernel CVE team recommends that you update to the latest
stable kernel version for this, and many other bugfixes. Individual
changes are never tested alone, but rather are part of a larger kernel
release. Cherry-picking individual commits is not recommended or
supported by the Linux kernel community at all. If however, updating to
the latest release is impossible, the individual changes to resolve this
issue can be found at these commits:
https://git.kernel.org/stable/c/3b8da67191e938a63d2736dabb4ac5d337e5de57
https://git.kernel.org/stable/c/4f97e6a9d62cb1fce82fbf4baff44b83221bc178
https://git.kernel.org/stable/c/a80a486d72e20bd12c335bcd38b6e6f19356b0aa
^ permalink raw reply [relevance 8%]
* CVE-2024-26952: ksmbd: fix potencial out-of-bounds when buffer offset is invalid
@ 2024-05-01 5:21 8% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-05-01 5:21 UTC (permalink / raw)
To: linux-cve-announce; +Cc: Greg Kroah-Hartman
Description
===========
In the Linux kernel, the following vulnerability has been resolved:
ksmbd: fix potencial out-of-bounds when buffer offset is invalid
I found potencial out-of-bounds when buffer offset fields of a few requests
is invalid. This patch set the minimum value of buffer offset field to
->Buffer offset to validate buffer length.
The Linux kernel CVE team has assigned CVE-2024-26952 to this issue.
Affected and fixed versions
===========================
Fixed in 6.7.12 with commit 2dcda336b6e8
Fixed in 6.8.3 with commit 0c5541b4c980
Fixed in 6.9-rc1 with commit c6cd2e8d2d9a
Please see https://www.kernel.org for a full list of currently supported
kernel versions by the kernel community.
Unaffected versions might change over time as fixes are backported to
older supported kernel versions. The official CVE entry at
https://cve.org/CVERecord/?id=CVE-2024-26952
will be updated if fixes are backported, please check that for the most
up to date information about this issue.
Affected files
==============
The file(s) affected by this issue are:
fs/smb/server/smb2misc.c
fs/smb/server/smb2pdu.c
Mitigation
==========
The Linux kernel CVE team recommends that you update to the latest
stable kernel version for this, and many other bugfixes. Individual
changes are never tested alone, but rather are part of a larger kernel
release. Cherry-picking individual commits is not recommended or
supported by the Linux kernel community at all. If however, updating to
the latest release is impossible, the individual changes to resolve this
issue can be found at these commits:
https://git.kernel.org/stable/c/2dcda336b6e80b72d58d30d40f2fad9724e5fe63
https://git.kernel.org/stable/c/0c5541b4c980626fa3cab16ba1a451757778bbb5
https://git.kernel.org/stable/c/c6cd2e8d2d9aa7ee35b1fa6a668e32a22a9753da
^ permalink raw reply [relevance 8%]
* Re: [PATCH v2 00/35] x86/resctrl: Move the resctrl filesystem code to /fs/resctrl
2024-04-29 23:34 0% ` Peter Newman
@ 2024-04-30 16:29 0% ` Dave Martin
0 siblings, 0 replies; 200+ results
From: Dave Martin @ 2024-04-30 16:29 UTC (permalink / raw)
To: Peter Newman
Cc: x86, linux-kernel, James Morse, Fenghua Yu, Reinette Chatre,
Thomas Gleixner, Ingo Molnar, Borislav Petkov, H Peter Anvin,
Babu Moger, shameerali.kolothum.thodi, D Scott Phillips OS, carl,
lcherian, bobo.shaobowang, Shaopeng Tan (Fujitsu),
baolin.wang, Jamie Iles, Xin Hao, dfustini, amitsinght,
David Hildenbrand, Rex Nie
Hi Peter,
On Mon, Apr 29, 2024 at 04:34:34PM -0700, Peter Newman wrote:
> Hi Dave (and James),
>
> On Fri, Apr 26, 2024 at 8:05 AM Dave Martin <Dave.Martin@arm.com> wrote:
> >
> > Hi all,
> >
> > This is a respin of the resctrl refactoring series described below,
> > addressing review feedback. Many thanks to those to responded with
> > feedback on the v1 series [2].
> >
> > See Notes and FYIs in the individual patches for details on the changes
> > and outstanding issues.
> >
> >
> > This series has not been rebased since the v1 posting, and remains
> > based on the following upstream commit:
> >
> > commit 23956900041d968f9ad0f30db6dede4daccd7aa9
> > Merge tag 'v6.9-rc-smb3-server-fixes' of git://git.samba.org/ksmbd
> >
> > The actual code changes against v1 are few in number and rather spread
> > around. For reviewer convenience, a diff against v1 is appended to
> > this cover letter.
> >
> > Due to the limited code changes, this series has *not* received any
> > additional runtime testing over than done for v1 (other than build
> > bisect testing).
> >
> > Cheers
> > ---Dave
> >
> >
> > [2] v1 series:
> > [PATCH v1 00/31] x86/resctrl: Move the resctrl filesystem code to /fs/resctrl
> > https://lore.kernel.org/all/20240321165106.31602-1-james.morse@arm.com/
> >
> > --8<-- Original blurb
> >
> > This is the final series that allows other architectures to implement resctrl.
> > The last patch just moves the code, and its a bit of a monster. I don't expect
> > that to get merged as part of this series - we should wait for it to make
> > less impact on other series. It's included here to show what gets moved, and
> > that structures/function-prototypes have the right visibility.
> >
> > Otherwise this series renames functions and moves code around. With the
> > exception of invalid configurations for the configurable-events, there should
> > be no changes in behaviour caused by this series.
> >
> > The driving pattern is to make things like struct rdtgroup private to resctrl.
> > Features like pseudo-lock aren't going to work on arm64, the ability to disable
> > it at compile time is added.
> >
> > After this, I can start posting the MPAM driver to make use of resctrl on arm64.
> > (What's MPAM? See the cover letter of the first series. [1])
> >
> > This series is based on Linus' commit 23956900041d and can be retrieved from:
> > https://git.kernel.org/pub/scm/linux/kernel/git/morse/linux.git
> > mpam/move_to_fs/v1
> >
> > Sorry for the mid-merge window base, I'm away for a few weeks - this should
> > rebase trivially onto rc1.
> >
> > As ever - bugs welcome,
> > Thanks,
> >
> > James
> >
> > [1] https://lore.kernel.org/lkml/20201030161120.227225-1-james.morse@arm.com/
> >
> > -->8--
> >
> >
> > Dave Martin (4):
> > x86/resctrl: Squelch whitespace anomalies in resctrl core code
> > x86/resctrl: Prefer alloc(sizeof(*foo)) idiom in rdt_init_fs_context()
> > x86/resctrl: Relax some asm #includes
> > [SQUASHME] x86/resctrl: Move the resctrl filesystem code to
> > /fs/resctrl
> >
> > James Morse (31):
> > x86/resctrl: Fix allocation of cleanest CLOSID on platforms with no
> > monitors
> > x86/resctrl: Add a helper to avoid reaching into the arch code
> > resource list
> > x86/resctrl: Move ctrlval string parsing policy away from the arch
> > code
> > x86/resctrl: Add helper for setting CPU default properties
> > x86/resctrl: Remove rdtgroup from update_cpu_closid_rmid()
> > x86/resctrl: Export resctrl fs's init function
> > x86/resctrl: Wrap resctrl_arch_find_domain() around rdt_find_domain()
> > x86/resctrl: Move resctrl types to a separate header
> > x86/resctrl: Add a resctrl helper to reset all the resources
> > x86/resctrl: Move monitor init work to a resctrl init call
> > x86/resctrl: Move monitor exit work to a resctrl exit call
> > x86/resctrl: Move max_{name,data}_width into resctrl code
> > x86/resctrl: Stop using the for_each_*_rdt_resource() walkers
> > x86/resctrl: Export the is_mbm_*_enabled() helpers to asm/resctrl.h
> > x86/resctrl: Add resctrl_arch_is_evt_configurable() to abstract BMEC
> > x86/resctrl: Change mon_event_config_{read,write}() to be arch helpers
> > x86/resctrl: Move mbm_cfg_mask to struct rdt_resource
> > x86/resctrl: Allow resctrl_arch_mon_event_config_write() to return an
> > error
> > x86/resctrl: Add resctrl_arch_ prefix to pseudo lock functions
> > x86/resctrl: Allow an architecture to disable pseudo lock
> > x86/resctrl: Make prefetch_disable_bits belong to the arch code
> > x86/resctrl: Make resctrl_arch_pseudo_lock_fn() take a plr
> > x86/resctrl: Move thread_throttle_mode_init() to be managed by resctrl
> > x86/resctrl: Move get_config_index() to a header
> > x86/resctrl: Claim get_domain_from_cpu() for resctrl
> > x86/resctrl: Describe resctrl's bitmap size assumptions
> > x86/resctrl: Rename resctrl_sched_in() to begin with "resctrl_arch_"
> > x86/resctrl: Drop __init/__exit on assorted symbols
> > fs/resctrl: Add boiler plate for external resctrl code
> > x86/resctrl: Move the filesystem bits to headers visible to fs/resctrl
> > x86/resctrl: Move the resctrl filesystem code to /fs/resctrl
> >
> > MAINTAINERS | 2 +
> > arch/Kconfig | 8 +
> > arch/x86/Kconfig | 5 +-
> > arch/x86/include/asm/resctrl.h | 45 +-
> > arch/x86/kernel/cpu/resctrl/Makefile | 5 +-
> > arch/x86/kernel/cpu/resctrl/core.c | 119 +-
> > arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 506 +--
> > arch/x86/kernel/cpu/resctrl/internal.h | 436 +--
> > arch/x86/kernel/cpu/resctrl/monitor.c | 813 +---
> > arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 1130 +-----
> > arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4205 +--------------------
> > arch/x86/kernel/process_32.c | 2 +-
> > arch/x86/kernel/process_64.c | 2 +-
> > fs/Kconfig | 1 +
> > fs/Makefile | 1 +
> > fs/resctrl/Kconfig | 36 +
> > fs/resctrl/Makefile | 3 +
> > fs/resctrl/ctrlmondata.c | 527 +++
> > fs/resctrl/internal.h | 338 ++
> > fs/resctrl/monitor.c | 843 +++++
> > fs/resctrl/pseudo_lock.c | 1122 ++++++
> > fs/resctrl/rdtgroup.c | 4013 ++++++++++++++++++++
> > include/linux/resctrl.h | 157 +-
> > include/linux/resctrl_types.h | 98 +
> > 24 files changed, 7402 insertions(+), 7015 deletions(-)
> > create mode 100644 fs/resctrl/Kconfig
> > create mode 100644 fs/resctrl/Makefile
> > create mode 100644 fs/resctrl/ctrlmondata.c
> > create mode 100644 fs/resctrl/internal.h
> > create mode 100644 fs/resctrl/monitor.c
> > create mode 100644 fs/resctrl/pseudo_lock.c
> > create mode 100644 fs/resctrl/rdtgroup.c
> > create mode 100644 include/linux/resctrl_types.h
>
> I was able to build a kernel with the changes and ran through our
> internal suite of functional tests on the following implementations:
>
> - AMD EPYC 7B12 64-Core Processor
> - Intel(R) Xeon(R) Platinum 8581C
>
> and the results looked good.
>
> Tested-by: Peter Newman <peternewman@google.com>
>
> Thanks!
>
Great, thanks for the testing!
Cheers
---Dave
^ permalink raw reply [relevance 0%]
* linux-next: Tree for Apr 30
@ 2024-04-30 7:04 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-04-30 7:04 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 41169 bytes --]
Hi all,
Changes since 20240429:
New tree: refactor-heap
The mm tree gained a build failure for which I reverted 2 commits.
The modules tree still has its boot failure for which I applied a
supplied patch.
The dmi tree gained a build failure for which I reverted a commit.
The kvm-x86 tree gained a conflict against the kvm-arm tree.
The iio tree gained a conflict against the iio-fixes tree.
Non-merge commits (relative to Linus' tree): 8727
8671 files changed, 571250 insertions(+), 199028 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 373 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (98369dccd2f8 Merge tag 'wq-for-6.9-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (bcf28f9e63d4 selftests/vDSO: fix runtime errors on LoongArch)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (daa1bd43e56b Merge tag 'mtk-soc-fixes-for-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into for-next)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (210cfef57926 selftests/powerpc/papr-vpd: Fix missing variable initialization)
Merging s390-fixes/fixes (b961ec10b9f9 s390/vdso: Add CFI for RA register to asm macro vdso_func)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (ba1cb99b559e Merge branch 'vxlan-stats')
Merging bpf/master (b867247555c4 Merge branch 'qed-error-codes')
Merging ipsec/master (58fbfecab965 xfrm: Preserve vlan tags for transport mode software GRO)
Merging netfilter/main (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs/main (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging wireless/for-next (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (c158cf914713 ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node())
Merging sound-asoc-fixes/for-linus (bda16500dd0b ASoC: rt715-sdca: volume step modification)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (ff33132605c1 regulator: change devm_regulator_get_enable_optional() stub to return Ok)
Merging spi-fixes/for-linus (7430764f5a85 spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging usb.current/usb-linus (f2004e82abb6 usb: typec: qcom-pmic: fix pdphy start() error handling)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (3c324a40b7c3 iio: temperature: mcp9600: Fix temperature reading for negative values)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (ee59be35d7a8 misc/pvpanic-pci: register attributes via pci_driver)
Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging thunderbolt-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging input-current/for-linus (be81415a32ef Input: xpad - add support for ASUS ROG RAIKIRI)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (44ecfa3e5f1c Merge branch 'svm' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH)
Merging btrfs-fixes/next-fixes (3550bc7dc848 Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (515a3c3a5489 platform/x86: ISST: Add Grand Ridge to HPM CPU list)
Merging samsung-krzk-fixes/fixes (da244c16ac58 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (e67572cd2204 Linux 6.9-rc6)
Merging drm-intel-fixes/for-linux-next-fixes (e67572cd2204 Linux 6.9-rc6)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (c714fcdf5b75 Merge tag 'intel-gpio-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-current)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (e67572cd2204 Linux 6.9-rc6)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (e67572cd2204 Linux 6.9-rc6)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (f8981b0d5295 Merge tag 'qcom-clk-fixes-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-fixes)
Merging drm-misc-fixes/for-linux-next-fixes (e4236b14fe32 drm/imagination: Ensure PVR_MIPS_PT_PAGE_COUNT is never zero)
Merging mm-stable/mm-stable (72801513b2bf mm: set pageblock_order to HPAGE_PMD_ORDER in case with !CONFIG_HUGETLB_PAGE but THP enabled)
Merging mm-nonmm-stable/mm-nonmm-stable (e02577872ff5 crash: add prefix for crash dumping messages)
Merging mm/mm-everything (3c2a0d2f0ca0 foo)
Applying: Revert "mm/vmscan: avoid split lazyfree THP during shrink_folio_list()"
Applying: Revert "mm/rmap: integrate PMD-mapped folio splitting into pagewalk loop"
Merging kbuild/for-next (060ef2b42249 kconfig: remove 'optional' property support)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (8c618b58c89c perf test: Reintroduce -p/--parallel and make -S/--sequential the default)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (7befe2ef9384 Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (4052ce07d5d7 perf/arm-spe: Assign parents for event_source device)
Merging arm-soc/for-next (c23c2ae92027 soc: document merges)
Merging amlogic/for-next (2b952b1d0a54 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (7f6f45a762c3 Merge branches 'v6.9-next/soc' and 'v6.9-next/dts64' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (99376e9b6f12 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (8dabf52bd8db Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (87e058864108 Merge branch 'fixes' into for-next)
Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
0087ca056c73 ("arm64: dts: st: add all 8 i2c nodes on stm32mp251")
2886ab7437de ("arm64: dts: st: add rcc support for STM32MP25")
385ca8e3841f ("arm64: dts: st: add spi3 / spi8 properties on stm32mp257f-ev1")
3e7d579c9fca ("ARM: dts: stm32: add ETZPC as a system bus for STM32MP15x boards")
4ef09379d765 ("arm64: dts: st: add i2c2 / i2c8 properties on stm32mp257f-ev1")
5e6b388d7bcb ("ARM: dts: stm32: move can3 node from stm32f746 to stm32f769")
7442597f90ba ("arm64: dts: st: add i2c2/i2c8 pins for stm32mp25")
7c12d95564a2 ("ARM: dts: stm32: add LTDC pinctrl on STM32MP13x SoC family")
7c3d4f99a920 ("ARM: dts: stm32: put ETZPC as an access controller for STM32MP15x boards")
808691f7389d ("media: dt-bindings: add access-controllers to STM32MP25 video codecs")
881bccce217e ("ARM: dts: stm32: add LTDC support for STM32MP13x SoC family")
8fe31699b83d ("bus: stm32_firewall: fix off by one in stm32_firewall_get_firewall()")
9e716b41a2b5 ("arm64: dts: st: add RIFSC as an access controller for STM32MP25x boards")
a012bd75abf6 ("ARM: dts: stm32: enable display support on stm32mp135f-dk board")
aee0ce48516c ("arm64: dts: st: add spi3/spi8 pins for stm32mp25")
be62e9c0c3fc ("bus: etzpc: introduce ETZPC firewall controller driver")
c7f2f2c0ace8 ("ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1")
cab43766e000 ("ARM: dts: stm32: add ETZPC as a system bus for STM32MP13x boards")
d3740a9fd78c ("dt-bindings: display: simple: allow panel-common properties")
dccdbccb7045 ("arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25")
de9b447d5678 ("ARM: dts: stm32: put ETZPC as an access controller for STM32MP13x boards")
ede58756bbe5 ("arm64: dts: st: add all 8 spi nodes on stm32mp251")
f798f7079233 ("ARM: dts: stm32: add PWR regulators support on stm32mp131")
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (9cedf91ec112 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (92e92dc84e17 Merge branch 'clk-scmi' into clk-next)
Merging clk-imx/for-next (5224b189462f clk: imx: add i.MX95 BLK CTL clk driver)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (f3334ebb8a2a LoongArch: Lately init pmu after smp is online)
Merging m68k/for-next (bd622532f7b3 m68k: amiga: Use str_plural() to fix Coccinelle warning)
Merging m68knommu/for-next (2595108e5842 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (487fa28fa8b6 parisc: Define sigset_t in parisc uapi header)
Merging powerpc/next (f318c8be797f powerpc/ptdump: Fix walk_vmemmap() to also print first vmemmap entry)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (849599b702ef powerpc/crash: add crash memory hotplug support)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (d866a7ef7a6e riscv: dts: thead: Fix node ordering in TH1520 device tree)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (e57f5e1df560 Merge branch 'shared-zeropage' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (48d85acdaa52 sparc: chmc: Convert to platform remove callback returning void)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros)
Merging bcachefs/for-next (59fa5f9ea20f bcachefs: Change destroy_inode to free_inode)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (d0af553021b4 Merge branch 'for-next-next-v6.9-20240425' into for-next-20240425)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (8f03ed91d75e smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (7ca906c7f7e5 Pull ext2 and isofs removal to PageError bit.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (3763f9effcdc f2fs: use helper to print zone condition)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (fa7e19337908 fuse: Add initial support for fs-verity)
Merging gfs2/for-next (1e86044402c4 gfs2: Remove and replace gfs2_glock_queue_work)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (bc642d7bfdac ksmbd: fix uninitialized symbol 'share' in smb2_tree_connect())
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (06cd86b25b98 SUNRPC: Remove comment for sp_lock)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (e58ac1770ded xfs: refactor dir format helpers)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (eea3260250ea Merge branch 'vfs.iomap' into vfs.all)
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (ccd0bdb57e31 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5deb5b56bccb i2c: smbus: fix NULL function pointer dereference)
Merging i2c-host/i2c/i2c-host (8a603d2c41de i2c: ali15x3: remove printout on handled timeouts)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (868577e6bfe1 firmware: dmi: Stop decoding on broken entry)
Merging hwmon-staging/hwmon-next (2ba3ec0d5d4a hwmon: (nzxt-kraken3) Add support for NZXT Kraken 2023 (standard and Elite) models)
Merging jc_docs/docs-next (fcb5bcefdbfb Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging v4l-dvb-next/master (4a7d735191de media: dw2102: fix coding style issues)
Merging pm/linux-next (92af2d44b4c3 Merge branch 'thermal-core' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (0cebf7cb2d70 pmdomain: core: Don't clear suspended_count at genpd_prepare())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (734b5def91b5 thermal/drivers/loongson2: Add Loongson-2K2000 support)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (f88320b698ad RDMA/mana_ib: Fix missing ret value)
Merging net-next/main (89de2db19317 Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next)
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/filter.h
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in kernel/bpf/core.c
Merging bpf-next/for-next (1bba3b3d373d selftests/bpf: validate nulled-out struct_ops program is handled properly)
Merging ipsec-next/master (aeb48a428d7d udpencap: Remove Obsolete UDP_ENCAP_ESPINUDP_NON_IKE Support)
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (b4208ba1661e Bluetooth: hci_conn: Use __counted_by() to avoid -Wfamnae warning)
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.c
Merging wireless-next/for-next (cc1380dd1882 wifi: brcmfmac: remove unused brcmf_usb_image struct)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1)
Merging crypto/master (ed265f7fd9a6 crypto: x86/aes-gcm - simplify GCM hash subkey derivation)
Merging drm/drm-next (b84bc948528e Merge v6.9-rc6 into drm-next)
Merging drm-exynos/for-linux-next (2236a61bd491 Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next)
Merging drm-misc/for-linux-next (75b68f22e39a drm: ci: fix the xfails for apq8016)
Merging amdgpu/drm-next (aa463cc850c4 drm/amd/display: Fix CFLAGS for dml2_core_dcn4_calcs.o)
Merging drm-intel/for-linux-next (41b088a26803 drm/i915/display: split out intel_sprite_regs.h from i915_reg.h)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (4caf410766ad drm/xe: Merge 16021540221 and 18034896535 WAs)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (6b844f0626fc Merge branch 'topic/emu10k1-fix' into for-next)
Merging ieee1394/for-next (b66fde5b9bc2 firewire: core: add tracepoints events for asynchronous outbound response)
Merging sound-asoc/for-next (8b56e4bd1abe Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (3c2c250cb3a5 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Applying: linux-next: boot failure after merge of the modules tree
Merging input/next (9e0631695eac input: pm8xxx-vibrator: add new SPMI vibrator support)
Merging block/for-next (518f377c90e5 Merge branch 'for-6.10/io_uring' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (83637d9017b2 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (e38063b94324 mmc: atmel-mci: Switch to use dev_err_probe())
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (84c1815e46bd Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (74560bb3685b lsm: remove the now superfluous sentinel element from ctl_table array)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (3c6e94beeacd Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (ef6e717d93c7 Merge branches 'arm/renesas', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (669430b183fc of: property: fw_devlink: Add support for "power-supplies" binding)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU)
Merging spi/for-next (cecfc48904cf Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (d2b316f5173d Merge branch into tip/master: 'x86/shstk')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (03db22b93a01 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (b93b7b4635f1 ftrace: Asynchronous grace period for register_ftrace_direct())
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kvm/next (a96cb3bf390e Merge x86 bugfixes from Linux 6.9-rc3)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging kvm-arm/next (135c8fabdedd Merge branch kvm-arm64/lpi-xa-cache into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (2489e6c9ebb5 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx')
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/aarch64/psci_test.c
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (5c94664cf279 platform/x86: asus-laptop: Use sysfs_emit() and sysfs_emit_at() to replace sprintf())
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion)
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (e5019b14230a Merge 6.9-rc5 into driver-core-next)
Merging usb/usb-next (3f12222a4beb usb: dwc3: core: Fix compile warning on s390 gcc in dwc3_get_phy call)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/core.c
Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev"
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (660a70809856 Merge 6.9-rc5 into tty-next)
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (0b6896838d6a Merge tag 'w1-drv-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1 into char-misc-next)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (2d7e8a64a1e7 coresight: Docs/ABI/testing/sysfs-bus-coresight-devices: Fix spelling errors)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (80721776c5af iio: adc: axi-adc: make sure AXI clock is enabled)
CONFLICT (content): Merge conflict in drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
Merging phy-next/next (9c79b779643e phy: rockchip: fix CONFIG_TYPEC dependency)
Merging soundwire/next (a36ec5f7625d soundwire: intel_ace2x: simplify check_wake())
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (848e447e000c vfio/cdx: add interrupt support)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (ee2098c0b512 spmi: pmic-arb: Add multi bus support)
Merging staging/staging-next (75ff53c44f5e staging: vc04_services: Drop completed TODO item)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (700b2e1eccb4 dmaengine: xilinx: xdma: fix module autoloading)
Merging cgroup/for-next (b7d56d953a67 cgroup/cpuset: Remove outdated comment in sched_partition_write())
Merging scsi/for-next (8c5220c43ba0 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (aca061774bc4 scsi: mpi3mr: Fix some kernel-doc warnings in scsi_bsg_mpi3mr.h)
Merging vhost/linux-next (24ddee0ff8c3 Merge tag 'stable/vduse-virtio-net' into vhost)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (87f678f813d9 Merge branches 'rproc-next' and 'rpmsg-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (5539287ca656 gpio: brcmstb: add support for gpio-ranges)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (f3953d6d4f60 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (f9c744747973 pinctrl: samsung: support a bus clock)
Merging pwm/pwm/for-next (6144744bb9a8 pwm: meson: Use mul_u64_u64_div_u64() for frequency calculating)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (693fe2f6a9ea selftests: kselftest: Make ksft_exit functions return void instead of int)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (aa892c2e7919 kunit: string-stream-test: use KUNIT_DEFINE_ACTION_WRAPPER)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (62dba604a488 cxl/hdm: Debug, use decoder name function)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (b3d8a8e87014 slub: use count_partial_free_approx() in slab_out_of_memory())
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (046892f93be4 MAINTAINERS: Add Günther Noack as Landlock reviewer)
Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature)
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (10e29251be0e binfmt_elf_fdpic: fix /proc/<pid>/auxv)
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (207fa4298699 kunit/fortify: Add memcpy() tests)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (c9d066401193 tools/power turbostat: version 2024.04.27)
Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Applying: Revert "firmware: dmi: Stop decoding on broken entry"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Re: query fs info level 0x100
2024-04-29 17:11 0% ` Jeremy Allison
@ 2024-04-30 3:30 0% ` Steve French
0 siblings, 0 replies; 200+ results
From: Steve French @ 2024-04-30 3:30 UTC (permalink / raw)
To: Jeremy Allison; +Cc: Ralph Boehme, samba-technical, CIFS
Worked for me. You can add my Reviewed-by and Tested-by if you want.
On Mon, Apr 29, 2024 at 12:11 PM Jeremy Allison <jra@samba.org> wrote:
>
> On Mon, Apr 29, 2024 at 06:44:39PM +0200, Ralph Boehme wrote:
> >On 4/29/24 6:13 PM, Steve French wrote:
> >>But the (current Samba) server fails the level 100 (level 0x64 in hex)
> >>FS_POSIX_INFO with "STATUS_INVALID_ERROR_CLASS"
> >>which causes all xfstests to break since they can't verify the mount
> >>(e.g. with "stat -f").
> >>Nothing related to this on the client has changed, and ksmbd has
> >>always supported this so works fine there.
> >
> >ah, I broke it. Fix attached. Really embarrassing...
>
> Double embarrassing, I +1 reviewed it. So sorry for the bug :-(.
--
Thanks,
Steve
^ permalink raw reply [relevance 0%]
* Re: [PATCH v2 00/35] x86/resctrl: Move the resctrl filesystem code to /fs/resctrl
2024-04-26 15:05 1% [PATCH v2 00/35] x86/resctrl: Move the resctrl filesystem code to /fs/resctrl Dave Martin
@ 2024-04-29 23:34 0% ` Peter Newman
2024-04-30 16:29 0% ` Dave Martin
0 siblings, 1 reply; 200+ results
From: Peter Newman @ 2024-04-29 23:34 UTC (permalink / raw)
To: Dave Martin
Cc: x86, linux-kernel, James Morse, Fenghua Yu, Reinette Chatre,
Thomas Gleixner, Ingo Molnar, Borislav Petkov, H Peter Anvin,
Babu Moger, shameerali.kolothum.thodi, D Scott Phillips OS, carl,
lcherian, bobo.shaobowang, Shaopeng Tan (Fujitsu),
baolin.wang, Jamie Iles, Xin Hao, dfustini, amitsinght,
David Hildenbrand, Rex Nie
Hi Dave (and James),
On Fri, Apr 26, 2024 at 8:05 AM Dave Martin <Dave.Martin@arm.com> wrote:
>
> Hi all,
>
> This is a respin of the resctrl refactoring series described below,
> addressing review feedback. Many thanks to those to responded with
> feedback on the v1 series [2].
>
> See Notes and FYIs in the individual patches for details on the changes
> and outstanding issues.
>
>
> This series has not been rebased since the v1 posting, and remains
> based on the following upstream commit:
>
> commit 23956900041d968f9ad0f30db6dede4daccd7aa9
> Merge tag 'v6.9-rc-smb3-server-fixes' of git://git.samba.org/ksmbd
>
> The actual code changes against v1 are few in number and rather spread
> around. For reviewer convenience, a diff against v1 is appended to
> this cover letter.
>
> Due to the limited code changes, this series has *not* received any
> additional runtime testing over than done for v1 (other than build
> bisect testing).
>
> Cheers
> ---Dave
>
>
> [2] v1 series:
> [PATCH v1 00/31] x86/resctrl: Move the resctrl filesystem code to /fs/resctrl
> https://lore.kernel.org/all/20240321165106.31602-1-james.morse@arm.com/
>
> --8<-- Original blurb
>
> This is the final series that allows other architectures to implement resctrl.
> The last patch just moves the code, and its a bit of a monster. I don't expect
> that to get merged as part of this series - we should wait for it to make
> less impact on other series. It's included here to show what gets moved, and
> that structures/function-prototypes have the right visibility.
>
> Otherwise this series renames functions and moves code around. With the
> exception of invalid configurations for the configurable-events, there should
> be no changes in behaviour caused by this series.
>
> The driving pattern is to make things like struct rdtgroup private to resctrl.
> Features like pseudo-lock aren't going to work on arm64, the ability to disable
> it at compile time is added.
>
> After this, I can start posting the MPAM driver to make use of resctrl on arm64.
> (What's MPAM? See the cover letter of the first series. [1])
>
> This series is based on Linus' commit 23956900041d and can be retrieved from:
> https://git.kernel.org/pub/scm/linux/kernel/git/morse/linux.git
> mpam/move_to_fs/v1
>
> Sorry for the mid-merge window base, I'm away for a few weeks - this should
> rebase trivially onto rc1.
>
> As ever - bugs welcome,
> Thanks,
>
> James
>
> [1] https://lore.kernel.org/lkml/20201030161120.227225-1-james.morse@arm.com/
>
> -->8--
>
>
> Dave Martin (4):
> x86/resctrl: Squelch whitespace anomalies in resctrl core code
> x86/resctrl: Prefer alloc(sizeof(*foo)) idiom in rdt_init_fs_context()
> x86/resctrl: Relax some asm #includes
> [SQUASHME] x86/resctrl: Move the resctrl filesystem code to
> /fs/resctrl
>
> James Morse (31):
> x86/resctrl: Fix allocation of cleanest CLOSID on platforms with no
> monitors
> x86/resctrl: Add a helper to avoid reaching into the arch code
> resource list
> x86/resctrl: Move ctrlval string parsing policy away from the arch
> code
> x86/resctrl: Add helper for setting CPU default properties
> x86/resctrl: Remove rdtgroup from update_cpu_closid_rmid()
> x86/resctrl: Export resctrl fs's init function
> x86/resctrl: Wrap resctrl_arch_find_domain() around rdt_find_domain()
> x86/resctrl: Move resctrl types to a separate header
> x86/resctrl: Add a resctrl helper to reset all the resources
> x86/resctrl: Move monitor init work to a resctrl init call
> x86/resctrl: Move monitor exit work to a resctrl exit call
> x86/resctrl: Move max_{name,data}_width into resctrl code
> x86/resctrl: Stop using the for_each_*_rdt_resource() walkers
> x86/resctrl: Export the is_mbm_*_enabled() helpers to asm/resctrl.h
> x86/resctrl: Add resctrl_arch_is_evt_configurable() to abstract BMEC
> x86/resctrl: Change mon_event_config_{read,write}() to be arch helpers
> x86/resctrl: Move mbm_cfg_mask to struct rdt_resource
> x86/resctrl: Allow resctrl_arch_mon_event_config_write() to return an
> error
> x86/resctrl: Add resctrl_arch_ prefix to pseudo lock functions
> x86/resctrl: Allow an architecture to disable pseudo lock
> x86/resctrl: Make prefetch_disable_bits belong to the arch code
> x86/resctrl: Make resctrl_arch_pseudo_lock_fn() take a plr
> x86/resctrl: Move thread_throttle_mode_init() to be managed by resctrl
> x86/resctrl: Move get_config_index() to a header
> x86/resctrl: Claim get_domain_from_cpu() for resctrl
> x86/resctrl: Describe resctrl's bitmap size assumptions
> x86/resctrl: Rename resctrl_sched_in() to begin with "resctrl_arch_"
> x86/resctrl: Drop __init/__exit on assorted symbols
> fs/resctrl: Add boiler plate for external resctrl code
> x86/resctrl: Move the filesystem bits to headers visible to fs/resctrl
> x86/resctrl: Move the resctrl filesystem code to /fs/resctrl
>
> MAINTAINERS | 2 +
> arch/Kconfig | 8 +
> arch/x86/Kconfig | 5 +-
> arch/x86/include/asm/resctrl.h | 45 +-
> arch/x86/kernel/cpu/resctrl/Makefile | 5 +-
> arch/x86/kernel/cpu/resctrl/core.c | 119 +-
> arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 506 +--
> arch/x86/kernel/cpu/resctrl/internal.h | 436 +--
> arch/x86/kernel/cpu/resctrl/monitor.c | 813 +---
> arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 1130 +-----
> arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4205 +--------------------
> arch/x86/kernel/process_32.c | 2 +-
> arch/x86/kernel/process_64.c | 2 +-
> fs/Kconfig | 1 +
> fs/Makefile | 1 +
> fs/resctrl/Kconfig | 36 +
> fs/resctrl/Makefile | 3 +
> fs/resctrl/ctrlmondata.c | 527 +++
> fs/resctrl/internal.h | 338 ++
> fs/resctrl/monitor.c | 843 +++++
> fs/resctrl/pseudo_lock.c | 1122 ++++++
> fs/resctrl/rdtgroup.c | 4013 ++++++++++++++++++++
> include/linux/resctrl.h | 157 +-
> include/linux/resctrl_types.h | 98 +
> 24 files changed, 7402 insertions(+), 7015 deletions(-)
> create mode 100644 fs/resctrl/Kconfig
> create mode 100644 fs/resctrl/Makefile
> create mode 100644 fs/resctrl/ctrlmondata.c
> create mode 100644 fs/resctrl/internal.h
> create mode 100644 fs/resctrl/monitor.c
> create mode 100644 fs/resctrl/pseudo_lock.c
> create mode 100644 fs/resctrl/rdtgroup.c
> create mode 100644 include/linux/resctrl_types.h
I was able to build a kernel with the changes and ran through our
internal suite of functional tests on the following implementations:
- AMD EPYC 7B12 64-Core Processor
- Intel(R) Xeon(R) Platinum 8581C
and the results looked good.
Tested-by: Peter Newman <peternewman@google.com>
Thanks!
^ permalink raw reply [relevance 0%]
* Re: Samba ctime still reported incorrectly
2024-04-29 17:17 0% ` Jeremy Allison
@ 2024-04-29 19:27 0% ` Ralph Boehme
0 siblings, 0 replies; 200+ results
From: Ralph Boehme @ 2024-04-29 19:27 UTC (permalink / raw)
To: Jeremy Allison; +Cc: Steve French, CIFS, samba-technical
[-- Attachment #1.1: Type: text/plain, Size: 2515 bytes --]
On 4/29/24 7:17 PM, Jeremy Allison wrote:
> On Mon, Apr 29, 2024 at 10:51:21AM +0200, Ralph Boehme wrote:
>> Hi Steve,
>>
>> On 4/28/24 9:41 PM, Steve French via samba-technical wrote:
>>> I did another test of the Samba server ctime bug on Samba master
>>> (4.21.0pre1) and Samba server is still broken in how it reports ctime.
>>> An example scenario is simple, creating a hardlink is supposed to
>>> update ctime on a file (and this works fine to Windows server and
>>> ksmbd etc) but Samba server mistakenly reports ctime as mtime (unless
>>> you mount with the "posix" mount option). This e.g. breaks xfstest
>>> generic/236 when run to Samba
>>>
>>> More information is at:
>>> https://bugzilla.samba.org/show_bug.cgi?id=10883
>>
>> I wonder if this is a bug going back as far as
>> c9dca82ed7757f4745edf6ee6048bd94d86c4dbc
>>
>> @Jeremy: do you remember why you chose to return mtime in
>> get_change_timespec() and not ctime?
>
> If you look closely at that commit, you'll see
> that it's actually not changing the logic that
> previously existed :-).
yeah, sure, but it was a decent refactoring so I was wondering whether
you'd considered the actual logic you were touching was correct. :)
>
> - put_long_date_timespec(p, m_timespec); /* change time */
> + put_long_date_timespec(p, c_timespec); /* change time */
>
> Previously we were using m_timespec as change time,
> and c_timespec in this change now comes from:
>
> + c_timespec = get_change_timespec(fsp, smb_fname);
>
> +struct timespec get_change_timespec(struct files_struct *fsp,
> + const struct smb_filename *smb_fname)
> +{
> + return smb_fname->st.st_ex_mtime;
> +}
>
> So I actually wasn't changing what we already were
> doing :-).
>
> Now as to *why* we were using m_time instead of c_time,
> my guess is that we were trying to emulate NTFS
> semantics which were not documented or well understood at the
> time (where "the time" is probably prior to 2009 :-).
Hm, so what do we do? MS-FSA seems to indicate NTFS ctime has pretty
much the same semantics as POSIX ctime:
2.1.1.3 Per File
LastChangeTime: The time that identifies when the file metadata or
contents were last changed in the FILETIME format specified in [MS-FSCC]
section 2.1.1.
Let's see how many tests complain:
<https://gitlab.com/samba-team/devel/samba/-/pipelines/1272333543>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [relevance 0%]
* Re: Samba ctime still reported incorrectly
2024-04-29 8:51 0% ` Ralph Boehme
@ 2024-04-29 17:17 0% ` Jeremy Allison
2024-04-29 19:27 0% ` Ralph Boehme
0 siblings, 1 reply; 200+ results
From: Jeremy Allison @ 2024-04-29 17:17 UTC (permalink / raw)
To: Ralph Boehme; +Cc: Steve French, CIFS, samba-technical
On Mon, Apr 29, 2024 at 10:51:21AM +0200, Ralph Boehme wrote:
>Hi Steve,
>
>On 4/28/24 9:41 PM, Steve French via samba-technical wrote:
>>I did another test of the Samba server ctime bug on Samba master
>>(4.21.0pre1) and Samba server is still broken in how it reports ctime.
>>An example scenario is simple, creating a hardlink is supposed to
>>update ctime on a file (and this works fine to Windows server and
>>ksmbd etc) but Samba server mistakenly reports ctime as mtime (unless
>>you mount with the "posix" mount option). This e.g. breaks xfstest
>>generic/236 when run to Samba
>>
>>More information is at:
>>https://bugzilla.samba.org/show_bug.cgi?id=10883
>
>I wonder if this is a bug going back as far as
>c9dca82ed7757f4745edf6ee6048bd94d86c4dbc
>
>@Jeremy: do you remember why you chose to return mtime in
>get_change_timespec() and not ctime?
If you look closely at that commit, you'll see
that it's actually not changing the logic that
previously existed :-).
- put_long_date_timespec(p, m_timespec); /* change time */
+ put_long_date_timespec(p, c_timespec); /* change time */
Previously we were using m_timespec as change time,
and c_timespec in this change now comes from:
+ c_timespec = get_change_timespec(fsp, smb_fname);
+struct timespec get_change_timespec(struct files_struct *fsp,
+ const struct smb_filename *smb_fname)
+{
+ return smb_fname->st.st_ex_mtime;
+}
So I actually wasn't changing what we already were
doing :-).
Now as to *why* we were using m_time instead of c_time,
my guess is that we were trying to emulate NTFS
semantics which were not documented or well understood at the
time (where "the time" is probably prior to 2009 :-).
^ permalink raw reply [relevance 0%]
* Re: query fs info level 0x100
2024-04-29 16:44 0% ` Ralph Boehme
@ 2024-04-29 17:11 0% ` Jeremy Allison
2024-04-30 3:30 0% ` Steve French
0 siblings, 1 reply; 200+ results
From: Jeremy Allison @ 2024-04-29 17:11 UTC (permalink / raw)
To: Ralph Boehme; +Cc: Steve French, samba-technical, CIFS
On Mon, Apr 29, 2024 at 06:44:39PM +0200, Ralph Boehme wrote:
>On 4/29/24 6:13 PM, Steve French wrote:
>>But the (current Samba) server fails the level 100 (level 0x64 in hex)
>>FS_POSIX_INFO with "STATUS_INVALID_ERROR_CLASS"
>>which causes all xfstests to break since they can't verify the mount
>>(e.g. with "stat -f").
>>Nothing related to this on the client has changed, and ksmbd has
>>always supported this so works fine there.
>
>ah, I broke it. Fix attached. Really embarrassing...
Double embarrassing, I +1 reviewed it. So sorry for the bug :-(.
^ permalink raw reply [relevance 0%]
* Re: query fs info level 0x100
2024-04-29 16:13 4% ` Steve French
2024-04-29 16:37 0% ` Stefan Metzmacher
@ 2024-04-29 16:44 0% ` Ralph Boehme
2024-04-29 17:11 0% ` Jeremy Allison
1 sibling, 1 reply; 200+ results
From: Ralph Boehme @ 2024-04-29 16:44 UTC (permalink / raw)
To: Steve French; +Cc: samba-technical, Jeremy Allison, CIFS
[-- Attachment #1.1.1: Type: text/plain, Size: 445 bytes --]
On 4/29/24 6:13 PM, Steve French wrote:
> But the (current Samba) server fails the level 100 (level 0x64 in hex)
> FS_POSIX_INFO with "STATUS_INVALID_ERROR_CLASS"
> which causes all xfstests to break since they can't verify the mount
> (e.g. with "stat -f").
> Nothing related to this on the client has changed, and ksmbd has
> always supported this so works fine there.
ah, I broke it. Fix attached. Really embarrassing...
-slow
[-- Attachment #1.1.2: bug15639-master.patch --]
[-- Type: text/x-patch, Size: 989 bytes --]
From 3862563582683f86a1fd5d25422b3137f1b05141 Mon Sep 17 00:00:00 2001
From: Ralph Boehme <slow@samba.org>
Date: Mon, 29 Apr 2024 18:38:10 +0200
Subject: [PATCH] smbd: SMB3 POSIX Extensions statfs() is broken
Regression introduced by 55d98b29eb294542cc4947573f233e0d5e6966cb. D'oh!
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15639
Signed-off-by: Ralph Boehme <slow@samba.org>
---
source3/smbd/smb2_trans2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index 5198a04a74c6..8e122025d283 100644
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -1991,7 +1991,7 @@ static bool fsinfo_unix_valid_level(connection_struct *conn,
uint16_t info_level)
{
if (conn_using_smb2(conn->sconn) &&
- fsp->posix_flags == FSP_POSIX_FLAGS_OPEN &&
+ (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) &&
info_level == SMB2_FS_POSIX_INFORMATION_INTERNAL)
{
return true;
--
2.44.0
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply related [relevance 0%]
* Re: query fs info level 0x100
2024-04-29 16:13 4% ` Steve French
@ 2024-04-29 16:37 0% ` Stefan Metzmacher
2024-04-29 16:44 0% ` Ralph Boehme
1 sibling, 0 replies; 200+ results
From: Stefan Metzmacher @ 2024-04-29 16:37 UTC (permalink / raw)
To: Steve French, Ralph Boehme
Cc: CIFS, Volker.Lendecke, samba-technical, Jeremy Allison
Am 29.04.24 um 18:13 schrieb Steve French via samba-technical:
> On Mon, Apr 29, 2024 at 12:31 AM Ralph Boehme <slow@samba.org> wrote:
>>
>> On 4/29/24 1:27 AM, Steve French wrote:
>>> Trying some xfstests to current Samba (master branch, Samba 4.21),
>>> they fail because query fs info (level 0x100) is returning
>>> STATUS_INVALID_INFO_CLASS) - this works to ksmbd and I thought it used
>>> to work to Samba. I do see the SMB3.1.1 opens with the POSIX open
>>> context works - but the query fs info failing causes xfstests to fail.
>>>
>>> Is that missing rom current mainline Samba?
>>
>> have you enabled SMB3 UNIX Extensions?
>>
>> smb3 unix extensions = yes
>
> Yes - it is set to yes in the smb.conf for both the global section and
> the per share section
>
> I also see that POSIX extensions in:
> 1) the server returns posix negotiation context in the SMB3.1.1
> negotiate protocol response
> 2) the server returns the level 100 (FILE_POSIX_INFO) query info responses
>
> But the (current Samba) server fails the level 100 (level 0x64 in hex)
> FS_POSIX_INFO with "STATUS_INVALID_ERROR_CLASS"
> which causes all xfstests to break since they can't verify the mount
> (e.g. with "stat -f").
> Nothing related to this on the client has changed, and ksmbd has
> always supported this so works fine there.
I guess fsinfo_unix_valid_level() needs
fsp->posix_flags & FSP_POSIX_FLAGS_OPEN
instead of
fsp->posix_flags == FSP_POSIX_FLAGS_OPEN
In smbd_do_qfilepathinfo() we do the check with '&' instead of '=='.
metze
^ permalink raw reply [relevance 0%]
* Re: query fs info level 0x100
2024-04-29 5:31 0% ` Ralph Boehme
@ 2024-04-29 16:13 4% ` Steve French
2024-04-29 16:37 0% ` Stefan Metzmacher
2024-04-29 16:44 0% ` Ralph Boehme
0 siblings, 2 replies; 200+ results
From: Steve French @ 2024-04-29 16:13 UTC (permalink / raw)
To: Ralph Boehme; +Cc: samba-technical, Volker.Lendecke, Jeremy Allison, CIFS
On Mon, Apr 29, 2024 at 12:31 AM Ralph Boehme <slow@samba.org> wrote:
>
> On 4/29/24 1:27 AM, Steve French wrote:
> > Trying some xfstests to current Samba (master branch, Samba 4.21),
> > they fail because query fs info (level 0x100) is returning
> > STATUS_INVALID_INFO_CLASS) - this works to ksmbd and I thought it used
> > to work to Samba. I do see the SMB3.1.1 opens with the POSIX open
> > context works - but the query fs info failing causes xfstests to fail.
> >
> > Is that missing rom current mainline Samba?
>
> have you enabled SMB3 UNIX Extensions?
>
> smb3 unix extensions = yes
Yes - it is set to yes in the smb.conf for both the global section and
the per share section
I also see that POSIX extensions in:
1) the server returns posix negotiation context in the SMB3.1.1
negotiate protocol response
2) the server returns the level 100 (FILE_POSIX_INFO) query info responses
But the (current Samba) server fails the level 100 (level 0x64 in hex)
FS_POSIX_INFO with "STATUS_INVALID_ERROR_CLASS"
which causes all xfstests to break since they can't verify the mount
(e.g. with "stat -f").
Nothing related to this on the client has changed, and ksmbd has
always supported this so works fine there.
--
Thanks,
Steve
^ permalink raw reply [relevance 4%]
* Re: [RFC PATCH net-next 0/5] net: In-kernel QUIC implementation with Userspace handshake
2024-04-25 18:06 5% ` Xin Long
@ 2024-04-29 15:20 0% ` Stefan Metzmacher
2024-05-02 18:08 6% ` Xin Long
0 siblings, 1 reply; 200+ results
From: Stefan Metzmacher @ 2024-04-29 15:20 UTC (permalink / raw)
To: Xin Long
Cc: network dev, davem, kuba, Eric Dumazet, Paolo Abeni,
Steve French, Namjae Jeon, Chuck Lever III, Jeff Layton,
Sabrina Dubroca, Tyler Fanelli, Pengtao He, linux-cifs,
Samba Technical
Hi Xin Long,
>>
> Just confirmed from other ebpf experts, there are no in-kernel interfaces
> for loading and interacting with BPF maps/programs(other than from BPF itself).
>
> It seems that we have to do this match in QUIC stack. In the latest QUIC
> code, I added quic_packet_get_alpn(), a 59-line function, to parse ALPNs
> and then it will search for the listen sock with these ALPNs in
> quic_sock_lookup().
>
> I introduced 'alpn_match' module param, and it can be enabled when loading
> the module QUIC by:
>
> # modprobe quic alpn_match=1
>
> You can test it by tests/sample_test in the latest code:
>
> Start 3 servers:
>
> # ./sample_test server 0.0.0.0 1234 \
> ./keys/server-key.pem ./keys/server-cert.pem smbd
> # ./sample_test server 0.0.0.0 1234 \
> ./keys/server-key.pem ./keys/server-cert.pem h3
> # ./sample_test server 0.0.0.0 1234 \
> ./keys/server-key.pem ./keys/server-cert.pem ksmbd
>
> Try to connect on clients with:
>
> # ./sample_test client 127.0.0.1 1234 ksmbd
> # ./sample_test client 127.0.0.1 1234 smbd
> # ./sample_test client 127.0.0.1 1234 h3
>
> to see if the corresponding server responds.
>
> There might be some concerns but it's also a useful feature that can not
> be implemented in userland QUICs. The commit is here:
>
> https://github.com/lxin/quic/commit/de82f8135f4e9196b503b4ab5b359d88f2b2097f
>
> Please check if this is enough for SMB applications.
It look great thanks!
> Note as a listen socket is now identified by [address + port + ALPN] when
> alpn_match=1, this feature does NOT require SO_REUSEPORT socket option to
> be set, unless one wants multiple sockets to listen to
> the same [address + port + ALPN].
I'd argue that this should be the default and be required before listen()
or maybe before bind(), so that it can return EADDRINUSE. As EADDRINUSE should only
happen for servers it might be useful to have a QUIC_SOCKOPT_LISTEN_ALPN instead of
QUIC_SOCKOPT_ALPN. As QUIC_SOCKOPT_ALPN on a client socket should not generate let
bind() care about the alpn value at all.
For listens on tcp you also need to specify an explicit port (at least in order
to be useful).
And it would mean that all application would use it and not block other applications
from using an explicit alpn.
Also an module parameter for this means the administrator would have to take care
of it, which means it might be unuseable if loaded with it.
I hope to find some time in the next weeks to play with this.
Should be relatively trivial create a prototype for samba's smbd.
Thanks!
metze
^ permalink raw reply [relevance 0%]
* Re: Samba ctime still reported incorrectly
2024-04-28 19:41 4% Samba ctime still reported incorrectly Steve French
@ 2024-04-29 8:51 0% ` Ralph Boehme
2024-04-29 17:17 0% ` Jeremy Allison
0 siblings, 1 reply; 200+ results
From: Ralph Boehme @ 2024-04-29 8:51 UTC (permalink / raw)
To: Steve French, Jeremy Allison; +Cc: CIFS, samba-technical
[-- Attachment #1.1: Type: text/plain, Size: 816 bytes --]
Hi Steve,
On 4/28/24 9:41 PM, Steve French via samba-technical wrote:
> I did another test of the Samba server ctime bug on Samba master
> (4.21.0pre1) and Samba server is still broken in how it reports ctime.
> An example scenario is simple, creating a hardlink is supposed to
> update ctime on a file (and this works fine to Windows server and
> ksmbd etc) but Samba server mistakenly reports ctime as mtime (unless
> you mount with the "posix" mount option). This e.g. breaks xfstest
> generic/236 when run to Samba
>
> More information is at:
> https://bugzilla.samba.org/show_bug.cgi?id=10883
I wonder if this is a bug going back as far as
c9dca82ed7757f4745edf6ee6048bd94d86c4dbc
@Jeremy: do you remember why you chose to return mtime in
get_change_timespec() and not ctime?
-slow
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [relevance 0%]
* linux-next: Tree for Apr 29
@ 2024-04-29 7:20 1% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-04-29 7:20 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 41018 bytes --]
Hi all,
Changes since 20240426:
New tree: turbostat
The net-next tree gained a conflict against the mm tree.
The bpf-next tree gained a conflict against the net tree.
The drm-xe tree gained a conflict against the drm tree.
The iommu tree gained a conflict against the pm tree.
The modules tree still has its boot failure for which I applied a
supplied patch.
The random tree gained a conflict against the pm tree.
Non-merge commits (relative to Linus' tree): 8469
8410 files changed, 563149 insertions(+), 195299 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 372 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (e67572cd2204 Linux 6.9-rc6)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (de50568a6bfb mm/vmalloc: fix return value of vb_alloc if size is 0)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (61231eb8113c ARC: [plat-hsdk]: Remove misplaced interrupt-cells property)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (daa1bd43e56b Merge tag 'mtk-soc-fixes-for-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into for-next)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (210cfef57926 selftests/powerpc/papr-vpd: Fix missing variable initialization)
Merging s390-fixes/fixes (b961ec10b9f9 s390/vdso: Add CFI for RA register to asm macro vdso_func)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (b2ff42c6d3ab Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging bpf/master (b2ff42c6d3ab Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging ipsec/master (8b06a24bb625 xfrm: fix possible derferencing in error path)
Merging netfilter/main (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs/main (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging wireless/for-next (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (15c7e87aa88f ALSA: emu10k1: make E-MU FPGA writes potentially more reliable)
Merging sound-asoc-fixes/for-linus (bda16500dd0b ASoC: rt715-sdca: volume step modification)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (ff33132605c1 regulator: change devm_regulator_get_enable_optional() stub to return Ok)
Merging spi-fixes/for-linus (7430764f5a85 spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging usb.current/usb-linus (f2004e82abb6 usb: typec: qcom-pmic: fix pdphy start() error handling)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (d7230b995246 iio: invensense: fix timestamp glitches when switching frequency)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (4108a30f1097 mei: me: add lunar lake point M DID)
Merging soundwire-fixes/fixes (63dc588e7af1 soundwire: amd: fix for wake interrupt handling for clockstop mode)
Merging thunderbolt-fixes/fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging input-current/for-linus (be81415a32ef Input: xpad - add support for ASUS ROG RAIKIRI)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (f221033f5c24 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (44ecfa3e5f1c Merge branch 'svm' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (4b759dd57655 cxl/core: Fix potential payload size confusion in cxl_mem_get_poison())
Merging btrfs-fixes/next-fixes (3550bc7dc848 Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (f609e7b1b49e platform/x86/amd/pmc: Extend Framework 13 quirk to more BIOSes)
Merging samsung-krzk-fixes/fixes (da244c16ac58 clk: samsung: Revert "clk: Use device_get_match_data()")
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (3a8534035c07 Merge tag 'drm-xe-fixes-2024-04-25' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (c714fcdf5b75 Merge tag 'intel-gpio-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-current)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (19843452dca4 rust: remove `params` from `module` macro example)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (f8981b0d5295 Merge tag 'qcom-clk-fixes-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-fixes)
Merging drm-misc-fixes/for-linux-next-fixes (27906e5d7824 drm/ttm: Print the memory decryption status just once)
Merging mm-stable/mm-stable (72801513b2bf mm: set pageblock_order to HPAGE_PMD_ORDER in case with !CONFIG_HUGETLB_PAGE but THP enabled)
Merging mm-nonmm-stable/mm-nonmm-stable (95982a76bb50 crash: add prefix for crash dumping messages)
14c7095a68e0 ("LoongArch/tlb: fix "error: parameter 'ptep' set but not used" due to __tlb_remove_tlb_entry()")
Merging mm/mm-everything (0e7486112abe foo)
Merging kbuild/for-next (060ef2b42249 kconfig: remove 'optional' property support)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (8c618b58c89c perf test: Reintroduce -p/--parallel and make -S/--sequential the default)
cd88c11c6d89 ("tools lib rbtree: Pick some improvements from the kernel rbtree code")
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (7befe2ef9384 Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (4052ce07d5d7 perf/arm-spe: Assign parents for event_source device)
Merging arm-soc/for-next (daa1bd43e56b Merge tag 'mtk-soc-fixes-for-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into for-next)
Merging amlogic/for-next (2b952b1d0a54 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (086035cda928 arm64: dts: mediatek: mt8188: add lvts definitions)
244490a729c6 ("soc: mediatek: mtk-svs: Append "-thermal" to thermal zone names")
a452af6b1e66 ("soc: mediatek: mtk-socinfo: depends on CONFIG_SOC_BUS")
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (99376e9b6f12 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (8dabf52bd8db Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (f19aa4422b2c Merge branch 'fixes' into for-next)
Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next)
Merging ti/ti-next (4c4ee097c795 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (92e92dc84e17 Merge branch 'clk-scmi' into clk-next)
Merging clk-imx/for-next (5224b189462f clk: imx: add i.MX95 BLK CTL clk driver)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (f3334ebb8a2a LoongArch: Lately init pmu after smp is online)
Merging m68k/for-next (70d830e337f9 m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER)
Merging m68knommu/for-next (2a92aed55942 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (ce25c853020c parisc: Move sigset_t typedef to parisc uapi header)
Merging powerpc/next (f318c8be797f powerpc/ptdump: Fix walk_vmemmap() to also print first vmemmap entry)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (849599b702ef powerpc/crash: add crash memory hotplug support)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (d866a7ef7a6e riscv: dts: thead: Fix node ordering in TH1520 device tree)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (cd67fe6dd7fc Merge branch 'shared-zeropage' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (48d85acdaa52 sparc: chmc: Convert to platform remove callback returning void)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (11cca8ccf2c3 tty: xtensa/iss: Use min() to fix Coccinelle warning)
Merging bcachefs/for-next (59ac1888a9c6 bcachefs: uninline set_btree_iter_dontneed())
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (d0af553021b4 Merge branch 'for-next-next-v6.9-20240425' into for-next-20240425)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (8f03ed91d75e smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (7ca906c7f7e5 Pull ext2 and isofs removal to PageError bit.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (3763f9effcdc f2fs: use helper to print zone condition)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (fa7e19337908 fuse: Add initial support for fs-verity)
Merging gfs2/for-next (1e86044402c4 gfs2: Remove and replace gfs2_glock_queue_work)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (e67572cd2204 Linux 6.9-rc6)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (06cd86b25b98 SUNRPC: Remove comment for sp_lock)
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (08e012a62de8 xfs: Remove unused function xrep_dir_self_parent)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (eea3260250ea Merge branch 'vfs.iomap' into vfs.all)
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (ccd0bdb57e31 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5deb5b56bccb i2c: smbus: fix NULL function pointer dereference)
Merging i2c-host/i2c/i2c-host (8d49135d177d i2c: thunderx: Adding ioclk support)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (cf770af5645a firmware: dmi-id: add a release callback function)
Merging hwmon-staging/hwmon-next (2ba3ec0d5d4a hwmon: (nzxt-kraken3) Add support for NZXT Kraken 2023 (standard and Elite) models)
Merging jc_docs/docs-next (fcb5bcefdbfb Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging v4l-dvb-next/master (eb005c801ec7 media: mediatek: vcodec: Only free buffer VA that is not NULL)
Merging pm/linux-next (e4bf39aed884 Merge branches 'acpi-tools', 'acpi-property' and 'acpi-docs' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (0cebf7cb2d70 pmdomain: core: Don't clear suspended_count at genpd_prepare())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (734b5def91b5 thermal/drivers/loongson2: Add Loongson-2K2000 support)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (f88320b698ad RDMA/mana_ib: Fix missing ret value)
Merging net-next/main (5c4c0edca68a tools: ynl: don't append doc of missing type directly to the type)
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/linux/slab.h
Merging bpf-next/for-next (6e25bcf06af0 bpf_helpers.h: Define bpf_tail_call_static when building with GCC)
CONFLICT (content): Merge conflict in include/linux/filter.h
CONFLICT (content): Merge conflict in kernel/bpf/core.c
Merging ipsec-next/master (aeb48a428d7d udpencap: Remove Obsolete UDP_ENCAP_ESPINUDP_NON_IKE Support)
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (0a0f9014b784 Bluetooth: qca: fix wcn3991 device address check)
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.c
Merging wireless-next/for-next (cc1380dd1882 wifi: brcmfmac: remove unused brcmf_usb_image struct)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1)
Merging crypto/master (ed265f7fd9a6 crypto: x86/aes-gcm - simplify GCM hash subkey derivation)
Merging drm/drm-next (2236a61bd491 Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next)
22bf0bc04d27 ("drm/xe: call free_gsc_pkt only once on action add failure")
6e7a41762479 ("drm/amd/display: Set color_mgmt_changed to true on unsuspend")
7e38ccb5276f ("drm/amdkfd: Fix eviction fence handling")
81bf14519a8c ("drm/amdkfd: make sure VM is ready for updating operations")
a99641e38704 ("drm/xe: Remove sysfs only once on action add failure")
e53a1713de31 ("drm/amdgpu: Fix leak when GPU memory allocation fails")
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c
Merging drm-exynos/for-linux-next (2236a61bd491 Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next)
Merging drm-misc/for-linux-next (c72211751870 drm: xlnx: zynqmp_dpsub: Fix compilation error)
Merging amdgpu/drm-next (aa463cc850c4 drm/amd/display: Fix CFLAGS for dml2_core_dcn4_calcs.o)
2476c6bd950e ("drm/amdgpu/vpe: fix vpe dpm setup failed")
26de73bc0a73 ("drm/amdgpu: Fix the ring buffer size for queue VM flush")
63335b383a0a ("drm/amdkfd: Add VRAM accounting for SVM migration")
69bc7a8a61aa ("drm/amdgpu/pm: Remove gpu_od if it's an empty directory")
7b19f1f3466f ("drm/amdgpu: Assign correct bits for SDMA HDP flush")
a522ec528cc7 ("drm/amdgpu/umsch: don't execute umsch test when GPU is in reset/suspend")
e0a9bbeea002 ("drm/amdgpu/sdma5.2: use legacy HDP flush for SDMA2/3")
e76691f45a60 ("drm/amdgpu: Update BO eviction priorities")
f88da7fbf665 ("drm/amdgpu/mes: fix use-after-free issue")
f989ecccdf6b ("drm/amdkfd: Fix rescheduling of restore worker")
fa7bb2cac0f7 ("drm/amd/pm: Restore config space after reset")
Merging drm-intel/for-linux-next (b55f3bbab891 drm/{i915, xe}: Implement fbdev emulation as in-kernel client)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (98ad158e5434 drm/xe: Delete PT update selftest)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (6b844f0626fc Merge branch 'topic/emu10k1-fix' into for-next)
Merging ieee1394/for-next (a3d0ba225eb1 firewire: core: replace local macros with common inline functions for isochronous packet header)
Merging sound-asoc/for-next (efdfbbc4dcc8 Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (fe0f5056b4fa bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Applying: linux-next: boot failure after merge of the modules tree
Merging input/next (9e0631695eac input: pm8xxx-vibrator: add new SPMI vibrator support)
Merging block/for-next (518f377c90e5 Merge branch 'for-6.10/io_uring' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (83637d9017b2 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (e38063b94324 mmc: atmel-mci: Switch to use dev_err_probe())
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (84c1815e46bd Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (74560bb3685b lsm: remove the now superfluous sentinel element from ctl_table array)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (3c6e94beeacd Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (ef6e717d93c7 Merge branches 'arm/renesas', 'x86/amd', 'core' and 'x86/vt-d' into next)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (669430b183fc of: property: fw_devlink: Add support for "power-supplies" binding)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU)
Merging spi/for-next (83deebfc4b1a Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (0a2f1c12ac13 Merge branch into tip/master: 'x86/shstk')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (03db22b93a01 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (b93b7b4635f1 ftrace: Asynchronous grace period for register_ftrace_direct())
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kvm/next (a96cb3bf390e Merge x86 bugfixes from Linux 6.9-rc3)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging kvm-arm/next (135c8fabdedd Merge branch kvm-arm64/lpi-xa-cache into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test)
Merging kvm-x86/next (7b076c6a308e Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests' and 'vmx')
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (88c0ef69dd88 platform/x86: asus-wmi: cleanup main struct to avoid some holes)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (c8f460d991df platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD))
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (e5019b14230a Merge 6.9-rc5 into driver-core-next)
Merging usb/usb-next (3f12222a4beb usb: dwc3: core: Fix compile warning on s390 gcc in dwc3_get_phy call)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/core.c
Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev"
Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (660a70809856 Merge 6.9-rc5 into tty-next)
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (e22810ab3f5e mei: bus: constify the struct mei_cl_bus_type usage)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (ba8c06fe7e16 coresight: tpiu: Convert to platform remove callback returning void)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (b80ad8e3cd27 iio: adc: ti-ads131e08: Use device_for_each_child_node_scoped() to simplify error paths.)
Merging phy-next/next (9c79b779643e phy: rockchip: fix CONFIG_TYPEC dependency)
Merging soundwire/next (a36ec5f7625d soundwire: intel_ace2x: simplify check_wake())
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (82b951e6fbd3 vfio/pci: fix potential memory leak in vfio_intx_enable())
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (ee2098c0b512 spmi: pmic-arb: Add multi bus support)
Merging staging/staging-next (75ff53c44f5e staging: vc04_services: Drop completed TODO item)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (700b2e1eccb4 dmaengine: xilinx: xdma: fix module autoloading)
Merging cgroup/for-next (b7d56d953a67 cgroup/cpuset: Remove outdated comment in sched_partition_write())
Merging scsi/for-next (8c5220c43ba0 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (aca061774bc4 scsi: mpi3mr: Fix some kernel-doc warnings in scsi_bsg_mpi3mr.h)
Merging vhost/linux-next (24ddee0ff8c3 Merge tag 'stable/vduse-virtio-net' into vhost)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (87f678f813d9 Merge branches 'rproc-next' and 'rpmsg-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (5539287ca656 gpio: brcmstb: add support for gpio-ranges)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (f3953d6d4f60 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants)
Merging pwm/pwm/for-next (6144744bb9a8 pwm: meson: Use mul_u64_u64_div_u64() for frequency calculating)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (693fe2f6a9ea selftests: kselftest: Make ksft_exit functions return void instead of int)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (aa892c2e7919 kunit: string-stream-test: use KUNIT_DEFINE_ACTION_WRAPPER)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc)
57456adef68d ("ndtest: Convert to platform remove callback returning void")
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (62dba604a488 cxl/hdm: Debug, use decoder name function)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (cda30c6542c8 efi: Clear up misconceptions about a maximum variable name size)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (b3d8a8e87014 slub: use count_partial_free_approx() in slab_out_of_memory())
Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings)
CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c
Merging landlock/next (dc792a74600a fs/ioctl: Add a comment to keep the logic in sync with LSM policies)
Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature)
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (10e29251be0e binfmt_elf_fdpic: fix /proc/<pid>/auxv)
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (99803fb635e4 hardening: Refresh KCFI options, add some more)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging turbostat/next (c9d066401193 tools/power turbostat: version 2024.04.27)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 1%]
* Re: query fs info level 0x100
2024-04-28 23:27 4% query fs info level 0x100 Steve French
@ 2024-04-29 5:31 0% ` Ralph Boehme
2024-04-29 16:13 4% ` Steve French
0 siblings, 1 reply; 200+ results
From: Ralph Boehme @ 2024-04-29 5:31 UTC (permalink / raw)
To: Steve French, samba-technical; +Cc: Volker.Lendecke, Jeremy Allison, CIFS
[-- Attachment #1.1: Type: text/plain, Size: 533 bytes --]
On 4/29/24 1:27 AM, Steve French wrote:
> Trying some xfstests to current Samba (master branch, Samba 4.21),
> they fail because query fs info (level 0x100) is returning
> STATUS_INVALID_INFO_CLASS) - this works to ksmbd and I thought it used
> to work to Samba. I do see the SMB3.1.1 opens with the POSIX open
> context works - but the query fs info failing causes xfstests to fail.
>
> Is that missing rom current mainline Samba?
have you enabled SMB3 UNIX Extensions?
smb3 unix extensions = yes
Cheers!
-slow
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [relevance 0%]
* query fs info level 0x100
@ 2024-04-28 23:27 4% Steve French
2024-04-29 5:31 0% ` Ralph Boehme
0 siblings, 1 reply; 200+ results
From: Steve French @ 2024-04-28 23:27 UTC (permalink / raw)
To: Ralph Böhme, samba-technical; +Cc: Volker.Lendecke, Jeremy Allison, CIFS
Trying some xfstests to current Samba (master branch, Samba 4.21),
they fail because query fs info (level 0x100) is returning
STATUS_INVALID_INFO_CLASS) - this works to ksmbd and I thought it used
to work to Samba. I do see the SMB3.1.1 opens with the POSIX open
context works - but the query fs info failing causes xfstests to fail.
Is that missing rom current mainline Samba?
--
Thanks,
Steve
^ permalink raw reply [relevance 4%]
* Linux 6.9-rc6
@ 2024-04-28 20:58 4% Linus Torvalds
0 siblings, 0 replies; 200+ results
From: Linus Torvalds @ 2024-04-28 20:58 UTC (permalink / raw)
To: Linux Kernel Mailing List
Things continue to look pretty normal, and nothing here really stands
out. The biggest single change that stands out in the diffstat is
literally a documentation update, everything else looks pretty small
and spread out.
We have the usual driver updates (mainly networking and gpu but some
updates elsewhere), some filesystem updates (mainly smb, bcachefs,
nfsd reverts, and some ntfs compat updates), and misc other fixes all
over - wifi fixes, arm dts fixlets, yadda yadda.
Nothing looks particularly big or bad. Shortlog appended for details,
please do keep testing,
Linus
---
Abdelrahman Morsy (1):
HID: mcp-2221: cancel delayed_work only when CONFIG_IIO is enabled
Akhil R (1):
dmaengine: tegra186: Fix residual calculation
Alex Deucher (1):
drm/amdgpu/sdma5.2: use legacy HDP flush for SDMA2/3
Alex Elder (1):
mailmap: add entries for Alex Elder
Alexey Brodkin (1):
ARC: [plat-hsdk]: Remove misplaced interrupt-cells property
Alice Ryhl (1):
rust: don't select CONSTRUCTORS
Andrei Simion (2):
ARM: dts: microchip: at91-sama7g5ek: Replace
regulator-suspend-voltage with the valid property
ARM: dts: microchip: at91-sama7g54_curiosity: Replace
regulator-suspend-voltage with the valid property
Andrew Jones (1):
RISC-V: selftests: cbo: Ensure asm operands match constraints, take 2
Andrey Ryabinin (1):
stackdepot: respect __GFP_NOLOCKDEP allocation flag
Andy Shevchenko (2):
idma64: Don't try to serve interrupts when device is powered off
gpio: tangier: Use correct type for the IRQ chip data
Andy Yan (1):
arm64: dts: rockchip: Fix the i2c address of es8316 on Cool Pi CM5
AngeloGioacchino Del Regno (1):
soc: mediatek: mtk-svs: Append "-thermal" to thermal zone names
Arkadiusz Kubalewski (1):
dpll: fix dpll_pin_on_pin_register() for multiple parent pins
Arnd Bergmann (2):
dmaengine: owl: fix register access functions
mtd: diskonchip: work around ubsan link failure
Arınç ÜNAL (1):
arm64: dts: rockchip: set PHY address of MT7531 switch to 0x1f
Aswin Unnikrishnan (1):
rust: remove `params` from `module` macro example
Avraham Stern (1):
wifi: iwlwifi: mvm: remove old PASN station when adding a new one
Baoquan He (1):
LoongArch: Fix Kconfig item and left code related to CRASH_CORE
Bartosz Golaszewski (1):
Bluetooth: qca: set power_ctrl_enabled on NULL returned by
gpiod_get_optional()
Ben Zong-You Xie (1):
perf riscv: Fix the warning due to the incompatible type
Benjamin Tissoires (1):
MAINTAINERS: update Benjamin's email address
Benno Lossin (1):
rust: macros: fix soundness issue in `module!` macro
Bibo Mao (1):
LoongArch: Lately init pmu after smp is online
Bjorn Helgaas (1):
ARC: Fix typos
Bo-Wei Chen (1):
docs: rust: fix improper rendering in Arch Support page
Christian Brauner (3):
ntfs3: serve as alias for the legacy ntfs driver
ntfs3: enforce read-only when used as legacy ntfs driver
ntfs3: add legacy ntfs file operations
Christian Gmeiner (1):
Revert "drm/etnaviv: Expose a few more chipspecs to userspace"
Christian Marangi (2):
mtd: rawnand: qcom: Fix broken OP_RESET_DEVICE command in
qcom_misc_cmd_type_exec()
mtd: limit OTP NVMEM cell parse to non-NAND devices
Christoph Müllner (2):
riscv: thead: Rename T-Head PBMT to MAE
riscv: T-Head: Test availability bit before enabling MAE errata
Chuck Lever (3):
Revert "svcrdma: Add Write chunk WRs to the RPC's Send WR chain"
Revert "NFSD: Reschedule CB operations when backchannel rpc_clnt
is shut down"
Revert "NFSD: Convert the callback workqueue to use delayed_work"
Chun-Yi Lee (1):
Bluetooth: hci_sync: Using hci_cmd_sync_submit when removing Adv Monitor
Clément Léger (2):
riscv: hwprobe: fix invalid sign extension for RISCV_HWPROBE_EXT_ZVFHMIN
selftests: sud_test: return correct emulated syscall value on RISC-V
Conor Dooley (1):
rust: make mutually exclusive with CFI_CLANG
Cristian Ciocaltea (1):
phy: phy-rockchip-samsung-hdptx: Select CONFIG_RATIONAL
Dan Carpenter (1):
net: ti: icssg-prueth: Fix signedness bug in prueth_init_rx_chns()
Dan Williams (1):
cxl/core: Fix potential payload size confusion in cxl_mem_get_poison()
Daniel Golle (2):
soc: mediatek: mtk-socinfo: depends on CONFIG_SOC_BUS
net: phy: mediatek-ge-soc: follow netdev LED trigger semantics
Daniel Okazaki (1):
eeprom: at24: fix memory corruption race condition
Daniele Palmas (1):
net: usb: qmi_wwan: add Telit FN920C04 compositions
David Bauer (1):
vxlan: drop packets from invalid src-address
David Christensen (1):
MAINTAINERS: eth: mark IBM eHEA as an Orphan
David Hildenbrand (1):
LoongArch: Fix a build error due to __tlb_remove_tlb_entry()
David Howells (4):
cifs: Fix reacquisition of volume cookie on still-live connection
cifs: Add tracing for the cifs_tcon struct refcounting
netfs: Fix writethrough-mode error handling
netfs: Fix the pre-flush when appending to a file in writethrough mode
David Kaplan (1):
x86/cpu: Fix check for RDPKRU in __show_regs()
David Sterba (1):
btrfs: remove colon from messages with state
Derek Foreman (1):
drm/etnaviv: fix tx clock gating on some GC7000 variants
Dragan Simic (2):
arm64: dts: rockchip: Remove unsupported node from the Pinebook Pro dts
arm64: dts: rockchip: Designate the system power controller on QuartzPro64
Duanqiang Wen (3):
net: libwx: fix alloc msix vectors failed
Revert "net: txgbe: fix i2c dev name cannot match clkdev"
Revert "net: txgbe: fix clk_name exceed MAX_DEV_ID limits"
Duoming Zhou (1):
ax25: Fix netdev refcount issue
Edward Liaw (1):
selftests/harness: remove use of LINE_MAX
Eric Dumazet (4):
icmp: prevent possible NULL dereferences from icmp_build_probe()
net: fix sk_memory_allocated_{add|sub} vs softirqs
ipv4: check for NULL idev in ip_route_use_hint()
net: usb: ax88179_178a: stop lying about skb->truesize
Eric Van Hensbergen (1):
fs/9p: mitigate inode collisions
Erwan Velu (1):
i40e: Report MFS in decimal base instead of hex
Felix Fietkau (1):
wifi: mac80211: split mesh fast tx cache into local/proxied/forwarded
Felix Kuehling (3):
drm/amdkfd: Fix eviction fence handling
drm/amdgpu: Update BO eviction priorities
drm/amdkfd: Fix rescheduling of restore worker
Fenghua Yu (1):
dmaengine: idxd: Fix oops during rmmod on single-CPU platforms
Gabor Juhos (1):
phy: qcom: m31: match requested regulator name with dt schema
Geert Uytterhoeven (1):
net: ravb: Fix registered interrupt names
Guanrui Huang (1):
irqchip/gic-v3-its: Prevent double free on error
Guenter Roeck (1):
MAINTAINERS: Drop entry for PCA9541 bus master selector
Gustavo A. R. Silva (1):
smb: client: Fix struct_group() usage in __packed structs
Günther Noack (1):
fs: Return ENOTTY directly if FS_IOC_GETUUID or FS_IOC_GETFSSYSFSPATH fail
Hangbin Liu (1):
bridge/br_netlink.c: no need to return void function
Hans de Goede (1):
phy: ti: tusb1210: Resolve charger-det crash if charger psy is
unregistered
Himal Prasad Ghimiray (2):
drm/xe: Remove sysfs only once on action add failure
drm/xe: call free_gsc_pkt only once on action add failure
Huacai Chen (1):
LoongArch: Fix callchain parse error with kernel tracepoint events
Hyunwoo Kim (3):
tcp: Fix Use-After-Free in tcp_ao_connect_init
net: gtp: Fix Use-After-Free in gtp_dellink
net: openvswitch: Fix Use-After-Free in ovs_ct_exit
Ido Schimmel (12):
mlxsw: core: Unregister EMAD trap using FORWARD action
mlxsw: core_env: Fix driver initialization with old firmware
mlxsw: pci: Fix driver initialization with old firmware
mlxsw: spectrum_acl_tcam: Fix race in region ID allocation
mlxsw: spectrum_acl_tcam: Fix race during rehash delayed work
mlxsw: spectrum_acl_tcam: Fix possible use-after-free during
activity update
mlxsw: spectrum_acl_tcam: Fix possible use-after-free during rehash
mlxsw: spectrum_acl_tcam: Rate limit error message
mlxsw: spectrum_acl_tcam: Fix memory leak during rehash
mlxsw: spectrum_acl_tcam: Fix warning during rehash
mlxsw: spectrum_acl_tcam: Fix incorrect list API usage
mlxsw: spectrum_acl_tcam: Fix memory leak when canceling rehash work
Igor Artemiev (1):
wifi: cfg80211: fix the order of arguments for trace events of
the tx_rx_evt class
Ikjoon Jang (1):
arm64: dts: mediatek: mt8183: Add power-domains properity to mfgcfg
Iskander Amara (2):
arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma
arm64: dts: rockchip: fix alphabetical ordering RK3399 puma
Ismael Luceno (1):
ipvs: Fix checksumming on GSO of SCTP packets
Jack Xiao (1):
drm/amdgpu/mes: fix use-after-free issue
Jacob Keller (1):
ice: fix LAG and VF lock dependency in ice_reset_vf()
Jakub Kicinski (2):
tools: ynl: don't ignore errors in NLMSG_DONE messages
eth: bnxt: fix counting packets discarded due to OOM and netpoll
Jarred White (1):
ACPI: CPPC: Fix bit_offset shift in MASK_VAL() macro
Jason Reeder (1):
net: ethernet: ti: am65-cpts: Fix PTPv1 message type on TX packets
Jiantao Shan (1):
LoongArch: Fix access error when read fault on a write-only VMA
Johan Hovold (5):
phy: qcom: qmp-combo: fix VCO div offset on v5_5nm and v6
arm64: dts: qcom: sc8280xp: add missing PCIe minimum OPP
Bluetooth: qca: fix invalid device address check
Bluetooth: qca: fix NULL-deref on non-serdev suspend
Bluetooth: qca: fix NULL-deref on non-serdev setup
Johannes Berg (12):
wifi: mac80211: check EHT/TTLM action frame length
wifi: mac80211: don't use rate mask for scanning
Revert "wifi: iwlwifi: bump FW API to 90 for BZ/SC devices"
wifi: mac80211: fix idle calculation with multi-link
wifi: mac80211: mlme: re-parse with correct mode
wifi: mac80211: mlme: fix memory leak
wifi: mac80211: mlme: re-parse if AP mode is less than client
wifi: nl80211: don't free NULL coalescing rule
wifi: mac80211_hwsim: init peer measurement result
wifi: mac80211: remove link before AP
wifi: mac80211: fix unaligned le16 access
wifi: iwlwifi: mvm: fix link ID management
Johannes Thumshirn (1):
btrfs: fix information leak in btrfs_ioctl_logical_to_ino()
Johannes Weiner (1):
mm: zswap: fix shrinker NULL crash with cgroup_disable=memory
Jose Ignacio Tornos Martinez (1):
arm64: dts: rockchip: regulator for sd needs to be always on for BPI-R2Pro
Joshua Ashton (1):
drm/amd/display: Set color_mgmt_changed to true on unsuspend
Justin Chen (1):
net: bcmasp: fix memory leak when bringing down interface
Kalle Valo (1):
wifi: ath11k: use RCU when accessing struct inet6_dev::ac_list
Kenny Levinsen (1):
HID: i2c-hid: Revert to await reset ACK before reading report descriptor
Kent Overstreet (14):
bcachefs: Fix null ptr deref in twf from BCH_IOCTL_FSCK_OFFLINE
bcachefs: node scan: ignore multiple nodes with same seq if interior
bcachefs: make sure to release last journal pin in replay
bcachefs: Fix bch2_dev_btree_bitmap_marked_sectors() shift
bcachefs: KEY_TYPE_error is allowed for reflink
bcachefs: fix leak in bch2_gc_write_reflink_key
bcachefs: Fix bio alloc in check_extent_checksum()
bcachefs: Check for journal entries overruning end of sb clean section
bcachefs: Fix missing call to bch2_fs_allocator_background_exit()
bcachefs: bkey_cached.btree_trans_barrier_seq needs to be a ulong
bcachefs: Tweak btree key cache shrinker so it actually frees
bcachefs: Fix deadlock in journal write path
bcachefs: Fix inode early destruction path
bcachefs: If we run merges at a lower watermark, they must be nonblocking
Kirill A. Shutemov (1):
x86/tdx: Preserve shared bit on mprotect()
Krzysztof Kozlowski (4):
arm64: dts: rockchip: drop panel port unit address in GRU Scarlet
arm64: dts: rockchip: drop redundant pcie-reset-suspend in Scarlet Dumo
arm64: dts: rockchip: drop redundant disable-gpios in Lubancat 1
arm64: dts: rockchip: drop redundant disable-gpios in Lubancat 2
Kuniyuki Iwashima (1):
af_unix: Suppress false-positive lockdep splat for spin_lock()
in __unix_gc().
Laine Taffin Altman (1):
rust: init: remove impl Zeroable for Infallible
Lang Yu (2):
drm/amdkfd: make sure VM is ready for updating operations
drm/amdgpu/umsch: don't execute umsch test when GPU is in reset/suspend
Lijo Lazar (2):
drm/amdgpu: Assign correct bits for SDMA HDP flush
drm/amd/pm: Restore config space after reset
Linus Torvalds (1):
Linux 6.9-rc6
Louis Chauvet (1):
dmaengine: xilinx: xdma: Fix synchronization issue
Luca Weiss (1):
arm64: dts: qcom: Fix type of "wdog" IRQs for remoteprocs
Lucas Stach (1):
drm/atomic-helper: fix parameter order in
drm_format_conv_state_copy() call
Luiz Augusto von Dentz (3):
Bluetooth: hci_sync: Use advertised PHYs on hci_le_ext_create_conn_sync
Bluetooth: hci_event: Fix sending HCI_OP_READ_ENC_KEY_SIZE
Bluetooth: MGMT: Fix failing to MGMT_OP_ADD_UUID/MGMT_OP_REMOVE_UUID
Lukas Wunner (1):
igc: Fix LED-related deadlock on driver unbind
MD Danish Anwar (1):
net: phy: dp83869: Fix MII mode failure
Ma Jun (1):
drm/amdgpu/pm: Remove gpu_od if it's an empty directory
Maksim Kiselev (1):
mmc: sdhci-of-dwcmshc: th1520: Increase tuning loop count to 128
Manivannan Sadhasivam (3):
arm64: dts: qcom: sm8450: Fix the msi-map entries
arm64: dts: qcom: sm8550: Fix the msi-map entries
arm64: dts: qcom: sm8650: Fix the msi-map entries
Mantas Pucka (1):
mmc: sdhci-msm: pervent access to suspended controller
Marcel Ziswiler (1):
phy: freescale: imx8m-pcie: fix pcie link-up instability
Marek Vasut (1):
arm64: dts: imx8mp: Fix assigned-clocks for second CSI2
Marios Makassikis (1):
ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
Matthew Sakai (1):
dm vdo murmurhash: remove unneeded semicolon
Matthew Wilcox (Oracle) (3):
mm: create FOLIO_FLAG_FALSE and FOLIO_TYPE_OPS macros
mm: support page_mapcount() on page_has_type() pages
mm: turn folio_test_hugetlb into a PageType
Matthias Schiffer (1):
net: dsa: mv88e6xx: fix supported_interfaces setup in
mv88e6250_phylink_get_caps()
Maximilian Luz (2):
firmware: qcom: uefisecapp: Fix memory related IO errors and crashes
arm64: dts: qcom: sc8180x: Fix ss_phy_irq for secondary USB controller
Miaohe Lin (1):
mm/hugetlb: fix DEBUG_LOCKS_WARN_ON(1) when dissolve_free_hugetlb_folio()
Michael Chan (1):
bnxt_en: Fix error recovery for 5760X (P7) chips
Michael Heimpold (1):
ARM: dts: imx6ull-tarragon: fix USB over-current polarity
Michal Tomek (1):
phy: rockchip-snps-pcie3: fix bifurcation on rk3588
Michal Wajdeczko (1):
drm/xe/guc: Fix arguments passed to relay G2H handlers
Miguel Ojeda (2):
kbuild: rust: remove unneeded `@rustc_cfg` to avoid ICE
kbuild: rust: force `alloc` extern to allow "empty" Rust files
Mikhail Kobuk (2):
phy: marvell: a3700-comphy: Fix out of bounds read
phy: marvell: a3700-comphy: Fix hardcoded array size
Ming Lei (1):
dm: restore synchronous close of device mapper block device
Miquel Raynal (2):
dmaengine: xilinx: xdma: Fix wrong offsets in the buffers
addresses in dma descriptor
dmaengine: xilinx: xdma: Clarify kdoc in XDMA driver
Miri Korenblit (1):
wifi: iwlwifi: mvm: return uid from iwl_mvm_build_scan_cmd
Muhammad Usama Anjum (2):
selftests: mm: fix unused and uninitialized variable warning
selftests: mm: protection_keys: save/restore nr_hugepages value
from launch script
Muhammed Efe Cetin (1):
arm64: dts: rockchip: mark system power controller and fix typo
on orangepi-5-plus
Mukul Joshi (2):
drm/amdgpu: Fix leak when GPU memory allocation fails
drm/amdkfd: Add VRAM accounting for SVM migration
Nam Cao (2):
HID: i2c-hid: remove I2C_HID_READ_PENDING flag to prevent lock-up
fbdev: fix incorrect address computation in deferred IO
Namjae Jeon (4):
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
ksmbd: common: use struct_group_attr instead of struct_group for
network_open_info
ksmbd: add continuous availability share parameter
Naohiro Aota (1):
btrfs: scrub: run relocation repair when/only needed
Nathan Chancellor (2):
bcachefs: Fix format specifier in validate_bset_keys()
Bluetooth: Fix type of len in {l2cap,sco}_sock_getsockopt_old()
Nuno Pereira (1):
HID: nintendo: Fix N64 controller being identified as mouse
Nícolas F. R. A. Prado (5):
arm64: dts: mediatek: mt8192: Add missing gce-client-reg to mutex
arm64: dts: mediatek: mt8195: Add missing gce-client-reg to vpp/vdosys
arm64: dts: mediatek: mt8195: Add missing gce-client-reg to mutex
arm64: dts: mediatek: mt8195: Add missing gce-client-reg to mutex1
arm64: dts: mediatek: cherry: Describe CPU supplies
Oleg Nesterov (2):
sched/isolation: Prevent boot crash when the boot CPU is nohz_full
sched/isolation: Fix boot crash when maxcpus < first housekeeping CPU
Pablo Neira Ayuso (1):
netfilter: nf_tables: honor table dormant flag from netdev
release event path
Patrik Jakobsson (1):
drm/gma500: Remove lid code
Paul Geurts (1):
NFC: trf7970a: disable all regulators on removal
Paulo Alcantara (1):
smb: client: fix rename(2) regression against samba
Peter Münster (1):
net: b44: set pause params only when interface is up
Peter Xu (1):
mm/hugetlb: fix missing hugetlb_lock for resv uncharge
Peyton Lee (1):
drm/amdgpu/vpe: fix vpe dpm setup failed
Pin-yen Lin (4):
arm64: dts: mediatek: mt8192-asurada: Update min voltage
constraint for MT6315
arm64: dts: mediatek: mt8195-cherry: Update min voltage
constraint for MT6315
arm64: dts: mediatek: mt8183-kukui: Use default min voltage for MT6358
arm64: dts: mediatek: mt8186-corsola: Update min voltage
constraint for Vgpu
Prathamesh Shete (1):
gpio: tegra186: Fix tegra186_gpio_is_accessible() check
Prike Liang (1):
drm/amdgpu: Fix the ring buffer size for queue VM flush
Qu Wenruo (1):
btrfs: fix wrong block_start calculation for btrfs_drop_extent_map_range()
Quentin Schulz (3):
arm64: dts: rockchip: enable internal pull-up on Q7_USB_ID for RK3399 Puma
arm64: dts: rockchip: enable internal pull-up on PCIE_WAKE# for
RK3399 Puma
arm64: dts: rockchip: add regulators for PCIe on RK3399 Puma Haikou
Rafael J. Wysocki (1):
ACPI: PM: s2idle: Evaluate all Low-Power S0 Idle _DSM functions
Rafał Miłecki (9):
arm64: dts: mediatek: mt7622: fix clock controllers
arm64: dts: mediatek: mt7622: fix IR nodename
arm64: dts: mediatek: mt7622: fix ethernet controller "compatible"
arm64: dts: mediatek: mt7622: drop "reset-names" from thermal block
arm64: dts: mediatek: mt7986: drop invalid properties from ethsys
arm64: dts: mediatek: mt7986: drop "#reset-cells" from Ethernet controller
arm64: dts: mediatek: mt7986: drop invalid thermal block clock
arm64: dts: mediatek: mt7986: prefix BPI-R3 cooling maps with "map-"
arm64: dts: mediatek: mt2712: fix validation errors
Rahul Rameshbabu (4):
macsec: Enable devices to advertise whether they update sk_buff
md_dst during offloads
ethernet: Add helper for assigning packet type when dest address
does not match device address
macsec: Detect if Rx skb is macsec-related for offloading
devices that update md_dst
net/mlx5e: Advertise mlx5 ethernet driver updates sk_buff md_dst
for MACsec
Rajendra Nayak (1):
arm64: dts: qcom: x1e80100: Fix the compatible for cluster idle states
Rex Zhang (1):
dmaengine: idxd: Convert spinlock to mutex to lock evl workqueue
Richard Kinder (1):
wifi: mac80211: ensure beacon is non-S1G prior to extracting the
beacon timestamp field
Rob Herring (3):
dt-bindings: rockchip: grf: Add missing type to 'pcie-phy' node
dt-bindings: eeprom: at24: Fix ST M24C64-D compatible schema
arm64: dts: rockchip: Fix USB interface compatible string on
kobol-helios64
Sabrina Dubroca (1):
tls: fix lockless read of strp->msg_ready in ->poll
Samuel Holland (2):
riscv: Fix TASK_SIZE on 64-bit NOMMU
riscv: Fix loading 64-bit NOMMU kernels past the start of RAM
Sean Anderson (1):
dma: xilinx_dpdma: Fix locking
Sean Christopherson (2):
cpu: Re-enable CPU mitigations by default for !X86 architectures
cpu: Ignore "mitigations" kernel parameter if CPU_MITIGATIONS=n
Sean Wang (1):
Bluetooth: btusb: mediatek: Fix double free of skb in coredump
Sebastian Reichel (2):
phy: rockchip-snps-pcie3: fix clearing PHP_GRF_PCIESEL_CON bits
phy: rockchip: naneng-combphy: Fix mux on rk3588
Sergei Antonov (1):
mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers
Sindhu Devale (1):
i40e: Do not use WQ_MEM_RECLAIM flag for workqueue
Stephen Boyd (2):
phy: qcom: qmp-combo: Fix VCO div offset on v3
phy: qcom: qmp-combo: Fix register base for QSERDES_DP_PHY_MODE
Steve French (2):
smb3: missing lock when picking channel
smb3: fix lock ordering potential deadlock in cifs_sync_mid_result
Su Hui (1):
octeontx2-af: fix the double free in rvu_npc_freemem()
Sudheer Mogilappagari (1):
iavf: Fix TC config comparison with existing adapter TC config
Sweet Tea Dorminy (1):
btrfs: fallback if compressed IO fails for ENOSPC
Takayuki Nagata (1):
cifs: reinstate original behavior again for forceuid/forcegid
Tetsuo Handa (1):
profiling: Remove create_prof_cpu_mask().
Thorsten Leemhuis (6):
docs: verify/bisect: use git switch, tag kernel, and various fixes
docs: verify/bisect: add and fetch stable branches ahead of time
docs: verify/bisect: proper headlines and more spacing
docs: verify/bisect: explain testing reverts, patches and newer code
docs: verify/bisect: describe how to use a build host
docs: verify/bisect: stable regressions: first stable, then mainline
Tianchen Ding (2):
sched/eevdf: Always update V if se->on_rq when reweighting
sched/eevdf: Fix miscalculation in reweight_entity() when se is not curr
Tom Lendacky (1):
x86/sev: Check for MWAITX and MONITORX opcodes in the #VC handler
Uwe Kleine-König (1):
MAINTAINERS: Update Uwe's email address, drop SIOX maintenance
Vanshidhar Konda (1):
ACPI: CPPC: Fix access width used for PCC registers
Vijendar Mukunda (1):
soundwire: amd: fix for wake interrupt handling for clockstop mode
Vikas Gupta (2):
bnxt_en: refactor reset close code
bnxt_en: Fix the PCI-AER routines
Vineet Gupta (2):
ARC: Fix -Wmissing-prototypes warnings
ARC: mm: fix new code about cache aliasing
Vinod Koul (1):
dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
Vishal Moola (Oracle) (1):
hugetlb: check for anon_vma prior to folio allocation
WangYuli (1):
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0bda:0x4853
Wedson Almeida Filho (2):
rust: phy: implement `Send` for `Registration`
rust: kernel: require `Send` for `Module` implementations
Wenkuan Wang (1):
x86/CPU/AMD: Add models 0x10-0x1f to the Zen5 range
William Zhang (1):
mtd: rawnand: brcmnand: Fix data access violation for STB chip
Wolfram Sang (1):
i2c: smbus: fix NULL function pointer dereference
Xuewen Yan (1):
sched/eevdf: Prevent vlag from going out of bounds in reweight_eevdf()
Yaraslau Furman (1):
HID: logitech-dj: allow mice to use all types of reports
Yick Xie (1):
udp: preserve the connected status if only UDP cmsg
Yu Kuai (1):
block: fix module reference leakage from bdev_open_by_dev error path
Zhang Lixu (1):
HID: intel-ish-hid: ipc: Fix dev_err usage with uninitialized dev->devc
Zhu Lingshan (1):
vDPA: code clean for vhost_vdpa uapi
Zijun Hu (1):
Bluetooth: btusb: Fix triggering coredump implementation for QCA
^ permalink raw reply [relevance 4%]
* Samba ctime still reported incorrectly
@ 2024-04-28 19:41 4% Steve French
2024-04-29 8:51 0% ` Ralph Boehme
0 siblings, 1 reply; 200+ results
From: Steve French @ 2024-04-28 19:41 UTC (permalink / raw)
To: samba-technical; +Cc: CIFS
I did another test of the Samba server ctime bug on Samba master
(4.21.0pre1) and Samba server is still broken in how it reports ctime.
An example scenario is simple, creating a hardlink is supposed to
update ctime on a file (and this works fine to Windows server and
ksmbd etc) but Samba server mistakenly reports ctime as mtime (unless
you mount with the "posix" mount option). This e.g. breaks xfstest
generic/236 when run to Samba
More information is at:
https://bugzilla.samba.org/show_bug.cgi?id=10883
--
Thanks,
Steve
^ permalink raw reply [relevance 4%]
* Linux 6.8.8
@ 2024-04-27 15:55 3% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-27 15:55 UTC (permalink / raw)
To: linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby, Greg Kroah-Hartman
I'm announcing the release of the 6.8.8 kernel.
All users of the 6.8 kernel series must upgrade.
The updated 6.8.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.8.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2
arch/arm64/kernel/head.S | 5
arch/arm64/mm/pageattr.c | 3
arch/x86/include/asm/barrier.h | 3
arch/x86/include/asm/kvm_host.h | 1
arch/x86/kernel/cpu/bugs.c | 11
arch/x86/kernel/cpu/cpuid-deps.c | 6
arch/x86/kvm/cpuid.c | 1
arch/x86/kvm/cpuid.h | 10
arch/x86/kvm/lapic.c | 3
arch/x86/kvm/mmu/mmu.c | 5
arch/x86/kvm/mmu/tdp_mmu.c | 21 -
arch/x86/kvm/vmx/vmx.c | 24 +
arch/x86/kvm/x86.c | 2
block/bdev.c | 29 +
block/ioctl.c | 3
drivers/accessibility/speakup/main.c | 2
drivers/android/binder.c | 4
drivers/char/random.c | 10
drivers/clk/clk.c | 161 +++++++--
drivers/clk/mediatek/clk-mt7988-infracfg.c | 2
drivers/clk/mediatek/clk-mtk.c | 15
drivers/comedi/drivers/vmk80xx.c | 35 -
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 72 ++--
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4
drivers/gpu/drm/i915/display/intel_cdclk.c | 37 +-
drivers/gpu/drm/nouveau/nouveau_bios.c | 13
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 7
drivers/gpu/drm/panel/panel-visionox-rm69299.c | 2
drivers/gpu/drm/radeon/radeon_atombios.c | 8
drivers/gpu/drm/ttm/ttm_pool.c | 38 +-
drivers/gpu/drm/v3d/v3d_irq.c | 4
drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 35 +
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 7
drivers/gpu/drm/vmwgfx/vmwgfx_bo.h | 2
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 3
drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 32 +
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4
drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 15
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 44 +-
drivers/gpu/drm/xe/display/intel_fb_bo.c | 8
drivers/infiniband/core/cm.c | 11
drivers/infiniband/hw/mlx5/mad.c | 3
drivers/infiniband/sw/rxe/rxe.c | 2
drivers/interconnect/core.c | 8
drivers/interconnect/qcom/x1e80100.c | 26 -
drivers/iommu/iommufd/Kconfig | 1
drivers/misc/cardreader/rtsx_pcr.c | 2
drivers/misc/mei/pci-me.c | 2
drivers/misc/mei/platform-vsc.c | 17
drivers/misc/mei/vsc-tp.c | 84 +++-
drivers/misc/mei/vsc-tp.h | 3
drivers/net/dsa/mt7530.c | 38 +-
drivers/net/dsa/mt7530.h | 5
drivers/net/ethernet/intel/ice/ice_tc_lib.c | 15
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 7
drivers/net/ethernet/mediatek/mtk_wed.c | 6
drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 27 -
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 9
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 4
drivers/net/ethernet/mellanox/mlx5/core/main.c | 5
drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c | 1
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c | 61 ++-
drivers/net/ethernet/realtek/r8169.h | 4
drivers/net/ethernet/realtek/r8169_leds.c | 23 -
drivers/net/ethernet/realtek/r8169_main.c | 7
drivers/net/ethernet/renesas/ravb.h | 6
drivers/net/ethernet/renesas/ravb_main.c | 93 ++---
drivers/net/ethernet/stmicro/stmmac/common.h | 1
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2
drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c | 2
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 7
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 18 -
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 29 -
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 18 +
drivers/net/tun.c | 18 -
drivers/net/usb/ax88179_178a.c | 4
drivers/platform/x86/amd/pmc/pmc-quirks.c | 9
drivers/s390/cio/device.c | 13
drivers/s390/cio/qdio_main.c | 28 +
drivers/s390/net/ism_drv.c | 37 +-
drivers/scsi/scsi_lib.c | 7
drivers/thermal/thermal_debugfs.c | 1
drivers/thunderbolt/domain.c | 5
drivers/thunderbolt/icm.c | 2
drivers/thunderbolt/lc.c | 45 ++
drivers/thunderbolt/nhi.c | 19 -
drivers/thunderbolt/path.c | 13
drivers/thunderbolt/switch.c | 178 ++++++++--
drivers/thunderbolt/tb.c | 44 +-
drivers/thunderbolt/tb.h | 10
drivers/thunderbolt/tb_regs.h | 6
drivers/thunderbolt/usb4.c | 52 ++
drivers/tty/serial/8250/8250_dw.c | 6
drivers/tty/serial/mxs-auart.c | 8
drivers/tty/serial/pmac_zilog.c | 14
drivers/tty/serial/serial_base.h | 4
drivers/tty/serial/serial_core.c | 23 +
drivers/tty/serial/serial_port.c | 34 +
drivers/tty/serial/stm32-usart.c | 13
drivers/ufs/host/ufs-qcom.c | 8
drivers/usb/class/cdc-wdm.c | 6
drivers/usb/core/port.c | 4
drivers/usb/dwc2/hcd_ddma.c | 4
drivers/usb/gadget/function/f_ncm.c | 4
drivers/usb/misc/onboard_usb_hub.c | 6
drivers/usb/serial/option.c | 40 ++
drivers/usb/typec/tcpm/tcpm.c | 4
drivers/virt/vmgenid.c | 2
fs/btrfs/extent_io.c | 20 -
fs/fuse/dir.c | 1
fs/nfsd/nfs4xdr.c | 47 +-
fs/nilfs2/dir.c | 2
fs/smb/common/smb2pdu.h | 2
fs/smb/server/server.c | 13
fs/smb/server/smb2pdu.c | 4
fs/smb/server/vfs.c | 5
fs/squashfs/inode.c | 5
fs/sysfs/file.c | 2
include/asm-generic/barrier.h | 8
include/linux/blkdev.h | 2
include/linux/bootconfig.h | 7
include/linux/gpio/property.h | 1
include/linux/shmem_fs.h | 9
include/linux/swapops.h | 65 +--
include/linux/udp.h | 2
include/net/netfilter/nf_flow_table.h | 12
include/net/netfilter/nf_tables.h | 14
include/net/sch_generic.h | 1
include/trace/events/rpcgss.h | 4
init/main.c | 2
io_uring/io_uring.c | 26 -
kernel/fork.c | 33 -
kernel/sched/sched.h | 20 -
lib/bootconfig.c | 19 -
mm/gup.c | 54 +--
mm/huge_memory.c | 6
mm/hugetlb.c | 10
mm/internal.h | 10
mm/madvise.c | 17
mm/memory-failure.c | 18 -
mm/shmem.c | 6
net/bridge/br_input.c | 15
net/bridge/br_netfilter_hooks.c | 6
net/bridge/br_private.h | 1
net/bridge/netfilter/nf_conntrack_bridge.c | 14
net/core/dev.c | 6
net/netfilter/nf_flow_table_inet.c | 3
net/netfilter/nf_flow_table_ip.c | 10
net/netfilter/nf_tables_api.c | 82 ++++
net/netfilter/nft_lookup.c | 1
net/netfilter/nft_set_bitmap.c | 4
net/netfilter/nft_set_hash.c | 8
net/netfilter/nft_set_pipapo.c | 43 +-
net/netfilter/nft_set_pipapo.h | 6
net/netfilter/nft_set_pipapo_avx2.c | 59 +--
net/netfilter/nft_set_rbtree.c | 4
net/sched/sch_generic.c | 1
net/unix/af_unix.c | 12
sound/core/seq/seq_ump_convert.c | 2
sound/pci/hda/patch_realtek.c | 7
sound/pci/hda/tas2781_hda_i2c.c | 4
tools/perf/ui/browsers/annotate.c | 2
tools/perf/util/annotate.c | 3
tools/perf/util/bpf_skel/lock_contention.bpf.c | 5
tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc | 6
tools/testing/selftests/iommu/config | 2
tools/testing/selftests/net/tcp_ao/lib/proc.c | 2
tools/testing/selftests/net/tcp_ao/lib/setup.c | 12
tools/testing/selftests/net/tcp_ao/rst.c | 23 -
tools/testing/selftests/net/tcp_ao/setsockopt-closed.c | 2
tools/testing/selftests/net/udpgso.c | 2
tools/testing/selftests/powerpc/papr_vpd/papr_vpd.c | 2
178 files changed, 1902 insertions(+), 827 deletions(-)
Ai Chao (1):
ALSA: hda/realtek - Enable audio jacks of Haier Boyue G42 with ALC269VC
Alan Stern (1):
fs: sysfs: Fix reference leak in sysfs_break_active_protection()
Alex Deucher (1):
drm/radeon: make -fstrict-flex-arrays=3 happy
Alexander Usyskin (1):
mei: me: disable RPL-S on SPS and IGN firmwares
Alexey Izbyshev (1):
io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
Andy Shevchenko (2):
gpiolib: swnode: Remove wrong header inclusion
serial: core: Clearing the circular buffer before NULLifying it
Ard Biesheuvel (1):
arm64/head: Disable MMU at EL2 before clearing HCR_EL2.E2H
Arınç ÜNAL (4):
net: dsa: mt7530: fix mirroring frames received on local port
net: dsa: mt7530: fix port mirroring for MT7988 SoC switch
net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
Asbjørn Sloth Tønnesen (2):
net: sparx5: flower: fix fragment flags handling
octeontx2-pf: fix FLOW_DIS_IS_FRAGMENT implementation
Bart Van Assche (1):
scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING
Carlos Llamas (1):
binder: check offset alignment in binder_get_object()
Carolina Jubran (1):
net/mlx5e: Prevent deadlock while disabling aRFS
Christian König (2):
drm/amdgpu: remove invalid resource->start check v2
drm/ttm: stop pooling cached NUMA pages v2
Christoph Hellwig (1):
block: propagate partition scanning errors to the BLKRRPART ioctl
Chuanhong Guo (1):
USB: serial: option: add support for Fibocom FM650/FG650
Coia Prant (1):
USB: serial: option: add Lonsung U8300/U9300 product
Daniel Golle (1):
clk: mediatek: mt7988-infracfg: fix clocks for 2nd PCIe port
Daniele Palmas (1):
USB: serial: option: add Telit FN920C04 rmnet compositions
Danny Lin (1):
fuse: fix leaked ENOSYS error on first statx call
Dave Airlie (1):
nouveau: fix instmem race condition around ptr stores
David Hildenbrand (1):
mm/madvise: make MADV_POPULATE_(READ|WRITE) handle VM_FAULT_RETRY properly
David Matlack (1):
KVM: x86/mmu: Write-protect L2 SPTEs in TDP MMU when clearing dirty status
Dmitry Baryshkov (1):
drm/panel: visionox-rm69299: don't unregister DSI device
Dmitry Safonov (4):
selftests/tcp_ao: Make RST tests less flaky
selftests/tcp_ao: Zero-init tcp_ao_info_opt
selftests/tcp_ao: Fix fscanf() call for format-security
selftests/tcp_ao: Printing fixes to confirm with format-security
Emil Kronborg (1):
serial: mxs-auart: add spinlock around changing cts state
Eric Biggers (1):
x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
Eric Dumazet (1):
net/sched: Fix mirred deadlock on device recursion
Fabio Estevam (1):
usb: misc: onboard_usb_hub: Disable the USB hub clock on failure
Felix Fietkau (1):
net: ethernet: mtk_eth_soc: fix WED + wifi reset
Felix Kuehling (1):
drm/amdkfd: Fix memory leak in create_process failure
Finn Thain (1):
serial/pmac_zilog: Remove flawed mitigation for rx irq flood
Florian Westphal (2):
netfilter: nft_set_pipapo: constify lookup fn args where possible
netfilter: nft_set_pipapo: do not free live element
Gerd Bayer (1):
s390/ism: Properly fix receive message buffer allocation
Gil Fine (2):
thunderbolt: Avoid notify PM core about runtime PM resume
thunderbolt: Fix wake configurations after device unplug
Greg Kroah-Hartman (2):
Revert "usb: cdc-wdm: close race between read and workqueue"
Linux 6.8.8
Hans de Goede (1):
serial: 8250_dw: Revert: Do not reclock if already at correct rate
Heiner Kallweit (2):
r8169: fix LED-related deadlock on module removal
r8169: add missing conditional compiling for call to r8169_remove_leds
Huayu Zhang (1):
ALSA: hda/realtek: Fix volumn control of ThinkBook 16P Gen4
Jason A. Donenfeld (2):
Revert "vmgenid: emit uevent when VMGENID updates"
random: handle creditable entropy from atomic process context
Jason Gunthorpe (1):
iommufd: Add missing IOMMUFD_DRIVER kconfig for the selftest
Jeongjun Park (1):
nilfs2: fix OOB in nilfs_set_de_type
Jerry Meng (1):
USB: serial: option: support Quectel EM060K sub-models
Jose Ignacio Tornos Martinez (1):
net: usb: ax88179_178a: avoid writing the mac address before first reading
Josh Poimboeuf (1):
x86/bugs: Fix BHI retpoline check
Kai-Heng Feng (1):
usb: Disable USB3 LPM at shutdown
Konrad Dybcio (1):
interconnect: qcom: x1e80100: Remove inexistent ACV_PERF BCM
Kuniyuki Iwashima (2):
af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
af_unix: Don't peek OOB data without MSG_OOB.
Kyle Tso (1):
usb: typec: tcpm: Correct the PDO counting in pd_set
Lei Chen (1):
tun: limit printing rate when illegal packet received by tun dev
Lokesh Gidra (1):
userfaultfd: change src_folio after ensuring it's unpinned in UFFDIO_MOVE
Maarten Lankhorst (1):
drm/xe: Fix bo leak in intel_fb_bo_framebuffer_init
Manivannan Sadhasivam (1):
scsi: ufs: qcom: Add missing interconnect bandwidth values for Gear 5
Marcin Szycik (1):
ice: Fix checking for unsupported keys on non-tunnel device
Mario Limonciello (1):
platform/x86/amd/pmc: Extend Framework 13 quirk to more BIOSes
Marios Makassikis (1):
ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
Mark Zhang (1):
RDMA/cm: Print the old state when cm_destroy_id gets timeout
Mathieu Desnoyers (1):
sched: Add missing memory barrier in switch_mm_cid
Mauro Carvalho Chehab (1):
ALSA: hda/realtek: Add quirks for Huawei Matebook D14 NBLB-WAX9N
Maíra Canal (1):
drm/v3d: Don't increment `enabled_ns` twice
Miaohe Lin (2):
mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled
fork: defer linking file vma until vma is fully initialized
Michael Guralnik (1):
RDMA/mlx5: Fix port number for counter query in multi-port configuration
Michal Swiatkowski (2):
ice: tc: check src_vsi in case of traffic from VF
ice: tc: allow zero flags in parsing tc flower
Mika Westerberg (2):
thunderbolt: Do not create DisplayPort tunnels on adapters of the same router
thunderbolt: Reset only non-USB4 host routers in resume
Mike Tipton (1):
interconnect: Don't access req_list while it's being manipulated
Mikhail Kobuk (1):
drm: nv04: Fix out of bounds access
Minas Harutyunyan (1):
usb: dwc2: host: Fix dereference issue in DDMA completion flow.
Muhammad Usama Anjum (1):
iommufd: Add config needed for iommufd_fail_nth
Namhyung Kim (2):
perf annotate: Make sure to call symbol__annotate2() in TUI
perf lock contention: Add a missing NULL check
Namjae Jeon (3):
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
Naohiro Aota (1):
btrfs: zoned: do not flag ZEROOUT on non-dirty extent buffer
Nathan Lynch (1):
selftests/powerpc/papr-vpd: Fix missing variable initialization
Nikita Zhandarovich (1):
comedi: vmk80xx: fix incomplete endpoint checking
Niklas Söderlund (1):
ravb: Group descriptor types used in Rx ring
Norihiko Hama (1):
usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
Oscar Salvador (1):
mm,swapops: update check in is_pfn_swap_entry for hwpoison entries
Pablo Neira Ayuso (7):
netfilter: br_netfilter: skip conntrack input hook for promisc packets
netfilter: nft_set_pipapo: walk over current view on netlink dump
netfilter: flowtable: validate pppoe header
netfilter: flowtable: incorrect pppoe tuple
netfilter: nf_tables: missing iterator type in lookup walk
netfilter: nf_tables: restore set elements when delete set fails
netfilter: nf_tables: fix memleak in map from abort path
Paul Barker (2):
net: ravb: Count packets instead of descriptors in R-Car RX path
net: ravb: Allow RX loop to move past DMA mapping errors
Peter Oberparleiter (2):
s390/qdio: handle deferred cc1
s390/cio: fix race condition during online processing
Peter Xu (1):
mm/userfaultfd: allow hugetlb change protection upon poison entry
Phillip Lougher (1):
Squashfs: check the inode number is not the invalid value of zero
Pin-yen Lin (1):
clk: mediatek: Do a runtime PM get on controllers during probe
Qiang Zhang (1):
bootconfig: use memblock_free_late to free xbc memory to buddy
Qu Wenruo (1):
btrfs: do not wait for short bulk allocation
Rafael J. Wysocki (1):
thermal/debugfs: Add missing count increment to thermal_debug_tz_trip_up()
Rick Edgecombe (1):
KVM: x86/mmu: x86: Don't overflow lpage_info when checking attributes
Ricky Wu (1):
misc: rtsx: Fix rts5264 driver status incorrect when card removed
Sakari Ailus (2):
Revert "mei: vsc: Call wake_up() in the threaded IRQ handler"
mei: vsc: Unregister interrupt handler for system suspend
Samuel Thibault (1):
speakup: Avoid crash on very long word
Sanath S (4):
thunderbolt: Introduce tb_port_reset()
thunderbolt: Introduce tb_path_deactivate_hop()
thunderbolt: Make tb_switch_reset() support Thunderbolt 2, 3 and USB4 routers
thunderbolt: Reset topology created by the boot firmware
Sandipan Das (1):
KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
Sean Christopherson (2):
KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
KVM: x86/pmu: Disable support for adaptive PEBS
Serge Semin (3):
net: stmmac: Apply half-duplex-less constraint for DW QoS Eth only
net: stmmac: Fix max-speed being ignored on queue re-init
net: stmmac: Fix IP-cores specific MAC capabilities
Shay Drory (3):
net/mlx5: Lag, restore buckets number to default after hash LAG deactivation
net/mlx5: Restore mistakenly dropped parts in register devlink flow
net/mlx5: E-switch, store eswitch pointer before registering devlink_param
Shenghao Ding (2):
ALSA: hda/tas2781: correct the register for pow calibrated data
ALSA: hda/tas2781: Add new vendor_id and subsystem_id to support ThinkPad ICE-1
Siddharth Vadapalli (1):
net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
Stephen Boyd (4):
clk: Remove prepare_lock hold assertion in __clk_release()
clk: Initialize struct clk_core kref earlier
clk: Get runtime PM before walking tree during disable_unused
clk: Get runtime PM before walking tree for clk_summary
Steven Rostedt (Google) (1):
SUNRPC: Fix rpcgss_context trace event acceptor field
Sumanth Korikkar (1):
mm/shmem: inline shmem_is_huge() for disabled transparent hugepages
Takashi Iwai (1):
ALSA: seq: ump: Fix conversion from MIDI2 to MIDI1 UMP messages
Tony Lindgren (2):
serial: core: Fix regression when runtime PM is not enabled
serial: core: Fix missing shutdown and startup for serial base port
Uwe Kleine-König (2):
serial: stm32: Return IRQ_NONE in the ISR if no handling happend
serial: stm32: Reset .throttled state in .startup()
Vanillan Wang (1):
USB: serial: option: add Rolling RW101-GL and RW135-GL support
Vasily Gorbik (1):
NFSD: fix endianness issue in nfsd4_encode_fattr4
Ville Syrjälä (1):
drm/i915/cdclk: Fix voltage_level programming edge case
Yanjun.Zhu (1):
RDMA/rxe: Fix the problem "mutex_destroy missing"
Yaxiong Tian (1):
arm64: hibernate: Fix level3 translation fault in swsusp_save()
Yuanhe Shu (1):
selftests/ftrace: Limit length in subsystem-enable tests
Yuntao Wang (1):
init/main.c: Fix potential static_command_line memory overflow
Yuri Benditovich (1):
net: change maximum number of UDP segments to 128
Zack Rusin (3):
drm/vmwgfx: Fix prime import/export
drm/vmwgfx: Sort primary plane formats by order of preference
drm/vmwgfx: Fix crtc's atomic check conditional
Ziyang Xuan (2):
netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
bolan wang (1):
USB: serial: option: add Fibocom FM135-GL variants
xinhui pan (1):
drm/amdgpu: validate the parameters of bo mapping operations more clearly
^ permalink raw reply [relevance 3%]
* Linux 6.6.29
@ 2024-04-27 15:55 3% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-27 15:55 UTC (permalink / raw)
To: linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby, Greg Kroah-Hartman
I'm announcing the release of the 6.6.29 kernel.
All users of the 6.6 kernel series must upgrade.
The updated 6.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.6.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/admin-guide/kernel-parameters.txt | 3
MAINTAINERS | 2
Makefile | 2
arch/arm/mach-omap2/pdata-quirks.c | 10
arch/arm64/include/asm/tlbflush.h | 40
arch/arm64/kernel/head.S | 5
arch/arm64/mm/pageattr.c | 3
arch/powerpc/include/asm/ftrace.h | 10
arch/powerpc/include/asm/sections.h | 1
arch/powerpc/kernel/trace/ftrace.c | 12
arch/powerpc/kernel/trace/ftrace_64_pg.c | 5
arch/powerpc/kernel/vmlinux.lds.S | 2
arch/x86/include/asm/barrier.h | 3
arch/x86/include/asm/kvm_host.h | 1
arch/x86/kernel/cpu/bugs.c | 11
arch/x86/kernel/cpu/cpuid-deps.c | 6
arch/x86/kvm/cpuid.c | 1
arch/x86/kvm/cpuid.h | 10
arch/x86/kvm/lapic.c | 3
arch/x86/kvm/mmu/mmu.c | 2
arch/x86/kvm/mmu/tdp_mmu.c | 21
arch/x86/kvm/vmx/vmx.c | 24
arch/x86/kvm/x86.c | 2
drivers/accessibility/speakup/main.c | 2
drivers/android/binder.c | 4
drivers/char/random.c | 10
drivers/clk/clk.c | 195
drivers/clk/mediatek/clk-mtk.c | 15
drivers/comedi/drivers/vmk80xx.c | 35
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 72
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 3
drivers/gpu/drm/drm_panel_orientation_quirks.c | 6
drivers/gpu/drm/i915/display/intel_atomic.c | 1
drivers/gpu/drm/i915/display/intel_cdclk.c | 37
drivers/gpu/drm/i915/display/intel_crtc.c | 96
drivers/gpu/drm/i915/display/intel_crtc.h | 6
drivers/gpu/drm/i915/display/intel_display.c | 43
drivers/gpu/drm/i915/display/intel_display_device.h | 1
drivers/gpu/drm/i915/display/intel_display_types.h | 2
drivers/gpu/drm/i915/display/intel_dp.c | 13
drivers/gpu/drm/i915/display/intel_dp_mst.c | 2
drivers/gpu/drm/i915/i915_vma.c | 42
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 8
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 8
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 8
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 95
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 3
drivers/gpu/drm/nouveau/nouveau_bios.c | 13
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 7
drivers/gpu/drm/panel/panel-visionox-rm69299.c | 2
drivers/gpu/drm/radeon/radeon_atombios.c | 8
drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 35
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 7
drivers/gpu/drm/vmwgfx/vmwgfx_bo.h | 2
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 3
drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 32
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4
drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 15
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 44
drivers/infiniband/core/cm.c | 11
drivers/infiniband/hw/mlx5/mad.c | 3
drivers/infiniband/sw/rxe/rxe.c | 2
drivers/interconnect/core.c | 8
drivers/media/common/videobuf2/videobuf2-core.c | 9
drivers/misc/mei/pci-me.c | 2
drivers/net/dsa/mt7530.c | 38
drivers/net/dsa/mt7530.h | 5
drivers/net/ethernet/intel/ice/ice_tc_lib.c | 15
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 7
drivers/net/ethernet/mediatek/mtk_wed.c | 6
drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 27
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 9
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 4
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c | 61
drivers/net/ethernet/stmicro/stmmac/common.h | 1
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2
drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c | 2
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 7
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 18
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 29
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 18
drivers/net/tun.c | 18
drivers/net/usb/ax88179_178a.c | 4
drivers/net/virtio_net.c | 25
drivers/pci/bus.c | 49
drivers/pci/pci.c | 78
drivers/pci/pci.h | 4
drivers/pci/pcie/aspm.c | 21
drivers/pci/pcie/dpc.c | 5
drivers/pci/quirks.c | 8
drivers/platform/x86/amd/pmc/pmc-quirks.c | 9
drivers/s390/cio/device.c | 13
drivers/s390/cio/qdio_main.c | 28
drivers/s390/net/ism_drv.c | 37
drivers/scsi/scsi_lib.c | 7
drivers/thunderbolt/domain.c | 5
drivers/thunderbolt/icm.c | 2
drivers/thunderbolt/lc.c | 45
drivers/thunderbolt/nhi.c | 19
drivers/thunderbolt/path.c | 13
drivers/thunderbolt/switch.c | 178
drivers/thunderbolt/tb.c | 38
drivers/thunderbolt/tb.h | 10
drivers/thunderbolt/tb_regs.h | 6
drivers/thunderbolt/usb4.c | 52
drivers/tty/serial/mxs-auart.c | 8
drivers/tty/serial/pmac_zilog.c | 14
drivers/tty/serial/serial_base.h | 4
drivers/tty/serial/serial_core.c | 21
drivers/tty/serial/serial_port.c | 34
drivers/tty/serial/stm32-usart.c | 13
drivers/ufs/host/ufs-qcom.c | 8
drivers/usb/class/cdc-wdm.c | 6
drivers/usb/core/hub.c | 15
drivers/usb/core/port.c | 4
drivers/usb/core/quirks.c | 7
drivers/usb/dwc2/hcd_ddma.c | 4
drivers/usb/gadget/function/f_ncm.c | 4
drivers/usb/host/xhci-mem.c | 2
drivers/usb/host/xhci-ring.c | 11
drivers/usb/host/xhci.c | 23
drivers/usb/host/xhci.h | 9
drivers/usb/serial/option.c | 40
fs/ceph/addr.c | 22
fs/ceph/cache.c | 2
fs/ceph/caps.c | 53
fs/ceph/crypto.c | 2
fs/ceph/debugfs.c | 4
fs/ceph/dir.c | 24
fs/ceph/export.c | 10
fs/ceph/file.c | 26
fs/ceph/inode.c | 14
fs/ceph/ioctl.c | 8
fs/ceph/mds_client.c | 41
fs/ceph/mds_client.h | 3
fs/ceph/mdsmap.c | 3
fs/ceph/snap.c | 18
fs/ceph/super.c | 22
fs/ceph/super.h | 13
fs/ceph/xattr.c | 12
fs/fuse/dir.c | 1
fs/nilfs2/dir.c | 2
fs/smb/client/cifs_debug.c | 6
fs/smb/client/cifsglob.h | 3
fs/smb/client/cifsproto.h | 20
fs/smb/client/connect.c | 131
fs/smb/client/dfs.c | 51
fs/smb/client/dfs.h | 33
fs/smb/client/dfs_cache.c | 53
fs/smb/client/misc.c | 7
fs/smb/common/smb2pdu.h | 2
fs/smb/server/server.c | 13
fs/smb/server/smb2pdu.c | 4
fs/smb/server/vfs.c | 5
fs/sysfs/file.c | 2
include/asm-generic/barrier.h | 8
include/linux/bootconfig.h | 7
include/linux/ceph/mdsmap.h | 5
include/linux/gpio/property.h | 1
include/linux/pci.h | 5
include/linux/shmem_fs.h | 9
include/linux/swapops.h | 65
include/linux/udp.h | 2
include/linux/usb/hcd.h | 5
include/linux/usb/quirks.h | 3
include/net/netfilter/nf_flow_table.h | 12
include/trace/events/rpcgss.h | 4
include/uapi/linux/pci_regs.h | 1
init/main.c | 2
io_uring/io_uring.c | 26
kernel/sched/sched.h | 20
lib/bootconfig.c | 19
mm/hugetlb.c | 10
mm/memory-failure.c | 18
mm/shmem.c | 6
net/bridge/br_input.c | 15
net/bridge/br_netfilter_hooks.c | 6
net/bridge/br_private.h | 1
net/bridge/netfilter/nf_conntrack_bridge.c | 14
net/netfilter/nf_flow_table_inet.c | 3
net/netfilter/nf_flow_table_ip.c | 10
net/netfilter/nf_tables_api.c | 16
net/netfilter/nft_set_pipapo.c | 14
net/unix/af_unix.c | 12
sound/core/seq/seq_ump_convert.c | 2
sound/pci/hda/patch_realtek.c | 3
sound/pci/hda/tas2781_hda_i2c.c | 4
sound/soc/ti/omap3pandora.c | 63
sound/usb/Makefile | 2
sound/usb/mixer_quirks.c | 9
sound/usb/mixer_scarlett2.c | 4391 ++++++++++
sound/usb/mixer_scarlett2.h | 7
sound/usb/mixer_scarlett_gen2.c | 4274 ---------
sound/usb/mixer_scarlett_gen2.h | 7
tools/perf/util/bpf_skel/lock_contention.bpf.c | 5
tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc | 6
tools/testing/selftests/kselftest.h | 18
tools/testing/selftests/net/udpgso.c | 2
tools/testing/selftests/timers/posix_timers.c | 156
205 files changed, 6733 insertions(+), 5414 deletions(-)
Ai Chao (1):
ALSA: hda/realtek - Enable audio jacks of Haier Boyue G42 with ALC269VC
Alan Stern (1):
fs: sysfs: Fix reference leak in sysfs_break_active_protection()
Alex Deucher (1):
drm/radeon: make -fstrict-flex-arrays=3 happy
Alexander Usyskin (1):
mei: me: disable RPL-S on SPS and IGN firmwares
Alexey Izbyshev (1):
io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
Andy Shevchenko (2):
gpiolib: swnode: Remove wrong header inclusion
serial: core: Clearing the circular buffer before NULLifying it
Ard Biesheuvel (1):
arm64/head: Disable MMU at EL2 before clearing HCR_EL2.E2H
Arınç ÜNAL (4):
net: dsa: mt7530: fix mirroring frames received on local port
net: dsa: mt7530: fix port mirroring for MT7988 SoC switch
net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
Asbjørn Sloth Tønnesen (2):
net: sparx5: flower: fix fragment flags handling
octeontx2-pf: fix FLOW_DIS_IS_FRAGMENT implementation
Bart Van Assche (1):
scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING
Bjorn Helgaas (1):
PCI/DPC: Use FIELD_GET()
Breno Leitao (1):
virtio_net: Do not send RSS key if it is not supported
Brenton Simpson (1):
drm: panel-orientation-quirks: Add quirk for Lenovo Legion Go
Carlos Llamas (1):
binder: check offset alignment in binder_get_object()
Carolina Jubran (1):
net/mlx5e: Prevent deadlock while disabling aRFS
Christian König (1):
drm/amdgpu: remove invalid resource->start check v2
Chuanhong Guo (1):
USB: serial: option: add support for Fibocom FM650/FG650
Coia Prant (1):
USB: serial: option: add Lonsung U8300/U9300 product
Daniele Palmas (1):
USB: serial: option: add Telit FN920C04 rmnet compositions
Danny Lin (1):
fuse: fix leaked ENOSYS error on first statx call
Dave Airlie (1):
nouveau: fix instmem race condition around ptr stores
David Matlack (1):
KVM: x86/mmu: Write-protect L2 SPTEs in TDP MMU when clearing dirty status
Dillon Varone (1):
drm/amd/display: Do not recursively call manual trigger programming
Dmitry Baryshkov (2):
drm/msm/dpu: populate SSPP scaler block version
drm/panel: visionox-rm69299: don't unregister DSI device
Emil Kronborg (1):
serial: mxs-auart: add spinlock around changing cts state
Eric Biggers (1):
x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
Felix Fietkau (1):
net: ethernet: mtk_eth_soc: fix WED + wifi reset
Felix Kuehling (1):
drm/amdkfd: Fix memory leak in create_process failure
Finn Thain (1):
serial/pmac_zilog: Remove flawed mitigation for rx irq flood
Florian Westphal (1):
netfilter: nft_set_pipapo: do not free live element
Gavin Shan (1):
arm64: tlb: Fix TLBI RANGE operand
Geoffrey D. Bennett (7):
ALSA: scarlett2: Move USB IDs out from device_info struct
ALSA: scarlett2: Add support for Clarett 8Pre USB
ALSA: scarlett2: Default mixer driver to enabled
ALSA: scarlett2: Add correct product series name to messages
ALSA: scarlett2: Add Focusrite Clarett+ 2Pre and 4Pre support
ALSA: scarlett2: Add Focusrite Clarett 2Pre and 4Pre USB support
ALSA: scarlett2: Rename scarlett_gen2 to scarlett2
Gerd Bayer (1):
s390/ism: Properly fix receive message buffer allocation
Gil Fine (2):
thunderbolt: Avoid notify PM core about runtime PM resume
thunderbolt: Fix wake configurations after device unplug
Greg Kroah-Hartman (2):
Revert "usb: cdc-wdm: close race between read and workqueue"
Linux 6.6.29
Hans Verkuil (1):
media: videobuf2: request more buffers for vb2_read
Hardik Gajjar (2):
usb: xhci: Add timeout argument in address_device USB HCD callback
usb: new quirk to reduce the SET_ADDRESS request timeout
Ilpo Järvinen (1):
PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word()
Janusz Krzysztofik (1):
drm/i915/vma: Fix UAF on destroy against retire race
Jason A. Donenfeld (1):
random: handle creditable entropy from atomic process context
Jeongjun Park (1):
nilfs2: fix OOB in nilfs_set_de_type
Jerry Meng (1):
USB: serial: option: support Quectel EM060K sub-models
Johan Hovold (1):
PCI/ASPM: Fix deadlock when enabling ASPM
John Stultz (1):
selftests: timers: Fix posix_timers ksft_print_msg() warning
Jose Ignacio Tornos Martinez (1):
net: usb: ax88179_178a: avoid writing the mac address before first reading
Josh Poimboeuf (1):
x86/bugs: Fix BHI retpoline check
Kai-Heng Feng (1):
usb: Disable USB3 LPM at shutdown
Kuniyuki Iwashima (2):
af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
af_unix: Don't peek OOB data without MSG_OOB.
Lei Chen (1):
tun: limit printing rate when illegal packet received by tun dev
Linus Walleij (1):
ASoC: ti: Convert Pandora ASoC to GPIO descriptors
Manivannan Sadhasivam (1):
scsi: ufs: qcom: Add missing interconnect bandwidth values for Gear 5
Marcin Szycik (1):
ice: Fix checking for unsupported keys on non-tunnel device
Mario Limonciello (1):
platform/x86/amd/pmc: Extend Framework 13 quirk to more BIOSes
Marios Makassikis (1):
ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
Mark Brown (1):
selftests: timers: Convert posix_timers test to generate KTAP output
Mark Zhang (1):
RDMA/cm: Print the old state when cm_destroy_id gets timeout
Mathieu Desnoyers (1):
sched: Add missing memory barrier in switch_mm_cid
Mauro Carvalho Chehab (1):
ALSA: hda/realtek: Add quirks for Huawei Matebook D14 NBLB-WAX9N
Miaohe Lin (1):
mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled
Michael Guralnik (1):
RDMA/mlx5: Fix port number for counter query in multi-port configuration
Michal Swiatkowski (2):
ice: tc: check src_vsi in case of traffic from VF
ice: tc: allow zero flags in parsing tc flower
Mika Westerberg (1):
thunderbolt: Reset only non-USB4 host routers in resume
Mike Tipton (1):
interconnect: Don't access req_list while it's being manipulated
Mikhail Kobuk (1):
drm: nv04: Fix out of bounds access
Minas Harutyunyan (1):
usb: dwc2: host: Fix dereference issue in DDMA completion flow.
Namhyung Kim (1):
perf lock contention: Add a missing NULL check
Namjae Jeon (3):
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
Naveen N Rao (1):
powerpc/ftrace: Ignore ftrace locations in exit text sections
NeilBrown (1):
ceph: redirty page before returning AOP_WRITEPAGE_ACTIVATE
Nikita Zhandarovich (1):
comedi: vmk80xx: fix incomplete endpoint checking
Norihiko Hama (1):
usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
Oleg Nesterov (2):
selftests/timers/posix_timers: Reimplement check_timer_distribution()
selftests: kselftest: Fix build failure with NOLIBC
Oscar Salvador (1):
mm,swapops: update check in is_pfn_swap_entry for hwpoison entries
Pablo Neira Ayuso (3):
netfilter: br_netfilter: skip conntrack input hook for promisc packets
netfilter: flowtable: validate pppoe header
netfilter: flowtable: incorrect pppoe tuple
Paulo Alcantara (4):
smb: client: remove extra @chan_count check in __cifs_put_smb_ses()
smb: client: fix UAF in smb2_reconnect_server()
smb: client: guarantee refcounted children from parent session
smb: client: refresh referral without acquiring refpath_lock
Peter Oberparleiter (2):
s390/qdio: handle deferred cc1
s390/cio: fix race condition during online processing
Peter Xu (1):
mm/userfaultfd: allow hugetlb change protection upon poison entry
Pin-yen Lin (1):
clk: mediatek: Do a runtime PM get on controllers during probe
Qiang Zhang (1):
bootconfig: use memblock_free_late to free xbc memory to buddy
Ryan Roberts (1):
arm64/mm: Modify range-based tlbi to decrement scale
Samuel Thibault (1):
speakup: Avoid crash on very long word
Sanath S (4):
thunderbolt: Introduce tb_port_reset()
thunderbolt: Introduce tb_path_deactivate_hop()
thunderbolt: Make tb_switch_reset() support Thunderbolt 2, 3 and USB4 routers
thunderbolt: Reset topology created by the boot firmware
Sandipan Das (1):
KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
Sean Christopherson (2):
KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
KVM: x86/pmu: Disable support for adaptive PEBS
Serge Semin (3):
net: stmmac: Apply half-duplex-less constraint for DW QoS Eth only
net: stmmac: Fix max-speed being ignored on queue re-init
net: stmmac: Fix IP-cores specific MAC capabilities
Shay Drory (2):
net/mlx5: Lag, restore buckets number to default after hash LAG deactivation
net/mlx5: E-switch, store eswitch pointer before registering devlink_param
Shenghao Ding (2):
ALSA: hda/tas2781: correct the register for pow calibrated data
ALSA: hda/tas2781: Add new vendor_id and subsystem_id to support ThinkPad ICE-1
Siddharth Vadapalli (1):
net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
Stephen Boyd (4):
clk: Remove prepare_lock hold assertion in __clk_release()
clk: Initialize struct clk_core kref earlier
clk: Get runtime PM before walking tree during disable_unused
clk: Get runtime PM before walking tree for clk_summary
Steve French (1):
smb3: show beginning time for per share stats
Steven Rostedt (Google) (1):
SUNRPC: Fix rpcgss_context trace event acceptor field
Sumanth Korikkar (1):
mm/shmem: inline shmem_is_huge() for disabled transparent hugepages
Takashi Iwai (1):
ALSA: seq: ump: Fix conversion from MIDI2 to MIDI1 UMP messages
Tony Lindgren (1):
serial: core: Fix missing shutdown and startup for serial base port
Uwe Kleine-König (2):
serial: stm32: Return IRQ_NONE in the ISR if no handling happend
serial: stm32: Reset .throttled state in .startup()
Vanillan Wang (1):
USB: serial: option: add Rolling RW101-GL and RW135-GL support
Ville Syrjälä (9):
drm/i915: Fix FEC pipe A vs. DDI A mixup
drm/i915/mst: Reject FEC+MST on ICL
drm/i915/cdclk: Fix voltage_level programming edge case
drm/i915: Change intel_pipe_update_{start,end}() calling convention
drm/i915: Extract intel_crtc_vblank_evade_scanlines()
drm/i915: Enable VRR later during fastsets
drm/i915: Adjust seamless_m_n flag behaviour
drm/i915: Disable live M/N updates when using bigjoiner
drm/i915/mst: Limit MST+DSC to TGL+
Vishal Badole (1):
clk: Show active consumers of clocks in debugfs
Xiubo Li (2):
ceph: pass the mdsc to several helpers
ceph: rename _to_client() to _to_fs_client()
Yanjun.Zhu (1):
RDMA/rxe: Fix the problem "mutex_destroy missing"
Yaxiong Tian (1):
arm64: hibernate: Fix level3 translation fault in swsusp_save()
Yuanhe Shu (1):
selftests/ftrace: Limit length in subsystem-enable tests
Yuntao Wang (1):
init/main.c: Fix potential static_command_line memory overflow
Yuri Benditovich (1):
net: change maximum number of UDP segments to 128
Zack Rusin (3):
drm/vmwgfx: Fix prime import/export
drm/vmwgfx: Sort primary plane formats by order of preference
drm/vmwgfx: Fix crtc's atomic check conditional
Ziyang Xuan (2):
netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
bolan wang (1):
USB: serial: option: add Fibocom FM135-GL variants
xinhui pan (1):
drm/amdgpu: validate the parameters of bo mapping operations more clearly
^ permalink raw reply [relevance 3%]
* Linux 6.1.88
@ 2024-04-27 15:54 3% Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-27 15:54 UTC (permalink / raw)
To: linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby, Greg Kroah-Hartman
I'm announcing the release of the 6.1.88 kernel.
All users of the 6.1 kernel series must upgrade.
The updated 6.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/admin-guide/kernel-parameters.txt | 3
MAINTAINERS | 2
Makefile | 2
arch/arm/mach-omap2/board-n8x0.c | 5
arch/arm/mach-omap2/common-board-devices.h | 2
arch/arm/mach-omap2/pdata-quirks.c | 11
arch/arm64/mm/pageattr.c | 3
arch/x86/boot/Makefile | 2
arch/x86/boot/compressed/Makefile | 2
arch/x86/boot/compressed/misc.c | 1
arch/x86/boot/compressed/sev.c | 3
arch/x86/boot/compressed/vmlinux.lds.S | 6
arch/x86/boot/header.S | 211
arch/x86/boot/setup.ld | 14
arch/x86/boot/tools/build.c | 273
arch/x86/include/asm/boot.h | 1
arch/x86/include/asm/init.h | 2
arch/x86/include/asm/kvm_host.h | 1
arch/x86/include/asm/mem_encrypt.h | 8
arch/x86/include/asm/page_types.h | 12
arch/x86/include/asm/sev.h | 10
arch/x86/kernel/amd_gart_64.c | 2
arch/x86/kernel/cpu/bugs.c | 11
arch/x86/kernel/cpu/cpuid-deps.c | 6
arch/x86/kernel/head64.c | 7
arch/x86/kernel/platform-quirks.c | 1
arch/x86/kernel/sev-shared.c | 23
arch/x86/kernel/sev.c | 11
arch/x86/kvm/cpuid.c | 1
arch/x86/kvm/cpuid.h | 10
arch/x86/kvm/lapic.c | 3
arch/x86/kvm/mmu/mmu.c | 2
arch/x86/kvm/vmx/vmx.c | 24
arch/x86/kvm/x86.c | 2
arch/x86/mm/mem_encrypt_boot.S | 4
arch/x86/mm/mem_encrypt_identity.c | 58
arch/x86/mm/pat/set_memory.c | 6
arch/x86/mm/pti.c | 2
drivers/accessibility/speakup/main.c | 2
drivers/android/binder.c | 4
drivers/char/random.c | 10
drivers/clk/clk.c | 201
drivers/clk/mediatek/clk-gate.c | 23
drivers/clk/mediatek/clk-gate.h | 7
drivers/clk/mediatek/clk-mt2701-aud.c | 4
drivers/clk/mediatek/clk-mt2701-eth.c | 4
drivers/clk/mediatek/clk-mt2701-g3d.c | 2
drivers/clk/mediatek/clk-mt2701-hif.c | 4
drivers/clk/mediatek/clk-mt2701-mm.c | 4
drivers/clk/mediatek/clk-mt2701.c | 22
drivers/clk/mediatek/clk-mt2712-mm.c | 4
drivers/clk/mediatek/clk-mt2712.c | 24
drivers/clk/mediatek/clk-mt6765.c | 13
drivers/clk/mediatek/clk-mt6779-mm.c | 4
drivers/clk/mediatek/clk-mt6779.c | 21
drivers/clk/mediatek/clk-mt6795-infracfg.c | 3
drivers/clk/mediatek/clk-mt6795-mm.c | 3
drivers/clk/mediatek/clk-mt6795-pericfg.c | 6
drivers/clk/mediatek/clk-mt6795-topckgen.c | 6
drivers/clk/mediatek/clk-mt6797-mm.c | 4
drivers/clk/mediatek/clk-mt6797.c | 7
drivers/clk/mediatek/clk-mt7622-aud.c | 4
drivers/clk/mediatek/clk-mt7622-eth.c | 8
drivers/clk/mediatek/clk-mt7622-hif.c | 8
drivers/clk/mediatek/clk-mt7622.c | 22
drivers/clk/mediatek/clk-mt7629-eth.c | 7
drivers/clk/mediatek/clk-mt7629-hif.c | 8
drivers/clk/mediatek/clk-mt7629.c | 18
drivers/clk/mediatek/clk-mt7986-eth.c | 10
drivers/clk/mediatek/clk-mt7986-infracfg.c | 7
drivers/clk/mediatek/clk-mt7986-topckgen.c | 3
drivers/clk/mediatek/clk-mt8135.c | 18
drivers/clk/mediatek/clk-mt8167-aud.c | 2
drivers/clk/mediatek/clk-mt8167-img.c | 2
drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 2
drivers/clk/mediatek/clk-mt8167-mm.c | 4
drivers/clk/mediatek/clk-mt8167-vdec.c | 3
drivers/clk/mediatek/clk-mt8167.c | 12
drivers/clk/mediatek/clk-mt8173-mm.c | 4
drivers/clk/mediatek/clk-mt8173.c | 34
drivers/clk/mediatek/clk-mt8183-audio.c | 4
drivers/clk/mediatek/clk-mt8183-mm.c | 4
drivers/clk/mediatek/clk-mt8183.c | 36
drivers/clk/mediatek/clk-mt8186-mcu.c | 3
drivers/clk/mediatek/clk-mt8186-mm.c | 3
drivers/clk/mediatek/clk-mt8186-topckgen.c | 9
drivers/clk/mediatek/clk-mt8192-aud.c | 3
drivers/clk/mediatek/clk-mt8192-mm.c | 3
drivers/clk/mediatek/clk-mt8192.c | 90
drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 3
drivers/clk/mediatek/clk-mt8195-topckgen.c | 9
drivers/clk/mediatek/clk-mt8195-vdo0.c | 3
drivers/clk/mediatek/clk-mt8195-vdo1.c | 3
drivers/clk/mediatek/clk-mt8365-mm.c | 5
drivers/clk/mediatek/clk-mt8365.c | 14
drivers/clk/mediatek/clk-mt8516-aud.c | 2
drivers/clk/mediatek/clk-mt8516.c | 12
drivers/clk/mediatek/clk-mtk.c | 127
drivers/clk/mediatek/clk-mtk.h | 13
drivers/clk/mediatek/clk-mux.c | 14
drivers/clk/mediatek/clk-mux.h | 3
drivers/comedi/drivers/vmk80xx.c | 35
drivers/firmware/efi/libstub/Makefile | 7
drivers/firmware/efi/libstub/x86-stub.c | 58
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 72
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 78
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 3
drivers/gpu/drm/drm_panel_orientation_quirks.c | 6
drivers/gpu/drm/i915/i915_vma.c | 42
drivers/gpu/drm/nouveau/nouveau_bios.c | 13
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 7
drivers/gpu/drm/panel/panel-visionox-rm69299.c | 2
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 11
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4
drivers/hid/hid-ids.h | 2
drivers/hid/hid-kye.c | 62
drivers/hid/hid-quirks.c | 6
drivers/infiniband/core/cm.c | 11
drivers/infiniband/hw/mlx5/mad.c | 3
drivers/infiniband/sw/rxe/rxe.c | 2
drivers/misc/mei/pci-me.c | 2
drivers/net/dsa/mt7530.c | 58
drivers/net/dsa/mt7530.h | 6
drivers/net/ethernet/intel/ice/ice_tc_lib.c | 2
drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 27
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 4
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 18
drivers/net/tun.c | 18
drivers/net/usb/ax88179_178a.c | 4
drivers/pci/bus.c | 49
drivers/pci/pci.c | 78
drivers/pci/pci.h | 4
drivers/pci/pcie/aspm.c | 21
drivers/pci/pcie/dpc.c | 5
drivers/pci/quirks.c | 68
drivers/pci/switch/switchtec.c | 158
drivers/s390/cio/device.c | 13
drivers/s390/cio/qdio_main.c | 28
drivers/thunderbolt/quirks.c | 2
drivers/thunderbolt/switch.c | 48
drivers/thunderbolt/tb.c | 4
drivers/thunderbolt/tb.h | 3
drivers/thunderbolt/usb4.c | 13
drivers/tty/serial/mxs-auart.c | 8
drivers/tty/serial/pmac_zilog.c | 14
drivers/tty/serial/stm32-usart.c | 13
drivers/usb/class/cdc-wdm.c | 6
drivers/usb/core/hub.c | 15
drivers/usb/core/port.c | 4
drivers/usb/core/quirks.c | 7
drivers/usb/dwc2/hcd_ddma.c | 4
drivers/usb/gadget/function/f_ncm.c | 4
drivers/usb/host/pci-quirks.c | 4
drivers/usb/host/xhci-mem.c | 2
drivers/usb/host/xhci-ring.c | 11
drivers/usb/host/xhci.c | 23
drivers/usb/host/xhci.h | 9
drivers/usb/serial/option.c | 40
fs/nilfs2/dir.c | 2
fs/smb/common/smb2pdu.h | 2
fs/smb/server/server.c | 13
fs/smb/server/smb2pdu.c | 4
fs/smb/server/vfs.c | 5
fs/sysfs/file.c | 2
include/linux/bootconfig.h | 7
include/linux/pci.h | 5
include/linux/pci_ids.h | 2
include/linux/switchtec.h | 1
include/linux/usb/hcd.h | 5
include/linux/usb/quirks.h | 3
include/net/dsa.h | 8
include/net/netfilter/nf_flow_table.h | 12
include/trace/events/rpcgss.h | 4
include/uapi/linux/pci_regs.h | 1
init/main.c | 2
io_uring/io_uring.c | 16
lib/bootconfig.c | 19
mm/memory-failure.c | 18
net/bridge/br_input.c | 15
net/bridge/br_netfilter_hooks.c | 6
net/bridge/br_private.h | 1
net/bridge/netfilter/nf_conntrack_bridge.c | 14
net/dsa/dsa2.c | 24
net/netfilter/nf_flow_table_inet.c | 3
net/netfilter/nf_flow_table_ip.c | 10
net/netfilter/nf_tables_api.c | 16
net/netfilter/nft_set_pipapo.c | 14
net/unix/af_unix.c | 12
sound/pci/hda/patch_realtek.c | 1
sound/soc/ti/omap3pandora.c | 63
sound/usb/Makefile | 2
sound/usb/mixer_quirks.c | 9
sound/usb/mixer_scarlett2.c | 4391 ++++++++++
sound/usb/mixer_scarlett2.h | 7
sound/usb/mixer_scarlett_gen2.c | 4274 ---------
sound/usb/mixer_scarlett_gen2.h | 7
tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc | 6
198 files changed, 6276 insertions(+), 5630 deletions(-)
Ai Chao (1):
ALSA: hda/realtek - Enable audio jacks of Haier Boyue G42 with ALC269VC
Alan Stern (1):
fs: sysfs: Fix reference leak in sysfs_break_active_protection()
Alexander Usyskin (1):
mei: me: disable RPL-S on SPS and IGN firmwares
Alexey Izbyshev (1):
io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
Alvaro Karsz (1):
PCI: Avoid FLR for SolidRun SNET DPU rev 1
AngeloGioacchino Del Regno (6):
clk: mediatek: mt8192: Correctly unregister and free clocks on failure
clk: mediatek: mt8192: Propagate struct device for gate clocks
clk: mediatek: clk-gate: Propagate struct device with mtk_clk_register_gates()
clk: mediatek: clk-mtk: Propagate struct device for composites
clk: mediatek: clk-mux: Propagate struct device for mtk-mux
clk: mediatek: clk-mtk: Extend mtk_clk_simple_probe()
Ard Biesheuvel (20):
x86/efi: Drop EFI stub .bss from .data section
x86/efi: Disregard setup header of loaded image
x86/efistub: Reinstate soft limit for initrd loading
x86/efi: Drop alignment flags from PE section headers
x86/boot: Remove the 'bugger off' message
x86/boot: Omit compression buffer from PE/COFF image memory footprint
x86/boot: Drop redundant code setting the root device
x86/boot: Drop references to startup_64
x86/boot: Grab kernel_info offset from zoffset header directly
x86/boot: Set EFI handover offset directly in header asm
x86/boot: Define setup size in linker script
x86/boot: Derive file size from _edata symbol
x86/boot: Construct PE/COFF .text section from assembler
x86/boot: Drop PE/COFF .reloc section
x86/boot: Split off PE/COFF .data section
x86/boot: Increase section and file alignment to 4k/512
x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section
x86/sme: Move early SME kernel encryption handling into .head.text
x86/sev: Move early startup code into .head.text section
x86/efistub: Remap kernel text read-only before dropping NX attribute
Arnd Bergmann (1):
x86/quirks: Include linux/pnp.h for arch_pnpbios_disabled()
Arınç ÜNAL (4):
net: dsa: mt7530: fix mirroring frames received on local port
net: dsa: mt7530: set all CPU ports in MT7531_CPU_PMAP
net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
Bjorn Helgaas (1):
PCI/DPC: Use FIELD_GET()
Brenton Simpson (1):
drm: panel-orientation-quirks: Add quirk for Lenovo Legion Go
Carlos Llamas (1):
binder: check offset alignment in binder_get_object()
Carolina Jubran (1):
net/mlx5e: Prevent deadlock while disabling aRFS
Christophe JAILLET (1):
usb: pci-quirks: Reduce the length of a spinlock section in usb_amd_find_chipset_info()
Chuanhong Guo (1):
USB: serial: option: add support for Fibocom FM650/FG650
Coia Prant (1):
USB: serial: option: add Lonsung U8300/U9300 product
Daniele Palmas (1):
USB: serial: option: add Telit FN920C04 rmnet compositions
Dave Airlie (1):
nouveau: fix instmem race condition around ptr stores
David Yang (1):
HID: kye: Sort kye devices
Dillon Varone (1):
drm/amd/display: Do not recursively call manual trigger programming
Dmitry Baryshkov (1):
drm/panel: visionox-rm69299: don't unregister DSI device
Dmitry Torokhov (1):
ARM: omap2: n8x0: stop instantiating codec platform data
Emil Kronborg (1):
serial: mxs-auart: add spinlock around changing cts state
Eric Biggers (1):
x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
Finn Thain (1):
serial/pmac_zilog: Remove flawed mitigation for rx irq flood
Florian Westphal (1):
netfilter: nft_set_pipapo: do not free live element
Geoffrey D. Bennett (7):
ALSA: scarlett2: Move USB IDs out from device_info struct
ALSA: scarlett2: Add support for Clarett 8Pre USB
ALSA: scarlett2: Default mixer driver to enabled
ALSA: scarlett2: Add correct product series name to messages
ALSA: scarlett2: Add Focusrite Clarett+ 2Pre and 4Pre support
ALSA: scarlett2: Add Focusrite Clarett 2Pre and 4Pre USB support
ALSA: scarlett2: Rename scarlett_gen2 to scarlett2
Gil Fine (2):
thunderbolt: Avoid notify PM core about runtime PM resume
thunderbolt: Fix wake configurations after device unplug
Greg Kroah-Hartman (2):
Revert "usb: cdc-wdm: close race between read and workqueue"
Linux 6.1.88
Hardik Gajjar (2):
usb: xhci: Add timeout argument in address_device USB HCD callback
usb: new quirk to reduce the SET_ADDRESS request timeout
Hawking Zhang (1):
drm/amdgpu: fix incorrect active rb bitmap for gfx11
Hou Wenlong (2):
x86/head/64: Add missing __head annotation to startup_64_load_idt()
x86/head/64: Move the __head definition to <asm/init.h>
Ilpo Järvinen (1):
PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word()
Janusz Krzysztofik (1):
drm/i915/vma: Fix UAF on destroy against retire race
Jason A. Donenfeld (1):
random: handle creditable entropy from atomic process context
Jeongjun Park (1):
nilfs2: fix OOB in nilfs_set_de_type
Jerry Meng (1):
USB: serial: option: support Quectel EM060K sub-models
Johan Hovold (1):
PCI/ASPM: Fix deadlock when enabling ASPM
Jose Ignacio Tornos Martinez (1):
net: usb: ax88179_178a: avoid writing the mac address before first reading
Josh Poimboeuf (1):
x86/bugs: Fix BHI retpoline check
Kai-Heng Feng (1):
usb: Disable USB3 LPM at shutdown
Kelvin Cao (2):
PCI: switchtec: Use normal comment style
PCI: switchtec: Add support for PCIe Gen5 devices
Konrad Dybcio (1):
clk: Print an info line before disabling unused clocks
Kuniyuki Iwashima (2):
af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
af_unix: Don't peek OOB data without MSG_OOB.
Lei Chen (1):
tun: limit printing rate when illegal packet received by tun dev
Linus Walleij (1):
ASoC: ti: Convert Pandora ASoC to GPIO descriptors
Maciej W. Rozycki (1):
PCI: Execute quirk_enable_clear_retrain_link() earlier
Marios Makassikis (1):
ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
Mark Zhang (1):
RDMA/cm: Print the old state when cm_destroy_id gets timeout
Miaohe Lin (1):
mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled
Michael Guralnik (1):
RDMA/mlx5: Fix port number for counter query in multi-port configuration
Michal Swiatkowski (1):
ice: tc: allow zero flags in parsing tc flower
Mika Westerberg (2):
thunderbolt: Log function name of the called quirk
thunderbolt: Add debug log for link controller power quirk
Mike Pastore (1):
PCI: Delay after FLR of Solidigm P44 Pro NVMe
Mikhail Kobuk (1):
drm: nv04: Fix out of bounds access
Minas Harutyunyan (1):
usb: dwc2: host: Fix dereference issue in DDMA completion flow.
Namjae Jeon (3):
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
Nikita Zhandarovich (1):
comedi: vmk80xx: fix incomplete endpoint checking
Norihiko Hama (1):
usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
Pablo Neira Ayuso (3):
netfilter: br_netfilter: skip conntrack input hook for promisc packets
netfilter: flowtable: validate pppoe header
netfilter: flowtable: incorrect pppoe tuple
Pasha Tatashin (1):
x86/mm: Remove P*D_PAGE_MASK and P*D_PAGE_SIZE macros
Peter Oberparleiter (2):
s390/qdio: handle deferred cc1
s390/cio: fix race condition during online processing
Pin-yen Lin (1):
clk: mediatek: Do a runtime PM get on controllers during probe
Qiang Zhang (1):
bootconfig: use memblock_free_late to free xbc memory to buddy
Samuel Thibault (1):
speakup: Avoid crash on very long word
Sandipan Das (1):
KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
Sean Christopherson (2):
KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
KVM: x86/pmu: Disable support for adaptive PEBS
Shay Drory (1):
net/mlx5: Lag, restore buckets number to default after hash LAG deactivation
Siddharth Vadapalli (1):
net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
Stephen Boyd (4):
clk: Remove prepare_lock hold assertion in __clk_release()
clk: Initialize struct clk_core kref earlier
clk: Get runtime PM before walking tree during disable_unused
clk: Get runtime PM before walking tree for clk_summary
Steven Rostedt (Google) (1):
SUNRPC: Fix rpcgss_context trace event acceptor field
Tim Huang (1):
drm/amdgpu: fix incorrect number of active RBs for gfx11
Uwe Kleine-König (2):
serial: stm32: Return IRQ_NONE in the ISR if no handling happend
serial: stm32: Reset .throttled state in .startup()
Vanillan Wang (1):
USB: serial: option: add Rolling RW101-GL and RW135-GL support
Vishal Badole (1):
clk: Show active consumers of clocks in debugfs
Vladimir Oltean (1):
net: dsa: introduce preferred_default_local_cpu_port and use on MT7530
Yanjun.Zhu (1):
RDMA/rxe: Fix the problem "mutex_destroy missing"
Yaxiong Tian (1):
arm64: hibernate: Fix level3 translation fault in swsusp_save()
Yu Zhe (1):
clk: remove unnecessary (void*) conversions
Yuanhe Shu (1):
selftests/ftrace: Limit length in subsystem-enable tests
Yuntao Wang (1):
init/main.c: Fix potential static_command_line memory overflow
Zack Rusin (3):
drm/vmwgfx: Enable DMA mappings with SEV
drm/vmwgfx: Sort primary plane formats by order of preference
drm/vmwgfx: Fix crtc's atomic check conditional
Ziyang Xuan (2):
netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
bolan wang (1):
USB: serial: option: add Fibocom FM135-GL variants
xinhui pan (1):
drm/amdgpu: validate the parameters of bo mapping operations more clearly
^ permalink raw reply [relevance 3%]
* Re: Linux 5.15.157
2024-04-27 15:54 6% Linux 5.15.157 Greg Kroah-Hartman
@ 2024-04-27 15:54 5% ` Greg Kroah-Hartman
0 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-27 15:54 UTC (permalink / raw)
To: linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby, Greg Kroah-Hartman
diff --git a/Documentation/filesystems/nfs/exporting.rst b/Documentation/filesystems/nfs/exporting.rst
index 6a1cbd7de38d..6f59a364f84c 100644
--- a/Documentation/filesystems/nfs/exporting.rst
+++ b/Documentation/filesystems/nfs/exporting.rst
@@ -241,10 +241,3 @@ following flags are defined:
all of an inode's dirty data on last close. Exports that behave this
way should set EXPORT_OP_FLUSH_ON_CLOSE so that NFSD knows to skip
waiting for writeback when closing such files.
-
- EXPORT_OP_ASYNC_LOCK - Indicates a capable filesystem to do async lock
- requests from lockd. Only set EXPORT_OP_ASYNC_LOCK if the filesystem has
- it's own ->lock() functionality as core posix_lock_file() implementation
- has no async lock request handling yet. For more information about how to
- indicate an async lock request from a ->lock() file_operations struct, see
- fs/locks.c and comment for the function vfs_lock_file().
diff --git a/Makefile b/Makefile
index 30680c037e1d..013b68ef0c3f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 15
-SUBLEVEL = 156
+SUBLEVEL = 157
EXTRAVERSION =
NAME = Trick or Treat
diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index a3bacd79507a..f0779d0f349d 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -211,9 +211,6 @@ bool kernel_page_present(struct page *page)
pte_t *ptep;
unsigned long addr = (unsigned long)page_address(page);
- if (!can_set_direct_map())
- return true;
-
pgdp = pgd_offset_k(addr);
if (pgd_none(READ_ONCE(*pgdp)))
return false;
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 08cfc26ee7c6..f779facd8246 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -732,6 +732,7 @@ struct kvm_vcpu_arch {
int cpuid_nent;
struct kvm_cpuid_entry2 *cpuid_entries;
+ bool is_amd_compatible;
u64 reserved_gpa_bits;
int maxphyaddr;
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index b30b32b288dd..247545b57dff 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1629,7 +1629,8 @@ static void __init bhi_select_mitigation(void)
return;
/* Retpoline mitigates against BHI unless the CPU has RRSBA behavior */
- if (cpu_feature_enabled(X86_FEATURE_RETPOLINE)) {
+ if (boot_cpu_has(X86_FEATURE_RETPOLINE) &&
+ !boot_cpu_has(X86_FEATURE_RETPOLINE_LFENCE)) {
spec_ctrl_disable_kernel_rrsba();
if (rrsba_disabled)
return;
@@ -2783,11 +2784,13 @@ static const char *spectre_bhi_state(void)
{
if (!boot_cpu_has_bug(X86_BUG_BHI))
return "; BHI: Not affected";
- else if (boot_cpu_has(X86_FEATURE_CLEAR_BHB_HW))
+ else if (boot_cpu_has(X86_FEATURE_CLEAR_BHB_HW))
return "; BHI: BHI_DIS_S";
- else if (boot_cpu_has(X86_FEATURE_CLEAR_BHB_LOOP))
+ else if (boot_cpu_has(X86_FEATURE_CLEAR_BHB_LOOP))
return "; BHI: SW loop, KVM: SW loop";
- else if (boot_cpu_has(X86_FEATURE_RETPOLINE) && rrsba_disabled)
+ else if (boot_cpu_has(X86_FEATURE_RETPOLINE) &&
+ !boot_cpu_has(X86_FEATURE_RETPOLINE_LFENCE) &&
+ rrsba_disabled)
return "; BHI: Retpoline";
else if (boot_cpu_has(X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT))
return "; BHI: Vulnerable, KVM: SW loop";
diff --git a/arch/x86/kernel/cpu/cpuid-deps.c b/arch/x86/kernel/cpu/cpuid-deps.c
index defda61f372d..2161676577f2 100644
--- a/arch/x86/kernel/cpu/cpuid-deps.c
+++ b/arch/x86/kernel/cpu/cpuid-deps.c
@@ -44,7 +44,10 @@ static const struct cpuid_dep cpuid_deps[] = {
{ X86_FEATURE_F16C, X86_FEATURE_XMM2, },
{ X86_FEATURE_AES, X86_FEATURE_XMM2 },
{ X86_FEATURE_SHA_NI, X86_FEATURE_XMM2 },
+ { X86_FEATURE_GFNI, X86_FEATURE_XMM2 },
{ X86_FEATURE_FMA, X86_FEATURE_AVX },
+ { X86_FEATURE_VAES, X86_FEATURE_AVX },
+ { X86_FEATURE_VPCLMULQDQ, X86_FEATURE_AVX },
{ X86_FEATURE_AVX2, X86_FEATURE_AVX, },
{ X86_FEATURE_AVX512F, X86_FEATURE_AVX, },
{ X86_FEATURE_AVX512IFMA, X86_FEATURE_AVX512F },
@@ -56,9 +59,6 @@ static const struct cpuid_dep cpuid_deps[] = {
{ X86_FEATURE_AVX512VL, X86_FEATURE_AVX512F },
{ X86_FEATURE_AVX512VBMI, X86_FEATURE_AVX512F },
{ X86_FEATURE_AVX512_VBMI2, X86_FEATURE_AVX512VL },
- { X86_FEATURE_GFNI, X86_FEATURE_AVX512VL },
- { X86_FEATURE_VAES, X86_FEATURE_AVX512VL },
- { X86_FEATURE_VPCLMULQDQ, X86_FEATURE_AVX512VL },
{ X86_FEATURE_AVX512_VNNI, X86_FEATURE_AVX512VL },
{ X86_FEATURE_AVX512_BITALG, X86_FEATURE_AVX512VL },
{ X86_FEATURE_AVX512_4VNNIW, X86_FEATURE_AVX512F },
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 537e826205ce..6222aa3221f5 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -189,6 +189,7 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)
kvm_update_pv_runtime(vcpu);
+ vcpu->arch.is_amd_compatible = guest_cpuid_is_amd_or_hygon(vcpu);
vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);
vcpu->arch.reserved_gpa_bits = kvm_vcpu_reserved_gpa_bits_raw(vcpu);
diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h
index c99edfff7f82..3c0b2dddc989 100644
--- a/arch/x86/kvm/cpuid.h
+++ b/arch/x86/kvm/cpuid.h
@@ -121,6 +121,16 @@ static inline bool guest_cpuid_is_intel(struct kvm_vcpu *vcpu)
return best && is_guest_vendor_intel(best->ebx, best->ecx, best->edx);
}
+static inline bool guest_cpuid_is_amd_compatible(struct kvm_vcpu *vcpu)
+{
+ return vcpu->arch.is_amd_compatible;
+}
+
+static inline bool guest_cpuid_is_intel_compatible(struct kvm_vcpu *vcpu)
+{
+ return !guest_cpuid_is_amd_compatible(vcpu);
+}
+
static inline int guest_cpuid_family(struct kvm_vcpu *vcpu)
{
struct kvm_cpuid_entry2 *best;
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index b5b20078a413..8d0eaad7a759 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -2419,7 +2419,8 @@ int kvm_apic_local_deliver(struct kvm_lapic *apic, int lvt_type)
trig_mode = reg & APIC_LVT_LEVEL_TRIGGER;
r = __apic_accept_irq(apic, mode, vector, 1, trig_mode, NULL);
- if (r && lvt_type == APIC_LVTPC)
+ if (r && lvt_type == APIC_LVTPC &&
+ guest_cpuid_is_intel_compatible(apic->vcpu))
kvm_lapic_set_reg(apic, APIC_LVTPC, reg | APIC_LVT_MASKED);
return r;
}
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 4724289c8a7f..acb9193fc06a 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -4351,7 +4351,7 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu,
context->root_level, is_efer_nx(context),
guest_can_use_gbpages(vcpu),
is_cr4_pse(context),
- guest_cpuid_is_amd_or_hygon(vcpu));
+ guest_cpuid_is_amd_compatible(vcpu));
}
static void
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 57a1484e257f..f781ba5d421d 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3107,7 +3107,7 @@ static void kvmclock_sync_fn(struct work_struct *work)
static bool can_set_mci_status(struct kvm_vcpu *vcpu)
{
/* McStatusWrEn enabled? */
- if (guest_cpuid_is_amd_or_hygon(vcpu))
+ if (guest_cpuid_is_amd_compatible(vcpu))
return !!(vcpu->arch.msr_hwcr & BIT_ULL(18));
return false;
diff --git a/drivers/accessibility/speakup/main.c b/drivers/accessibility/speakup/main.c
index 7b2016534162..b70489d998d7 100644
--- a/drivers/accessibility/speakup/main.c
+++ b/drivers/accessibility/speakup/main.c
@@ -573,7 +573,7 @@ static u_long get_word(struct vc_data *vc)
}
attr_ch = get_char(vc, (u_short *)tmp_pos, &spk_attr);
buf[cnt++] = attr_ch;
- while (tmpx < vc->vc_cols - 1) {
+ while (tmpx < vc->vc_cols - 1 && cnt < sizeof(buf) - 1) {
tmp_pos += 2;
tmpx++;
ch = get_char(vc, (u_short *)tmp_pos, &temp);
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 7547c4ed265c..11d65e23f1b6 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -1678,8 +1678,10 @@ static size_t binder_get_object(struct binder_proc *proc,
size_t object_size = 0;
read_size = min_t(size_t, sizeof(*object), buffer->data_size - offset);
- if (offset > buffer->data_size || read_size < sizeof(*hdr))
+ if (offset > buffer->data_size || read_size < sizeof(*hdr) ||
+ !IS_ALIGNED(offset, sizeof(u32)))
return 0;
+
if (u) {
if (copy_from_user(object, u + offset, read_size))
return 0;
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 84397af4fb33..a05b5bca6425 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -37,7 +37,11 @@ static HLIST_HEAD(clk_root_list);
static HLIST_HEAD(clk_orphan_list);
static LIST_HEAD(clk_notifier_list);
-static struct hlist_head *all_lists[] = {
+/* List of registered clks that use runtime PM */
+static HLIST_HEAD(clk_rpm_list);
+static DEFINE_MUTEX(clk_rpm_list_lock);
+
+static const struct hlist_head *all_lists[] = {
&clk_root_list,
&clk_orphan_list,
NULL,
@@ -59,6 +63,7 @@ struct clk_core {
struct clk_hw *hw;
struct module *owner;
struct device *dev;
+ struct hlist_node rpm_node;
struct device_node *of_node;
struct clk_core *parent;
struct clk_parent_map *parents;
@@ -129,6 +134,89 @@ static void clk_pm_runtime_put(struct clk_core *core)
pm_runtime_put_sync(core->dev);
}
+/**
+ * clk_pm_runtime_get_all() - Runtime "get" all clk provider devices
+ *
+ * Call clk_pm_runtime_get() on all runtime PM enabled clks in the clk tree so
+ * that disabling unused clks avoids a deadlock where a device is runtime PM
+ * resuming/suspending and the runtime PM callback is trying to grab the
+ * prepare_lock for something like clk_prepare_enable() while
+ * clk_disable_unused_subtree() holds the prepare_lock and is trying to runtime
+ * PM resume/suspend the device as well.
+ *
+ * Context: Acquires the 'clk_rpm_list_lock' and returns with the lock held on
+ * success. Otherwise the lock is released on failure.
+ *
+ * Return: 0 on success, negative errno otherwise.
+ */
+static int clk_pm_runtime_get_all(void)
+{
+ int ret;
+ struct clk_core *core, *failed;
+
+ /*
+ * Grab the list lock to prevent any new clks from being registered
+ * or unregistered until clk_pm_runtime_put_all().
+ */
+ mutex_lock(&clk_rpm_list_lock);
+
+ /*
+ * Runtime PM "get" all the devices that are needed for the clks
+ * currently registered. Do this without holding the prepare_lock, to
+ * avoid the deadlock.
+ */
+ hlist_for_each_entry(core, &clk_rpm_list, rpm_node) {
+ ret = clk_pm_runtime_get(core);
+ if (ret) {
+ failed = core;
+ pr_err("clk: Failed to runtime PM get '%s' for clk '%s'\n",
+ dev_name(failed->dev), failed->name);
+ goto err;
+ }
+ }
+
+ return 0;
+
+err:
+ hlist_for_each_entry(core, &clk_rpm_list, rpm_node) {
+ if (core == failed)
+ break;
+
+ clk_pm_runtime_put(core);
+ }
+ mutex_unlock(&clk_rpm_list_lock);
+
+ return ret;
+}
+
+/**
+ * clk_pm_runtime_put_all() - Runtime "put" all clk provider devices
+ *
+ * Put the runtime PM references taken in clk_pm_runtime_get_all() and release
+ * the 'clk_rpm_list_lock'.
+ */
+static void clk_pm_runtime_put_all(void)
+{
+ struct clk_core *core;
+
+ hlist_for_each_entry(core, &clk_rpm_list, rpm_node)
+ clk_pm_runtime_put(core);
+ mutex_unlock(&clk_rpm_list_lock);
+}
+
+static void clk_pm_runtime_init(struct clk_core *core)
+{
+ struct device *dev = core->dev;
+
+ if (dev && pm_runtime_enabled(dev)) {
+ core->rpm_enabled = true;
+
+ mutex_lock(&clk_rpm_list_lock);
+ hlist_add_head(&core->rpm_node, &clk_rpm_list);
+ mutex_unlock(&clk_rpm_list_lock);
+ }
+}
+
/*** locking ***/
static void clk_prepare_lock(void)
{
@@ -1252,9 +1340,6 @@ static void __init clk_unprepare_unused_subtree(struct clk_core *core)
if (core->flags & CLK_IGNORE_UNUSED)
return;
- if (clk_pm_runtime_get(core))
- return;
-
if (clk_core_is_prepared(core)) {
trace_clk_unprepare(core);
if (core->ops->unprepare_unused)
@@ -1263,8 +1348,6 @@ static void __init clk_unprepare_unused_subtree(struct clk_core *core)
core->ops->unprepare(core->hw);
trace_clk_unprepare_complete(core);
}
-
- clk_pm_runtime_put(core);
}
static void __init clk_disable_unused_subtree(struct clk_core *core)
@@ -1280,9 +1363,6 @@ static void __init clk_disable_unused_subtree(struct clk_core *core)
if (core->flags & CLK_OPS_PARENT_ENABLE)
clk_core_prepare_enable(core->parent);
- if (clk_pm_runtime_get(core))
- goto unprepare_out;
-
flags = clk_enable_lock();
if (core->enable_count)
@@ -1307,8 +1387,6 @@ static void __init clk_disable_unused_subtree(struct clk_core *core)
unlock_out:
clk_enable_unlock(flags);
- clk_pm_runtime_put(core);
-unprepare_out:
if (core->flags & CLK_OPS_PARENT_ENABLE)
clk_core_disable_unprepare(core->parent);
}
@@ -1324,12 +1402,22 @@ __setup("clk_ignore_unused", clk_ignore_unused_setup);
static int __init clk_disable_unused(void)
{
struct clk_core *core;
+ int ret;
if (clk_ignore_unused) {
pr_warn("clk: Not disabling unused clocks\n");
return 0;
}
+ pr_info("clk: Disabling unused clocks\n");
+
+ ret = clk_pm_runtime_get_all();
+ if (ret)
+ return ret;
+ /*
+ * Grab the prepare lock to keep the clk topology stable while iterating
+ * over clks.
+ */
clk_prepare_lock();
hlist_for_each_entry(core, &clk_root_list, child_node)
@@ -1346,6 +1434,8 @@ static int __init clk_disable_unused(void)
clk_prepare_unlock();
+ clk_pm_runtime_put_all();
+
return 0;
}
late_initcall_sync(clk_disable_unused);
@@ -3652,9 +3742,6 @@ static int __clk_core_init(struct clk_core *core)
}
clk_core_reparent_orphans_nolock();
-
-
- kref_init(&core->ref);
out:
clk_pm_runtime_put(core);
unlock:
@@ -3883,6 +3970,22 @@ static void clk_core_free_parent_map(struct clk_core *core)
kfree(core->parents);
}
+/* Free memory allocated for a struct clk_core */
+static void __clk_release(struct kref *ref)
+{
+ struct clk_core *core = container_of(ref, struct clk_core, ref);
+
+ if (core->rpm_enabled) {
+ mutex_lock(&clk_rpm_list_lock);
+ hlist_del(&core->rpm_node);
+ mutex_unlock(&clk_rpm_list_lock);
+ }
+
+ clk_core_free_parent_map(core);
+ kfree_const(core->name);
+ kfree(core);
+}
+
static struct clk *
__clk_register(struct device *dev, struct device_node *np, struct clk_hw *hw)
{
@@ -3903,6 +4006,8 @@ __clk_register(struct device *dev, struct device_node *np, struct clk_hw *hw)
goto fail_out;
}
+ kref_init(&core->ref);
+
core->name = kstrdup_const(init->name, GFP_KERNEL);
if (!core->name) {
ret = -ENOMEM;
@@ -3915,9 +4020,8 @@ __clk_register(struct device *dev, struct device_node *np, struct clk_hw *hw)
}
core->ops = init->ops;
- if (dev && pm_runtime_enabled(dev))
- core->rpm_enabled = true;
core->dev = dev;
+ clk_pm_runtime_init(core);
core->of_node = np;
if (dev && dev->driver)
core->owner = dev->driver->owner;
@@ -3957,12 +4061,10 @@ __clk_register(struct device *dev, struct device_node *np, struct clk_hw *hw)
hw->clk = NULL;
fail_create_clk:
- clk_core_free_parent_map(core);
fail_parents:
fail_ops:
- kfree_const(core->name);
fail_name:
- kfree(core);
+ kref_put(&core->ref, __clk_release);
fail_out:
return ERR_PTR(ret);
}
@@ -4042,18 +4144,6 @@ int of_clk_hw_register(struct device_node *node, struct clk_hw *hw)
}
EXPORT_SYMBOL_GPL(of_clk_hw_register);
-/* Free memory allocated for a clock. */
-static void __clk_release(struct kref *ref)
-{
- struct clk_core *core = container_of(ref, struct clk_core, ref);
-
- lockdep_assert_held(&prepare_lock);
-
- clk_core_free_parent_map(core);
- kfree_const(core->name);
- kfree(core);
-}
-
/*
* Empty clk_ops for unregistered clocks. These are used temporarily
* after clk_unregister() was called on a clock and until last clock
@@ -4106,7 +4196,7 @@ static void clk_core_evict_parent_cache_subtree(struct clk_core *root,
/* Remove this clk from all parent caches */
static void clk_core_evict_parent_cache(struct clk_core *core)
{
- struct hlist_head **lists;
+ const struct hlist_head **lists;
struct clk_core *root;
lockdep_assert_held(&prepare_lock);
diff --git a/drivers/comedi/drivers/vmk80xx.c b/drivers/comedi/drivers/vmk80xx.c
index 9a1d146b7ebb..07d10373b954 100644
--- a/drivers/comedi/drivers/vmk80xx.c
+++ b/drivers/comedi/drivers/vmk80xx.c
@@ -642,33 +642,22 @@ static int vmk80xx_find_usb_endpoints(struct comedi_device *dev)
struct vmk80xx_private *devpriv = dev->private;
struct usb_interface *intf = comedi_to_usb_interface(dev);
struct usb_host_interface *iface_desc = intf->cur_altsetting;
- struct usb_endpoint_descriptor *ep_desc;
- int i;
-
- if (iface_desc->desc.bNumEndpoints != 2)
- return -ENODEV;
-
- for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) {
- ep_desc = &iface_desc->endpoint[i].desc;
-
- if (usb_endpoint_is_int_in(ep_desc) ||
- usb_endpoint_is_bulk_in(ep_desc)) {
- if (!devpriv->ep_rx)
- devpriv->ep_rx = ep_desc;
- continue;
- }
+ struct usb_endpoint_descriptor *ep_rx_desc, *ep_tx_desc;
+ int ret;
- if (usb_endpoint_is_int_out(ep_desc) ||
- usb_endpoint_is_bulk_out(ep_desc)) {
- if (!devpriv->ep_tx)
- devpriv->ep_tx = ep_desc;
- continue;
- }
- }
+ if (devpriv->model == VMK8061_MODEL)
+ ret = usb_find_common_endpoints(iface_desc, &ep_rx_desc,
+ &ep_tx_desc, NULL, NULL);
+ else
+ ret = usb_find_common_endpoints(iface_desc, NULL, NULL,
+ &ep_rx_desc, &ep_tx_desc);
- if (!devpriv->ep_rx || !devpriv->ep_tx)
+ if (ret)
return -ENODEV;
+ devpriv->ep_rx = ep_rx_desc;
+ devpriv->ep_tx = ep_tx_desc;
+
if (!usb_endpoint_maxp(devpriv->ep_rx) || !usb_endpoint_maxp(devpriv->ep_tx))
return -EINVAL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 0e4554950e07..b2192b21691e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2306,6 +2306,37 @@ static void amdgpu_vm_bo_insert_map(struct amdgpu_device *adev,
trace_amdgpu_vm_bo_map(bo_va, mapping);
}
+/* Validate operation parameters to prevent potential abuse */
+static int amdgpu_vm_verify_parameters(struct amdgpu_device *adev,
+ struct amdgpu_bo *bo,
+ uint64_t saddr,
+ uint64_t offset,
+ uint64_t size)
+{
+ uint64_t tmp, lpfn;
+
+ if (saddr & AMDGPU_GPU_PAGE_MASK
+ || offset & AMDGPU_GPU_PAGE_MASK
+ || size & AMDGPU_GPU_PAGE_MASK)
+ return -EINVAL;
+
+ if (check_add_overflow(saddr, size, &tmp)
+ || check_add_overflow(offset, size, &tmp)
+ || size == 0 /* which also leads to end < begin */)
+ return -EINVAL;
+
+ /* make sure object fit at this offset */
+ if (bo && offset + size > amdgpu_bo_size(bo))
+ return -EINVAL;
+
+ /* Ensure last pfn not exceed max_pfn */
+ lpfn = (saddr + size - 1) >> AMDGPU_GPU_PAGE_SHIFT;
+ if (lpfn >= adev->vm_manager.max_pfn)
+ return -EINVAL;
+
+ return 0;
+}
+
/**
* amdgpu_vm_bo_map - map bo inside a vm
*
@@ -2332,21 +2363,14 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev,
struct amdgpu_bo *bo = bo_va->base.bo;
struct amdgpu_vm *vm = bo_va->base.vm;
uint64_t eaddr;
+ int r;
- /* validate the parameters */
- if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK)
- return -EINVAL;
- if (saddr + size <= saddr || offset + size <= offset)
- return -EINVAL;
-
- /* make sure object fit at this offset */
- eaddr = saddr + size - 1;
- if ((bo && offset + size > amdgpu_bo_size(bo)) ||
- (eaddr >= adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT))
- return -EINVAL;
+ r = amdgpu_vm_verify_parameters(adev, bo, saddr, offset, size);
+ if (r)
+ return r;
saddr /= AMDGPU_GPU_PAGE_SIZE;
- eaddr /= AMDGPU_GPU_PAGE_SIZE;
+ eaddr = saddr + (size - 1) / AMDGPU_GPU_PAGE_SIZE;
tmp = amdgpu_vm_it_iter_first(&vm->va, saddr, eaddr);
if (tmp) {
@@ -2399,17 +2423,9 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_device *adev,
uint64_t eaddr;
int r;
- /* validate the parameters */
- if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK)
- return -EINVAL;
- if (saddr + size <= saddr || offset + size <= offset)
- return -EINVAL;
-
- /* make sure object fit at this offset */
- eaddr = saddr + size - 1;
- if ((bo && offset + size > amdgpu_bo_size(bo)) ||
- (eaddr >= adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT))
- return -EINVAL;
+ r = amdgpu_vm_verify_parameters(adev, bo, saddr, offset, size);
+ if (r)
+ return r;
/* Allocate all the needed memory */
mapping = kmalloc(sizeof(*mapping), GFP_KERNEL);
@@ -2423,7 +2439,7 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_device *adev,
}
saddr /= AMDGPU_GPU_PAGE_SIZE;
- eaddr /= AMDGPU_GPU_PAGE_SIZE;
+ eaddr = saddr + (size - 1) / AMDGPU_GPU_PAGE_SIZE;
mapping->start = saddr;
mapping->last = eaddr;
@@ -2510,10 +2526,14 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev,
struct amdgpu_bo_va_mapping *before, *after, *tmp, *next;
LIST_HEAD(removed);
uint64_t eaddr;
+ int r;
+
+ r = amdgpu_vm_verify_parameters(adev, NULL, saddr, 0, size);
+ if (r)
+ return r;
- eaddr = saddr + size - 1;
saddr /= AMDGPU_GPU_PAGE_SIZE;
- eaddr /= AMDGPU_GPU_PAGE_SIZE;
+ eaddr = saddr + (size - 1) / AMDGPU_GPU_PAGE_SIZE;
/* Allocate all the needed memory */
before = kzalloc(sizeof(*before), GFP_KERNEL);
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index e8c445eb1100..f63ceb8d3e4e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -23,6 +23,7 @@
*/
#include "nouveau_drv.h"
+#include "nouveau_bios.h"
#include "nouveau_reg.h"
#include "dispnv04/hw.h"
#include "nouveau_encoder.h"
@@ -1675,7 +1676,7 @@ apply_dcb_encoder_quirks(struct drm_device *dev, int idx, u32 *conn, u32 *conf)
*/
if (nv_match_device(dev, 0x0201, 0x1462, 0x8851)) {
if (*conn == 0xf2005014 && *conf == 0xffffffff) {
- fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS, 1, 1, 1);
+ fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS, 1, 1, DCB_OUTPUT_B);
return false;
}
}
@@ -1761,26 +1762,26 @@ fabricate_dcb_encoder_table(struct drm_device *dev, struct nvbios *bios)
#ifdef __powerpc__
/* Apple iMac G4 NV17 */
if (of_machine_is_compatible("PowerMac4,5")) {
- fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS, 0, all_heads, 1);
- fabricate_dcb_output(dcb, DCB_OUTPUT_ANALOG, 1, all_heads, 2);
+ fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS, 0, all_heads, DCB_OUTPUT_B);
+ fabricate_dcb_output(dcb, DCB_OUTPUT_ANALOG, 1, all_heads, DCB_OUTPUT_C);
return;
}
#endif
/* Make up some sane defaults */
fabricate_dcb_output(dcb, DCB_OUTPUT_ANALOG,
- bios->legacy.i2c_indices.crt, 1, 1);
+ bios->legacy.i2c_indices.crt, 1, DCB_OUTPUT_B);
if (nv04_tv_identify(dev, bios->legacy.i2c_indices.tv) >= 0)
fabricate_dcb_output(dcb, DCB_OUTPUT_TV,
bios->legacy.i2c_indices.tv,
- all_heads, 0);
+ all_heads, DCB_OUTPUT_A);
else if (bios->tmds.output0_script_ptr ||
bios->tmds.output1_script_ptr)
fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS,
bios->legacy.i2c_indices.panel,
- all_heads, 1);
+ all_heads, DCB_OUTPUT_B);
}
static int
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
index c51bac76174c..9fe5b6a36ab9 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
@@ -221,8 +221,11 @@ nv50_instobj_acquire(struct nvkm_memory *memory)
void __iomem *map = NULL;
/* Already mapped? */
- if (refcount_inc_not_zero(&iobj->maps))
+ if (refcount_inc_not_zero(&iobj->maps)) {
+ /* read barrier match the wmb on refcount set */
+ smp_rmb();
return iobj->map;
+ }
/* Take the lock, and re-check that another thread hasn't
* already mapped the object in the meantime.
@@ -249,6 +252,8 @@ nv50_instobj_acquire(struct nvkm_memory *memory)
iobj->base.memory.ptrs = &nv50_instobj_fast;
else
iobj->base.memory.ptrs = &nv50_instobj_slow;
+ /* barrier to ensure the ptrs are written before refcount is set */
+ smp_wmb();
refcount_set(&iobj->maps, 1);
}
diff --git a/drivers/gpu/drm/panel/panel-visionox-rm69299.c b/drivers/gpu/drm/panel/panel-visionox-rm69299.c
index eb43503ec97b..6134432e4918 100644
--- a/drivers/gpu/drm/panel/panel-visionox-rm69299.c
+++ b/drivers/gpu/drm/panel/panel-visionox-rm69299.c
@@ -261,8 +261,6 @@ static int visionox_rm69299_remove(struct mipi_dsi_device *dsi)
struct visionox_rm69299 *ctx = mipi_dsi_get_drvdata(dsi);
mipi_dsi_detach(ctx->dsi);
- mipi_dsi_device_unregister(ctx->dsi);
-
drm_panel_remove(&ctx->panel);
return 0;
}
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
index 8c8ee87fd3ac..23c2dc943caf 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
@@ -246,10 +246,10 @@ struct vmw_framebuffer_bo {
static const uint32_t __maybe_unused vmw_primary_plane_formats[] = {
- DRM_FORMAT_XRGB1555,
- DRM_FORMAT_RGB565,
DRM_FORMAT_XRGB8888,
DRM_FORMAT_ARGB8888,
+ DRM_FORMAT_RGB565,
+ DRM_FORMAT_XRGB1555,
};
static const uint32_t __maybe_unused vmw_cursor_plane_formats[] = {
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 504e1adf1997..c8a7fe5fbc23 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -1033,23 +1033,26 @@ static void cm_reset_to_idle(struct cm_id_private *cm_id_priv)
}
}
-static noinline void cm_destroy_id_wait_timeout(struct ib_cm_id *cm_id)
+static noinline void cm_destroy_id_wait_timeout(struct ib_cm_id *cm_id,
+ enum ib_cm_state old_state)
{
struct cm_id_private *cm_id_priv;
cm_id_priv = container_of(cm_id, struct cm_id_private, id);
- pr_err("%s: cm_id=%p timed out. state=%d refcnt=%d\n", __func__,
- cm_id, cm_id->state, refcount_read(&cm_id_priv->refcount));
+ pr_err("%s: cm_id=%p timed out. state %d -> %d, refcnt=%d\n", __func__,
+ cm_id, old_state, cm_id->state, refcount_read(&cm_id_priv->refcount));
}
static void cm_destroy_id(struct ib_cm_id *cm_id, int err)
{
struct cm_id_private *cm_id_priv;
+ enum ib_cm_state old_state;
struct cm_work *work;
int ret;
cm_id_priv = container_of(cm_id, struct cm_id_private, id);
spin_lock_irq(&cm_id_priv->lock);
+ old_state = cm_id->state;
retest:
switch (cm_id->state) {
case IB_CM_LISTEN:
@@ -1158,7 +1161,7 @@ static void cm_destroy_id(struct ib_cm_id *cm_id, int err)
msecs_to_jiffies(
CM_DESTROY_ID_WAIT_TIMEOUT));
if (!ret) /* timeout happened */
- cm_destroy_id_wait_timeout(cm_id);
+ cm_destroy_id_wait_timeout(cm_id, old_state);
} while (!ret);
while ((work = cm_dequeue_work(cm_id_priv)) != NULL)
diff --git a/drivers/infiniband/hw/mlx5/mad.c b/drivers/infiniband/hw/mlx5/mad.c
index f6f2df855c2e..108284180775 100644
--- a/drivers/infiniband/hw/mlx5/mad.c
+++ b/drivers/infiniband/hw/mlx5/mad.c
@@ -166,7 +166,8 @@ static int process_pma_cmd(struct mlx5_ib_dev *dev, u32 port_num,
mdev = dev->mdev;
mdev_port_num = 1;
}
- if (MLX5_CAP_GEN(dev->mdev, num_ports) == 1) {
+ if (MLX5_CAP_GEN(dev->mdev, num_ports) == 1 &&
+ !mlx5_core_mp_enabled(mdev)) {
/* set local port to one for Function-Per-Port HCA. */
mdev = dev->mdev;
mdev_port_num = 1;
diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
index 8e0f9c489cab..f6ef782ce75c 100644
--- a/drivers/infiniband/sw/rxe/rxe.c
+++ b/drivers/infiniband/sw/rxe/rxe.c
@@ -35,6 +35,8 @@ void rxe_dealloc(struct ib_device *ib_dev)
if (rxe->tfm)
crypto_free_shash(rxe->tfm);
+
+ mutex_destroy(&rxe->usdev_lock);
}
/* initialize rxe device parameters */
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 91586d8afcaa..2809338a5c3a 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -115,7 +115,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
{MEI_PCI_DEVICE(MEI_DEV_ID_ADP_P, MEI_ME_PCH15_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_ADP_N, MEI_ME_PCH15_CFG)},
- {MEI_PCI_DEVICE(MEI_DEV_ID_RPL_S, MEI_ME_PCH15_CFG)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_RPL_S, MEI_ME_PCH15_SPS_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_MTL_M, MEI_ME_PCH15_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_ARL_S, MEI_ME_PCH15_CFG)},
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index f291d1e70f80..86db6a18c837 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -415,6 +415,20 @@ static void mt7530_pll_setup(struct mt7530_priv *priv)
core_set(priv, CORE_TRGMII_GSW_CLK_CG, REG_GSWCK_EN);
}
+/* If port 6 is available as a CPU port, always prefer that as the default,
+ * otherwise don't care.
+ */
+static struct dsa_port *
+mt753x_preferred_default_local_cpu_port(struct dsa_switch *ds)
+{
+ struct dsa_port *cpu_dp = dsa_to_port(ds, 6);
+
+ if (dsa_port_is_cpu(cpu_dp))
+ return cpu_dp;
+
+ return NULL;
+}
+
/* Setup port 6 interface mode and TRGMII TX circuit */
static int
mt7530_pad_clk_setup(struct dsa_switch *ds, phy_interface_t interface)
@@ -1232,6 +1246,13 @@ mt753x_cpu_port_enable(struct dsa_switch *ds, int port)
if (priv->id == ID_MT7530 || priv->id == ID_MT7621)
mt7530_rmw(priv, MT7530_MFC, CPU_MASK, CPU_EN | CPU_PORT(port));
+ /* Add the CPU port to the CPU port bitmap for MT7531. Trapped frames
+ * will be forwarded to the CPU port that is affine to the inbound user
+ * port.
+ */
+ if (priv->id == ID_MT7531)
+ mt7530_set(priv, MT7531_CFC, MT7531_CPU_PMAP(BIT(port)));
+
/* CPU port gets connected to all user ports of
* the switch.
*/
@@ -2389,8 +2410,6 @@ mt7530_setup(struct dsa_switch *ds)
SYS_CTRL_PHY_RST | SYS_CTRL_SW_RST |
SYS_CTRL_REG_RST);
- mt7530_pll_setup(priv);
-
/* Lower Tx driving for TRGMII path */
for (i = 0; i < NUM_TRGMII_CTRL; i++)
mt7530_write(priv, MT7530_TRGMII_TD_ODT(i),
@@ -2408,6 +2427,9 @@ mt7530_setup(struct dsa_switch *ds)
priv->p6_interface = PHY_INTERFACE_MODE_NA;
+ if ((val & HWTRAP_XTAL_MASK) == HWTRAP_XTAL_40MHZ)
+ mt7530_pll_setup(priv);
+
mt753x_trap_frames(priv);
/* Enable and reset MIB counters */
@@ -2437,6 +2459,9 @@ mt7530_setup(struct dsa_switch *ds)
PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));
}
+ /* Allow mirroring frames received on the local port (monitor port). */
+ mt7530_set(priv, MT753X_AGC, LOCAL_EN);
+
/* Setup VLAN ID 0 for VLAN-unaware bridges */
ret = mt7530_setup_vlan0(priv);
if (ret)
@@ -2507,16 +2532,8 @@ static int
mt7531_setup_common(struct dsa_switch *ds)
{
struct mt7530_priv *priv = ds->priv;
- struct dsa_port *cpu_dp;
int ret, i;
- /* BPDU to CPU port */
- dsa_switch_for_each_cpu_port(cpu_dp, ds) {
- mt7530_rmw(priv, MT7531_CFC, MT7531_CPU_PMAP_MASK,
- BIT(cpu_dp->index));
- break;
- }
-
mt753x_trap_frames(priv);
/* Enable and reset MIB counters */
@@ -2553,6 +2570,9 @@ mt7531_setup_common(struct dsa_switch *ds)
PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));
}
+ /* Allow mirroring frames received on the local port (monitor port). */
+ mt7530_set(priv, MT753X_AGC, LOCAL_EN);
+
/* Flush the FDB table */
ret = mt7530_fdb_cmd(priv, MT7530_FDB_FLUSH, NULL);
if (ret < 0)
@@ -2567,7 +2587,7 @@ mt7531_setup(struct dsa_switch *ds)
struct mt7530_priv *priv = ds->priv;
struct mt7530_dummy_poll p;
u32 val, id;
- int ret;
+ int ret, i;
/* Reset whole chip through gpio pin or memory-mapped registers for
* different type of hardware
@@ -2627,18 +2647,25 @@ mt7531_setup(struct dsa_switch *ds)
priv->p5_interface = PHY_INTERFACE_MODE_NA;
priv->p6_interface = PHY_INTERFACE_MODE_NA;
- /* Enable PHY core PLL, since phy_device has not yet been created
- * provided for phy_[read,write]_mmd_indirect is called, we provide
- * our own mt7531_ind_mmd_phy_[read,write] to complete this
- * function.
+ /* Enable Energy-Efficient Ethernet (EEE) and PHY core PLL, since
+ * phy_device has not yet been created provided for
+ * phy_[read,write]_mmd_indirect is called, we provide our own
+ * mt7531_ind_mmd_phy_[read,write] to complete this function.
*/
val = mt7531_ind_c45_phy_read(priv, MT753X_CTRL_PHY_ADDR,
MDIO_MMD_VEND2, CORE_PLL_GROUP4);
- val |= MT7531_PHY_PLL_BYPASS_MODE;
+ val |= MT7531_RG_SYSPLL_DMY2 | MT7531_PHY_PLL_BYPASS_MODE;
val &= ~MT7531_PHY_PLL_OFF;
mt7531_ind_c45_phy_write(priv, MT753X_CTRL_PHY_ADDR, MDIO_MMD_VEND2,
CORE_PLL_GROUP4, val);
+ /* Disable EEE advertisement on the switch PHYs. */
+ for (i = MT753X_CTRL_PHY_ADDR;
+ i < MT753X_CTRL_PHY_ADDR + MT7530_NUM_PHYS; i++) {
+ mt7531_ind_c45_phy_write(priv, i, MDIO_MMD_AN, MDIO_AN_EEE_ADV,
+ 0);
+ }
+
mt7531_setup_common(ds);
/* Setup VLAN ID 0 for VLAN-unaware bridges */
@@ -3376,6 +3403,7 @@ static int mt753x_set_mac_eee(struct dsa_switch *ds, int port,
static const struct dsa_switch_ops mt7530_switch_ops = {
.get_tag_protocol = mtk_get_tag_protocol,
.setup = mt753x_setup,
+ .preferred_default_local_cpu_port = mt753x_preferred_default_local_cpu_port,
.get_strings = mt7530_get_strings,
.get_ethtool_stats = mt7530_get_ethtool_stats,
.get_sset_count = mt7530_get_sset_count,
diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
index 299a26ad5809..4a013680ce64 100644
--- a/drivers/net/dsa/mt7530.h
+++ b/drivers/net/dsa/mt7530.h
@@ -32,6 +32,10 @@ enum mt753x_id {
#define SYSC_REG_RSTCTRL 0x34
#define RESET_MCM BIT(2)
+/* Register for ARL global control */
+#define MT753X_AGC 0xc
+#define LOCAL_EN BIT(7)
+
/* Registers to mac forward control for unknown frames */
#define MT7530_MFC 0x10
#define BC_FFP(x) (((x) & 0xff) << 24)
@@ -54,6 +58,7 @@ enum mt753x_id {
#define MT7531_MIRROR_PORT_GET(x) (((x) >> 16) & MIRROR_MASK)
#define MT7531_MIRROR_PORT_SET(x) (((x) & MIRROR_MASK) << 16)
#define MT7531_CPU_PMAP_MASK GENMASK(7, 0)
+#define MT7531_CPU_PMAP(x) FIELD_PREP(MT7531_CPU_PMAP_MASK, x)
#define MT753X_MIRROR_REG(id) (((id) == ID_MT7531) ? \
MT7531_CFC : MT7530_MFC)
@@ -668,6 +673,7 @@ enum mt7531_clk_skew {
#define RG_SYSPLL_DDSFBK_EN BIT(12)
#define RG_SYSPLL_BIAS_EN BIT(11)
#define RG_SYSPLL_BIAS_LPF_EN BIT(10)
+#define MT7531_RG_SYSPLL_DMY2 BIT(6)
#define MT7531_PHY_PLL_OFF BIT(5)
#define MT7531_PHY_PLL_BYPASS_MODE BIT(4)
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index f94d6d322df4..4bd57b79a023 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -2535,6 +2535,8 @@ static void am65_cpsw_unregister_devlink(struct am65_cpsw_common *common)
static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common)
{
+ struct am65_cpsw_rx_chn *rx_chan = &common->rx_chns;
+ struct am65_cpsw_tx_chn *tx_chan = common->tx_chns;
struct device *dev = common->dev;
struct devlink_port *dl_port;
struct am65_cpsw_port *port;
@@ -2553,6 +2555,22 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common)
return ret;
}
+ /* The DMA Channels are not guaranteed to be in a clean state.
+ * Reset and disable them to ensure that they are back to the
+ * clean state and ready to be used.
+ */
+ for (i = 0; i < common->tx_ch_num; i++) {
+ k3_udma_glue_reset_tx_chn(tx_chan[i].tx_chn, &tx_chan[i],
+ am65_cpsw_nuss_tx_cleanup);
+ k3_udma_glue_disable_tx_chn(tx_chan[i].tx_chn);
+ }
+
+ for (i = 0; i < AM65_CPSW_MAX_RX_FLOWS; i++)
+ k3_udma_glue_reset_rx_chn(rx_chan->rx_chn, i, rx_chan,
+ am65_cpsw_nuss_rx_cleanup, !!i);
+
+ k3_udma_glue_disable_rx_chn(rx_chan->rx_chn);
+
ret = am65_cpsw_nuss_register_devlink(common);
if (ret)
return ret;
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 42bf0a3ec632..f0e34b2b072e 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2096,14 +2096,16 @@ static ssize_t tun_put_user(struct tun_struct *tun,
tun_is_little_endian(tun), true,
vlan_hlen)) {
struct skb_shared_info *sinfo = skb_shinfo(skb);
- pr_err("unexpected GSO type: "
- "0x%x, gso_size %d, hdr_len %d\n",
- sinfo->gso_type, tun16_to_cpu(tun, gso.gso_size),
- tun16_to_cpu(tun, gso.hdr_len));
- print_hex_dump(KERN_ERR, "tun: ",
- DUMP_PREFIX_NONE,
- 16, 1, skb->head,
- min((int)tun16_to_cpu(tun, gso.hdr_len), 64), true);
+
+ if (net_ratelimit()) {
+ netdev_err(tun->dev, "unexpected GSO type: 0x%x, gso_size %d, hdr_len %d\n",
+ sinfo->gso_type, tun16_to_cpu(tun, gso.gso_size),
+ tun16_to_cpu(tun, gso.hdr_len));
+ print_hex_dump(KERN_ERR, "tun: ",
+ DUMP_PREFIX_NONE,
+ 16, 1, skb->head,
+ min((int)tun16_to_cpu(tun, gso.hdr_len), 64), true);
+ }
WARN_ON_ONCE(1);
return -EINVAL;
}
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index a111154a9046..c16f18cfeed7 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -360,10 +360,8 @@ int ccw_device_set_online(struct ccw_device *cdev)
spin_lock_irq(cdev->ccwlock);
ret = ccw_device_online(cdev);
- spin_unlock_irq(cdev->ccwlock);
- if (ret == 0)
- wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
- else {
+ if (ret) {
+ spin_unlock_irq(cdev->ccwlock);
CIO_MSG_EVENT(0, "ccw_device_online returned %d, "
"device 0.%x.%04x\n",
ret, cdev->private->dev_id.ssid,
@@ -372,7 +370,12 @@ int ccw_device_set_online(struct ccw_device *cdev)
put_device(&cdev->dev);
return ret;
}
- spin_lock_irq(cdev->ccwlock);
+ /* Wait until a final state is reached */
+ while (!dev_fsm_final_state(cdev)) {
+ spin_unlock_irq(cdev->ccwlock);
+ wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
+ spin_lock_irq(cdev->ccwlock);
+ }
/* Check if online processing was successful */
if ((cdev->private->state != DEV_STATE_ONLINE) &&
(cdev->private->state != DEV_STATE_W4SENSE)) {
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 45e810c6ea3b..9c77ec3a8dcd 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -679,8 +679,8 @@ static void qdio_handle_activate_check(struct qdio_irq *irq_ptr,
lgr_info_log();
}
-static void qdio_establish_handle_irq(struct qdio_irq *irq_ptr, int cstat,
- int dstat)
+static int qdio_establish_handle_irq(struct qdio_irq *irq_ptr, int cstat,
+ int dstat, int dcc)
{
DBF_DEV_EVENT(DBF_INFO, irq_ptr, "qest irq");
@@ -688,15 +688,18 @@ static void qdio_establish_handle_irq(struct qdio_irq *irq_ptr, int cstat,
goto error;
if (dstat & ~(DEV_STAT_DEV_END | DEV_STAT_CHN_END))
goto error;
+ if (dcc == 1)
+ return -EAGAIN;
if (!(dstat & DEV_STAT_DEV_END))
goto error;
qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ESTABLISHED);
- return;
+ return 0;
error:
DBF_ERROR("%4x EQ:error", irq_ptr->schid.sch_no);
DBF_ERROR("ds: %2x cs:%2x", dstat, cstat);
qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ERR);
+ return -EIO;
}
/* qdio interrupt handler */
@@ -705,7 +708,7 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
{
struct qdio_irq *irq_ptr = cdev->private->qdio_data;
struct subchannel_id schid;
- int cstat, dstat;
+ int cstat, dstat, rc, dcc;
if (!intparm || !irq_ptr) {
ccw_device_get_schid(cdev, &schid);
@@ -725,10 +728,12 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
qdio_irq_check_sense(irq_ptr, irb);
cstat = irb->scsw.cmd.cstat;
dstat = irb->scsw.cmd.dstat;
+ dcc = scsw_cmd_is_valid_cc(&irb->scsw) ? irb->scsw.cmd.cc : 0;
+ rc = 0;
switch (irq_ptr->state) {
case QDIO_IRQ_STATE_INACTIVE:
- qdio_establish_handle_irq(irq_ptr, cstat, dstat);
+ rc = qdio_establish_handle_irq(irq_ptr, cstat, dstat, dcc);
break;
case QDIO_IRQ_STATE_CLEANUP:
qdio_set_state(irq_ptr, QDIO_IRQ_STATE_INACTIVE);
@@ -742,12 +747,25 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
if (cstat || dstat)
qdio_handle_activate_check(irq_ptr, intparm, cstat,
dstat);
+ else if (dcc == 1)
+ rc = -EAGAIN;
break;
case QDIO_IRQ_STATE_STOPPED:
break;
default:
WARN_ON_ONCE(1);
}
+
+ if (rc == -EAGAIN) {
+ DBF_DEV_EVENT(DBF_INFO, irq_ptr, "qint retry");
+ rc = ccw_device_start(cdev, &irq_ptr->ccw, intparm, 0, 0);
+ if (!rc)
+ return;
+ DBF_ERROR("%4x RETRY ERR", irq_ptr->schid.sch_no);
+ DBF_ERROR("rc:%4x", rc);
+ qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ERR);
+ }
+
wake_up(&cdev->private->wait_q);
}
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 62a132b35ba2..fdfed54e62f3 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -2669,22 +2669,29 @@ void tb_switch_unconfigure_link(struct tb_switch *sw)
{
struct tb_port *up, *down;
- if (sw->is_unplugged)
- return;
if (!tb_route(sw) || tb_switch_is_icm(sw))
return;
+ /*
+ * Unconfigure downstream port so that wake-on-connect can be
+ * configured after router unplug. No need to unconfigure upstream port
+ * since its router is unplugged.
+ */
up = tb_upstream_port(sw);
- if (tb_switch_is_usb4(up->sw))
- usb4_port_unconfigure(up);
- else
- tb_lc_unconfigure_port(up);
-
down = up->remote;
if (tb_switch_is_usb4(down->sw))
usb4_port_unconfigure(down);
else
tb_lc_unconfigure_port(down);
+
+ if (sw->is_unplugged)
+ return;
+
+ up = tb_upstream_port(sw);
+ if (tb_switch_is_usb4(up->sw))
+ usb4_port_unconfigure(up);
+ else
+ tb_lc_unconfigure_port(up);
}
static void tb_switch_credits_init(struct tb_switch *sw)
@@ -2926,7 +2933,26 @@ static int tb_switch_set_wake(struct tb_switch *sw, unsigned int flags)
return tb_lc_set_wake(sw, flags);
}
-int tb_switch_resume(struct tb_switch *sw)
+static void tb_switch_check_wakes(struct tb_switch *sw)
+{
+ if (device_may_wakeup(&sw->dev)) {
+ if (tb_switch_is_usb4(sw))
+ usb4_switch_check_wakes(sw);
+ }
+}
+
+/**
+ * tb_switch_resume() - Resume a switch after sleep
+ * @sw: Switch to resume
+ * @runtime: Is this resume from runtime suspend or system sleep
+ *
+ * Resumes and re-enumerates router (and all its children), if still plugged
+ * after suspend. Don't enumerate device router whose UID was changed during
+ * suspend. If this is resume from system sleep, notifies PM core about the
+ * wakes occurred during suspend. Disables all wakes, except USB4 wake of
+ * upstream port for USB4 routers that shall be always enabled.
+ */
+int tb_switch_resume(struct tb_switch *sw, bool runtime)
{
struct tb_port *port;
int err;
@@ -2971,6 +2997,9 @@ int tb_switch_resume(struct tb_switch *sw)
if (err)
return err;
+ if (!runtime)
+ tb_switch_check_wakes(sw);
+
/* Disable wakes */
tb_switch_set_wake(sw, 0);
@@ -3000,7 +3029,8 @@ int tb_switch_resume(struct tb_switch *sw)
*/
if (tb_port_unlock(port))
tb_port_warn(port, "failed to unlock port\n");
- if (port->remote && tb_switch_resume(port->remote->sw)) {
+ if (port->remote &&
+ tb_switch_resume(port->remote->sw, runtime)) {
tb_port_warn(port,
"lost during suspend, disconnecting\n");
tb_sw_set_unplugged(port->remote->sw);
diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c
index 0c3e1d14cddc..8bf45da1012e 100644
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@ -1491,7 +1491,7 @@ static int tb_resume_noirq(struct tb *tb)
/* remove any pci devices the firmware might have setup */
tb_switch_reset(tb->root_switch);
- tb_switch_resume(tb->root_switch);
+ tb_switch_resume(tb->root_switch, false);
tb_free_invalid_tunnels(tb);
tb_free_unplugged_children(tb->root_switch);
tb_restore_children(tb->root_switch);
@@ -1617,7 +1617,7 @@ static int tb_runtime_resume(struct tb *tb)
struct tb_tunnel *tunnel, *n;
mutex_lock(&tb->lock);
- tb_switch_resume(tb->root_switch);
+ tb_switch_resume(tb->root_switch, true);
tb_free_invalid_tunnels(tb);
tb_restore_children(tb->root_switch);
list_for_each_entry_safe(tunnel, n, &tcm->tunnel_list, list)
diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h
index db0d3d37772f..a739cbf2be1b 100644
--- a/drivers/thunderbolt/tb.h
+++ b/drivers/thunderbolt/tb.h
@@ -740,7 +740,7 @@ int tb_switch_configure(struct tb_switch *sw);
int tb_switch_add(struct tb_switch *sw);
void tb_switch_remove(struct tb_switch *sw);
void tb_switch_suspend(struct tb_switch *sw, bool runtime);
-int tb_switch_resume(struct tb_switch *sw);
+int tb_switch_resume(struct tb_switch *sw, bool runtime);
int tb_switch_reset(struct tb_switch *sw);
void tb_sw_set_unplugged(struct tb_switch *sw);
struct tb_port *tb_switch_find_port(struct tb_switch *sw,
@@ -1043,6 +1043,7 @@ static inline struct tb_retimer *tb_to_retimer(struct device *dev)
return NULL;
}
+void usb4_switch_check_wakes(struct tb_switch *sw);
int usb4_switch_setup(struct tb_switch *sw);
int usb4_switch_read_uid(struct tb_switch *sw, u64 *uid);
int usb4_switch_drom_read(struct tb_switch *sw, unsigned int address, void *buf,
diff --git a/drivers/thunderbolt/usb4.c b/drivers/thunderbolt/usb4.c
index 36547afa1896..44eb9c658866 100644
--- a/drivers/thunderbolt/usb4.c
+++ b/drivers/thunderbolt/usb4.c
@@ -175,15 +175,18 @@ static inline int usb4_switch_op_data(struct tb_switch *sw, u16 opcode,
tx_dwords, rx_data, rx_dwords);
}
-static void usb4_switch_check_wakes(struct tb_switch *sw)
+/**
+ * usb4_switch_check_wakes() - Check for wakes and notify PM core about them
+ * @sw: Router whose wakes to check
+ *
+ * Checks wakes occurred during suspend and notify the PM core about them.
+ */
+void usb4_switch_check_wakes(struct tb_switch *sw)
{
struct tb_port *port;
bool wakeup = false;
u32 val;
- if (!device_may_wakeup(&sw->dev))
- return;
-
if (tb_route(sw)) {
if (tb_sw_read(sw, &val, TB_CFG_SWITCH, ROUTER_CS_6, 1))
return;
@@ -248,8 +251,6 @@ int usb4_switch_setup(struct tb_switch *sw)
u32 val = 0;
int ret;
- usb4_switch_check_wakes(sw);
-
if (!tb_route(sw))
return 0;
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 12ce150b0ad4..b2eadbac013e 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -217,7 +217,6 @@ static bool pmz_receive_chars(struct uart_pmac_port *uap)
{
struct tty_port *port;
unsigned char ch, r1, drop, flag;
- int loops = 0;
/* Sanity check, make sure the old bug is no longer happening */
if (uap->port.state == NULL) {
@@ -298,24 +297,11 @@ static bool pmz_receive_chars(struct uart_pmac_port *uap)
if (r1 & Rx_OVR)
tty_insert_flip_char(port, 0, TTY_OVERRUN);
next_char:
- /* We can get stuck in an infinite loop getting char 0 when the
- * line is in a wrong HW state, we break that here.
- * When that happens, I disable the receive side of the driver.
- * Note that what I've been experiencing is a real irq loop where
- * I'm getting flooded regardless of the actual port speed.
- * Something strange is going on with the HW
- */
- if ((++loops) > 1000)
- goto flood;
ch = read_zsreg(uap, R0);
if (!(ch & Rx_CH_AV))
break;
}
- return true;
- flood:
- pmz_interrupt_control(uap, 0);
- pmz_error("pmz: rx irq flood !\n");
return true;
}
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 38c2e6089e4c..0d99ba64ea52 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -485,7 +485,6 @@ static ssize_t wdm_write
static int service_outstanding_interrupt(struct wdm_device *desc)
{
int rv = 0;
- int used;
/* submit read urb only if the device is waiting for it */
if (!desc->resp_count || !--desc->resp_count)
@@ -500,10 +499,7 @@ static int service_outstanding_interrupt(struct wdm_device *desc)
goto out;
}
- used = test_and_set_bit(WDM_RESPONDING, &desc->flags);
- if (used)
- goto out;
-
+ set_bit(WDM_RESPONDING, &desc->flags);
spin_unlock_irq(&desc->iuspin);
rv = usb_submit_urb(desc->response, GFP_KERNEL);
spin_lock_irq(&desc->iuspin);
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index 1f2e2a39b70f..2d87a4681e67 100644
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -295,8 +295,10 @@ static void usb_port_shutdown(struct device *dev)
{
struct usb_port *port_dev = to_usb_port(dev);
- if (port_dev->child)
+ if (port_dev->child) {
usb_disable_usb2_hardware_lpm(port_dev->child);
+ usb_unlocked_disable_lpm(port_dev->child);
+ }
}
static const struct dev_pm_ops usb_port_pm_ops = {
diff --git a/drivers/usb/dwc2/hcd_ddma.c b/drivers/usb/dwc2/hcd_ddma.c
index 6a4aa71da103..d6fa02d851e4 100644
--- a/drivers/usb/dwc2/hcd_ddma.c
+++ b/drivers/usb/dwc2/hcd_ddma.c
@@ -897,13 +897,15 @@ static int dwc2_cmpl_host_isoc_dma_desc(struct dwc2_hsotg *hsotg,
struct dwc2_dma_desc *dma_desc;
struct dwc2_hcd_iso_packet_desc *frame_desc;
u16 frame_desc_idx;
- struct urb *usb_urb = qtd->urb->priv;
+ struct urb *usb_urb;
u16 remain = 0;
int rc = 0;
if (!qtd->urb)
return -EINVAL;
+ usb_urb = qtd->urb->priv;
+
dma_sync_single_for_cpu(hsotg->dev, qh->desc_list_dma + (idx *
sizeof(struct dwc2_dma_desc)),
sizeof(struct dwc2_dma_desc),
diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index e93b0eb74c08..00995d65b54c 100644
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -888,7 +888,7 @@ static int ncm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
if (alt > 1)
goto fail;
- if (ncm->port.in_ep->enabled) {
+ if (ncm->netdev) {
DBG(cdev, "reset ncm\n");
ncm->netdev = NULL;
gether_disconnect(&ncm->port);
@@ -1373,7 +1373,7 @@ static void ncm_disable(struct usb_function *f)
DBG(cdev, "ncm deactivated\n");
- if (ncm->port.in_ep->enabled) {
+ if (ncm->netdev) {
ncm->netdev = NULL;
gether_disconnect(&ncm->port);
}
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 1a3e5a9414f0..b5ee8518fcc7 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -255,6 +255,10 @@ static void option_instat_callback(struct urb *urb);
#define QUECTEL_PRODUCT_EM061K_LMS 0x0124
#define QUECTEL_PRODUCT_EC25 0x0125
#define QUECTEL_PRODUCT_EM060K_128 0x0128
+#define QUECTEL_PRODUCT_EM060K_129 0x0129
+#define QUECTEL_PRODUCT_EM060K_12a 0x012a
+#define QUECTEL_PRODUCT_EM060K_12b 0x012b
+#define QUECTEL_PRODUCT_EM060K_12c 0x012c
#define QUECTEL_PRODUCT_EG91 0x0191
#define QUECTEL_PRODUCT_EG95 0x0195
#define QUECTEL_PRODUCT_BG96 0x0296
@@ -1218,6 +1222,18 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_128, 0xff, 0xff, 0x30) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_128, 0xff, 0x00, 0x40) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_128, 0xff, 0xff, 0x40) },
+ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_129, 0xff, 0xff, 0x30) },
+ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_129, 0xff, 0x00, 0x40) },
+ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_129, 0xff, 0xff, 0x40) },
+ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_12a, 0xff, 0xff, 0x30) },
+ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_12a, 0xff, 0x00, 0x40) },
+ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_12a, 0xff, 0xff, 0x40) },
+ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_12b, 0xff, 0xff, 0x30) },
+ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_12b, 0xff, 0x00, 0x40) },
+ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_12b, 0xff, 0xff, 0x40) },
+ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_12c, 0xff, 0xff, 0x30) },
+ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_12c, 0xff, 0x00, 0x40) },
+ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_12c, 0xff, 0xff, 0x40) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LCN, 0xff, 0xff, 0x30) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LCN, 0xff, 0x00, 0x40) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LCN, 0xff, 0xff, 0x40) },
@@ -1360,6 +1376,12 @@ static const struct usb_device_id option_ids[] = {
.driver_info = NCTRL(2) | RSVD(3) },
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1083, 0xff), /* Telit FE990 (ECM) */
.driver_info = NCTRL(0) | RSVD(1) },
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a0, 0xff), /* Telit FN20C04 (rmnet) */
+ .driver_info = RSVD(0) | NCTRL(3) },
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a4, 0xff), /* Telit FN20C04 (rmnet) */
+ .driver_info = RSVD(0) | NCTRL(3) },
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a9, 0xff), /* Telit FN20C04 (rmnet) */
+ .driver_info = RSVD(0) | NCTRL(2) | RSVD(3) | RSVD(4) },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910),
.driver_info = NCTRL(0) | RSVD(1) | RSVD(3) },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM),
@@ -2052,6 +2074,10 @@ static const struct usb_device_id option_ids[] = {
.driver_info = RSVD(3) },
{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9803, 0xff),
.driver_info = RSVD(4) },
+ { USB_DEVICE(LONGCHEER_VENDOR_ID, 0x9b05), /* Longsung U8300 */
+ .driver_info = RSVD(4) | RSVD(5) },
+ { USB_DEVICE(LONGCHEER_VENDOR_ID, 0x9b3c), /* Longsung U9300 */
+ .driver_info = RSVD(0) | RSVD(4) },
{ USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },
{ USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) },
{ USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
@@ -2272,15 +2298,29 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0xff, 0x30) }, /* Fibocom FG150 Diag */
{ USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0, 0) }, /* Fibocom FG150 AT */
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0111, 0xff) }, /* Fibocom FM160 (MBIM mode) */
+ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0115, 0xff), /* Fibocom FM135 (laptop MBIM) */
+ .driver_info = RSVD(5) },
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) }, /* Fibocom NL668-AM/NL652-EU (laptop MBIM) */
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a2, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a3, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff), /* Fibocom FM101-GL (laptop MBIM) */
.driver_info = RSVD(4) },
+ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0a04, 0xff) }, /* Fibocom FM650-CN (ECM mode) */
+ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0a05, 0xff) }, /* Fibocom FM650-CN (NCM mode) */
+ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0a06, 0xff) }, /* Fibocom FM650-CN (RNDIS mode) */
+ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0a07, 0xff) }, /* Fibocom FM650-CN (MBIM mode) */
{ USB_DEVICE_INTERFACE_CLASS(0x2df3, 0x9d03, 0xff) }, /* LongSung M5710 */
{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1404, 0xff) }, /* GosunCn GM500 RNDIS */
{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1405, 0xff) }, /* GosunCn GM500 MBIM */
{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1406, 0xff) }, /* GosunCn GM500 ECM/NCM */
+ { USB_DEVICE(0x33f8, 0x0104), /* Rolling RW101-GL (laptop RMNET) */
+ .driver_info = RSVD(4) | RSVD(5) },
+ { USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x01a2, 0xff) }, /* Rolling RW101-GL (laptop MBIM) */
+ { USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x01a3, 0xff) }, /* Rolling RW101-GL (laptop MBIM) */
+ { USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x01a4, 0xff), /* Rolling RW101-GL (laptop MBIM) */
+ .driver_info = RSVD(4) },
+ { USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x0115, 0xff), /* Rolling RW135-GL (laptop MBIM) */
+ .driver_info = RSVD(5) },
{ USB_DEVICE_AND_INTERFACE_INFO(OPPO_VENDOR_ID, OPPO_PRODUCT_R11, 0xff, 0xff, 0x30) },
{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x30) },
{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x40) },
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 5a98c5da1225..8d8b45599236 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1046,6 +1046,9 @@ __btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,
if (ret)
return ret;
+ ret = btrfs_record_root_in_trans(trans, node->root);
+ if (ret)
+ return ret;
ret = btrfs_update_delayed_inode(trans, node->root, path, node);
return ret;
}
diff --git a/fs/ksmbd/ksmbd_netlink.h b/fs/ksmbd/ksmbd_netlink.h
index ecffcb8a1557..dc30cd0f6acd 100644
--- a/fs/ksmbd/ksmbd_netlink.h
+++ b/fs/ksmbd/ksmbd_netlink.h
@@ -166,7 +166,8 @@ struct ksmbd_share_config_response {
__u16 force_uid;
__u16 force_gid;
__s8 share_name[KSMBD_REQ_MAX_SHARE_NAME];
- __u32 reserved[112]; /* Reserved room */
+ __u32 reserved[111]; /* Reserved room */
+ __u32 payload_sz;
__u32 veto_list_sz;
__s8 ____payload[];
};
diff --git a/fs/ksmbd/mgmt/share_config.c b/fs/ksmbd/mgmt/share_config.c
index 328a412259dc..a2f0a2edceb8 100644
--- a/fs/ksmbd/mgmt/share_config.c
+++ b/fs/ksmbd/mgmt/share_config.c
@@ -158,7 +158,12 @@ static struct ksmbd_share_config *share_config_request(struct unicode_map *um,
share->name = kstrdup(name, GFP_KERNEL);
if (!test_share_config_flag(share, KSMBD_SHARE_FLAG_PIPE)) {
- share->path = kstrdup(ksmbd_share_config_path(resp),
+ int path_len = PATH_MAX;
+
+ if (resp->payload_sz)
+ path_len = resp->payload_sz - resp->veto_list_sz;
+
+ share->path = kstrndup(ksmbd_share_config_path(resp), path_len,
GFP_KERNEL);
if (share->path)
share->path_sz = strlen(share->path);
diff --git a/fs/ksmbd/smb2ops.c b/fs/ksmbd/smb2ops.c
index c69943d96565..d0db9f32c423 100644
--- a/fs/ksmbd/smb2ops.c
+++ b/fs/ksmbd/smb2ops.c
@@ -229,6 +229,11 @@ void init_smb3_0_server(struct ksmbd_conn *conn)
conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION)
conn->vals->capabilities |= SMB2_GLOBAL_CAP_ENCRYPTION;
+ if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION ||
+ (!(server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION_OFF) &&
+ conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION))
+ conn->vals->capabilities |= SMB2_GLOBAL_CAP_ENCRYPTION;
+
if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL)
conn->vals->capabilities |= SMB2_GLOBAL_CAP_MULTI_CHANNEL;
}
@@ -276,11 +281,6 @@ int init_smb3_11_server(struct ksmbd_conn *conn)
conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING |
SMB2_GLOBAL_CAP_DIRECTORY_LEASING;
- if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION ||
- (!(server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION_OFF) &&
- conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION))
- conn->vals->capabilities |= SMB2_GLOBAL_CAP_ENCRYPTION;
-
if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL)
conn->vals->capabilities |= SMB2_GLOBAL_CAP_MULTI_CHANNEL;
diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index 14cd86a14012..86b1fb43104e 100644
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -5581,8 +5581,9 @@ static int smb2_rename(struct ksmbd_work *work,
if (!file_info->ReplaceIfExists)
flags = RENAME_NOREPLACE;
- smb_break_all_levII_oplock(work, fp, 0);
rc = ksmbd_vfs_rename(work, &fp->filp->f_path, new_name, flags);
+ if (!rc)
+ smb_break_all_levII_oplock(work, fp, 0);
out:
kfree(new_name);
return rc;
diff --git a/fs/ksmbd/transport_ipc.c b/fs/ksmbd/transport_ipc.c
index 2c9662e32799..d62ebbff1e0f 100644
--- a/fs/ksmbd/transport_ipc.c
+++ b/fs/ksmbd/transport_ipc.c
@@ -65,6 +65,7 @@ struct ipc_msg_table_entry {
struct hlist_node ipc_table_hlist;
void *response;
+ unsigned int msg_sz;
};
static struct delayed_work ipc_timer_work;
@@ -274,6 +275,7 @@ static int handle_response(int type, void *payload, size_t sz)
}
memcpy(entry->response, payload, sz);
+ entry->msg_sz = sz;
wake_up_interruptible(&entry->wait);
ret = 0;
break;
@@ -452,6 +454,34 @@ static int ipc_msg_send(struct ksmbd_ipc_msg *msg)
return ret;
}
+static int ipc_validate_msg(struct ipc_msg_table_entry *entry)
+{
+ unsigned int msg_sz = entry->msg_sz;
+
+ if (entry->type == KSMBD_EVENT_RPC_REQUEST) {
+ struct ksmbd_rpc_command *resp = entry->response;
+
+ msg_sz = sizeof(struct ksmbd_rpc_command) + resp->payload_sz;
+ } else if (entry->type == KSMBD_EVENT_SPNEGO_AUTHEN_REQUEST) {
+ struct ksmbd_spnego_authen_response *resp = entry->response;
+
+ msg_sz = sizeof(struct ksmbd_spnego_authen_response) +
+ resp->session_key_len + resp->spnego_blob_len;
+ } else if (entry->type == KSMBD_EVENT_SHARE_CONFIG_REQUEST) {
+ struct ksmbd_share_config_response *resp = entry->response;
+
+ if (resp->payload_sz) {
+ if (resp->payload_sz < resp->veto_list_sz)
+ return -EINVAL;
+
+ msg_sz = sizeof(struct ksmbd_share_config_response) +
+ resp->payload_sz;
+ }
+ }
+
+ return entry->msg_sz != msg_sz ? -EINVAL : 0;
+}
+
static void *ipc_msg_send_request(struct ksmbd_ipc_msg *msg, unsigned int handle)
{
struct ipc_msg_table_entry entry;
@@ -476,6 +506,13 @@ static void *ipc_msg_send_request(struct ksmbd_ipc_msg *msg, unsigned int handle
ret = wait_event_interruptible_timeout(entry.wait,
entry.response != NULL,
IPC_WAIT_TIMEOUT);
+ if (entry.response) {
+ ret = ipc_validate_msg(&entry);
+ if (ret) {
+ kvfree(entry.response);
+ entry.response = NULL;
+ }
+ }
out:
down_write(&ipc_msg_table_lock);
hash_del(&entry.ipc_table_hlist);
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 55c0a0331188..4e30f3c50970 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -470,7 +470,9 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
struct nlm_host *host, struct nlm_lock *lock, int wait,
struct nlm_cookie *cookie, int reclaim)
{
+#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
struct inode *inode = nlmsvc_file_inode(file);
+#endif
struct nlm_block *block = NULL;
int error;
int mode;
@@ -484,7 +486,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
(long long)lock->fl.fl_end,
wait);
- if (!exportfs_lock_op_is_async(inode->i_sb->s_export_op)) {
+ if (nlmsvc_file_file(file)->f_op->lock) {
async_block = wait;
wait = 0;
}
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 40b5b226e504..d07176eee935 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -7420,7 +7420,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct nfsd4_blocked_lock *nbl = NULL;
struct file_lock *file_lock = NULL;
struct file_lock *conflock = NULL;
- struct super_block *sb;
__be32 status = 0;
int lkflg;
int err;
@@ -7442,7 +7441,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
dprintk("NFSD: nfsd4_lock: permission denied!\n");
return status;
}
- sb = cstate->current_fh.fh_dentry->d_sb;
if (lock->lk_is_new) {
if (nfsd4_has_session(cstate))
@@ -7494,8 +7492,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
fp = lock_stp->st_stid.sc_file;
switch (lock->lk_type) {
case NFS4_READW_LT:
- if (nfsd4_has_session(cstate) ||
- exportfs_lock_op_is_async(sb->s_export_op))
+ if (nfsd4_has_session(cstate))
fl_flags |= FL_SLEEP;
fallthrough;
case NFS4_READ_LT:
@@ -7507,8 +7504,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
fl_type = F_RDLCK;
break;
case NFS4_WRITEW_LT:
- if (nfsd4_has_session(cstate) ||
- exportfs_lock_op_is_async(sb->s_export_op))
+ if (nfsd4_has_session(cstate))
fl_flags |= FL_SLEEP;
fallthrough;
case NFS4_WRITE_LT:
@@ -7536,7 +7532,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
* for file locks), so don't attempt blocking lock notifications
* on those filesystems:
*/
- if (!exportfs_lock_op_is_async(sb->s_export_op))
+ if (nf->nf_file->f_op->lock)
fl_flags &= ~FL_SLEEP;
nbl = find_or_allocate_block(lock_sop, &fp->fi_fhandle, nn);
diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
index 81394e22d0a0..eb7de9e2a384 100644
--- a/fs/nilfs2/dir.c
+++ b/fs/nilfs2/dir.c
@@ -243,7 +243,7 @@ nilfs_filetype_table[NILFS_FT_MAX] = {
#define S_SHIFT 12
static unsigned char
-nilfs_type_by_mode[S_IFMT >> S_SHIFT] = {
+nilfs_type_by_mode[(S_IFMT >> S_SHIFT) + 1] = {
[S_IFREG >> S_SHIFT] = NILFS_FT_REG_FILE,
[S_IFDIR >> S_SHIFT] = NILFS_FT_DIR,
[S_IFCHR >> S_SHIFT] = NILFS_FT_CHRDEV,
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index d019d6ac6ad0..fd55a4a04d6d 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -440,6 +440,8 @@ struct kernfs_node *sysfs_break_active_protection(struct kobject *kobj,
kn = kernfs_find_and_get(kobj->sd, attr->name);
if (kn)
kernfs_break_active_protection(kn);
+ else
+ kobject_put(kobj);
return kn;
}
EXPORT_SYMBOL_GPL(sysfs_break_active_protection);
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index df15d4d445dd..74a26cabc084 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -321,7 +321,12 @@ enum bpf_type_flag {
*/
MEM_RDONLY = BIT(1 + BPF_BASE_TYPE_BITS),
- __BPF_TYPE_LAST_FLAG = MEM_RDONLY,
+ /* MEM was "allocated" from a different helper, and cannot be mixed
+ * with regular non-MEM_ALLOC'ed MEM types.
+ */
+ MEM_ALLOC = BIT(2 + BPF_BASE_TYPE_BITS),
+
+ __BPF_TYPE_LAST_FLAG = MEM_ALLOC,
};
/* Max number of base types. */
@@ -405,7 +410,7 @@ enum bpf_return_type {
RET_PTR_TO_SOCKET_OR_NULL = PTR_MAYBE_NULL | RET_PTR_TO_SOCKET,
RET_PTR_TO_TCP_SOCK_OR_NULL = PTR_MAYBE_NULL | RET_PTR_TO_TCP_SOCK,
RET_PTR_TO_SOCK_COMMON_OR_NULL = PTR_MAYBE_NULL | RET_PTR_TO_SOCK_COMMON,
- RET_PTR_TO_ALLOC_MEM_OR_NULL = PTR_MAYBE_NULL | RET_PTR_TO_ALLOC_MEM,
+ RET_PTR_TO_ALLOC_MEM_OR_NULL = PTR_MAYBE_NULL | MEM_ALLOC | RET_PTR_TO_ALLOC_MEM,
RET_PTR_TO_BTF_ID_OR_NULL = PTR_MAYBE_NULL | RET_PTR_TO_BTF_ID,
/* This must be the last entry. Its purpose is to ensure the enum is
diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h
index 3d04b48e502d..c0993b079ab5 100644
--- a/include/linux/bpf_verifier.h
+++ b/include/linux/bpf_verifier.h
@@ -541,8 +541,8 @@ bpf_prog_offload_replace_insn(struct bpf_verifier_env *env, u32 off,
void
bpf_prog_offload_remove_insns(struct bpf_verifier_env *env, u32 off, u32 cnt);
-int check_ctx_reg(struct bpf_verifier_env *env,
- const struct bpf_reg_state *reg, int regno);
+int check_ptr_off_reg(struct bpf_verifier_env *env,
+ const struct bpf_reg_state *reg, int regno);
int check_mem_reg(struct bpf_verifier_env *env, struct bpf_reg_state *reg,
u32 regno, u32 mem_size);
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index 6525f4b7eb97..218fc5c54e90 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -222,23 +222,9 @@ struct export_operations {
atomic attribute updates
*/
#define EXPORT_OP_FLUSH_ON_CLOSE (0x20) /* fs flushes file data on close */
-#define EXPORT_OP_ASYNC_LOCK (0x40) /* fs can do async lock request */
unsigned long flags;
};
-/**
- * exportfs_lock_op_is_async() - export op supports async lock operation
- * @export_ops: the nfs export operations to check
- *
- * Returns true if the nfs export_operations structure has
- * EXPORT_OP_ASYNC_LOCK in their flags set
- */
-static inline bool
-exportfs_lock_op_is_async(const struct export_operations *export_ops)
-{
- return export_ops->flags & EXPORT_OP_ASYNC_LOCK;
-}
-
extern int exportfs_encode_inode_fh(struct inode *inode, struct fid *fid,
int *max_len, struct inode *parent);
extern int exportfs_encode_fh(struct dentry *dentry, struct fid *fid,
diff --git a/include/net/dsa.h b/include/net/dsa.h
index bec439c4a085..e57d6e65f27e 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -705,6 +705,14 @@ struct dsa_switch_ops {
struct phy_device *phy);
void (*port_disable)(struct dsa_switch *ds, int port);
+ /*
+ * Compatibility between device trees defining multiple CPU ports and
+ * drivers which are not OK to use by default the numerically smallest
+ * CPU port of a switch for its local ports. This can return NULL,
+ * meaning "don't know/don't care".
+ */
+ struct dsa_port *(*preferred_default_local_cpu_port)(struct dsa_switch *ds);
+
/*
* Port's MAC EEE settings
*/
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 2ba326f9e004..c47baa623ba5 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -26,6 +26,9 @@
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
#include <net/netns/conntrack.h>
#endif
+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
+#include <net/netns/flow_table.h>
+#endif
#include <net/netns/nftables.h>
#include <net/netns/xfrm.h>
#include <net/netns/mpls.h>
@@ -138,6 +141,9 @@ struct net {
#if defined(CONFIG_NF_TABLES) || defined(CONFIG_NF_TABLES_MODULE)
struct netns_nftables nft;
#endif
+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
+ struct netns_ft ft;
+#endif
#endif
#ifdef CONFIG_WEXT_CORE
struct sk_buff_head wext_nlevents;
diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h
index dabd84fa3fd3..8e98fb8edff8 100644
--- a/include/net/netfilter/nf_flow_table.h
+++ b/include/net/netfilter/nf_flow_table.h
@@ -318,7 +318,7 @@ int nf_flow_rule_route_ipv6(struct net *net, const struct flow_offload *flow,
int nf_flow_table_offload_init(void);
void nf_flow_table_offload_exit(void);
-static inline __be16 nf_flow_pppoe_proto(const struct sk_buff *skb)
+static inline __be16 __nf_flow_pppoe_proto(const struct sk_buff *skb)
{
__be16 proto;
@@ -334,4 +334,35 @@ static inline __be16 nf_flow_pppoe_proto(const struct sk_buff *skb)
return 0;
}
+static inline bool nf_flow_pppoe_proto(struct sk_buff *skb, __be16 *inner_proto)
+{
+ if (!pskb_may_pull(skb, PPPOE_SES_HLEN))
+ return false;
+
+ *inner_proto = __nf_flow_pppoe_proto(skb);
+
+ return true;
+}
+
+#define NF_FLOW_TABLE_STAT_INC(net, count) __this_cpu_inc((net)->ft.stat->count)
+#define NF_FLOW_TABLE_STAT_DEC(net, count) __this_cpu_dec((net)->ft.stat->count)
+#define NF_FLOW_TABLE_STAT_INC_ATOMIC(net, count) \
+ this_cpu_inc((net)->ft.stat->count)
+#define NF_FLOW_TABLE_STAT_DEC_ATOMIC(net, count) \
+ this_cpu_dec((net)->ft.stat->count)
+
+#ifdef CONFIG_NF_FLOW_TABLE_PROCFS
+int nf_flow_table_init_proc(struct net *net);
+void nf_flow_table_fini_proc(struct net *net);
+#else
+static inline int nf_flow_table_init_proc(struct net *net)
+{
+ return 0;
+}
+
+static inline void nf_flow_table_fini_proc(struct net *net)
+{
+}
+#endif /* CONFIG_NF_FLOW_TABLE_PROCFS */
+
#endif /* _NF_FLOW_TABLE_H */
diff --git a/include/net/netns/flow_table.h b/include/net/netns/flow_table.h
new file mode 100644
index 000000000000..1c5fc657e267
--- /dev/null
+++ b/include/net/netns/flow_table.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __NETNS_FLOW_TABLE_H
+#define __NETNS_FLOW_TABLE_H
+
+struct nf_flow_table_stat {
+ unsigned int count_wq_add;
+ unsigned int count_wq_del;
+ unsigned int count_wq_stats;
+};
+
+struct netns_ft {
+ struct nf_flow_table_stat __percpu *stat;
+};
+#endif
diff --git a/include/trace/events/rpcgss.h b/include/trace/events/rpcgss.h
index b8fd13303ee7..6959255ccfa9 100644
--- a/include/trace/events/rpcgss.h
+++ b/include/trace/events/rpcgss.h
@@ -587,7 +587,7 @@ TRACE_EVENT(rpcgss_context,
__field(unsigned int, timeout)
__field(u32, window_size)
__field(int, len)
- __string(acceptor, data)
+ __string_len(acceptor, data, len)
),
TP_fast_assign(
@@ -596,7 +596,7 @@ TRACE_EVENT(rpcgss_context,
__entry->timeout = timeout;
__entry->window_size = window_size;
__entry->len = len;
- strncpy(__get_str(acceptor), data, len);
+ __assign_str(acceptor, data);
),
TP_printk("win_size=%u expiry=%lu now=%lu timeout=%u acceptor=%.*s",
diff --git a/init/main.c b/init/main.c
index f27e8510b155..3f3dc2a8bd86 100644
--- a/init/main.c
+++ b/init/main.c
@@ -640,6 +640,8 @@ static void __init setup_command_line(char *command_line)
if (!saved_command_line)
panic("%s: Failed to allocate %zu bytes\n", __func__, len + ilen);
+ len = xlen + strlen(command_line) + 1;
+
static_command_line = memblock_alloc(len, SMP_CACHE_BYTES);
if (!static_command_line)
panic("%s: Failed to allocate %zu bytes\n", __func__, len);
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 5d4bea53ac1f..a0c7e13e0ab4 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -5447,6 +5447,46 @@ static u32 *reg2btf_ids[__BPF_REG_TYPE_MAX] = {
#endif
};
+/* Returns true if struct is composed of scalars, 4 levels of nesting allowed */
+static bool __btf_type_is_scalar_struct(struct bpf_verifier_log *log,
+ const struct btf *btf,
+ const struct btf_type *t, int rec)
+{
+ const struct btf_type *member_type;
+ const struct btf_member *member;
+ u32 i;
+
+ if (!btf_type_is_struct(t))
+ return false;
+
+ for_each_member(i, t, member) {
+ const struct btf_array *array;
+
+ member_type = btf_type_skip_modifiers(btf, member->type, NULL);
+ if (btf_type_is_struct(member_type)) {
+ if (rec >= 3) {
+ bpf_log(log, "max struct nesting depth exceeded\n");
+ return false;
+ }
+ if (!__btf_type_is_scalar_struct(log, btf, member_type, rec + 1))
+ return false;
+ continue;
+ }
+ if (btf_type_is_array(member_type)) {
+ array = btf_type_array(member_type);
+ if (!array->nelems)
+ return false;
+ member_type = btf_type_skip_modifiers(btf, array->type, NULL);
+ if (!btf_type_is_scalar(member_type))
+ return false;
+ continue;
+ }
+ if (!btf_type_is_scalar(member_type))
+ return false;
+ }
+ return true;
+}
+
static int btf_check_func_arg_match(struct bpf_verifier_env *env,
const struct btf *btf, u32 func_id,
struct bpf_reg_state *regs,
@@ -5455,6 +5495,7 @@ static int btf_check_func_arg_match(struct bpf_verifier_env *env,
enum bpf_prog_type prog_type = env->prog->type == BPF_PROG_TYPE_EXT ?
env->prog->aux->dst_prog->type : env->prog->type;
struct bpf_verifier_log *log = &env->log;
+ bool is_kfunc = btf_is_kernel(btf);
const char *func_name, *ref_tname;
const struct btf_type *t, *ref_t;
const struct btf_param *args;
@@ -5507,7 +5548,20 @@ static int btf_check_func_arg_match(struct bpf_verifier_env *env,
ref_t = btf_type_skip_modifiers(btf, t->type, &ref_id);
ref_tname = btf_name_by_offset(btf, ref_t->name_off);
- if (btf_is_kernel(btf)) {
+ if (btf_get_prog_ctx_type(log, btf, t, prog_type, i)) {
+ /* If function expects ctx type in BTF check that caller
+ * is passing PTR_TO_CTX.
+ */
+ if (reg->type != PTR_TO_CTX) {
+ bpf_log(log,
+ "arg#%d expected pointer to ctx, but got %s\n",
+ i, btf_type_str(t));
+ return -EINVAL;
+ }
+ if (check_ptr_off_reg(env, reg, regno))
+ return -EINVAL;
+ } else if (is_kfunc && (reg->type == PTR_TO_BTF_ID ||
+ (reg2btf_ids[base_type(reg->type)] && !type_flag(reg->type)))) {
const struct btf_type *reg_ref_t;
const struct btf *reg_btf;
const char *reg_ref_tname;
@@ -5523,14 +5577,9 @@ static int btf_check_func_arg_match(struct bpf_verifier_env *env,
if (reg->type == PTR_TO_BTF_ID) {
reg_btf = reg->btf;
reg_ref_id = reg->btf_id;
- } else if (reg2btf_ids[base_type(reg->type)]) {
+ } else {
reg_btf = btf_vmlinux;
reg_ref_id = *reg2btf_ids[base_type(reg->type)];
- } else {
- bpf_log(log, "kernel function %s args#%d expected pointer to %s %s but R%d is not a pointer to btf_id\n",
- func_name, i,
- btf_type_str(ref_t), ref_tname, regno);
- return -EINVAL;
}
reg_ref_t = btf_type_skip_modifiers(reg_btf, reg_ref_id,
@@ -5546,22 +5595,24 @@ static int btf_check_func_arg_match(struct bpf_verifier_env *env,
reg_ref_tname);
return -EINVAL;
}
- } else if (btf_get_prog_ctx_type(log, btf, t, prog_type, i)) {
- /* If function expects ctx type in BTF check that caller
- * is passing PTR_TO_CTX.
- */
- if (reg->type != PTR_TO_CTX) {
- bpf_log(log,
- "arg#%d expected pointer to ctx, but got %s\n",
- i, btf_type_str(t));
- return -EINVAL;
- }
- if (check_ctx_reg(env, reg, regno))
- return -EINVAL;
} else if (ptr_to_mem_ok) {
const struct btf_type *resolve_ret;
u32 type_size;
+ if (is_kfunc) {
+ /* Permit pointer to mem, but only when argument
+ * type is pointer to scalar, or struct composed
+ * (recursively) of scalars.
+ */
+ if (!btf_type_is_scalar(ref_t) &&
+ !__btf_type_is_scalar_struct(log, btf, ref_t, 0)) {
+ bpf_log(log,
+ "arg#%d pointer type %s %s must point to scalar or struct with scalar\n",
+ i, btf_type_str(ref_t), ref_tname);
+ return -EINVAL;
+ }
+ }
+
resolve_ret = btf_resolve_size(btf, ref_t, &type_size);
if (IS_ERR(resolve_ret)) {
bpf_log(log,
@@ -5574,6 +5625,8 @@ static int btf_check_func_arg_match(struct bpf_verifier_env *env,
if (check_mem_reg(env, reg, regno, type_size))
return -EINVAL;
} else {
+ bpf_log(log, "reg type unsupported for arg#%d %sfunction %s#%d\n", i,
+ is_kfunc ? "kernel " : "", func_name, func_id);
return -EINVAL;
}
}
@@ -5623,7 +5676,7 @@ int btf_check_kfunc_arg_match(struct bpf_verifier_env *env,
const struct btf *btf, u32 func_id,
struct bpf_reg_state *regs)
{
- return btf_check_func_arg_match(env, btf, func_id, regs, false);
+ return btf_check_func_arg_match(env, btf, func_id, regs, true);
}
/* Convert BTF of a function into bpf_reg_state if possible
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 008ddb694c8a..67b325427022 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -573,6 +573,8 @@ static const char *reg_type_str(struct bpf_verifier_env *env,
if (type & MEM_RDONLY)
strncpy(prefix, "rdonly_", 16);
+ if (type & MEM_ALLOC)
+ strncpy(prefix, "alloc_", 16);
snprintf(env->type_str_buf, TYPE_STR_BUF_LEN, "%s%s%s",
prefix, str[base_type(type)], postfix);
@@ -3980,16 +3982,17 @@ static int get_callee_stack_depth(struct bpf_verifier_env *env,
}
#endif
-int check_ctx_reg(struct bpf_verifier_env *env,
- const struct bpf_reg_state *reg, int regno)
+static int __check_ptr_off_reg(struct bpf_verifier_env *env,
+ const struct bpf_reg_state *reg, int regno,
+ bool fixed_off_ok)
{
- /* Access to ctx or passing it to a helper is only allowed in
- * its original, unmodified form.
+ /* Access to this pointer-typed register or passing it to a helper
+ * is only allowed in its original, unmodified form.
*/
- if (reg->off) {
- verbose(env, "dereference of modified ctx ptr R%d off=%d disallowed\n",
- regno, reg->off);
+ if (!fixed_off_ok && reg->off) {
+ verbose(env, "dereference of modified %s ptr R%d off=%d disallowed\n",
+ reg_type_str(env, reg->type), regno, reg->off);
return -EACCES;
}
@@ -3997,13 +4000,20 @@ int check_ctx_reg(struct bpf_verifier_env *env,
char tn_buf[48];
tnum_strn(tn_buf, sizeof(tn_buf), reg->var_off);
- verbose(env, "variable ctx access var_off=%s disallowed\n", tn_buf);
+ verbose(env, "variable %s access var_off=%s disallowed\n",
+ reg_type_str(env, reg->type), tn_buf);
return -EACCES;
}
return 0;
}
+int check_ptr_off_reg(struct bpf_verifier_env *env,
+ const struct bpf_reg_state *reg, int regno)
+{
+ return __check_ptr_off_reg(env, reg, regno, false);
+}
+
static int __check_buffer_access(struct bpf_verifier_env *env,
const char *buf_info,
const struct bpf_reg_state *reg,
@@ -4447,7 +4457,7 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regn
return -EACCES;
}
- err = check_ctx_reg(env, reg, regno);
+ err = check_ptr_off_reg(env, reg, regno);
if (err < 0)
return err;
@@ -5149,6 +5159,7 @@ static const struct bpf_reg_types mem_types = {
PTR_TO_MAP_KEY,
PTR_TO_MAP_VALUE,
PTR_TO_MEM,
+ PTR_TO_MEM | MEM_ALLOC,
PTR_TO_BUF,
},
};
@@ -5166,7 +5177,7 @@ static const struct bpf_reg_types int_ptr_types = {
static const struct bpf_reg_types fullsock_types = { .types = { PTR_TO_SOCKET } };
static const struct bpf_reg_types scalar_types = { .types = { SCALAR_VALUE } };
static const struct bpf_reg_types context_types = { .types = { PTR_TO_CTX } };
-static const struct bpf_reg_types alloc_mem_types = { .types = { PTR_TO_MEM } };
+static const struct bpf_reg_types alloc_mem_types = { .types = { PTR_TO_MEM | MEM_ALLOC } };
static const struct bpf_reg_types const_map_ptr_types = { .types = { CONST_PTR_TO_MAP } };
static const struct bpf_reg_types btf_ptr_types = { .types = { PTR_TO_BTF_ID } };
static const struct bpf_reg_types spin_lock_types = { .types = { PTR_TO_MAP_VALUE } };
@@ -5266,12 +5277,6 @@ static int check_reg_type(struct bpf_verifier_env *env, u32 regno,
kernel_type_name(btf_vmlinux, *arg_btf_id));
return -EACCES;
}
-
- if (!tnum_is_const(reg->var_off) || reg->var_off.value) {
- verbose(env, "R%d is a pointer to in-kernel struct with non-zero offset\n",
- regno);
- return -EACCES;
- }
}
return 0;
@@ -5326,10 +5331,33 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
if (err)
return err;
- if (type == PTR_TO_CTX) {
- err = check_ctx_reg(env, reg, regno);
+ switch ((u32)type) {
+ case SCALAR_VALUE:
+ /* Pointer types where reg offset is explicitly allowed: */
+ case PTR_TO_PACKET:
+ case PTR_TO_PACKET_META:
+ case PTR_TO_MAP_KEY:
+ case PTR_TO_MAP_VALUE:
+ case PTR_TO_MEM:
+ case PTR_TO_MEM | MEM_RDONLY:
+ case PTR_TO_MEM | MEM_ALLOC:
+ case PTR_TO_BUF:
+ case PTR_TO_BUF | MEM_RDONLY:
+ case PTR_TO_STACK:
+ /* Some of the argument types nevertheless require a
+ * zero register offset.
+ */
+ if (arg_type == ARG_PTR_TO_ALLOC_MEM)
+ goto force_off_check;
+ break;
+ /* All the rest must be rejected: */
+ default:
+force_off_check:
+ err = __check_ptr_off_reg(env, reg, regno,
+ type == PTR_TO_BTF_ID);
if (err < 0)
return err;
+ break;
}
skip_type_check:
@@ -9561,7 +9589,7 @@ static int check_ld_abs(struct bpf_verifier_env *env, struct bpf_insn *insn)
return err;
}
- err = check_ctx_reg(env, ®s[ctx_reg], ctx_reg);
+ err = check_ptr_off_reg(env, ®s[ctx_reg], ctx_reg);
if (err < 0)
return err;
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 5d713a7d7e87..af57705e1fef 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1564,10 +1564,17 @@ static int check_kprobe_address_safe(struct kprobe *p,
jump_label_lock();
preempt_disable();
- /* Ensure it is not in reserved area nor out of text */
- if (!(core_kernel_text((unsigned long) p->addr) ||
- is_module_text_address((unsigned long) p->addr)) ||
- in_gate_area_no_mm((unsigned long) p->addr) ||
+ /* Ensure the address is in a text area, and find a module if exists. */
+ *probed_mod = NULL;
+ if (!core_kernel_text((unsigned long) p->addr)) {
+ *probed_mod = __module_text_address((unsigned long) p->addr);
+ if (!(*probed_mod)) {
+ ret = -EINVAL;
+ goto out;
+ }
+ }
+ /* Ensure it is not in reserved area. */
+ if (in_gate_area_no_mm((unsigned long) p->addr) ||
within_kprobe_blacklist((unsigned long) p->addr) ||
jump_label_text_reserved(p->addr, p->addr) ||
static_call_text_reserved(p->addr, p->addr) ||
@@ -1577,8 +1584,7 @@ static int check_kprobe_address_safe(struct kprobe *p,
goto out;
}
- /* Check if are we probing a module */
- *probed_mod = __module_text_address((unsigned long) p->addr);
+ /* Get module refcount and reject __init functions for loaded modules. */
if (*probed_mod) {
/*
* We must hold a refcount of the probed module while updating
diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index dfdbcf1da216..106f9813841a 100644
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -1161,10 +1161,8 @@ register_snapshot_trigger(char *glob, struct event_trigger_ops *ops,
struct event_trigger_data *data,
struct trace_event_file *file)
{
- int ret = tracing_alloc_snapshot_instance(file->tr);
-
- if (ret < 0)
- return ret;
+ if (tracing_alloc_snapshot_instance(file->tr) != 0)
+ return 0;
return register_trigger(glob, ops, data, file);
}
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 54bfcdf69273..f3d49343f7db 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -30,7 +30,7 @@ br_netif_receive_skb(struct net *net, struct sock *sk, struct sk_buff *skb)
return netif_receive_skb(skb);
}
-static int br_pass_frame_up(struct sk_buff *skb)
+static int br_pass_frame_up(struct sk_buff *skb, bool promisc)
{
struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev;
struct net_bridge *br = netdev_priv(brdev);
@@ -65,6 +65,8 @@ static int br_pass_frame_up(struct sk_buff *skb)
br_multicast_count(br, NULL, skb, br_multicast_igmp_type(skb),
BR_MCAST_DIR_TX);
+ BR_INPUT_SKB_CB(skb)->promisc = promisc;
+
return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN,
dev_net(indev), NULL, skb, indev, NULL,
br_netif_receive_skb);
@@ -82,6 +84,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
struct net_bridge_mcast *brmctx;
struct net_bridge_vlan *vlan;
struct net_bridge *br;
+ bool promisc;
u16 vid = 0;
u8 state;
@@ -102,7 +105,9 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
if (p->flags & BR_LEARNING)
br_fdb_update(br, p, eth_hdr(skb)->h_source, vid, 0);
- local_rcv = !!(br->dev->flags & IFF_PROMISC);
+ promisc = !!(br->dev->flags & IFF_PROMISC);
+ local_rcv = promisc;
+
if (is_multicast_ether_addr(eth_hdr(skb)->h_dest)) {
/* by definition the broadcast is also a multicast address */
if (is_broadcast_ether_addr(eth_hdr(skb)->h_dest)) {
@@ -165,7 +170,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
unsigned long now = jiffies;
if (test_bit(BR_FDB_LOCAL, &dst->flags))
- return br_pass_frame_up(skb);
+ return br_pass_frame_up(skb, false);
if (now != dst->used)
dst->used = now;
@@ -178,7 +183,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
}
if (local_rcv)
- return br_pass_frame_up(skb);
+ return br_pass_frame_up(skb, promisc);
out:
return 0;
@@ -350,6 +355,8 @@ static rx_handler_result_t br_handle_frame(struct sk_buff **pskb)
goto forward;
}
+ BR_INPUT_SKB_CB(skb)->promisc = false;
+
/* The else clause should be hit when nf_hook():
* - returns < 0 (drop/error)
* - returns = 0 (stolen/nf_queue)
diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c
index 8a114a500046..9981e0dfdd4d 100644
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
@@ -584,11 +584,17 @@ static unsigned int br_nf_local_in(void *priv,
struct sk_buff *skb,
const struct nf_hook_state *state)
{
+ bool promisc = BR_INPUT_SKB_CB(skb)->promisc;
struct nf_conntrack *nfct = skb_nfct(skb);
const struct nf_ct_hook *ct_hook;
struct nf_conn *ct;
int ret;
+ if (promisc) {
+ nf_reset_ct(skb);
+ return NF_ACCEPT;
+ }
+
if (!nfct || skb->pkt_type == PACKET_HOST)
return NF_ACCEPT;
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index ff10ddeeb50f..fe61d3b8d0cc 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -547,6 +547,7 @@ struct br_input_skb_cb {
#endif
u8 proxyarp_replied:1;
u8 src_port_isolated:1;
+ u8 promisc:1;
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
u8 vlan_filtered:1;
#endif
diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c b/net/bridge/netfilter/nf_conntrack_bridge.c
index 83743e95939b..fbdb1ad448c3 100644
--- a/net/bridge/netfilter/nf_conntrack_bridge.c
+++ b/net/bridge/netfilter/nf_conntrack_bridge.c
@@ -293,18 +293,24 @@ static unsigned int nf_ct_bridge_pre(void *priv, struct sk_buff *skb,
static unsigned int nf_ct_bridge_in(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state)
{
- enum ip_conntrack_info ctinfo;
+ bool promisc = BR_INPUT_SKB_CB(skb)->promisc;
+ struct nf_conntrack *nfct = skb_nfct(skb);
struct nf_conn *ct;
- if (skb->pkt_type == PACKET_HOST)
+ if (promisc) {
+ nf_reset_ct(skb);
+ return NF_ACCEPT;
+ }
+
+ if (!nfct || skb->pkt_type == PACKET_HOST)
return NF_ACCEPT;
/* nf_conntrack_confirm() cannot handle concurrent clones,
* this happens for broad/multicast frames with e.g. macvlan on top
* of the bridge device.
*/
- ct = nf_ct_get(skb, &ctinfo);
- if (!ct || nf_ct_is_confirmed(ct) || nf_ct_is_template(ct))
+ ct = container_of(nfct, struct nf_conn, ct_general);
+ if (nf_ct_is_confirmed(ct) || nf_ct_is_template(ct))
return NF_ACCEPT;
/* let inet prerouting call conntrack again */
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 9751bee3fb2f..543834e31298 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -386,6 +386,24 @@ static int dsa_tree_setup_default_cpu(struct dsa_switch_tree *dst)
return 0;
}
+static struct dsa_port *
+dsa_switch_preferred_default_local_cpu_port(struct dsa_switch *ds)
+{
+ struct dsa_port *cpu_dp;
+
+ if (!ds->ops->preferred_default_local_cpu_port)
+ return NULL;
+
+ cpu_dp = ds->ops->preferred_default_local_cpu_port(ds);
+ if (!cpu_dp)
+ return NULL;
+
+ if (WARN_ON(!dsa_port_is_cpu(cpu_dp) || cpu_dp->ds != ds))
+ return NULL;
+
+ return cpu_dp;
+}
+
/* Perform initial assignment of CPU ports to user ports and DSA links in the
* fabric, giving preference to CPU ports local to each switch. Default to
* using the first CPU port in the switch tree if the port does not have a CPU
@@ -393,12 +411,16 @@ static int dsa_tree_setup_default_cpu(struct dsa_switch_tree *dst)
*/
static int dsa_tree_setup_cpu_ports(struct dsa_switch_tree *dst)
{
- struct dsa_port *cpu_dp, *dp;
+ struct dsa_port *preferred_cpu_dp, *cpu_dp, *dp;
list_for_each_entry(cpu_dp, &dst->ports, list) {
if (!dsa_port_is_cpu(cpu_dp))
continue;
+ preferred_cpu_dp = dsa_switch_preferred_default_local_cpu_port(cpu_dp->ds);
+ if (preferred_cpu_dp && preferred_cpu_dp != cpu_dp)
+ continue;
+
list_for_each_entry(dp, &dst->ports, list) {
/* Prefer a local CPU port */
if (dp->ds != cpu_dp->ds)
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 4f645d51c257..f02ebe460965 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -728,6 +728,15 @@ config NF_FLOW_TABLE
To compile it as a module, choose M here.
+config NF_FLOW_TABLE_PROCFS
+ bool "Supply flow table statistics in procfs"
+ default y
+ depends on PROC_FS
+ depends on SYSCTL
+ help
+ This option enables for the flow table offload statistics
+ to be shown in procfs under net/netfilter/nf_flowtable.
+
config NETFILTER_XTABLES
tristate "Netfilter Xtables support (required for ip_tables)"
default m if NETFILTER_ADVANCED=n
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index aab20e575ecd..3f77f20ae39e 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -124,6 +124,7 @@ obj-$(CONFIG_NFT_FWD_NETDEV) += nft_fwd_netdev.o
obj-$(CONFIG_NF_FLOW_TABLE) += nf_flow_table.o
nf_flow_table-objs := nf_flow_table_core.o nf_flow_table_ip.o \
nf_flow_table_offload.o
+nf_flow_table-$(CONFIG_NF_FLOW_TABLE_PROCFS) += nf_flow_table_procfs.o
obj-$(CONFIG_NF_FLOW_TABLE_INET) += nf_flow_table_inet.o
diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c
index e78cdd73ef62..beb0e84b5f42 100644
--- a/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@ -606,14 +606,74 @@ void nf_flow_table_free(struct nf_flowtable *flow_table)
}
EXPORT_SYMBOL_GPL(nf_flow_table_free);
+static int nf_flow_table_init_net(struct net *net)
+{
+ net->ft.stat = alloc_percpu(struct nf_flow_table_stat);
+ return net->ft.stat ? 0 : -ENOMEM;
+}
+
+static void nf_flow_table_fini_net(struct net *net)
+{
+ free_percpu(net->ft.stat);
+}
+
+static int nf_flow_table_pernet_init(struct net *net)
+{
+ int ret;
+
+ ret = nf_flow_table_init_net(net);
+ if (ret < 0)
+ return ret;
+
+ ret = nf_flow_table_init_proc(net);
+ if (ret < 0)
+ goto out_proc;
+
+ return 0;
+
+out_proc:
+ nf_flow_table_fini_net(net);
+ return ret;
+}
+
+static void nf_flow_table_pernet_exit(struct list_head *net_exit_list)
+{
+ struct net *net;
+
+ list_for_each_entry(net, net_exit_list, exit_list) {
+ nf_flow_table_fini_proc(net);
+ nf_flow_table_fini_net(net);
+ }
+}
+
+static struct pernet_operations nf_flow_table_net_ops = {
+ .init = nf_flow_table_pernet_init,
+ .exit_batch = nf_flow_table_pernet_exit,
+};
+
static int __init nf_flow_table_module_init(void)
{
- return nf_flow_table_offload_init();
+ int ret;
+
+ ret = register_pernet_subsys(&nf_flow_table_net_ops);
+ if (ret < 0)
+ return ret;
+
+ ret = nf_flow_table_offload_init();
+ if (ret)
+ goto out_offload;
+
+ return 0;
+
+out_offload:
+ unregister_pernet_subsys(&nf_flow_table_net_ops);
+ return ret;
}
static void __exit nf_flow_table_module_exit(void)
{
nf_flow_table_offload_exit();
+ unregister_pernet_subsys(&nf_flow_table_net_ops);
}
module_init(nf_flow_table_module_init);
diff --git a/net/netfilter/nf_flow_table_inet.c b/net/netfilter/nf_flow_table_inet.c
index 280fdd32965f..6783ea220f8f 100644
--- a/net/netfilter/nf_flow_table_inet.c
+++ b/net/netfilter/nf_flow_table_inet.c
@@ -21,7 +21,8 @@ nf_flow_offload_inet_hook(void *priv, struct sk_buff *skb,
proto = veth->h_vlan_encapsulated_proto;
break;
case htons(ETH_P_PPP_SES):
- proto = nf_flow_pppoe_proto(skb);
+ if (!nf_flow_pppoe_proto(skb, &proto))
+ return NF_ACCEPT;
break;
default:
proto = skb->protocol;
diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
index 28026467b54c..f3227f931696 100644
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
@@ -156,7 +156,7 @@ static void nf_flow_tuple_encap(struct sk_buff *skb,
tuple->encap[i].proto = skb->protocol;
break;
case htons(ETH_P_PPP_SES):
- phdr = (struct pppoe_hdr *)skb_mac_header(skb);
+ phdr = (struct pppoe_hdr *)skb_network_header(skb);
tuple->encap[i].id = ntohs(phdr->sid);
tuple->encap[i].proto = skb->protocol;
break;
@@ -246,10 +246,11 @@ static unsigned int nf_flow_xmit_xfrm(struct sk_buff *skb,
return NF_STOLEN;
}
-static bool nf_flow_skb_encap_protocol(const struct sk_buff *skb, __be16 proto,
+static bool nf_flow_skb_encap_protocol(struct sk_buff *skb, __be16 proto,
u32 *offset)
{
struct vlan_ethhdr *veth;
+ __be16 inner_proto;
switch (skb->protocol) {
case htons(ETH_P_8021Q):
@@ -260,7 +261,8 @@ static bool nf_flow_skb_encap_protocol(const struct sk_buff *skb, __be16 proto,
}
break;
case htons(ETH_P_PPP_SES):
- if (nf_flow_pppoe_proto(skb) == proto) {
+ if (nf_flow_pppoe_proto(skb, &inner_proto) &&
+ inner_proto == proto) {
*offset += PPPOE_SES_HLEN;
return true;
}
@@ -289,7 +291,7 @@ static void nf_flow_encap_pop(struct sk_buff *skb,
skb_reset_network_header(skb);
break;
case htons(ETH_P_PPP_SES):
- skb->protocol = nf_flow_pppoe_proto(skb);
+ skb->protocol = __nf_flow_pppoe_proto(skb);
skb_pull(skb, PPPOE_SES_HLEN);
skb_reset_network_header(skb);
break;
diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c
index 336f282a221f..6ac1ebe17456 100644
--- a/net/netfilter/nf_flow_table_offload.c
+++ b/net/netfilter/nf_flow_table_offload.c
@@ -953,17 +953,22 @@ static void flow_offload_work_stats(struct flow_offload_work *offload)
static void flow_offload_work_handler(struct work_struct *work)
{
struct flow_offload_work *offload;
+ struct net *net;
offload = container_of(work, struct flow_offload_work, work);
+ net = read_pnet(&offload->flowtable->net);
switch (offload->cmd) {
case FLOW_CLS_REPLACE:
flow_offload_work_add(offload);
+ NF_FLOW_TABLE_STAT_DEC_ATOMIC(net, count_wq_add);
break;
case FLOW_CLS_DESTROY:
flow_offload_work_del(offload);
+ NF_FLOW_TABLE_STAT_DEC_ATOMIC(net, count_wq_del);
break;
case FLOW_CLS_STATS:
flow_offload_work_stats(offload);
+ NF_FLOW_TABLE_STAT_DEC_ATOMIC(net, count_wq_stats);
break;
default:
WARN_ON_ONCE(1);
@@ -975,12 +980,18 @@ static void flow_offload_work_handler(struct work_struct *work)
static void flow_offload_queue_work(struct flow_offload_work *offload)
{
- if (offload->cmd == FLOW_CLS_REPLACE)
+ struct net *net = read_pnet(&offload->flowtable->net);
+
+ if (offload->cmd == FLOW_CLS_REPLACE) {
+ NF_FLOW_TABLE_STAT_INC(net, count_wq_add);
queue_work(nf_flow_offload_add_wq, &offload->work);
- else if (offload->cmd == FLOW_CLS_DESTROY)
+ } else if (offload->cmd == FLOW_CLS_DESTROY) {
+ NF_FLOW_TABLE_STAT_INC(net, count_wq_del);
queue_work(nf_flow_offload_del_wq, &offload->work);
- else
+ } else {
+ NF_FLOW_TABLE_STAT_INC(net, count_wq_stats);
queue_work(nf_flow_offload_stats_wq, &offload->work);
+ }
}
static struct flow_offload_work *
diff --git a/net/netfilter/nf_flow_table_procfs.c b/net/netfilter/nf_flow_table_procfs.c
new file mode 100644
index 000000000000..159b033a43e6
--- /dev/null
+++ b/net/netfilter/nf_flow_table_procfs.c
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <linux/kernel.h>
+#include <linux/proc_fs.h>
+#include <net/netfilter/nf_flow_table.h>
+
+static void *nf_flow_table_cpu_seq_start(struct seq_file *seq, loff_t *pos)
+{
+ struct net *net = seq_file_net(seq);
+ int cpu;
+
+ if (*pos == 0)
+ return SEQ_START_TOKEN;
+
+ for (cpu = *pos - 1; cpu < nr_cpu_ids; ++cpu) {
+ if (!cpu_possible(cpu))
+ continue;
+ *pos = cpu + 1;
+ return per_cpu_ptr(net->ft.stat, cpu);
+ }
+
+ return NULL;
+}
+
+static void *nf_flow_table_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+ struct net *net = seq_file_net(seq);
+ int cpu;
+
+ for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) {
+ if (!cpu_possible(cpu))
+ continue;
+ *pos = cpu + 1;
+ return per_cpu_ptr(net->ft.stat, cpu);
+ }
+ (*pos)++;
+ return NULL;
+}
+
+static void nf_flow_table_cpu_seq_stop(struct seq_file *seq, void *v)
+{
+}
+
+static int nf_flow_table_cpu_seq_show(struct seq_file *seq, void *v)
+{
+ const struct nf_flow_table_stat *st = v;
+
+ if (v == SEQ_START_TOKEN) {
+ seq_puts(seq, "wq_add wq_del wq_stats\n");
+ return 0;
+ }
+
+ seq_printf(seq, "%8d %8d %8d\n",
+ st->count_wq_add,
+ st->count_wq_del,
+ st->count_wq_stats
+ );
+ return 0;
+}
+
+static const struct seq_operations nf_flow_table_cpu_seq_ops = {
+ .start = nf_flow_table_cpu_seq_start,
+ .next = nf_flow_table_cpu_seq_next,
+ .stop = nf_flow_table_cpu_seq_stop,
+ .show = nf_flow_table_cpu_seq_show,
+};
+
+int nf_flow_table_init_proc(struct net *net)
+{
+ struct proc_dir_entry *pde;
+
+ pde = proc_create_net("nf_flowtable", 0444, net->proc_net_stat,
+ &nf_flow_table_cpu_seq_ops,
+ sizeof(struct seq_net_private));
+ return pde ? 0 : -ENOMEM;
+}
+
+void nf_flow_table_fini_proc(struct net *net)
+{
+ remove_proc_entry("nf_flowtable", net->proc_net_stat);
+}
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 113c1ebe4a5b..3999b89793fc 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2821,7 +2821,7 @@ static const struct nft_expr_type *__nft_expr_type_get(u8 family,
{
const struct nft_expr_type *type, *candidate = NULL;
- list_for_each_entry(type, &nf_tables_expressions, list) {
+ list_for_each_entry_rcu(type, &nf_tables_expressions, list) {
if (!nla_strcmp(nla, type->name)) {
if (!type->family && !candidate)
candidate = type;
@@ -2853,9 +2853,13 @@ static const struct nft_expr_type *nft_expr_type_get(struct net *net,
if (nla == NULL)
return ERR_PTR(-EINVAL);
+ rcu_read_lock();
type = __nft_expr_type_get(family, nla);
- if (type != NULL && try_module_get(type->owner))
+ if (type != NULL && try_module_get(type->owner)) {
+ rcu_read_unlock();
return type;
+ }
+ rcu_read_unlock();
lockdep_nfnl_nft_mutex_not_held();
#ifdef CONFIG_MODULES
@@ -7041,7 +7045,7 @@ static const struct nft_object_type *__nft_obj_type_get(u32 objtype, u8 family)
{
const struct nft_object_type *type;
- list_for_each_entry(type, &nf_tables_objects, list) {
+ list_for_each_entry_rcu(type, &nf_tables_objects, list) {
if (type->family != NFPROTO_UNSPEC &&
type->family != family)
continue;
@@ -7057,9 +7061,13 @@ nft_obj_type_get(struct net *net, u32 objtype, u8 family)
{
const struct nft_object_type *type;
+ rcu_read_lock();
type = __nft_obj_type_get(objtype, family);
- if (type != NULL && try_module_get(type->owner))
+ if (type != NULL && try_module_get(type->owner)) {
+ rcu_read_unlock();
return type;
+ }
+ rcu_read_unlock();
lockdep_nfnl_nft_mutex_not_held();
#ifdef CONFIG_MODULES
diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
index 58eca2616273..2299ced939c4 100644
--- a/net/netfilter/nft_set_pipapo.c
+++ b/net/netfilter/nft_set_pipapo.c
@@ -1994,6 +1994,8 @@ static void nft_pipapo_remove(const struct net *net, const struct nft_set *set,
rules_fx = rules_f0;
nft_pipapo_for_each_field(f, i, m) {
+ bool last = i == m->field_count - 1;
+
if (!pipapo_match_field(f, start, rules_fx,
match_start, match_end))
break;
@@ -2006,16 +2008,18 @@ static void nft_pipapo_remove(const struct net *net, const struct nft_set *set,
match_start += NFT_PIPAPO_GROUPS_PADDED_SIZE(f);
match_end += NFT_PIPAPO_GROUPS_PADDED_SIZE(f);
- }
- if (i == m->field_count) {
- priv->dirty = true;
- pipapo_drop(m, rulemap);
- return;
+ if (last && f->mt[rulemap[i].to].e == e) {
+ priv->dirty = true;
+ pipapo_drop(m, rulemap);
+ return;
+ }
}
first_rule += rules_f0;
}
+
+ WARN_ON_ONCE(1); /* elem_priv not found */
}
/**
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 628d97c195a7..f66f86704901 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2565,7 +2565,9 @@ static struct sk_buff *manage_oob(struct sk_buff *skb, struct sock *sk,
WRITE_ONCE(u->oob_skb, NULL);
consume_skb(skb);
}
- } else if (!(flags & MSG_PEEK)) {
+ } else if (flags & MSG_PEEK) {
+ skb = NULL;
+ } else {
skb_unlink(skb, &sk->sk_receive_queue);
WRITE_ONCE(u->oob_skb, NULL);
if (!WARN_ON_ONCE(skb_unref(skb)))
@@ -2644,18 +2646,16 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state,
last = skb = skb_peek(&sk->sk_receive_queue);
last_len = last ? last->len : 0;
+again:
#if IS_ENABLED(CONFIG_AF_UNIX_OOB)
if (skb) {
skb = manage_oob(skb, sk, flags, copied);
- if (!skb) {
+ if (!skb && copied) {
unix_state_unlock(sk);
- if (copied)
- break;
- goto redo;
+ break;
}
}
#endif
-again:
if (skb == NULL) {
if (copied >= target)
goto unlock;
diff --git a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
index b1ede6249866..b7c8f29c09a9 100644
--- a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
@@ -18,7 +18,7 @@ echo 'sched:*' > set_event
yield
-count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
+count=`head -n 100 trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -lt 3 ]; then
fail "at least fork, exec and exit events should be recorded"
fi
@@ -29,7 +29,7 @@ echo 1 > events/sched/enable
yield
-count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
+count=`head -n 100 trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -lt 3 ]; then
fail "at least fork, exec and exit events should be recorded"
fi
@@ -40,7 +40,7 @@ echo 0 > events/sched/enable
yield
-count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
+count=`head -n 100 trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -ne 0 ]; then
fail "any of scheduler events should not be recorded"
fi
^ permalink raw reply related [relevance 5%]
* Linux 5.15.157
@ 2024-04-27 15:54 6% Greg Kroah-Hartman
2024-04-27 15:54 5% ` Greg Kroah-Hartman
0 siblings, 1 reply; 200+ results
From: Greg Kroah-Hartman @ 2024-04-27 15:54 UTC (permalink / raw)
To: linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby, Greg Kroah-Hartman
I'm announcing the release of the 5.15.157 kernel.
All users of the 5.15 kernel series must upgrade.
The updated 5.15.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.15.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/filesystems/nfs/exporting.rst | 7
Makefile | 2
arch/arm64/mm/pageattr.c | 3
arch/x86/include/asm/kvm_host.h | 1
arch/x86/kernel/cpu/bugs.c | 11
arch/x86/kernel/cpu/cpuid-deps.c | 6
arch/x86/kvm/cpuid.c | 1
arch/x86/kvm/cpuid.h | 10
arch/x86/kvm/lapic.c | 3
arch/x86/kvm/mmu/mmu.c | 2
arch/x86/kvm/x86.c | 2
drivers/accessibility/speakup/main.c | 2
drivers/android/binder.c | 4
drivers/clk/clk.c | 154 +++++++---
drivers/comedi/drivers/vmk80xx.c | 35 --
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 72 ++--
drivers/gpu/drm/nouveau/nouveau_bios.c | 13
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 7
drivers/gpu/drm/panel/panel-visionox-rm69299.c | 2
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4
drivers/infiniband/core/cm.c | 11
drivers/infiniband/hw/mlx5/mad.c | 3
drivers/infiniband/sw/rxe/rxe.c | 2
drivers/misc/mei/pci-me.c | 2
drivers/net/dsa/mt7530.c | 60 ++-
drivers/net/dsa/mt7530.h | 6
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 18 +
drivers/net/tun.c | 18 -
drivers/s390/cio/device.c | 13
drivers/s390/cio/qdio_main.c | 28 +
drivers/thunderbolt/switch.c | 48 ++-
drivers/thunderbolt/tb.c | 4
drivers/thunderbolt/tb.h | 3
drivers/thunderbolt/usb4.c | 13
drivers/tty/serial/pmac_zilog.c | 14
drivers/usb/class/cdc-wdm.c | 6
drivers/usb/core/port.c | 4
drivers/usb/dwc2/hcd_ddma.c | 4
drivers/usb/gadget/function/f_ncm.c | 4
drivers/usb/serial/option.c | 40 ++
fs/btrfs/delayed-inode.c | 3
fs/ksmbd/ksmbd_netlink.h | 3
fs/ksmbd/mgmt/share_config.c | 7
fs/ksmbd/smb2ops.c | 10
fs/ksmbd/smb2pdu.c | 3
fs/ksmbd/transport_ipc.c | 37 ++
fs/lockd/svclock.c | 4
fs/nfsd/nfs4state.c | 10
fs/nilfs2/dir.c | 2
fs/sysfs/file.c | 2
include/linux/bpf.h | 9
include/linux/bpf_verifier.h | 4
include/linux/exportfs.h | 14
include/net/dsa.h | 8
include/net/net_namespace.h | 6
include/net/netfilter/nf_flow_table.h | 33 ++
include/net/netns/flow_table.h | 14
include/trace/events/rpcgss.h | 4
init/main.c | 2
kernel/bpf/btf.c | 93 ++++--
kernel/bpf/verifier.c | 66 +++-
kernel/kprobes.c | 18 -
kernel/trace/trace_events_trigger.c | 6
net/bridge/br_input.c | 15
net/bridge/br_netfilter_hooks.c | 6
net/bridge/br_private.h | 1
net/bridge/netfilter/nf_conntrack_bridge.c | 14
net/dsa/dsa2.c | 24 +
net/netfilter/Kconfig | 9
net/netfilter/Makefile | 1
net/netfilter/nf_flow_table_core.c | 62 +++-
net/netfilter/nf_flow_table_inet.c | 3
net/netfilter/nf_flow_table_ip.c | 10
net/netfilter/nf_flow_table_offload.c | 17 -
net/netfilter/nf_flow_table_procfs.c | 80 +++++
net/netfilter/nf_tables_api.c | 16 -
net/netfilter/nft_set_pipapo.c | 14
net/unix/af_unix.c | 12
tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc | 6
79 files changed, 971 insertions(+), 319 deletions(-)
Alan Stern (1):
fs: sysfs: Fix reference leak in sysfs_break_active_protection()
Alexander Usyskin (1):
mei: me: disable RPL-S on SPS and IGN firmwares
Arınç ÜNAL (4):
net: dsa: mt7530: fix mirroring frames received on local port
net: dsa: mt7530: set all CPU ports in MT7531_CPU_PMAP
net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
Boris Burkov (1):
btrfs: record delayed inode root in transaction
Carlos Llamas (1):
binder: check offset alignment in binder_get_object()
Chuanhong Guo (1):
USB: serial: option: add support for Fibocom FM650/FG650
Chuck Lever (1):
Revert "lockd: introduce safe async lock op"
Claudiu Beznea (1):
clk: remove extra empty line
Coia Prant (1):
USB: serial: option: add Lonsung U8300/U9300 product
Daniel Borkmann (4):
bpf: Generalize check_ctx_reg for reuse with other types
bpf: Generally fix helper register offset check
bpf: Fix out of bounds access for ringbuf helpers
bpf: Fix ringbuf memory type confusion when passing to helpers
Daniele Palmas (1):
USB: serial: option: add Telit FN920C04 rmnet compositions
Dave Airlie (1):
nouveau: fix instmem race condition around ptr stores
Dmitry Baryshkov (1):
drm/panel: visionox-rm69299: don't unregister DSI device
Eric Biggers (1):
x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
Finn Thain (1):
serial/pmac_zilog: Remove flawed mitigation for rx irq flood
Florian Westphal (1):
netfilter: nft_set_pipapo: do not free live element
Gil Fine (2):
thunderbolt: Avoid notify PM core about runtime PM resume
thunderbolt: Fix wake configurations after device unplug
Greg Kroah-Hartman (2):
Revert "usb: cdc-wdm: close race between read and workqueue"
Linux 5.15.157
Jeongjun Park (1):
nilfs2: fix OOB in nilfs_set_de_type
Jerry Meng (1):
USB: serial: option: support Quectel EM060K sub-models
Josh Poimboeuf (1):
x86/bugs: Fix BHI retpoline check
Kai-Heng Feng (1):
usb: Disable USB3 LPM at shutdown
Konrad Dybcio (1):
clk: Print an info line before disabling unused clocks
Kumar Kartikeya Dwivedi (1):
bpf: Extend kfunc with PTR_TO_CTX, PTR_TO_MEM argument support
Kuniyuki Iwashima (2):
af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
af_unix: Don't peek OOB data without MSG_OOB.
Lei Chen (1):
tun: limit printing rate when illegal packet received by tun dev
Mark Zhang (1):
RDMA/cm: Print the old state when cm_destroy_id gets timeout
Michael Guralnik (1):
RDMA/mlx5: Fix port number for counter query in multi-port configuration
Mikhail Kobuk (1):
drm: nv04: Fix out of bounds access
Minas Harutyunyan (1):
usb: dwc2: host: Fix dereference issue in DDMA completion flow.
Namjae Jeon (3):
ksmbd: don't send oplock break if rename fails
ksmbd: validate payload size in ipc response
ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
Nikita Zhandarovich (1):
comedi: vmk80xx: fix incomplete endpoint checking
Norihiko Hama (1):
usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
Pablo Neira Ayuso (3):
netfilter: br_netfilter: skip conntrack input hook for promisc packets
netfilter: flowtable: validate pppoe header
netfilter: flowtable: incorrect pppoe tuple
Peter Oberparleiter (2):
s390/qdio: handle deferred cc1
s390/cio: fix race condition during online processing
Samuel Thibault (1):
speakup: Avoid crash on very long word
Sandipan Das (1):
KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
Sean Christopherson (1):
KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
Siddh Raman Pant (1):
Revert "tracing/trigger: Fix to return error if failed to alloc snapshot"
Siddharth Vadapalli (1):
net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
Stephen Boyd (4):
clk: Remove prepare_lock hold assertion in __clk_release()
clk: Mark 'all_lists' as const
clk: Initialize struct clk_core kref earlier
clk: Get runtime PM before walking tree during disable_unused
Steven Rostedt (Google) (1):
SUNRPC: Fix rpcgss_context trace event acceptor field
Vanillan Wang (1):
USB: serial: option: add Rolling RW101-GL and RW135-GL support
Vlad Buslov (1):
netfilter: nf_flow_table: count pending offload workqueue tasks
Vladimir Oltean (1):
net: dsa: introduce preferred_default_local_cpu_port and use on MT7530
Yanjun.Zhu (1):
RDMA/rxe: Fix the problem "mutex_destroy missing"
Yaxiong Tian (1):
arm64: hibernate: Fix level3 translation fault in swsusp_save()
Yuanhe Shu (1):
selftests/ftrace: Limit length in subsystem-enable tests
Yuntao Wang (1):
init/main.c: Fix potential static_command_line memory overflow
Zack Rusin (1):
drm/vmwgfx: Sort primary plane formats by order of preference
Zheng Yejian (1):
kprobes: Fix possible use-after-free issue on kprobe registration
Ziyang Xuan (2):
netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
bolan wang (1):
USB: serial: option: add Fibocom FM135-GL variants
xinhui pan (1):
drm/amdgpu: validate the parameters of bo mapping operations more clearly
^ permalink raw reply [relevance 6%]
* [syzbot] [kernfs?] possible deadlock in kernfs_seq_start
@ 2024-04-27 11:09 2% syzbot
0 siblings, 0 replies; 200+ results
From: syzbot @ 2024-04-27 11:09 UTC (permalink / raw)
To: gregkh, linux-fsdevel, linux-kernel, syzkaller-bugs, tj
Hello,
syzbot found the following issue on:
HEAD commit: 71b1543c83d6 Merge tag '6.9-rc5-ksmbd-fixes' of git://git...
git tree: upstream
console output: https://syzkaller.appspot.com/x/log.txt?x=132f3973180000
kernel config: https://syzkaller.appspot.com/x/.config?x=5a05c230e142f2bc
dashboard link: https://syzkaller.appspot.com/bug?extid=4c493dcd5a68168a94b2
compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40
Unfortunately, I don't have any reproducer for this issue yet.
Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/c2ffdc70f4f4/disk-71b1543c.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/3f55cd9df875/vmlinux-71b1543c.xz
kernel image: https://storage.googleapis.com/syzbot-assets/c9547057857d/bzImage-71b1543c.xz
IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+4c493dcd5a68168a94b2@syzkaller.appspotmail.com
======================================================
WARNING: possible circular locking dependency detected
6.9.0-rc5-syzkaller-00031-g71b1543c83d6 #0 Not tainted
------------------------------------------------------
syz-executor.1/17062 is trying to acquire lock:
ffff88806b638488 (&of->mutex){+.+.}-{3:3}, at: kernfs_seq_start+0x53/0x3b0 fs/kernfs/file.c:154
but task is already holding lock:
ffff88806fe359e0 (&p->lock){+.+.}-{3:3}, at: seq_read_iter+0xb7/0xd60 fs/seq_file.c:182
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #4 (&p->lock){+.+.}-{3:3}:
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__mutex_lock_common kernel/locking/mutex.c:608 [inline]
__mutex_lock+0x136/0xd70 kernel/locking/mutex.c:752
seq_read_iter+0xb7/0xd60 fs/seq_file.c:182
call_read_iter include/linux/fs.h:2104 [inline]
copy_splice_read+0x662/0xb60 fs/splice.c:365
do_splice_read fs/splice.c:985 [inline]
splice_file_to_pipe+0x299/0x500 fs/splice.c:1295
do_sendfile+0x515/0xdc0 fs/read_write.c:1301
__do_sys_sendfile64 fs/read_write.c:1362 [inline]
__se_sys_sendfile64+0x17c/0x1e0 fs/read_write.c:1348
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
-> #3 (&pipe->mutex){+.+.}-{3:3}:
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__mutex_lock_common kernel/locking/mutex.c:608 [inline]
__mutex_lock+0x136/0xd70 kernel/locking/mutex.c:752
iter_file_splice_write+0x335/0x14e0 fs/splice.c:687
do_splice_from fs/splice.c:941 [inline]
do_splice+0xd77/0x1880 fs/splice.c:1354
__do_splice fs/splice.c:1436 [inline]
__do_sys_splice fs/splice.c:1652 [inline]
__se_sys_splice+0x331/0x4a0 fs/splice.c:1634
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
-> #2 (sb_writers#4){.+.+}-{0:0}:
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
percpu_down_read include/linux/percpu-rwsem.h:51 [inline]
__sb_start_write include/linux/fs.h:1664 [inline]
sb_start_write+0x4d/0x1c0 include/linux/fs.h:1800
mnt_want_write+0x3f/0x90 fs/namespace.c:409
ovl_create_object+0x13b/0x370 fs/overlayfs/dir.c:629
lookup_open fs/namei.c:3497 [inline]
open_last_lookups fs/namei.c:3566 [inline]
path_openat+0x1425/0x3240 fs/namei.c:3796
do_filp_open+0x235/0x490 fs/namei.c:3826
do_sys_openat2+0x13e/0x1d0 fs/open.c:1406
do_sys_open fs/open.c:1421 [inline]
__do_sys_openat fs/open.c:1437 [inline]
__se_sys_openat fs/open.c:1432 [inline]
__x64_sys_openat+0x247/0x2a0 fs/open.c:1432
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
-> #1 (&ovl_i_mutex_dir_key[depth]){++++}-{3:3}:
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
down_read+0xb1/0xa40 kernel/locking/rwsem.c:1526
inode_lock_shared include/linux/fs.h:805 [inline]
lookup_slow+0x45/0x70 fs/namei.c:1708
walk_component+0x2e1/0x410 fs/namei.c:2004
lookup_last fs/namei.c:2461 [inline]
path_lookupat+0x16f/0x450 fs/namei.c:2485
filename_lookup+0x256/0x610 fs/namei.c:2514
kern_path+0x35/0x50 fs/namei.c:2622
lookup_bdev+0xc5/0x290 block/bdev.c:1136
resume_store+0x1a0/0x710 kernel/power/hibernate.c:1235
kernfs_fop_write_iter+0x3a1/0x500 fs/kernfs/file.c:334
call_write_iter include/linux/fs.h:2110 [inline]
new_sync_write fs/read_write.c:497 [inline]
vfs_write+0xa84/0xcb0 fs/read_write.c:590
ksys_write+0x1a0/0x2c0 fs/read_write.c:643
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
-> #0 (&of->mutex){+.+.}-{3:3}:
check_prev_add kernel/locking/lockdep.c:3134 [inline]
check_prevs_add kernel/locking/lockdep.c:3253 [inline]
validate_chain+0x18cb/0x58e0 kernel/locking/lockdep.c:3869
__lock_acquire+0x1346/0x1fd0 kernel/locking/lockdep.c:5137
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__mutex_lock_common kernel/locking/mutex.c:608 [inline]
__mutex_lock+0x136/0xd70 kernel/locking/mutex.c:752
kernfs_seq_start+0x53/0x3b0 fs/kernfs/file.c:154
seq_read_iter+0x3d0/0xd60 fs/seq_file.c:225
call_read_iter include/linux/fs.h:2104 [inline]
copy_splice_read+0x662/0xb60 fs/splice.c:365
do_splice_read fs/splice.c:985 [inline]
splice_file_to_pipe+0x299/0x500 fs/splice.c:1295
do_sendfile+0x515/0xdc0 fs/read_write.c:1301
__do_sys_sendfile64 fs/read_write.c:1362 [inline]
__se_sys_sendfile64+0x17c/0x1e0 fs/read_write.c:1348
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
other info that might help us debug this:
Chain exists of:
&of->mutex --> &pipe->mutex --> &p->lock
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&p->lock);
lock(&pipe->mutex);
lock(&p->lock);
lock(&of->mutex);
*** DEADLOCK ***
2 locks held by syz-executor.1/17062:
#0: ffff88802d049468 (&pipe->mutex){+.+.}-{3:3}, at: splice_file_to_pipe+0x2e/0x500 fs/splice.c:1292
#1: ffff88806fe359e0 (&p->lock){+.+.}-{3:3}, at: seq_read_iter+0xb7/0xd60 fs/seq_file.c:182
stack backtrace:
CPU: 0 PID: 17062 Comm: syz-executor.1 Not tainted 6.9.0-rc5-syzkaller-00031-g71b1543c83d6 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024
Call Trace:
<TASK>
__dump_stack lib/dump_stack.c:88 [inline]
dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114
check_noncircular+0x36a/0x4a0 kernel/locking/lockdep.c:2187
check_prev_add kernel/locking/lockdep.c:3134 [inline]
check_prevs_add kernel/locking/lockdep.c:3253 [inline]
validate_chain+0x18cb/0x58e0 kernel/locking/lockdep.c:3869
__lock_acquire+0x1346/0x1fd0 kernel/locking/lockdep.c:5137
lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5754
__mutex_lock_common kernel/locking/mutex.c:608 [inline]
__mutex_lock+0x136/0xd70 kernel/locking/mutex.c:752
kernfs_seq_start+0x53/0x3b0 fs/kernfs/file.c:154
seq_read_iter+0x3d0/0xd60 fs/seq_file.c:225
call_read_iter include/linux/fs.h:2104 [inline]
copy_splice_read+0x662/0xb60 fs/splice.c:365
do_splice_read fs/splice.c:985 [inline]
splice_file_to_pipe+0x299/0x500 fs/splice.c:1295
do_sendfile+0x515/0xdc0 fs/read_write.c:1301
__do_sys_sendfile64 fs/read_write.c:1362 [inline]
__se_sys_sendfile64+0x17c/0x1e0 fs/read_write.c:1348
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xf5/0x240 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7f50be67dea9
Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 e1 20 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f50bf41a0c8 EFLAGS: 00000246 ORIG_RAX: 0000000000000028
RAX: ffffffffffffffda RBX: 00007f50be7ac1f0 RCX: 00007f50be67dea9
RDX: 0000000000000000 RSI: 0000000000000007 RDI: 0000000000000005
RBP: 00007f50be6ca4a4 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000004 R11: 0000000000000246 R12: 0000000000000000
R13: 000000000000006e R14: 00007f50be7ac1f0 R15: 00007ffe78344d68
</TASK>
---
This report is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller@googlegroups.com.
syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
If the report is already addressed, let syzbot know by replying with:
#syz fix: exact-commit-title
If you want to overwrite report's subsystems, reply with:
#syz set subsystems: new-subsystem
(See the list of subsystem names on the web dashboard)
If the report is a duplicate of another one, reply with:
#syz dup: exact-subject-of-another-report
If you want to undo deduplication, reply with:
#syz undup
^ permalink raw reply [relevance 2%]
* [PATCH v2 00/35] x86/resctrl: Move the resctrl filesystem code to /fs/resctrl
@ 2024-04-26 15:05 1% Dave Martin
2024-04-29 23:34 0% ` Peter Newman
0 siblings, 1 reply; 200+ results
From: Dave Martin @ 2024-04-26 15:05 UTC (permalink / raw)
To: x86, linux-kernel
Cc: James Morse, Fenghua Yu, Reinette Chatre, Thomas Gleixner,
Ingo Molnar, Borislav Petkov, H Peter Anvin, Babu Moger,
shameerali.kolothum.thodi, D Scott Phillips OS, carl, lcherian,
bobo.shaobowang, Shaopeng Tan (Fujitsu),
baolin.wang, Jamie Iles, Xin Hao, Peter Newman, dfustini,
amitsinght, David Hildenbrand, Rex Nie
Hi all,
This is a respin of the resctrl refactoring series described below,
addressing review feedback. Many thanks to those to responded with
feedback on the v1 series [2].
See Notes and FYIs in the individual patches for details on the changes
and outstanding issues.
This series has not been rebased since the v1 posting, and remains
based on the following upstream commit:
commit 23956900041d968f9ad0f30db6dede4daccd7aa9
Merge tag 'v6.9-rc-smb3-server-fixes' of git://git.samba.org/ksmbd
The actual code changes against v1 are few in number and rather spread
around. For reviewer convenience, a diff against v1 is appended to
this cover letter.
Due to the limited code changes, this series has *not* received any
additional runtime testing over than done for v1 (other than build
bisect testing).
Cheers
---Dave
[2] v1 series:
[PATCH v1 00/31] x86/resctrl: Move the resctrl filesystem code to /fs/resctrl
https://lore.kernel.org/all/20240321165106.31602-1-james.morse@arm.com/
--8<-- Original blurb
This is the final series that allows other architectures to implement resctrl.
The last patch just moves the code, and its a bit of a monster. I don't expect
that to get merged as part of this series - we should wait for it to make
less impact on other series. It's included here to show what gets moved, and
that structures/function-prototypes have the right visibility.
Otherwise this series renames functions and moves code around. With the
exception of invalid configurations for the configurable-events, there should
be no changes in behaviour caused by this series.
The driving pattern is to make things like struct rdtgroup private to resctrl.
Features like pseudo-lock aren't going to work on arm64, the ability to disable
it at compile time is added.
After this, I can start posting the MPAM driver to make use of resctrl on arm64.
(What's MPAM? See the cover letter of the first series. [1])
This series is based on Linus' commit 23956900041d and can be retrieved from:
https://git.kernel.org/pub/scm/linux/kernel/git/morse/linux.git
mpam/move_to_fs/v1
Sorry for the mid-merge window base, I'm away for a few weeks - this should
rebase trivially onto rc1.
As ever - bugs welcome,
Thanks,
James
[1] https://lore.kernel.org/lkml/20201030161120.227225-1-james.morse@arm.com/
-->8--
Dave Martin (4):
x86/resctrl: Squelch whitespace anomalies in resctrl core code
x86/resctrl: Prefer alloc(sizeof(*foo)) idiom in rdt_init_fs_context()
x86/resctrl: Relax some asm #includes
[SQUASHME] x86/resctrl: Move the resctrl filesystem code to
/fs/resctrl
James Morse (31):
x86/resctrl: Fix allocation of cleanest CLOSID on platforms with no
monitors
x86/resctrl: Add a helper to avoid reaching into the arch code
resource list
x86/resctrl: Move ctrlval string parsing policy away from the arch
code
x86/resctrl: Add helper for setting CPU default properties
x86/resctrl: Remove rdtgroup from update_cpu_closid_rmid()
x86/resctrl: Export resctrl fs's init function
x86/resctrl: Wrap resctrl_arch_find_domain() around rdt_find_domain()
x86/resctrl: Move resctrl types to a separate header
x86/resctrl: Add a resctrl helper to reset all the resources
x86/resctrl: Move monitor init work to a resctrl init call
x86/resctrl: Move monitor exit work to a resctrl exit call
x86/resctrl: Move max_{name,data}_width into resctrl code
x86/resctrl: Stop using the for_each_*_rdt_resource() walkers
x86/resctrl: Export the is_mbm_*_enabled() helpers to asm/resctrl.h
x86/resctrl: Add resctrl_arch_is_evt_configurable() to abstract BMEC
x86/resctrl: Change mon_event_config_{read,write}() to be arch helpers
x86/resctrl: Move mbm_cfg_mask to struct rdt_resource
x86/resctrl: Allow resctrl_arch_mon_event_config_write() to return an
error
x86/resctrl: Add resctrl_arch_ prefix to pseudo lock functions
x86/resctrl: Allow an architecture to disable pseudo lock
x86/resctrl: Make prefetch_disable_bits belong to the arch code
x86/resctrl: Make resctrl_arch_pseudo_lock_fn() take a plr
x86/resctrl: Move thread_throttle_mode_init() to be managed by resctrl
x86/resctrl: Move get_config_index() to a header
x86/resctrl: Claim get_domain_from_cpu() for resctrl
x86/resctrl: Describe resctrl's bitmap size assumptions
x86/resctrl: Rename resctrl_sched_in() to begin with "resctrl_arch_"
x86/resctrl: Drop __init/__exit on assorted symbols
fs/resctrl: Add boiler plate for external resctrl code
x86/resctrl: Move the filesystem bits to headers visible to fs/resctrl
x86/resctrl: Move the resctrl filesystem code to /fs/resctrl
MAINTAINERS | 2 +
arch/Kconfig | 8 +
arch/x86/Kconfig | 5 +-
arch/x86/include/asm/resctrl.h | 45 +-
arch/x86/kernel/cpu/resctrl/Makefile | 5 +-
arch/x86/kernel/cpu/resctrl/core.c | 119 +-
arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 506 +--
arch/x86/kernel/cpu/resctrl/internal.h | 436 +--
arch/x86/kernel/cpu/resctrl/monitor.c | 813 +---
arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 1130 +-----
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4205 +--------------------
arch/x86/kernel/process_32.c | 2 +-
arch/x86/kernel/process_64.c | 2 +-
fs/Kconfig | 1 +
fs/Makefile | 1 +
fs/resctrl/Kconfig | 36 +
fs/resctrl/Makefile | 3 +
fs/resctrl/ctrlmondata.c | 527 +++
fs/resctrl/internal.h | 338 ++
fs/resctrl/monitor.c | 843 +++++
fs/resctrl/pseudo_lock.c | 1122 ++++++
fs/resctrl/rdtgroup.c | 4013 ++++++++++++++++++++
include/linux/resctrl.h | 157 +-
include/linux/resctrl_types.h | 98 +
24 files changed, 7402 insertions(+), 7015 deletions(-)
create mode 100644 fs/resctrl/Kconfig
create mode 100644 fs/resctrl/Makefile
create mode 100644 fs/resctrl/ctrlmondata.c
create mode 100644 fs/resctrl/internal.h
create mode 100644 fs/resctrl/monitor.c
create mode 100644 fs/resctrl/pseudo_lock.c
create mode 100644 fs/resctrl/rdtgroup.c
create mode 100644 include/linux/resctrl_types.h
Interdiff:
diff --git a/arch/Kconfig b/arch/Kconfig
index 131d874d6738..f163964e6915 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -1409,10 +1409,10 @@ config ARCH_HAS_PHYS_TO_DMA
config ARCH_HAS_CPU_RESCTRL
bool
help
- The 'resctrl' filesystem allows CPU controls of shared resources
- such as caches and memory bandwidth to be configured. An architecture
- selects this if it provides the arch-specific hooks for the filesystem
- and needs the per-task CLOSID/RMID properties.
+ An architecture selects this option to indicate that the necessary
+ hooks are provided to support the common memory system usage
+ monitoring and control interfaces provided by the 'resctrl'
+ filesystem (see RESCTRL_FS).
config HAVE_ARCH_COMPILER_H
bool
diff --git a/arch/x86/include/asm/resctrl.h b/arch/x86/include/asm/resctrl.h
index 746431c66fc4..506ecd04788b 100644
--- a/arch/x86/include/asm/resctrl.h
+++ b/arch/x86/include/asm/resctrl.h
@@ -6,8 +6,8 @@
#include <linux/jump_label.h>
#include <linux/percpu.h>
-#include <linux/sched.h>
#include <linux/resctrl_types.h>
+#include <linux/sched.h>
/*
* This value can never be a valid CLOSID, and is used when mapping a
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index bf3538992667..8c20bd04b840 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -7,10 +7,9 @@
#include <linux/kernfs.h>
#include <linux/fs_context.h>
#include <linux/jump_label.h>
+#include <linux/resctrl.h>
#include <linux/tick.h>
-#include <asm/resctrl.h>
-
#define L3_QOS_CDP_ENABLE 0x01ULL
#define L2_QOS_CDP_ENABLE 0x01ULL
diff --git a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
index ba1596afee10..1488d1728f1f 100644
--- a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
+++ b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
@@ -11,6 +11,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/cacheflush.h>
#include <linux/cacheinfo.h>
#include <linux/cpu.h>
#include <linux/cpumask.h>
@@ -19,12 +20,11 @@
#include <linux/mman.h>
#include <linux/perf_event.h>
#include <linux/pm_qos.h>
+#include <linux/resctrl.h>
#include <linux/slab.h>
#include <linux/uaccess.h>
-#include <asm/cacheflush.h>
#include <asm/intel-family.h>
-#include <asm/resctrl.h>
#include <asm/perf_event.h>
#include "../../events/perf_event.h" /* For X86_CONFIG() */
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index fe3952514add..061501e9fc98 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -13,9 +13,9 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/cpu.h>
+#include <linux/resctrl.h>
#include <linux/slab.h>
-#include <asm/resctrl.h>
#include "internal.h"
DEFINE_STATIC_KEY_FALSE(rdt_enable_key);
@@ -28,9 +28,9 @@ DEFINE_STATIC_KEY_FALSE(rdt_alloc_enable_key);
* from update_closid_rmid() is protected against __switch_to() because
* preemption is disabled.
*/
-void resctrl_arch_sync_cpu_defaults(void *info)
+void resctrl_arch_sync_cpu_closid_rmid(void *info)
{
- struct resctrl_cpu_sync *r = info;
+ struct resctrl_cpu_defaults *r = info;
if (r) {
this_cpu_write(pqr_state.default_closid, r->closid);
@@ -255,6 +255,6 @@ void resctrl_arch_reset_resources(void)
{
struct rdt_resource *r;
- for_each_capable_rdt_resource(r)
+ for_each_alloc_capable_rdt_resource(r)
reset_all_ctrls(r);
}
diff --git a/fs/resctrl/Kconfig b/fs/resctrl/Kconfig
index 36a1ddbe6c21..a5fbda54d32f 100644
--- a/fs/resctrl/Kconfig
+++ b/fs/resctrl/Kconfig
@@ -2,18 +2,31 @@ config RESCTRL_FS
bool "CPU Resource Control Filesystem (resctrl)"
depends on ARCH_HAS_CPU_RESCTRL
select KERNFS
- select PROC_CPU_RESCTRL if PROC_FS
+ select PROC_CPU_RESCTRL if PROC_FS
help
- Resctrl is a filesystem interface
- to control allocation and
- monitoring of system resources
- used by the CPUs.
+ Some architectures provide hardware facilities to group tasks and
+ monitor and control their usage of memory system resources such as
+ caches and memory bandwidth. Examples of such facilities include
+ Intel's Resource Director Technology (Intel(R) RDT) and AMD's
+ Platform Quality of Service (AMD QoS).
+
+ If your system has the necessary support and you want to be able to
+ assign tasks to groups and manipulate the associated resource
+ monitors and controls from userspace, say Y here to get a mountable
+ 'resctrl' filesystem that lets you do just that.
+
+ If nothing mounts or prods the 'resctrl' filesystem, resource
+ controls and monitors are left in a quiescent, permissive state.
+
+ If unsure, it is safe to say N.
+
+ See <file:Documentation/arch/x86/resctrl.rst> for more information.
config RESCTRL_FS_PSEUDO_LOCK
bool
help
- Software mechanism to pin data in a cache portion using
- micro-architecture specific knowledge.
+ Software mechanism to pin data in a cache portion using
+ micro-architecture specific knowledge.
config RESCTRL_RMID_DEPENDS_ON_CLOSID
bool
diff --git a/fs/resctrl/Makefile b/fs/resctrl/Makefile
index 10fcfb0fdb10..ee8c4463317a 100644
--- a/fs/resctrl/Makefile
+++ b/fs/resctrl/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_RESCTRL_FS) += rdtgroup.o ctrlmondata.o monitor.o
-obj-$(CONFIG_RESCTRL_FS_PSEUDO_LOCK) += psuedo_lock.o
+obj-$(CONFIG_RESCTRL_FS_PSEUDO_LOCK) += pseudo_lock.o
diff --git a/fs/resctrl/internal.h b/fs/resctrl/internal.h
index f73267762a87..0e0c70d62c40 100644
--- a/fs/resctrl/internal.h
+++ b/fs/resctrl/internal.h
@@ -9,8 +9,6 @@
#include <linux/jump_label.h>
#include <linux/tick.h>
-#include <asm/resctrl.h>
-
/**
* cpumask_any_housekeeping() - Choose any CPU in @mask, preferring those that
* aren't marked nohz_full
diff --git a/fs/resctrl/monitor.c b/fs/resctrl/monitor.c
index 06f660dfd929..14a9f18efe45 100644
--- a/fs/resctrl/monitor.c
+++ b/fs/resctrl/monitor.c
@@ -745,7 +745,7 @@ static int dom_data_init(struct rdt_resource *r)
/*
* RESCTRL_RESERVED_CLOSID and RESCTRL_RESERVED_RMID are special and
* are always allocated. These are used for the rdtgroup_default
- * control group, which will be setup later in rdtgroup_init().
+ * control group, which will be setup later in resctrl_init().
*/
idx = resctrl_arch_rmid_idx_encode(RESCTRL_RESERVED_CLOSID,
RESCTRL_RESERVED_RMID);
diff --git a/fs/resctrl/psuedo_lock.c b/fs/resctrl/pseudo_lock.c
similarity index 99%
rename from fs/resctrl/psuedo_lock.c
rename to fs/resctrl/pseudo_lock.c
index 077c2abb6edd..2a36a2efbd49 100644
--- a/fs/resctrl/psuedo_lock.c
+++ b/fs/resctrl/pseudo_lock.c
@@ -11,6 +11,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/cacheflush.h>
#include <linux/cacheinfo.h>
#include <linux/cpu.h>
#include <linux/cpumask.h>
@@ -19,11 +20,10 @@
#include <linux/mman.h>
#include <linux/perf_event.h>
#include <linux/pm_qos.h>
+#include <linux/resctrl.h>
#include <linux/slab.h>
#include <linux/uaccess.h>
-#include <asm/cacheflush.h>
-#include <asm/resctrl.h>
#include <asm/perf_event.h>
#include "internal.h"
diff --git a/fs/resctrl/rdtgroup.c b/fs/resctrl/rdtgroup.c
index 936fc6e47386..09f120772c48 100644
--- a/fs/resctrl/rdtgroup.c
+++ b/fs/resctrl/rdtgroup.c
@@ -19,6 +19,7 @@
#include <linux/fs_parser.h>
#include <linux/sysfs.h>
#include <linux/kernfs.h>
+#include <linux/resctrl.h>
#include <linux/seq_buf.h>
#include <linux/seq_file.h>
#include <linux/sched/signal.h>
@@ -29,7 +30,6 @@
#include <uapi/linux/magic.h>
-#include <asm/resctrl.h>
#include "internal.h"
/* Mutex to protect rdtgroup access. */
@@ -363,17 +363,15 @@ static int rdtgroup_cpus_show(struct kernfs_open_file *of,
static void
update_closid_rmid(const struct cpumask *cpu_mask, struct rdtgroup *r)
{
- struct resctrl_cpu_sync defaults;
- struct resctrl_cpu_sync *defaults_p = NULL;
+ struct resctrl_cpu_defaults defaults, *p = NULL;
if (r) {
defaults.closid = r->closid;
defaults.rmid = r->mon.rmid;
- defaults_p = &defaults;
+ p = &defaults;
}
- on_each_cpu_mask(cpu_mask, resctrl_arch_sync_cpu_defaults, defaults_p,
- 1);
+ on_each_cpu_mask(cpu_mask, resctrl_arch_sync_cpu_closid_rmid, p, 1);
}
static int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask,
@@ -966,7 +964,7 @@ static int rdt_num_closids_show(struct kernfs_open_file *of,
}
static int rdt_default_ctrl_show(struct kernfs_open_file *of,
- struct seq_file *seq, void *v)
+ struct seq_file *seq, void *v)
{
struct resctrl_schema *s = of->kn->parent->priv;
struct rdt_resource *r = s->res;
@@ -976,7 +974,7 @@ static int rdt_default_ctrl_show(struct kernfs_open_file *of,
}
static int rdt_min_cbm_bits_show(struct kernfs_open_file *of,
- struct seq_file *seq, void *v)
+ struct seq_file *seq, void *v)
{
struct resctrl_schema *s = of->kn->parent->priv;
struct rdt_resource *r = s->res;
@@ -1092,7 +1090,7 @@ static int rdt_bit_usage_show(struct kernfs_open_file *of,
}
static int rdt_min_bw_show(struct kernfs_open_file *of,
- struct seq_file *seq, void *v)
+ struct seq_file *seq, void *v)
{
struct resctrl_schema *s = of->kn->parent->priv;
struct rdt_resource *r = s->res;
@@ -1127,7 +1125,7 @@ static int rdt_mon_features_show(struct kernfs_open_file *of,
}
static int rdt_bw_gran_show(struct kernfs_open_file *of,
- struct seq_file *seq, void *v)
+ struct seq_file *seq, void *v)
{
struct resctrl_schema *s = of->kn->parent->priv;
struct rdt_resource *r = s->res;
@@ -1137,7 +1135,7 @@ static int rdt_bw_gran_show(struct kernfs_open_file *of,
}
static int rdt_delay_linear_show(struct kernfs_open_file *of,
- struct seq_file *seq, void *v)
+ struct seq_file *seq, void *v)
{
struct resctrl_schema *s = of->kn->parent->priv;
struct rdt_resource *r = s->res;
@@ -1935,7 +1933,6 @@ static struct rftype res_common_files[] = {
.seq_show = rdtgroup_closid_show,
.fflags = RFTYPE_CTRL_BASE | RFTYPE_DEBUG,
},
-
};
static int rdtgroup_add_files(struct kernfs_node *kn, unsigned long fflags)
@@ -2161,7 +2158,7 @@ static int rdtgroup_create_info_dir(struct kernfs_node *parent_kn)
if (!r->mon_capable)
continue;
- fflags = r->fflags | RFTYPE_MON_INFO;
+ fflags = r->fflags | RFTYPE_MON_INFO;
sprintf(name, "%s_MON", r->name);
ret = rdtgroup_mkdir_info_resdir(r, name, fflags);
if (ret)
@@ -2449,7 +2446,7 @@ static int schemata_list_add(struct rdt_resource *r, enum resctrl_conf_type type
/*
* Choose a width for the resource data based on the resource that has
- * widest name and cbm.
+ * widest name and CBM.
*/
max_data_width = max(max_data_width, r->data_width);
@@ -2499,10 +2496,10 @@ static void schemata_list_destroy(void)
static int rdt_get_tree(struct fs_context *fc)
{
- struct rdt_resource *l3 = resctrl_arch_get_resource(RDT_RESOURCE_L3);
struct rdt_fs_context *ctx = rdt_fc2context(fc);
unsigned long flags = RFTYPE_CTRL_BASE;
struct rdt_domain *dom;
+ struct rdt_resource *r;
int ret;
cpus_read_lock();
@@ -2575,7 +2572,8 @@ static int rdt_get_tree(struct fs_context *fc)
resctrl_mounted = true;
if (resctrl_is_mbm_enabled()) {
- list_for_each_entry(dom, &l3->domains, list)
+ r = resctrl_arch_get_resource(RDT_RESOURCE_L3);
+ list_for_each_entry(dom, &r->domains, list)
mbm_setup_overflow_handler(dom, MBM_OVERFLOW_INTERVAL,
RESCTRL_PICK_ANY_CPU);
}
@@ -2669,7 +2667,7 @@ static int rdt_init_fs_context(struct fs_context *fc)
{
struct rdt_fs_context *ctx;
- ctx = kzalloc(sizeof(struct rdt_fs_context), GFP_KERNEL);
+ ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx)
return -ENOMEM;
@@ -3180,7 +3178,6 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)
rdt_last_cmd_puts("Failed to initialize allocations\n");
goto out;
}
-
}
rdtgrp->mode = RDT_MODE_SHAREABLE;
@@ -3466,8 +3463,11 @@ static int rdtgroup_rmdir_mon(struct rdtgroup *rdtgrp, cpumask_var_t tmpmask)
/* Give any tasks back to the parent group */
rdt_move_group_tasks(rdtgrp, prdtgrp, tmpmask);
- /* Update per cpu rmid of the moved CPUs first */
- closid = rdtgrp->closid;
+ /*
+ * Update per cpu closid/rmid of the moved CPUs first.
+ * Note: the closid will not change, but the arch code still needs it.
+ */
+ closid = prdtgrp->closid;
rmid = prdtgrp->mon.rmid;
for_each_cpu(cpu, &rdtgrp->cpu_mask)
resctrl_arch_set_cpu_default_closid_rmid(cpu, closid, rmid);
diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
index 00cc0457af50..819007e74ad3 100644
--- a/include/linux/resctrl.h
+++ b/include/linux/resctrl.h
@@ -41,9 +41,6 @@ int proc_resctrl_show(struct seq_file *m,
*/
#define RESCTRL_MAX_CBM 32
-extern unsigned int resctrl_rmid_realloc_limit;
-extern unsigned int resctrl_rmid_realloc_threshold;
-
/**
* struct pseudo_lock_region - pseudo-lock region information
* @s: Resctrl schema for the resource to which this
@@ -248,24 +245,35 @@ struct resctrl_schema {
u32 num_closid;
};
-struct resctrl_cpu_sync {
+struct resctrl_cpu_defaults {
u32 closid;
u32 rmid;
};
struct resctrl_mon_config_info {
- struct rdt_resource *r;
- struct rdt_domain *d;
- u32 evtid;
- u32 mon_config;
- int err;
+ struct rdt_resource *r;
+ struct rdt_domain *d;
+ u32 evtid;
+ u32 mon_config;
+ int err;
};
-/*
- * Update and re-load this CPUs defaults. Called via IPI, takes a pointer to
- * struct resctrl_cpu_sync, or NULL.
+/**
+ * resctrl_arch_sync_cpu_closid_rmid() - Refresh this CPU's CLOSID and RMID.
+ * Call via IPI.
+ * @info: If non-NULL, a pointer to a struct resctrl_cpu_defaults
+ * specifying the new CLOSID and RMID for tasks in the default
+ * resctrl ctrl and mon group when running on this CPU. If NULL,
+ * this CPU is not re-assigned to a different default group.
+ *
+ * Propagates reassignment of CPUs and/or tasks to different resctrl groups
+ * when requested by the resctrl core code.
+ *
+ * This function records the per-cpu defaults specified by @info (if any),
+ * and then reconfigures the CPU's hardware CLOSID and RMID for subsequent
+ * execution based on @current, in the same way as during a task switch.
*/
-void resctrl_arch_sync_cpu_defaults(void *info);
+void resctrl_arch_sync_cpu_closid_rmid(void *info);
/* The number of closid supported by this resource regardless of CDP */
u32 resctrl_arch_get_num_closid(struct rdt_resource *r);
@@ -286,9 +294,9 @@ static inline u32 resctrl_get_config_index(u32 closid,
case CDP_NONE:
return closid;
case CDP_CODE:
- return (closid * 2) + 1;
+ return closid * 2 + 1;
case CDP_DATA:
- return (closid * 2);
+ return closid * 2;
}
}
--
2.34.1
^ permalink raw reply related [relevance 1%]
* [syzbot] [can?] KMSAN: kernel-infoleak in raw_recvmsg
@ 2024-04-26 11:04 3% syzbot
2024-05-06 3:34 0% ` Oliver Hartkopp
0 siblings, 1 reply; 200+ results
From: syzbot @ 2024-04-26 11:04 UTC (permalink / raw)
To: davem, edumazet, kernel, kuba, linux-can, linux-kernel, mkl,
netdev, o.rempel, pabeni, robin, socketcan, syzkaller-bugs
Hello,
syzbot found the following issue on:
HEAD commit: 71b1543c83d6 Merge tag '6.9-rc5-ksmbd-fixes' of git://git...
git tree: upstream
console+strace: https://syzkaller.appspot.com/x/log.txt?x=1784bdd7180000
kernel config: https://syzkaller.appspot.com/x/.config?x=776c05250f36d55c
dashboard link: https://syzkaller.appspot.com/bug?extid=5681e40d297b30f5b513
compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=15b440d3180000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=14b00907180000
Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/14813ccfbcb3/disk-71b1543c.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/e7b88b42cf07/vmlinux-71b1543c.xz
kernel image: https://storage.googleapis.com/syzbot-assets/3a64a5abfbba/bzImage-71b1543c.xz
IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+5681e40d297b30f5b513@syzkaller.appspotmail.com
=====================================================
BUG: KMSAN: kernel-infoleak in instrument_copy_to_user include/linux/instrumented.h:114 [inline]
BUG: KMSAN: kernel-infoleak in copy_to_user_iter lib/iov_iter.c:24 [inline]
BUG: KMSAN: kernel-infoleak in iterate_ubuf include/linux/iov_iter.h:29 [inline]
BUG: KMSAN: kernel-infoleak in iterate_and_advance2 include/linux/iov_iter.h:245 [inline]
BUG: KMSAN: kernel-infoleak in iterate_and_advance include/linux/iov_iter.h:271 [inline]
BUG: KMSAN: kernel-infoleak in _copy_to_iter+0x366/0x2520 lib/iov_iter.c:185
instrument_copy_to_user include/linux/instrumented.h:114 [inline]
copy_to_user_iter lib/iov_iter.c:24 [inline]
iterate_ubuf include/linux/iov_iter.h:29 [inline]
iterate_and_advance2 include/linux/iov_iter.h:245 [inline]
iterate_and_advance include/linux/iov_iter.h:271 [inline]
_copy_to_iter+0x366/0x2520 lib/iov_iter.c:185
copy_to_iter include/linux/uio.h:196 [inline]
memcpy_to_msg include/linux/skbuff.h:4113 [inline]
raw_recvmsg+0x2b8/0x9e0 net/can/raw.c:1008
sock_recvmsg_nosec net/socket.c:1046 [inline]
sock_recvmsg+0x2c4/0x340 net/socket.c:1068
____sys_recvmsg+0x18a/0x620 net/socket.c:2803
___sys_recvmsg+0x223/0x840 net/socket.c:2845
do_recvmmsg+0x4fc/0xfd0 net/socket.c:2939
__sys_recvmmsg net/socket.c:3018 [inline]
__do_sys_recvmmsg net/socket.c:3041 [inline]
__se_sys_recvmmsg net/socket.c:3034 [inline]
__x64_sys_recvmmsg+0x397/0x490 net/socket.c:3034
x64_sys_call+0xf6c/0x3b50 arch/x86/include/generated/asm/syscalls_64.h:300
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xcf/0x1e0 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
Uninit was created at:
slab_post_alloc_hook mm/slub.c:3804 [inline]
slab_alloc_node mm/slub.c:3845 [inline]
kmem_cache_alloc_node+0x613/0xc50 mm/slub.c:3888
kmalloc_reserve+0x13d/0x4a0 net/core/skbuff.c:577
__alloc_skb+0x35b/0x7a0 net/core/skbuff.c:668
alloc_skb include/linux/skbuff.h:1313 [inline]
alloc_skb_with_frags+0xc8/0xbf0 net/core/skbuff.c:6504
sock_alloc_send_pskb+0xa81/0xbf0 net/core/sock.c:2795
sock_alloc_send_skb include/net/sock.h:1842 [inline]
j1939_sk_alloc_skb net/can/j1939/socket.c:878 [inline]
j1939_sk_send_loop net/can/j1939/socket.c:1142 [inline]
j1939_sk_sendmsg+0xc0a/0x2730 net/can/j1939/socket.c:1277
sock_sendmsg_nosec net/socket.c:730 [inline]
__sock_sendmsg+0x30f/0x380 net/socket.c:745
____sys_sendmsg+0x877/0xb60 net/socket.c:2584
___sys_sendmsg+0x28d/0x3c0 net/socket.c:2638
__sys_sendmsg net/socket.c:2667 [inline]
__do_sys_sendmsg net/socket.c:2676 [inline]
__se_sys_sendmsg net/socket.c:2674 [inline]
__x64_sys_sendmsg+0x307/0x4a0 net/socket.c:2674
x64_sys_call+0xc4b/0x3b50 arch/x86/include/generated/asm/syscalls_64.h:47
do_syscall_x64 arch/x86/entry/common.c:52 [inline]
do_syscall_64+0xcf/0x1e0 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe+0x77/0x7f
Bytes 12-15 of 16 are uninitialized
Memory access of size 16 starts at ffff888120969690
Data copied to user address 00000000200017c0
CPU: 1 PID: 5050 Comm: syz-executor198 Not tainted 6.9.0-rc5-syzkaller-00031-g71b1543c83d6 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024
=====================================================
---
This report is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller@googlegroups.com.
syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
If the report is already addressed, let syzbot know by replying with:
#syz fix: exact-commit-title
If you want syzbot to run the reproducer, reply with:
#syz test: git://repo/address.git branch-or-commit-hash
If you attach or paste a git patch, syzbot will apply it before testing.
If you want to overwrite report's subsystems, reply with:
#syz set subsystems: new-subsystem
(See the list of subsystem names on the web dashboard)
If the report is a duplicate of another one, reply with:
#syz dup: exact-subject-of-another-report
If you want to undo deduplication, reply with:
#syz undup
^ permalink raw reply [relevance 3%]
* linux-next: Tree for Apr 26
@ 2024-04-26 7:18 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-04-26 7:18 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 39936 bytes --]
Hi all,
Changes since 20240424:
The mm tree lost its build failure.
The modules tree still has its boot failure for which I applied a
supplied patch.
The tip tree gained a conflict against the stm32 tree.
The usb tree gained a conflict against the usb.current tree.
The tty tree gained a conflict against the mm tree.
The kselftest tree gained a conflict against the mm tree.
The execve tree gained a conflict against the mm tree.
Non-merge commits (relative to Linus' tree): 7859
7898 files changed, 535846 insertions(+), 182953 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 371 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (c942a0cd3603 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (1813e32b8c43 kmsan: compiler_types: declare __no_sanitize_or_inline)
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (61231eb8113c ARC: [plat-hsdk]: Remove misplaced interrupt-cells property)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (210cfef57926 selftests/powerpc/papr-vpd: Fix missing variable initialization)
Merging s390-fixes/fixes (412050af2ea3 s390/mm: Fix clearing storage keys for huge pages)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf/master (5bcf0dcbf906 xdp: use flags field to disambiguate broadcast redirect)
Merging ipsec/master (8b06a24bb625 xfrm: fix possible derferencing in error path)
Merging netfilter/main (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs/main (7eaf837a4eb5 netfilter: nf_tables: Fix a memory leak in nf_tables_updchain)
Merging wireless/for-next (91112fc6212a wifi: iwlwifi: mvm: fix link ID management)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (f25f17dc5c6a ALSA: seq: ump: Fix conversion from MIDI2 to MIDI1 UMP messages)
Merging sound-asoc-fixes/for-linus (bda16500dd0b ASoC: rt715-sdca: volume step modification)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (ff33132605c1 regulator: change devm_regulator_get_enable_optional() stub to return Ok)
Merging spi-fixes/for-linus (7430764f5a85 spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging usb.current/usb-linus (f2004e82abb6 usb: typec: qcom-pmic: fix pdphy start() error handling)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (74a72baf204f iio:imu: adis16475: Fix sync mode setting)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (4108a30f1097 mei: me: add lunar lake point M DID)
Merging soundwire-fixes/fixes (63dc588e7af1 soundwire: amd: fix for wake interrupt handling for clockstop mode)
Merging thunderbolt-fixes/fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging input-current/for-linus (be81415a32ef Input: xpad - add support for ASUS ROG RAIKIRI)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (f221033f5c24 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (44ecfa3e5f1c Merge branch 'svm' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (4b759dd57655 cxl/core: Fix potential payload size confusion in cxl_mem_get_poison())
Merging btrfs-fixes/next-fixes (3550bc7dc848 Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (f609e7b1b49e platform/x86/amd/pmc: Extend Framework 13 quirk to more BIOSes)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (961990efc608 scsi: sd: Only print updates to permanent stream count)
Merging drm-fixes/drm-fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging drm-intel-fixes/for-linux-next-fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (a373a36fb6b0 Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex)
Merging fpga-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (c714fcdf5b75 Merge tag 'intel-gpio-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-current)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (3126061444d6 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (19843452dca4 rust: remove `params` from `module` macro example)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (f8981b0d5295 Merge tag 'qcom-clk-fixes-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-fixes)
Merging drm-misc-fixes/for-linux-next-fixes (78d9161d2bcd fbdev: fix incorrect address computation in deferred IO)
Merging mm-stable/mm-stable (640958fde130 Merge branch 'master' into mm-stable)
Merging mm-nonmm-stable/mm-nonmm-stable (0bbac3facb5d Linux 6.9-rc4)
Merging mm/mm-everything (d378827d962c Merge branch 'mm-nonmm-unstable' into mm-everything)
Merging kbuild/for-next (dd934396afdc kconfig: use menu_for_each_entry() to traverse menu tree)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (e7a8074d2f62 tools include UAPI: Sync linux/vhost.h with the kernel sources)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (7befe2ef9384 Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (4052ce07d5d7 perf/arm-spe: Assign parents for event_source device)
Merging arm-soc/for-next (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging amlogic/for-next (2b952b1d0a54 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (7f65de1d6c36 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (6c0972ec9268 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (086035cda928 arm64: dts: mediatek: mt8188: add lvts definitions)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next)
Merging qcom/for-next (c6b2b55174cd Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (8dabf52bd8db Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (bc44dcd74309 Merge branch 'for-v6.10/clk-gs101-bindings' into for-next)
Merging scmi/for-linux-next (af134239e3af Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25)
Merging sunxi/sunxi/for-next (8f328223944a Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/dt into for-next)
Merging ti/ti-next (592695bed5f8 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (92e92dc84e17 Merge branch 'clk-scmi' into clk-next)
Merging clk-imx/for-next (5224b189462f clk: imx: add i.MX95 BLK CTL clk driver)
Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (f3334ebb8a2a LoongArch: Lately init pmu after smp is online)
7ab22b5c2af5 ("LoongArch: Fix a build error due to __tlb_remove_tlb_entry()")
Merging m68k/for-next (70d830e337f9 m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER)
Merging m68knommu/for-next (2a92aed55942 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (e8f897f4afef Linux 6.8)
Merging powerpc/next (f318c8be797f powerpc/ptdump: Fix walk_vmemmap() to also print first vmemmap entry)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (849599b702ef powerpc/crash: add crash memory hotplug support)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (ba5ea59f768f riscv: Do not save the scratch CSR during suspend)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (d866a7ef7a6e riscv: dts: thead: Fix node ordering in TH1520 device tree)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (d30edd25a7b5 Merge branch 'shared-zeropage' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (48d85acdaa52 sparc: chmc: Convert to platform remove callback returning void)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (11cca8ccf2c3 tty: xtensa/iss: Use min() to fix Coccinelle warning)
Merging bcachefs/for-next (59ac1888a9c6 bcachefs: uninline set_btree_iter_dontneed())
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (d0af553021b4 Merge branch 'for-next-next-v6.9-20240425' into for-next-20240425)
7f1f55f2cdcd ("btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()")
8aa467899340 ("btrfs: take the cleaner_mutex earlier in qgroup disable")
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (6584cb7b133c smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (7ca906c7f7e5 Pull ext2 and isofs removal to PageError bit.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (3763f9effcdc f2fs: use helper to print zone condition)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (fa7e19337908 fuse: Add initial support for fs-verity)
Merging gfs2/for-next (1e86044402c4 gfs2: Remove and replace gfs2_glock_queue_work)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (71b1543c83d6 Merge tag '6.9-rc5-ksmbd-fixes' of git://git.samba.org/ksmbd)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (e4c467166d75 NFSD: add listener-{set,get} netlink command)
CONFLICT (content): Merge conflict in fs/nfsd/nfs4callback.c
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (6a94b1acda7e xfs: reinstate delalloc for RT inodes (if sb_rextsize == 1))
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (eea3260250ea Merge branch 'vfs.iomap' into vfs.all)
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (ccd0bdb57e31 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5ceeabb0eb2e Merge tag 'i2c-host-fixes-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current)
Merging i2c-host/i2c/i2c-host (8d49135d177d i2c: thunderx: Adding ioclk support)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (cf770af5645a firmware: dmi-id: add a release callback function)
Merging hwmon-staging/hwmon-next (e723f6ca39fb hwmon: jc42: Remove I2C_CLASS_SPD support)
Merging jc_docs/docs-next (3e55130086c0 Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging v4l-dvb-next/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging pm/linux-next (dcb73e2a8283 Merge branch 'thermal-core' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (51090b2ef6ea dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (0cebf7cb2d70 pmdomain: core: Don't clear suspended_count at genpd_prepare())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (f88320b698ad RDMA/mana_ib: Fix missing ret value)
Merging net-next/main (c4e86b4363ac net: add two more call_rcu_hurry())
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging bpf-next/for-next (876373985efb Merge branch 'bpf: add mrtt and srtt as ctx->args for BPF_SOCK_OPS_RTT_CB')
Merging ipsec-next/master (aeb48a428d7d udpencap: Remove Obsolete UDP_ENCAP_ESPINUDP_NON_IKE Support)
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (0a0f9014b784 Bluetooth: qca: fix wcn3991 device address check)
2d7a4bf4bae8 ("Bluetooth: qca: fix NULL-deref on non-serdev suspend")
4405182b7a15 ("Bluetooth: hci_sync: Use advertised PHYs on hci_le_ext_create_conn_sync")
5a0265dc7990 ("Bluetooth: hci_sync: Using hci_cmd_sync_submit when removing Adv Monitor")
5e7d1e242697 ("Bluetooth: qca: set power_ctrl_enabled on NULL returned by gpiod_get_optional()")
9c049d8a7595 ("Bluetooth: Fix type of len in {l2cap,sco}_sock_getsockopt_old()")
a3aca621101b ("Bluetooth: MGMT: Fix failing to MGMT_OP_ADD_UUID/MGMT_OP_REMOVE_UUID")
aec46cd4ebff ("Bluetooth: qca: fix invalid device address check")
d19d765596e7 ("Bluetooth: hci_event: Fix sending HCI_OP_READ_ENC_KEY_SIZE")
df5efbdaa7d5 ("Bluetooth: btusb: mediatek: Fix double free of skb in coredump")
e10bb8abb81e ("Bluetooth: qca: fix NULL-deref on non-serdev setup")
e4e20e0a1700 ("Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0bda:0x4853")
f33b1c9d33d9 ("Bluetooth: btusb: Fix triggering coredump implementation for QCA")
CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.c
Merging wireless-next/for-next (b0d2d8f996c1 wifi: mac80211: handle link ID during management Tx)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1)
Merging crypto/master (543ea178fbfa crypto: x86/aes-xts - optimize size of instructions operating on lengths)
Merging drm/drm-next (83221064c28a Merge tag 'drm-xe-next-2024-04-23' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
Merging drm-exynos/for-linux-next (fc60ba033343 gpu: drm: exynos: hdmi: eliminate uses of of_node_put())
Merging drm-misc/for-linux-next (2bdb481bf7a9 drm/rockchip: vop2: Fix the port mux of VP2)
$ git reset --hard HEAD^
Merging next-20240424 version of drm-misc
Merging amdgpu/drm-next (d320d107d41d drm/amd/display: Code style adjustments)
Merging drm-intel/for-linux-next (b55f3bbab891 drm/{i915, xe}: Implement fbdev emulation as in-kernel client)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (edc9f11af3ad drm/xe: Replace engine references with exec queue in xe_guc_submit.c)
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node))
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (541b8a266e0e ALSA: control: Use list_for_each_entry_safe())
Merging ieee1394/for-next (0d4149e5e9b0 firewire: ohci: use pci_irq_vector() to retrieve allocated interrupt line)
Merging sound-asoc/for-next (efdfbbc4dcc8 Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (41ca2e5a670b bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Applying: linux-next: boot failure after merge of the modules tree
Merging input/next (9e0631695eac input: pm8xxx-vibrator: add new SPMI vibrator support)
Merging block/for-next (442a0ec15ee8 Merge branch 'for-6.10/block' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (83637d9017b2 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (12a3c649cb13 mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (84c1815e46bd Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (74560bb3685b lsm: remove the now superfluous sentinel element from ctl_table array)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (3c6e94beeacd Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (d02a66d84baa Merge branches 'memory-observability' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (669430b183fc of: property: fw_devlink: Add support for "power-supplies" binding)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU)
Merging spi/for-next (83deebfc4b1a Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (279d33d155a7 Merge branch into tip/master: 'x86/shstk')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (03db22b93a01 Merge ras/edac-urgent into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (b93b7b4635f1 ftrace: Asynchronous grace period for register_ftrace_direct())
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kvm/next (a96cb3bf390e Merge x86 bugfixes from Linux 6.9-rc3)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging kvm-arm/next (135c8fabdedd Merge branch kvm-arm64/lpi-xa-cache into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (f1c48c1ec735 RISC-V: KVM: selftests: Add ebreak test support)
Merging kvm-x86/next (7b076c6a308e Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests' and 'vmx')
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (88c0ef69dd88 platform/x86: asus-wmi: cleanup main struct to avoid some holes)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (c8f460d991df platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD))
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (e5019b14230a Merge 6.9-rc5 into driver-core-next)
Merging usb/usb-next (a160e1202ca3 usb: dwc3: qcom: Add multiport suspend/resume support for wrapper)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/core.c
Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev"
Merging thunderbolt/next (a3ad3a90e0a7 thunderbolt: There are only 5 basic router registers in pre-USB4 routers)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (660a70809856 Merge 6.9-rc5 into tty-next)
CONFLICT (content): Merge conflict in include/linux/kfifo.h
CONFLICT (content): Merge conflict in lib/kfifo.c
Merging char-misc/char-misc-next (e22810ab3f5e mei: bus: constify the struct mei_cl_bus_type usage)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (ba8c06fe7e16 coresight: tpiu: Convert to platform remove callback returning void)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (b80ad8e3cd27 iio: adc: ti-ads131e08: Use device_for_each_child_node_scoped() to simplify error paths.)
Merging phy-next/next (9c79b779643e phy: rockchip: fix CONFIG_TYPEC dependency)
Merging soundwire/next (4cd5ea6de156 soundwire: intel_init: resume all devices on exit.)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (82b951e6fbd3 vfio/pci: fix potential memory leak in vfio_intx_enable())
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (ee2098c0b512 spmi: pmic-arb: Add multi bus support)
Merging staging/staging-next (75ff53c44f5e staging: vc04_services: Drop completed TODO item)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (700b2e1eccb4 dmaengine: xilinx: xdma: fix module autoloading)
Merging cgroup/for-next (b7d56d953a67 cgroup/cpuset: Remove outdated comment in sched_partition_write())
Merging scsi/for-next (8c5220c43ba0 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging scsi-mkp/for-next (aca061774bc4 scsi: mpi3mr: Fix some kernel-doc warnings in scsi_bsg_mpi3mr.h)
Merging vhost/linux-next (24ddee0ff8c3 Merge tag 'stable/vduse-virtio-net' into vhost)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (87f678f813d9 Merge branches 'rproc-next' and 'rpmsg-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (ec37529e544c gpio: brcmstb: Use dynamic GPIO base numbers)
Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver)
Merging pinctrl/for-next (f3953d6d4f60 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces)
Merging pinctrl-samsung/for-next (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants)
Merging pwm/pwm/for-next (8f33f980dcfe dt-bindings: pwm: mediatek,pwm-disp: add compatible for mt8365 SoC)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (693fe2f6a9ea selftests: kselftest: Make ksft_exit functions return void instead of int)
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (aa892c2e7919 kunit: string-stream-test: use KUNIT_DEFINE_ACTION_WRAPPER)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (5b6d8ef6f056 kdb: Use str_plural() to fix Coccinelle warning)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (866c0674541f cxl: Fix use of phys_to_target_node() for x86)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (cda30c6542c8 efi: Clear up misconceptions about a maximum variable name size)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (b3d8a8e87014 slub: use count_partial_free_approx() in slab_out_of_memory())
Merging random/master (2668e3ae2ef3 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging landlock/next (dc792a74600a fs/ioctl: Add a comment to keep the logic in sync with LSM policies)
Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature)
Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (10e29251be0e binfmt_elf_fdpic: fix /proc/<pid>/auxv)
CONFLICT (content): Merge conflict in fs/binfmt_elf_fdpic.c
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (fa2b40bdd537 scsi: qla2xxx: Avoid possible run-time warning with long model_num)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* fs/smb/client/smb2pdu.c:3639 __SMB2_close() error: __builtin_memcpy() '&rsp->network_open_info' too small (52 vs 56)
@ 2024-04-25 21:14 2% kernel test robot
0 siblings, 0 replies; 200+ results
From: kernel test robot @ 2024-04-25 21:14 UTC (permalink / raw)
To: oe-kbuild; +Cc: lkp, Dan Carpenter
BCC: lkp@intel.com
CC: oe-kbuild-all@lists.linux.dev
CC: linux-kernel@vger.kernel.org
TO: Namjae Jeon <linkinjeon@kernel.org>
CC: Steve French <stfrench@microsoft.com>
tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
head: a93289b830ce783955b22fbe5d1274a464c05acf
commit: 0268a7cc7fdc47d90b6c18859de7718d5059f6f1 ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
date: 6 days ago
:::::: branch date: 3 hours ago
:::::: commit date: 6 days ago
config: x86_64-randconfig-161-20240426 (https://download.01.org/0day-ci/archive/20240426/202404260506.LY2fnQRZ-lkp@intel.com/config)
compiler: gcc-12 (Ubuntu 12.3.0-9ubuntu2) 12.3.0
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Reported-by: Dan Carpenter <error27@gmail.com>
| Closes: https://lore.kernel.org/r/202404260506.LY2fnQRZ-lkp@intel.com/
smatch warnings:
fs/smb/client/smb2pdu.c:3639 __SMB2_close() error: __builtin_memcpy() '&rsp->network_open_info' too small (52 vs 56)
vim +3639 fs/smb/client/smb2pdu.c
8eb4ecfab03d21 fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-08-01 3575
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3576 int
43f8a6a74ee244 fs/cifs/smb2pdu.c Steve French 2019-12-02 3577 __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
43f8a6a74ee244 fs/cifs/smb2pdu.c Steve French 2019-12-02 3578 u64 persistent_fid, u64 volatile_fid,
43f8a6a74ee244 fs/cifs/smb2pdu.c Steve French 2019-12-02 3579 struct smb2_file_network_open_info *pbuf)
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3580 {
40eff45b5dc7df fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-06-12 3581 struct smb_rqst rqst;
8eb4ecfab03d21 fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-08-01 3582 struct smb2_close_rsp *rsp = NULL;
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3583 struct cifs_ses *ses = tcon->ses;
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3584 struct TCP_Server_Info *server;
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3585 struct kvec iov[1];
da502f7df03d2d fs/cifs/smb2pdu.c Pavel Shilovsky 2016-10-25 3586 struct kvec rsp_iov;
ef2298a06d0129 fs/cifs/smb2pdu.c Garry McNulty 2018-10-03 3587 int resp_buftype = CIFS_NO_BUFFER;
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3588 int rc = 0;
9e8fae2597405a fs/cifs/smb2pdu.c Steve French 2019-12-02 3589 int flags = 0;
43f8a6a74ee244 fs/cifs/smb2pdu.c Steve French 2019-12-02 3590 bool query_attrs = false;
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3591 int retries = 0, cur_sleep = 1;
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3592
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3593 replay_again:
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3594 /* reinitialize for possible replay */
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3595 flags = 0;
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3596 query_attrs = false;
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3597 server = cifs_pick_channel(ses);
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3598
f96637be081141 fs/cifs/smb2pdu.c Joe Perches 2013-05-04 3599 cifs_dbg(FYI, "Close\n");
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3600
352d96f3acc6e0 fs/cifs/smb2pdu.c Aurelien Aptel 2020-05-31 3601 if (!ses || !server)
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3602 return -EIO;
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3603
5a77e75fedce55 fs/cifs/smb2pdu.c Steve French 2018-05-09 3604 if (smb3_encryption_required(tcon))
7fb8986e7449d0 fs/cifs/smb2pdu.c Pavel Shilovsky 2016-10-31 3605 flags |= CIFS_TRANSFORM_REQ;
7fb8986e7449d0 fs/cifs/smb2pdu.c Pavel Shilovsky 2016-10-31 3606
40eff45b5dc7df fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-06-12 3607 memset(&rqst, 0, sizeof(struct smb_rqst));
8eb4ecfab03d21 fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-08-01 3608 memset(&iov, 0, sizeof(iov));
40eff45b5dc7df fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-06-12 3609 rqst.rq_iov = iov;
40eff45b5dc7df fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-06-12 3610 rqst.rq_nvec = 1;
40eff45b5dc7df fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-06-12 3611
43f8a6a74ee244 fs/cifs/smb2pdu.c Steve French 2019-12-02 3612 /* check if need to ask server to return timestamps in close response */
43f8a6a74ee244 fs/cifs/smb2pdu.c Steve French 2019-12-02 3613 if (pbuf)
43f8a6a74ee244 fs/cifs/smb2pdu.c Steve French 2019-12-02 3614 query_attrs = true;
43f8a6a74ee244 fs/cifs/smb2pdu.c Steve French 2019-12-02 3615
f90f979726bc37 fs/cifs/smb2pdu.c Steve French 2019-09-03 3616 trace_smb3_close_enter(xid, persistent_fid, tcon->tid, ses->Suid);
352d96f3acc6e0 fs/cifs/smb2pdu.c Aurelien Aptel 2020-05-31 3617 rc = SMB2_close_init(tcon, server,
352d96f3acc6e0 fs/cifs/smb2pdu.c Aurelien Aptel 2020-05-31 3618 &rqst, persistent_fid, volatile_fid,
43f8a6a74ee244 fs/cifs/smb2pdu.c Steve French 2019-12-02 3619 query_attrs);
8eb4ecfab03d21 fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-08-01 3620 if (rc)
8eb4ecfab03d21 fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-08-01 3621 goto close_exit;
8eb4ecfab03d21 fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-08-01 3622
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3623 if (retries)
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3624 smb2_set_replay(server, &rqst);
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3625
352d96f3acc6e0 fs/cifs/smb2pdu.c Aurelien Aptel 2020-05-31 3626 rc = cifs_send_recv(xid, ses, server,
352d96f3acc6e0 fs/cifs/smb2pdu.c Aurelien Aptel 2020-05-31 3627 &rqst, &resp_buftype, flags, &rsp_iov);
da502f7df03d2d fs/cifs/smb2pdu.c Pavel Shilovsky 2016-10-25 3628 rsp = (struct smb2_close_rsp *)rsp_iov.iov_base;
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3629
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3630 if (rc != 0) {
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3631 cifs_stats_fail_inc(tcon, SMB2_CLOSE_HE);
eccb4422cf97a4 fs/cifs/smb2pdu.c Steve French 2018-05-17 3632 trace_smb3_close_err(xid, persistent_fid, tcon->tid, ses->Suid,
eccb4422cf97a4 fs/cifs/smb2pdu.c Steve French 2018-05-17 3633 rc);
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3634 goto close_exit;
43f8a6a74ee244 fs/cifs/smb2pdu.c Steve French 2019-12-02 3635 } else {
f90f979726bc37 fs/cifs/smb2pdu.c Steve French 2019-09-03 3636 trace_smb3_close_done(xid, persistent_fid, tcon->tid,
f90f979726bc37 fs/cifs/smb2pdu.c Steve French 2019-09-03 3637 ses->Suid);
43f8a6a74ee244 fs/cifs/smb2pdu.c Steve French 2019-12-02 3638 if (pbuf)
0015eb6e12384f fs/smb/client/smb2pdu.c Dmitry Antipov 2023-11-28 @3639 memcpy(&pbuf->network_open_info,
0015eb6e12384f fs/smb/client/smb2pdu.c Dmitry Antipov 2023-11-28 3640 &rsp->network_open_info,
0015eb6e12384f fs/smb/client/smb2pdu.c Dmitry Antipov 2023-11-28 3641 sizeof(pbuf->network_open_info));
173217bd733658 fs/smb/client/smb2pdu.c Ritvik Budhiraja 2024-04-02 3642 atomic_dec(&tcon->num_remote_opens);
43f8a6a74ee244 fs/cifs/smb2pdu.c Steve French 2019-12-02 3643 }
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3644
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3645 close_exit:
8eb4ecfab03d21 fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-08-01 3646 SMB2_close_free(&rqst);
2503a0dba98948 fs/cifs/smb2pdu.c Pavel Shilovsky 2011-12-26 3647 free_rsp_buf(resp_buftype, rsp);
9150c3adbf24d7 fs/cifs/smb2pdu.c Pavel Shilovsky 2019-11-21 3648
9150c3adbf24d7 fs/cifs/smb2pdu.c Pavel Shilovsky 2019-11-21 3649 /* retry close in a worker thread if this one is interrupted */
2659d3bff3e1b0 fs/cifs/smb2pdu.c Paulo Alcantara 2021-01-13 3650 if (is_interrupt_error(rc)) {
9e8fae2597405a fs/cifs/smb2pdu.c Steve French 2019-12-02 3651 int tmp_rc;
9e8fae2597405a fs/cifs/smb2pdu.c Steve French 2019-12-02 3652
9150c3adbf24d7 fs/cifs/smb2pdu.c Pavel Shilovsky 2019-11-21 3653 tmp_rc = smb2_handle_cancelled_close(tcon, persistent_fid,
9150c3adbf24d7 fs/cifs/smb2pdu.c Pavel Shilovsky 2019-11-21 3654 volatile_fid);
9150c3adbf24d7 fs/cifs/smb2pdu.c Pavel Shilovsky 2019-11-21 3655 if (tmp_rc)
9150c3adbf24d7 fs/cifs/smb2pdu.c Pavel Shilovsky 2019-11-21 3656 cifs_dbg(VFS, "handle cancelled close fid 0x%llx returned error %d\n",
9150c3adbf24d7 fs/cifs/smb2pdu.c Pavel Shilovsky 2019-11-21 3657 persistent_fid, tmp_rc);
9150c3adbf24d7 fs/cifs/smb2pdu.c Pavel Shilovsky 2019-11-21 3658 }
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3659
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3660 if (is_replayable_error(rc) &&
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3661 smb2_should_replay(tcon, &retries, &cur_sleep))
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3662 goto replay_again;
4f1fffa2376922 fs/smb/client/smb2pdu.c Shyam Prasad N 2024-01-21 3663
9150c3adbf24d7 fs/cifs/smb2pdu.c Pavel Shilovsky 2019-11-21 3664 return rc;
97ca1762246d6e fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-04-26 3665 }
97ca1762246d6e fs/cifs/smb2pdu.c Ronnie Sahlberg 2018-04-26 3666
:::::: The code at line 3639 was first introduced by commit
:::::: 0015eb6e12384ff1c589928e84deac2ad1ceb236 smb: client, common: fix fortify warnings
:::::: TO: Dmitry Antipov <dmantipov@yandex.ru>
:::::: CC: Steve French <stfrench@microsoft.com>
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [relevance 2%]
* Re: [RFC PATCH net-next 0/5] net: In-kernel QUIC implementation with Userspace handshake
@ 2024-04-25 18:06 5% ` Xin Long
2024-04-29 15:20 0% ` Stefan Metzmacher
0 siblings, 1 reply; 200+ results
From: Xin Long @ 2024-04-25 18:06 UTC (permalink / raw)
To: Stefan Metzmacher
Cc: network dev, davem, kuba, Eric Dumazet, Paolo Abeni,
Steve French, Namjae Jeon, Chuck Lever III, Jeff Layton,
Sabrina Dubroca, Tyler Fanelli, Pengtao He, linux-cifs,
Samba Technical
On Sun, Apr 21, 2024 at 3:27 PM Stefan Metzmacher <metze@samba.org> wrote:
>
> Am 20.04.24 um 21:32 schrieb Xin Long:
> > On Fri, Apr 19, 2024 at 3:19 PM Xin Long <lucien.xin@gmail.com> wrote:
> >>
> >> On Fri, Apr 19, 2024 at 2:51 PM Stefan Metzmacher <metze@samba.org> wrote:
> >>>
> >>> Hi Xin Long,
> >>>
> >>>>> But I think its unavoidable for the ALPN and SNI fields on
> >>>>> the server side. As every service tries to use udp port 443
> >>>>> and somehow that needs to be shared if multiple services want to
> >>>>> use it.
> >>>>>
> >>>>> I guess on the acceptor side we would need to somehow detach low level
> >>>>> udp struct sock from the logical listen struct sock.
> >>>>>
> >>>>> And quic_do_listen_rcv() would need to find the correct logical listening
> >>>>> socket and call quic_request_sock_enqueue() on the logical socket
> >>>>> not the lowlevel udo socket. The same for all stuff happening after
> >>>>> quic_request_sock_enqueue() at the end of quic_do_listen_rcv.
> >>>>>
> >>>> The implementation allows one low level UDP sock to serve for multiple
> >>>> QUIC socks.
> >>>>
> >>>> Currently, if your 3 quic applications listen to the same address:port
> >>>> with SO_REUSEPORT socket option set, the incoming connection will choose
> >>>> one of your applications randomly with hash(client_addr+port) vi
> >>>> reuseport_select_sock() in quic_sock_lookup().
> >>>>
> >>>> It should be easy to do a further match with ALPN between these 3 quic
> >>>> socks that listens to the same address:port to get the right quic sock,
> >>>> instead of that randomly choosing.
> >>>
> >>> Ah, that sounds good.
> >>>
> >>>> The problem is to parse the TLS Client_Hello message to get the ALPN in
> >>>> quic_sock_lookup(), which is not a proper thing to do in kernel, and
> >>>> might be rejected by networking maintainers, I need to check with them.
> >>>
> >>> Is the reassembling of CRYPTO frames done in the kernel or
> >>> userspace? Can you point me to the place in the code?
> >> In quic_inq_handshake_tail() in kernel, for Client Initial packet
> >> is processed when calling accept(), this is the path:
> >>
> >> quic_accept()-> quic_accept_sock_init() -> quic_packet_process() ->
> >> quic_packet_handshake_process() -> quic_frame_process() ->
> >> quic_frame_crypto_process() -> quic_inq_handshake_tail().
> >>
> >> Note that it's with the accept sock, not the listen sock.
> >>
> >>>
> >>> If it's really impossible to do in C code maybe
> >>> registering a bpf function in order to allow a listener
> >>> to check the intial quic packet and decide if it wants to serve
> >>> that connection would be possible as last resort?
> >> That's a smart idea! man.
> >> I think the bpf hook in reuseport_select_sock() is meant to do such
> >> selection.
> >>
> >> For the Client initial packet (the only packet you need to handle),
> >> I double you will need to do the reassembling, as Client Hello TLS message
> >> is always less than 400 byte in my env.
> >>
> >> But I think you need to do the decryption for the Client initial packet
> >> before decoding it then parsing the TLS message from its crypto frame.
> > I created this patch:
> >
> > https://github.com/lxin/quic/commit/aee0b7c77df3f39941f98bb901c73fdc560befb8
> >
> > to do this decryption in quic_sock_look() before calling
> > reuseport_select_sock(), so that it provides the bpf selector with
> > a plain-text QUIC initial packet:
> >
> > https://datatracker.ietf.org/doc/html/rfc9000#section-17.2.2
> >
> > If it's complex for you to do the decryption for the initial packet in
> > the bpf selector, I will apply this patch. Please let me know.
>
> I guess in addition to quic_server_handshake(), which is called
> after accept(), there should be quic_server_prepare_listen()
> (and something similar for in kernel servers) that setup the reuseport
> magic for the socket, so that it's not needed in every application.
>
> It seems there is only a single ebpf program possible per
> reuseport group, so there has to be just a single one.
>
> But is it possible for in kernel servers to also register an epbf program?
>
Just confirmed from other ebpf experts, there are no in-kernel interfaces
for loading and interacting with BPF maps/programs(other than from BPF itself).
It seems that we have to do this match in QUIC stack. In the latest QUIC
code, I added quic_packet_get_alpn(), a 59-line function, to parse ALPNs
and then it will search for the listen sock with these ALPNs in
quic_sock_lookup().
I introduced 'alpn_match' module param, and it can be enabled when loading
the module QUIC by:
# modprobe quic alpn_match=1
You can test it by tests/sample_test in the latest code:
Start 3 servers:
# ./sample_test server 0.0.0.0 1234 \
./keys/server-key.pem ./keys/server-cert.pem smbd
# ./sample_test server 0.0.0.0 1234 \
./keys/server-key.pem ./keys/server-cert.pem h3
# ./sample_test server 0.0.0.0 1234 \
./keys/server-key.pem ./keys/server-cert.pem ksmbd
Try to connect on clients with:
# ./sample_test client 127.0.0.1 1234 ksmbd
# ./sample_test client 127.0.0.1 1234 smbd
# ./sample_test client 127.0.0.1 1234 h3
to see if the corresponding server responds.
There might be some concerns but it's also a useful feature that can not
be implemented in userland QUICs. The commit is here:
https://github.com/lxin/quic/commit/de82f8135f4e9196b503b4ab5b359d88f2b2097f
Please check if this is enough for SMB applications.
Note as a listen socket is now identified by [address + port + ALPN] when
alpn_match=1, this feature does NOT require SO_REUSEPORT socket option to
be set, unless one wants multiple sockets to listen to
the same [address + port + ALPN].
Thanks.
^ permalink raw reply [relevance 5%]
* Re: Kernel RIP 0010:cifs_flush_folio
[not found] ` <CA+EPQ664FHmSU-XW2e63jz1hEYNYVS-RdY6309g7-hvUMdt5Ew@mail.gmail.com>
@ 2024-04-25 16:52 0% ` Shyam Prasad N
0 siblings, 0 replies; 200+ results
From: Shyam Prasad N @ 2024-04-25 16:52 UTC (permalink / raw)
To: Ritvik Budhiraja; +Cc: Steve French, linux-cifs, sprasad, David Howells
On Thu, Apr 25, 2024 at 12:05 PM Ritvik Budhiraja
<budhirajaritviksmb@gmail.com> wrote:
>
> The test that failed was generic/074, with: Output mismatch;
> Write failed at offset 9933824, Write failed at offset 9961472,
> Write failed at offset 9950208. The kernel version for the machine
> was Ubuntu 22.04, 6.5.0-1018-azure
>
> The target server was Azure Files XNFS
Correction. The server for the test that generated this stack would be
Azure Files SMB. Not NFS.
>
> On Thu, 25 Apr 2024 at 11:53, Steve French <smfrench@gmail.com> wrote:
>>
>> That is plausible that it is the same bug as in the report. What
>> kernel version is the xfstest failure on (and which xfstest)?
>>
>> Presumably this does not fail with recent kernels (e.g. 6.7 or later) correct?
>>
>> Since this is clone range (which not all servers support), what is the
>> target server (ksmbd? Samba on btrfs? Windows on REFS?)
>>
>> On Thu, Apr 25, 2024 at 1:14 AM Ritvik Budhiraja
>> <budhirajaritviksmb@gmail.com> wrote:
>> >
>> > Hi Steve,
>> > While investigating xnfstest results I came across the below kernel oops. I have seen this in some of the xfstest failures. I wanted to know if this is a known issue?
>> >
>> > I have identified a similar ubuntu bug: Bug #2060919 “cifs: Copying file to same directory results in pa...” : Bugs : linux package : Ubuntu (launchpad.net)
>> >
>> > Reference dmesg logs:
>> > BUG: unable to handle page fault for address: fffffffffffffffe
>> > [Tue Apr 23 09:22:02 2024] #PF: supervisor read access in kernel mode
>> > [Tue Apr 23 09:22:02 2024] #PF: error_code(0x0000) - not-present page
>> > [Tue Apr 23 09:22:02 2024] PGD 19d43b067 P4D 19d43b067 PUD 19d43d067 PMD 0
>> > [Tue Apr 23 09:22:02 2024] Oops: 0000 [#68] SMP NOPTI
>> > [Tue Apr 23 09:22:02 2024] CPU: 1 PID: 3856364 Comm: fsstress Tainted: G D 6.5.0-1018-azure #19~22.04.2-Ubuntu
>> > [Tue Apr 23 09:22:03 2024] Hardware name: Microsoft Corporation Virtual Machine/Virtual Machine, BIOS Hyper-V UEFI Release v4.1 11/28/2023
>> > [Tue Apr 23 09:22:03 2024] RIP: 0010:cifs_flush_folio+0x41/0xe0 [cifs]
>> > [Tue Apr 23 09:22:03 2024] Code: 49 89 cd 31 c9 41 54 53 48 89 f3 48 c1 ee 0c 48 83 ec 10 48 8b 7f 30 44 89 45 d4 e8 29 61 8e c6 49 89 c4 31 c0 4d 85 e4 74 7d <49> 8b 14 24 b8 00 10 00 00 f7 c2 00 00 01 00 74 12 41 0f b6 4c 24
>> > [Tue Apr 23 09:22:03 2024] RSP: 0018:ffffb182c3d3fcc0 EFLAGS: 00010282
>> > [Tue Apr 23 09:22:03 2024] RAX: 0000000000000000 RBX: 0000000011d00000 RCX: 0000000000000000
>> > [Tue Apr 23 09:22:03 2024] RDX: 0000000000000000 RSI: 0000000000011d00 RDI: ffffb182c3d3fc10
>> > [Tue Apr 23 09:22:03 2024] RBP: ffffb182c3d3fcf8 R08: 0000000000000001 R09: 0000000000000000
>> > [Tue Apr 23 09:22:03 2024] R10: 0000000011cfffff R11: 0000000000000000 R12: fffffffffffffffe
>> > [Tue Apr 23 09:22:03 2024] R13: ffffb182c3d3fd48 R14: ffff994311023c30 R15: ffffb182c3d3fd40
>> > [Tue Apr 23 09:22:03 2024] FS: 00007c82b3e10740(0000) GS:ffff9944b7d00000(0000) knlGS:0000000000000000
>> > [Tue Apr 23 09:22:03 2024] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
>> > [Tue Apr 23 09:22:03 2024] CR2: fffffffffffffffe CR3: 00000001acb52000 CR4: 0000000000350ee0
>> > [Tue Apr 23 09:22:03 2024] Call Trace:
>> > [Tue Apr 23 09:22:03 2024] <TASK>
>> > [Tue Apr 23 09:22:03 2024] ? show_regs+0x6a/0x80
>> > [Tue Apr 23 09:22:03 2024] ? __die+0x25/0x70
>> > [Tue Apr 23 09:22:03 2024] ? page_fault_oops+0x79/0x180
>> > [Tue Apr 23 09:22:03 2024] ? srso_return_thunk+0x5/0x10
>> > [Tue Apr 23 09:22:03 2024] ? search_exception_tables+0x61/0x70
>> > [Tue Apr 23 09:22:03 2024] ? srso_return_thunk+0x5/0x10
>> > [Tue Apr 23 09:22:03 2024] ? kernelmode_fixup_or_oops+0xa2/0x120
>> > [Tue Apr 23 09:22:03 2024] ? __bad_area_nosemaphore+0x16f/0x280
>> > [Tue Apr 23 09:22:03 2024] ? terminate_walk+0x97/0xf0
>> > [Tue Apr 23 09:22:03 2024] ? bad_area_nosemaphore+0x16/0x20
>> > [Tue Apr 23 09:22:03 2024] ? do_kern_addr_fault+0x62/0x80
>> > [Tue Apr 23 09:22:03 2024] ? exc_page_fault+0xdb/0x160
>> > [Tue Apr 23 09:22:03 2024] ? asm_exc_page_fault+0x27/0x30
>> > [Tue Apr 23 09:22:03 2024] ? cifs_flush_folio+0x41/0xe0 [cifs]
>> > [Tue Apr 23 09:22:03 2024] cifs_remap_file_range+0x16c/0x5e0 [cifs]
>> > [Tue Apr 23 09:22:03 2024] do_clone_file_range+0x107/0x290
>> > [Tue Apr 23 09:22:03 2024] vfs_clone_file_range+0x3f/0x120
>> > [Tue Apr 23 09:22:03 2024] ioctl_file_clone+0x4d/0xa0
>> > [Tue Apr 23 09:22:03 2024] do_vfs_ioctl+0x35c/0x860
>> > [Tue Apr 23 09:22:03 2024] __x64_sys_ioctl+0x73/0xd0
>> > [Tue Apr 23 09:22:03 2024] do_syscall_64+0x5c/0x90
>> > [Tue Apr 23 09:22:03 2024] ? srso_return_thunk+0x5/0x10
>> > [Tue Apr 23 09:22:03 2024] ? exc_page_fault+0x80/0x160
>> > [Tue Apr 23 09:22:03 2024] entry_SYSCALL_64_after_hwframe+0x6e/0xd8
>>
>>
>>
>> --
>> Thanks,
>>
>> Steve
I reviewed the launchpad bug. This problem seems to be well understood.
The problem seems to be well understood:
>>> Since the Ubuntu mantic kernel consumes both 6.1.y and 6.7.y / 6.8.y stable patches, this patch was applied to mantic's 6.5 kernel by mistake, and contains the wrong logic for how __filemap_get_folio() works in 6.5.
So the order of backport application seems to have led to this problem.
--
Regards,
Shyam
^ permalink raw reply [relevance 0%]
* [PATCH] ksmbd: fix uninitialized symbol 'share' in smb2_tree_connect()
@ 2024-04-25 13:57 8% Namjae Jeon
0 siblings, 0 replies; 200+ results
From: Namjae Jeon @ 2024-04-25 13:57 UTC (permalink / raw)
To: linux-cifs
Cc: smfrench, senozhatsky, tom, atteh.mailbox, Namjae Jeon,
kernel test robot, Dan Carpenter
Fix uninitialized symbol 'share' in smb2_tree_connect().
Fixes: e9d8c2f95ab8 ("ksmbd: add continuous availability share parameter")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
---
fs/smb/server/smb2pdu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index 355824151c2d..30229161b346 100644
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -1926,7 +1926,7 @@ int smb2_tree_connect(struct ksmbd_work *work)
struct ksmbd_session *sess = work->sess;
char *treename = NULL, *name = NULL;
struct ksmbd_tree_conn_status status;
- struct ksmbd_share_config *share;
+ struct ksmbd_share_config *share = NULL;
int rc = -EINVAL;
WORK_BUFFERS(work, req, rsp);
@@ -1988,7 +1988,7 @@ int smb2_tree_connect(struct ksmbd_work *work)
write_unlock(&sess->tree_conns_lock);
rsp->StructureSize = cpu_to_le16(16);
out_err1:
- if (server_conf.flags & KSMBD_GLOBAL_FLAG_DURABLE_HANDLE &&
+ if (server_conf.flags & KSMBD_GLOBAL_FLAG_DURABLE_HANDLE && share &&
test_share_config_flag(share,
KSMBD_SHARE_FLAG_CONTINUOUS_AVAILABILITY))
rsp->Capabilities = SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY;
--
2.25.1
^ permalink raw reply related [relevance 8%]
* Re: Kernel RIP 0010:cifs_flush_folio
[not found] <CA+EPQ66bhvV_Wr2PE=bQQwcYbfvXCAn_TyAoHdD9fSfahsgG0Q@mail.gmail.com>
@ 2024-04-25 6:23 4% ` Steve French
[not found] ` <CA+EPQ664FHmSU-XW2e63jz1hEYNYVS-RdY6309g7-hvUMdt5Ew@mail.gmail.com>
0 siblings, 1 reply; 200+ results
From: Steve French @ 2024-04-25 6:23 UTC (permalink / raw)
To: Ritvik Budhiraja; +Cc: linux-cifs, Shyam Prasad, sprasad, David Howells
That is plausible that it is the same bug as in the report. What
kernel version is the xfstest failure on (and which xfstest)?
Presumably this does not fail with recent kernels (e.g. 6.7 or later) correct?
Since this is clone range (which not all servers support), what is the
target server (ksmbd? Samba on btrfs? Windows on REFS?)
On Thu, Apr 25, 2024 at 1:14 AM Ritvik Budhiraja
<budhirajaritviksmb@gmail.com> wrote:
>
> Hi Steve,
> While investigating xnfstest results I came across the below kernel oops. I have seen this in some of the xfstest failures. I wanted to know if this is a known issue?
>
> I have identified a similar ubuntu bug: Bug #2060919 “cifs: Copying file to same directory results in pa...” : Bugs : linux package : Ubuntu (launchpad.net)
>
> Reference dmesg logs:
> BUG: unable to handle page fault for address: fffffffffffffffe
> [Tue Apr 23 09:22:02 2024] #PF: supervisor read access in kernel mode
> [Tue Apr 23 09:22:02 2024] #PF: error_code(0x0000) - not-present page
> [Tue Apr 23 09:22:02 2024] PGD 19d43b067 P4D 19d43b067 PUD 19d43d067 PMD 0
> [Tue Apr 23 09:22:02 2024] Oops: 0000 [#68] SMP NOPTI
> [Tue Apr 23 09:22:02 2024] CPU: 1 PID: 3856364 Comm: fsstress Tainted: G D 6.5.0-1018-azure #19~22.04.2-Ubuntu
> [Tue Apr 23 09:22:03 2024] Hardware name: Microsoft Corporation Virtual Machine/Virtual Machine, BIOS Hyper-V UEFI Release v4.1 11/28/2023
> [Tue Apr 23 09:22:03 2024] RIP: 0010:cifs_flush_folio+0x41/0xe0 [cifs]
> [Tue Apr 23 09:22:03 2024] Code: 49 89 cd 31 c9 41 54 53 48 89 f3 48 c1 ee 0c 48 83 ec 10 48 8b 7f 30 44 89 45 d4 e8 29 61 8e c6 49 89 c4 31 c0 4d 85 e4 74 7d <49> 8b 14 24 b8 00 10 00 00 f7 c2 00 00 01 00 74 12 41 0f b6 4c 24
> [Tue Apr 23 09:22:03 2024] RSP: 0018:ffffb182c3d3fcc0 EFLAGS: 00010282
> [Tue Apr 23 09:22:03 2024] RAX: 0000000000000000 RBX: 0000000011d00000 RCX: 0000000000000000
> [Tue Apr 23 09:22:03 2024] RDX: 0000000000000000 RSI: 0000000000011d00 RDI: ffffb182c3d3fc10
> [Tue Apr 23 09:22:03 2024] RBP: ffffb182c3d3fcf8 R08: 0000000000000001 R09: 0000000000000000
> [Tue Apr 23 09:22:03 2024] R10: 0000000011cfffff R11: 0000000000000000 R12: fffffffffffffffe
> [Tue Apr 23 09:22:03 2024] R13: ffffb182c3d3fd48 R14: ffff994311023c30 R15: ffffb182c3d3fd40
> [Tue Apr 23 09:22:03 2024] FS: 00007c82b3e10740(0000) GS:ffff9944b7d00000(0000) knlGS:0000000000000000
> [Tue Apr 23 09:22:03 2024] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [Tue Apr 23 09:22:03 2024] CR2: fffffffffffffffe CR3: 00000001acb52000 CR4: 0000000000350ee0
> [Tue Apr 23 09:22:03 2024] Call Trace:
> [Tue Apr 23 09:22:03 2024] <TASK>
> [Tue Apr 23 09:22:03 2024] ? show_regs+0x6a/0x80
> [Tue Apr 23 09:22:03 2024] ? __die+0x25/0x70
> [Tue Apr 23 09:22:03 2024] ? page_fault_oops+0x79/0x180
> [Tue Apr 23 09:22:03 2024] ? srso_return_thunk+0x5/0x10
> [Tue Apr 23 09:22:03 2024] ? search_exception_tables+0x61/0x70
> [Tue Apr 23 09:22:03 2024] ? srso_return_thunk+0x5/0x10
> [Tue Apr 23 09:22:03 2024] ? kernelmode_fixup_or_oops+0xa2/0x120
> [Tue Apr 23 09:22:03 2024] ? __bad_area_nosemaphore+0x16f/0x280
> [Tue Apr 23 09:22:03 2024] ? terminate_walk+0x97/0xf0
> [Tue Apr 23 09:22:03 2024] ? bad_area_nosemaphore+0x16/0x20
> [Tue Apr 23 09:22:03 2024] ? do_kern_addr_fault+0x62/0x80
> [Tue Apr 23 09:22:03 2024] ? exc_page_fault+0xdb/0x160
> [Tue Apr 23 09:22:03 2024] ? asm_exc_page_fault+0x27/0x30
> [Tue Apr 23 09:22:03 2024] ? cifs_flush_folio+0x41/0xe0 [cifs]
> [Tue Apr 23 09:22:03 2024] cifs_remap_file_range+0x16c/0x5e0 [cifs]
> [Tue Apr 23 09:22:03 2024] do_clone_file_range+0x107/0x290
> [Tue Apr 23 09:22:03 2024] vfs_clone_file_range+0x3f/0x120
> [Tue Apr 23 09:22:03 2024] ioctl_file_clone+0x4d/0xa0
> [Tue Apr 23 09:22:03 2024] do_vfs_ioctl+0x35c/0x860
> [Tue Apr 23 09:22:03 2024] __x64_sys_ioctl+0x73/0xd0
> [Tue Apr 23 09:22:03 2024] do_syscall_64+0x5c/0x90
> [Tue Apr 23 09:22:03 2024] ? srso_return_thunk+0x5/0x10
> [Tue Apr 23 09:22:03 2024] ? exc_page_fault+0x80/0x160
> [Tue Apr 23 09:22:03 2024] entry_SYSCALL_64_after_hwframe+0x6e/0xd8
--
Thanks,
Steve
^ permalink raw reply [relevance 4%]
* linux-next: Tree for Apr 24
@ 2024-04-24 10:21 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-04-24 10:21 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 38599 bytes --]
Hi all,
News: there will be no linux-next release tomorrow.
Changes since 20240423:
New tree: powerpc-kdump-hotplug
The gpio-brgl-fixes tree lost its build failure.
The mm tree still had its build failure for which I applied a patch.
The nfsd tree gained a conflict against the nfsd-fixes tree.
The vfs-brauner tree gained a conflict against the erofs-fixes tree.
The modules tree gained conflicts against the mm tree. It also was
involved in a boot failure, so I used the version from next-20240423.
The devicetree tree gained a conflict against the net-next, stm32 trees.
The rcu tree gained a conflict against the modules tree.
Non-merge commits (relative to Linus' tree): 7298
7444 files changed, 518857 insertions(+), 177297 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 371 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (9d1ddab261f3 Merge tag '6.9-rc5-smb-client-fixes' of git://git.samba.org/sfrench/cifs-2.6)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (bab29f1a77ba maple_tree: fix mas_empty_area_rev() null pointer dereference)
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (61231eb8113c ARC: [plat-hsdk]: Remove misplaced interrupt-cells property)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (210cfef57926 selftests/powerpc/papr-vpd: Fix missing variable initialization)
Merging s390-fixes/fixes (412050af2ea3 s390/mm: Fix clearing storage keys for huge pages)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (a44f2eb106a4 tools: ynl: don't ignore errors in NLMSG_DONE messages)
Merging bpf/master (5bcf0dcbf906 xdp: use flags field to disambiguate broadcast redirect)
Merging ipsec/master (8b06a24bb625 xfrm: fix possible derferencing in error path)
Merging netfilter/main (a9176f7c66f0 Merge branch 'mlxsw-fixes')
Merging ipvs/main (7eaf837a4eb5 netfilter: nf_tables: Fix a memory leak in nf_tables_updchain)
Merging wireless/for-next (91112fc6212a wifi: iwlwifi: mvm: fix link ID management)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5)
Merging sound-current/for-linus (f25f17dc5c6a ALSA: seq: ump: Fix conversion from MIDI2 to MIDI1 UMP messages)
Merging sound-asoc-fixes/for-linus (f2602fba4723 ASoC: cs35l56: Avoid static analysis warning of uninitialised variable)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (96e20adc43c4 regulator: change stubbed devm_regulator_get_enable to return Ok)
Merging spi-fixes/for-linus (7430764f5a85 spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging tty.current/tty-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging usb.current/usb-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (74a72baf204f iio:imu: adis16475: Fix sync mode setting)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (ed30a4a51bb1 Linux 6.9-rc5)
Merging soundwire-fixes/fixes (63dc588e7af1 soundwire: amd: fix for wake interrupt handling for clockstop mode)
Merging thunderbolt-fixes/fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging input-current/for-linus (57ed9567e63b Merge branch 'next' into for-linus)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (f221033f5c24 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (44ecfa3e5f1c Merge branch 'svm' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (4b759dd57655 cxl/core: Fix potential payload size confusion in cxl_mem_get_poison())
Merging btrfs-fixes/next-fixes (08487fb4f2bd Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (f609e7b1b49e platform/x86/amd/pmc: Extend Framework 13 quirk to more BIOSes)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (ca91259b775f scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING)
Merging drm-fixes/drm-fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging drm-intel-fixes/for-linux-next-fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging mmc-fixes/fixes (ace323f80b9b mmc: sdhci-of-dwcmshc: th1520: Increase tuning loop count to 128)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (a373a36fb6b0 Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (6b0856ee585d cache: sifive_ccache: Silence unused variable warning)
Merging fpga-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (ed30a4a51bb1 Linux 6.9-rc5)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (569a48fed355 erofs: reliably distinguish block based and fscache mode)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (7d32b207859f Revert "NFSD: Convert the callback workqueue to use delayed_work")
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (decd347c2a75 x86/efistub: Reinstate soft limit for initrd loading)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (56b70b91a161 rust: remove `params` from `module` macro example)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (f8981b0d5295 Merge tag 'qcom-clk-fixes-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-fixes)
Merging drm-misc-fixes/for-linux-next-fixes (a386c3041045 drm/atomic-helper: fix parameter order in drm_format_conv_state_copy() call)
Merging mm-stable/mm-stable (640958fde130 Merge branch 'master' into mm-stable)
Merging mm-nonmm-stable/mm-nonmm-stable (0bbac3facb5d Linux 6.9-rc4)
Merging mm/mm-everything (2541ee5668b0 Merge branch 'mm-nonmm-unstable' into mm-everything)
Applying: fixup for "writeback: support retrieving per group debug writeback stats of bdi"
Merging kbuild/for-next (dd934396afdc kconfig: use menu_for_each_entry() to traverse menu tree)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (e7a8074d2f62 tools include UAPI: Sync linux/vhost.h with the kernel sources)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (7befe2ef9384 Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (4052ce07d5d7 perf/arm-spe: Assign parents for event_source device)
Merging arm-soc/for-next (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging amlogic/for-next (2b952b1d0a54 Merge branch 'v6.10/defconfig' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (0696ed223eb6 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (b7c6f4085cba Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (374b2883cf13 Merge branch 'v6.9-next/dts64' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (2a1e301bf479 Merge branch 'omap-for-v6.10/dt' into for-next)
Merging qcom/for-next (c6b2b55174cd Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (8dabf52bd8db Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (a74fbb1dc2c6 Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (04f3d8db0b2c Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B)
Merging stm32/stm32-next (b12a916d30dc ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1)
Merging sunxi/sunxi/for-next (8f328223944a Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/dt into for-next)
Merging ti/ti-next (592695bed5f8 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (92e92dc84e17 Merge branch 'clk-scmi' into clk-next)
Merging clk-imx/for-next (5224b189462f clk: imx: add i.MX95 BLK CTL clk driver)
Merging clk-renesas/renesas-clk (44019387fce2 clk: renesas: r9a07g043: Add clock and reset entry for PLIC)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (5409ade5a799 LoongArch: Fix callchain parse error with kernel tracepoint events)
5743c278400a ("LoongArch: Fix a build error due to __tlb_remove_tlb_entry()")
Merging m68k/for-next (70d830e337f9 m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER)
Merging m68knommu/for-next (2a92aed55942 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (6613476e225e Linux 6.8-rc1)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (e8f897f4afef Linux 6.8)
Merging powerpc/next (f318c8be797f powerpc/ptdump: Fix walk_vmemmap() to also print first vmemmap entry)
Merging powerpc-kdump-hotplug/topic/kdump-hotplug (849599b702ef powerpc/crash: add crash memory hotplug support)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (ba5ea59f768f riscv: Do not save the scratch CSR during suspend)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (5db2c4dc413e riscv: dts: add initial canmv-k230 and k230-evb dts)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (d30edd25a7b5 Merge branch 'shared-zeropage' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (48d85acdaa52 sparc: chmc: Convert to platform remove callback returning void)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (11cca8ccf2c3 tty: xtensa/iss: Use min() to fix Coccinelle warning)
Merging bcachefs/for-next (711f072a8f7f bcachefs: Clean up inode alloc)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (33e209409638 Merge branch 'for-next-next-v6.9-20240419' into for-next-20240419)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (59b7e31117bc smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (d7ed5232f0f1 exfat: fix timing of synchronizing bitmap and inode)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (7ca906c7f7e5 Pull ext2 and isofs removal to PageError bit.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (06b206d9e2b4 f2fs: remove unnecessary block size check in init_f2fs_fs())
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (fa7e19337908 fuse: Add initial support for fs-verity)
Merging gfs2/for-next (29efef6907aa gfs2: Remove and replace gfs2_glock_queue_work)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (71b1543c83d6 Merge tag '6.9-rc5-ksmbd-fixes' of git://git.samba.org/ksmbd)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (6251e2abfc40 lockd: host: Remove unnecessary statements＇host = NULL;＇)
CONFLICT (content): Merge conflict in fs/nfsd/nfs4callback.c
Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (6a94b1acda7e xfs: reinstate delalloc for RT inodes (if sb_rextsize == 1))
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (4efbdf2eca99 Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in fs/erofs/super.c
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (ccd0bdb57e31 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5ceeabb0eb2e Merge tag 'i2c-host-fixes-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current)
Merging i2c-host/i2c/i2c-host (8d49135d177d i2c: thunderx: Adding ioclk support)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (cf770af5645a firmware: dmi-id: add a release callback function)
Merging hwmon-staging/hwmon-next (e723f6ca39fb hwmon: jc42: Remove I2C_CLASS_SPD support)
Merging jc_docs/docs-next (2309181eb018 Merge branch 'docs-fixes' into docs-next)
Merging v4l-dvb/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging v4l-dvb-next/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging pm/linux-next (e62751a8c70c Merge branch 'acpi-pm' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (39eaf5212441 cpufreq: dt-platdev: eliminate uses of of_node_put())
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (0cebf7cb2d70 pmdomain: core: Don't clear suspended_count at genpd_prepare())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M)
Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails)
Merging rdma/for-next (349e85995228 RDMA/hns: Modify the print level of CQE error)
Merging net-next/main (8d03c1534d4a Merge branch 'selftests-drv-net-support-testing-with-a-remote-system')
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging bpf-next/for-next (a7de265cb2d8 bpf: Fix typos in comments)
Merging ipsec-next/master (aeb48a428d7d udpencap: Remove Obsolete UDP_ENCAP_ESPINUDP_NON_IKE Support)
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (958efeeef2d3 Bluetooth: Remove 3 repeated macro definitions)
Merging wireless-next/for-next (b0d2d8f996c1 wifi: mac80211: handle link ID during management Tx)
CONFLICT (content): Merge conflict in net/mac80211/chan.c
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1)
Merging crypto/master (543ea178fbfa crypto: x86/aes-xts - optimize size of instructions operating on lengths)
Merging drm/drm-next (0208ca55aa9c Backmerge tag 'v6.9-rc5' into drm-next)
Merging drm-exynos/for-linux-next (5d2c7cc9c1b3 drm/exynos: mixer: drop driver owner initialization)
Merging drm-misc/for-linux-next (6abe93b621ab drm/v3d: Fix race-condition between sysfs/fdinfo and interrupt handler)
Merging amdgpu/drm-next (d60dc4dd7241 drm/amdgpu: Add interface to reserve bad page)
Merging drm-intel/for-linux-next (6068bc209ac8 drm/i915/dsi: pass display to register macros instead of implicit variable)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (3e5a516f3bf1 Merge tag 'phy_dp_modes_6.10' into msm-next-lumag)
Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane)
Merging drm-xe/drm-xe-next (869e54d4d54b drm/xe: make xe_pm_runtime_lockdep_map a static struct)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm_types.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (fb3b9c2d217f video: logo: Drop full path of the input filename in generated file)
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (3a56855bb549 ALSA: scarlett2: Zero initialize ret in scarlett2_ag_target_ctl_get())
Merging ieee1394/for-next (0d4149e5e9b0 firewire: ohci: use pci_irq_vector() to retrieve allocated interrupt line)
Merging sound-asoc/for-next (239a45349780 Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (41ca2e5a670b bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of)
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in kernel/module/main.c
$ git reset --hard HEAD^
Merging next-20240423 version of modules
CONFLICT (content): Merge conflict in kernel/module/main.c
[master af5214ede1c1] next-20240423/modules
Merging input/next (9e0631695eac input: pm8xxx-vibrator: add new SPMI vibrator support)
Merging block/for-next (12c12fbada5c Merge branch 'for-6.10/block' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (83637d9017b2 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (bce42d6108c9 mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (f7638784bd0c Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (74560bb3685b lsm: remove the now superfluous sentinel element from ctl_table array)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (3c6e94beeacd Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (d02a66d84baa Merge branches 'memory-observability' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (669430b183fc of: property: fw_devlink: Add support for "power-supplies" binding)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging dt-krzk/for-next (adfecb01c288 Merge branches 'next/dt' and 'next/dt64' into for-next)
Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU)
Merging spi/for-next (5343a65e03e4 Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (5a04007fb7a9 Merge branch into tip/master: 'x86/shstk')
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (8e95536e9495 Merge branch ras/edac-misc into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (b93b7b4635f1 ftrace: Asynchronous grace period for register_ftrace_direct())
Merging kvm/next (a96cb3bf390e Merge x86 bugfixes from Linux 6.9-rc3)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging kvm-arm/next (47de86165eea Merge branch kvm-arm64/nv-eret-pauth into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (f1c48c1ec735 RISC-V: KVM: selftests: Add ebreak test support)
Merging kvm-x86/next (7b076c6a308e Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests' and 'vmx')
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next)
Merging drivers-x86/for-next (88c0ef69dd88 platform/x86: asus-wmi: cleanup main struct to avoid some holes)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (70a5f3005008 platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD))
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (e5019b14230a Merge 6.9-rc5 into driver-core-next)
Merging usb/usb-next (0d31ea587709 Merge 6.9-rc5 into usb-next)
Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev"
Merging thunderbolt/next (d4d336f8c4d5 thunderbolt: No need to loop over all retimers if access fails)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (660a70809856 Merge 6.9-rc5 into tty-next)
Merging char-misc/char-misc-next (7732ce06ed8a Merge tag 'iio-for-6.10a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (d6fc00d0f640 coresight: etm4x: Fix access to resource selector registers)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount)
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (b80ad8e3cd27 iio: adc: ti-ads131e08: Use device_for_each_child_node_scoped() to simplify error paths.)
Merging phy-next/next (9c79b779643e phy: rockchip: fix CONFIG_TYPEC dependency)
Merging soundwire/next (4cd5ea6de156 soundwire: intel_init: resume all devices on exit.)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (82b951e6fbd3 vfio/pci: fix potential memory leak in vfio_intx_enable())
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (ee2098c0b512 spmi: pmic-arb: Add multi bus support)
Merging staging/staging-next (75ff53c44f5e staging: vc04_services: Drop completed TODO item)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (98f2233a5c20 dmaengine: pl08x: Use kcalloc() instead of kzalloc())
Merging cgroup/for-next (04d63da4da53 cgroup/cpuset: Fix incorrect top_cpuset flags)
Merging scsi/for-next (99033e81ab05 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (f92141e18c8b Merge patch series "convert SCSI to atomic queue limits, part 1 (v3)")
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging vhost/linux-next (24ddee0ff8c3 Merge tag 'stable/vduse-virtio-net' into vhost)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (0e8de59db6c3 Merge branches 'rproc-next' and 'rpmsg-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (8a7a61032587 gpiolib: Get rid of never false gpio_is_valid() calls)
Merging gpio-intel/for-next (1736df17fea0 gpiolib: acpi: Set label for IRQ only lines)
Merging pinctrl/for-next (85fb4a0fad95 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (21fc4d195922 pinctrl: renesas: r8a779h0: Add INTC-EX pins, groups, and function)
Merging pinctrl-samsung/for-next (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants)
Merging pwm/pwm/for-next (8f33f980dcfe dt-bindings: pwm: mediatek,pwm-disp: add compatible for mt8365 SoC)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (00ab560eb0e3 selftests: Mark ksft_exit_fail_perror() as __noreturn)
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (63761ec5971e kunit: unregister the device on error)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (5b6d8ef6f056 kdb: Use str_plural() to fix Coccinelle warning)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (813e0ae613d6 bus: mhi: host: Add mhi_power_down_keep_dev() API to support system suspend/hibernation)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (87971c973f5c cxl/hdm: dev_warn() on unsupported mixed mode decoder)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (cda30c6542c8 efi: Clear up misconceptions about a maximum variable name size)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (b3d8a8e87014 slub: use count_partial_free_approx() in slab_out_of_memory())
Merging random/master (2668e3ae2ef3 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging landlock/next (dc792a74600a fs/ioctl: Add a comment to keep the logic in sync with LSM policies)
Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature)
Merging sysctl/sysctl-next (12e78b868481 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (a9c3475dd67b Replace macro "ARCH_HAVE_EXTRA_ELF_NOTES" with kconfig)
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (716bc9b1c255 Merge branch 'for-next/hardening' into for-next/kspp)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Re: fs/smb/server/smb2pdu.c:1992 smb2_tree_connect() error: uninitialized symbol 'share'.
2024-04-24 6:28 5% Dan Carpenter
@ 2024-04-24 7:21 0% ` Namjae Jeon
0 siblings, 0 replies; 200+ results
From: Namjae Jeon @ 2024-04-24 7:21 UTC (permalink / raw)
To: Dan Carpenter; +Cc: oe-kbuild, lkp, oe-kbuild-all, linux-kernel, Steve French
2024년 4월 24일 (수) 오후 3:28, Dan Carpenter <dan.carpenter@linaro.org>님이 작성:
Hi Dan,
>
> tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
> head: 9d1ddab261f3e2af7c384dc02238784ce0cf9f98
> commit: e9d8c2f95ab8acaf3f4d4a53682a4afa3c263692 ksmbd: add continuous availability share parameter
> config: x86_64-randconfig-161-20240424 (https://download.01.org/0day-ci/archive/20240424/202404241435.Yxr6Wapq-lkp@intel.com/config)
> compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18)
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <lkp@intel.com>
> | Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> | Closes: https://lore.kernel.org/r/202404241435.Yxr6Wapq-lkp@intel.com/
>
> New smatch warnings:
> fs/smb/server/smb2pdu.c:1992 smb2_tree_connect() error: uninitialized symbol 'share'.
I will fix it.
Thanks for your report.
^ permalink raw reply [relevance 0%]
* fs/smb/server/smb2pdu.c:1992 smb2_tree_connect() error: uninitialized symbol 'share'.
@ 2024-04-24 6:28 5% Dan Carpenter
2024-04-24 7:21 0% ` Namjae Jeon
0 siblings, 1 reply; 200+ results
From: Dan Carpenter @ 2024-04-24 6:28 UTC (permalink / raw)
To: oe-kbuild, Namjae Jeon; +Cc: lkp, oe-kbuild-all, linux-kernel, Steve French
tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
head: 9d1ddab261f3e2af7c384dc02238784ce0cf9f98
commit: e9d8c2f95ab8acaf3f4d4a53682a4afa3c263692 ksmbd: add continuous availability share parameter
config: x86_64-randconfig-161-20240424 (https://download.01.org/0day-ci/archive/20240424/202404241435.Yxr6Wapq-lkp@intel.com/config)
compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
| Closes: https://lore.kernel.org/r/202404241435.Yxr6Wapq-lkp@intel.com/
New smatch warnings:
fs/smb/server/smb2pdu.c:1992 smb2_tree_connect() error: uninitialized symbol 'share'.
vim +/share +1992 fs/smb/server/smb2pdu.c
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1921 int smb2_tree_connect(struct ksmbd_work *work)
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1922 {
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1923 struct ksmbd_conn *conn = work->conn;
7b7d709ef7cf28 fs/smb/server/smb2pdu.c Namjae Jeon 2023-06-24 1924 struct smb2_tree_connect_req *req;
7b7d709ef7cf28 fs/smb/server/smb2pdu.c Namjae Jeon 2023-06-24 1925 struct smb2_tree_connect_rsp *rsp;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1926 struct ksmbd_session *sess = work->sess;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1927 char *treename = NULL, *name = NULL;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1928 struct ksmbd_tree_conn_status status;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1929 struct ksmbd_share_config *share;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1930 int rc = -EINVAL;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1931
7b7d709ef7cf28 fs/smb/server/smb2pdu.c Namjae Jeon 2023-06-24 1932 WORK_BUFFERS(work, req, rsp);
7b7d709ef7cf28 fs/smb/server/smb2pdu.c Namjae Jeon 2023-06-24 1933
c6cd2e8d2d9aa7 fs/smb/server/smb2pdu.c Namjae Jeon 2024-03-19 1934 treename = smb_strndup_from_utf16((char *)req + le16_to_cpu(req->PathOffset),
070fb21e5912b6 fs/cifsd/smb2pdu.c Namjae Jeon 2021-05-26 1935 le16_to_cpu(req->PathLength), true,
070fb21e5912b6 fs/cifsd/smb2pdu.c Namjae Jeon 2021-05-26 1936 conn->local_nls);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1937 if (IS_ERR(treename)) {
bde1694aecdb53 fs/cifsd/smb2pdu.c Namjae Jeon 2021-06-28 1938 pr_err("treename is NULL\n");
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1939 status.ret = KSMBD_TREE_CONN_STATUS_ERROR;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1940 goto out_err1;
^^^^^^^^^^^^^
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1941 }
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1942
16b5f54e30c1dd fs/ksmbd/smb2pdu.c Atte Heikkilä 2022-09-15 1943 name = ksmbd_extract_sharename(conn->um, treename);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1944 if (IS_ERR(name)) {
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1945 status.ret = KSMBD_TREE_CONN_STATUS_ERROR;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1946 goto out_err1;
^^^^^^^^^^^^^
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1947 }
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1948
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1949 ksmbd_debug(SMB, "tree connect request for tree %s treename %s\n",
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1950 name, treename);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1951
af7c39d971e43c fs/ksmbd/smb2pdu.c Namjae Jeon 2022-07-25 1952 status = ksmbd_tree_conn_connect(conn, sess, name);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1953 if (status.ret == KSMBD_TREE_CONN_STATUS_OK)
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1954 rsp->hdr.Id.SyncId.TreeId = cpu_to_le32(status.tree_conn->id);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1955 else
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1956 goto out_err1;
share is unitialized
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1957
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1958 share = status.tree_conn->share_conf;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1959 if (test_share_config_flag(share, KSMBD_SHARE_FLAG_PIPE)) {
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1960 ksmbd_debug(SMB, "IPC share path request\n");
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1961 rsp->ShareType = SMB2_SHARE_TYPE_PIPE;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1962 rsp->MaximalAccess = FILE_READ_DATA_LE | FILE_READ_EA_LE |
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1963 FILE_EXECUTE_LE | FILE_READ_ATTRIBUTES_LE |
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1964 FILE_DELETE_LE | FILE_READ_CONTROL_LE |
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1965 FILE_WRITE_DAC_LE | FILE_WRITE_OWNER_LE |
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1966 FILE_SYNCHRONIZE_LE;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1967 } else {
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1968 rsp->ShareType = SMB2_SHARE_TYPE_DISK;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1969 rsp->MaximalAccess = FILE_READ_DATA_LE | FILE_READ_EA_LE |
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1970 FILE_EXECUTE_LE | FILE_READ_ATTRIBUTES_LE;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1971 if (test_tree_conn_flag(status.tree_conn,
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1972 KSMBD_TREE_CONN_FLAG_WRITABLE)) {
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1973 rsp->MaximalAccess |= FILE_WRITE_DATA_LE |
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1974 FILE_APPEND_DATA_LE | FILE_WRITE_EA_LE |
3aefd54da5ec6e fs/cifsd/smb2pdu.c Wan Jiabing 2021-06-07 1975 FILE_DELETE_LE | FILE_WRITE_ATTRIBUTES_LE |
3aefd54da5ec6e fs/cifsd/smb2pdu.c Wan Jiabing 2021-06-07 1976 FILE_DELETE_CHILD_LE | FILE_READ_CONTROL_LE |
3aefd54da5ec6e fs/cifsd/smb2pdu.c Wan Jiabing 2021-06-07 1977 FILE_WRITE_DAC_LE | FILE_WRITE_OWNER_LE |
3aefd54da5ec6e fs/cifsd/smb2pdu.c Wan Jiabing 2021-06-07 1978 FILE_SYNCHRONIZE_LE;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1979 }
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1980 }
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1981
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1982 status.tree_conn->maximal_access = le32_to_cpu(rsp->MaximalAccess);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1983 if (conn->posix_ext_supported)
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1984 status.tree_conn->posix_extensions = true;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1985
33b235a6e6ebe0 fs/smb/server/smb2pdu.c Namjae Jeon 2023-10-05 1986 write_lock(&sess->tree_conns_lock);
33b235a6e6ebe0 fs/smb/server/smb2pdu.c Namjae Jeon 2023-10-05 1987 status.tree_conn->t_state = TREE_CONNECTED;
33b235a6e6ebe0 fs/smb/server/smb2pdu.c Namjae Jeon 2023-10-05 1988 write_unlock(&sess->tree_conns_lock);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1989 rsp->StructureSize = cpu_to_le16(16);
cdfb2fef522d0c fs/ksmbd/smb2pdu.c Marios Makassikis 2022-12-23 1990 out_err1:
e9d8c2f95ab8ac fs/smb/server/smb2pdu.c Namjae Jeon 2024-04-20 1991 if (server_conf.flags & KSMBD_GLOBAL_FLAG_DURABLE_HANDLE &&
e9d8c2f95ab8ac fs/smb/server/smb2pdu.c Namjae Jeon 2024-04-20 @1992 test_share_config_flag(share,
^^^^^
e9d8c2f95ab8ac fs/smb/server/smb2pdu.c Namjae Jeon 2024-04-20 1993 KSMBD_SHARE_FLAG_CONTINUOUS_AVAILABILITY))
e9d8c2f95ab8ac fs/smb/server/smb2pdu.c Namjae Jeon 2024-04-20 1994 rsp->Capabilities = SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY;
e9d8c2f95ab8ac fs/smb/server/smb2pdu.c Namjae Jeon 2024-04-20 1995 else
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1996 rsp->Capabilities = 0;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1997 rsp->Reserved = 0;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1998 /* default manual caching */
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1999 rsp->ShareFlags = SMB2_SHAREFLAG_MANUAL_CACHING;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2000
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [relevance 5%]
* fs/smb/server/smb2pdu.c:1992 smb2_tree_connect() error: uninitialized symbol 'share'.
@ 2024-04-24 6:05 6% kernel test robot
0 siblings, 0 replies; 200+ results
From: kernel test robot @ 2024-04-24 6:05 UTC (permalink / raw)
To: oe-kbuild; +Cc: lkp, Dan Carpenter
BCC: lkp@intel.com
CC: oe-kbuild-all@lists.linux.dev
CC: linux-kernel@vger.kernel.org
TO: Namjae Jeon <linkinjeon@kernel.org>
CC: Steve French <stfrench@microsoft.com>
tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
head: 9d1ddab261f3e2af7c384dc02238784ce0cf9f98
commit: e9d8c2f95ab8acaf3f4d4a53682a4afa3c263692 ksmbd: add continuous availability share parameter
date: 4 days ago
:::::: branch date: 13 hours ago
:::::: commit date: 4 days ago
config: x86_64-randconfig-161-20240424 (https://download.01.org/0day-ci/archive/20240424/202404241435.Yxr6Wapq-lkp@intel.com/config)
compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Reported-by: Dan Carpenter <error27@gmail.com>
| Closes: https://lore.kernel.org/r/202404241435.Yxr6Wapq-lkp@intel.com/
New smatch warnings:
fs/smb/server/smb2pdu.c:1992 smb2_tree_connect() error: uninitialized symbol 'share'.
Old smatch warnings:
fs/smb/server/smb2pdu.c:3697 smb2_open() warn: Function too hairy. No more merges.
vim +/share +1992 fs/smb/server/smb2pdu.c
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1914
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1915 /**
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1916 * smb2_tree_connect() - handler for smb2 tree connect command
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1917 * @work: smb work containing smb request buffer
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1918 *
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1919 * Return: 0 on success, otherwise error
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1920 */
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1921 int smb2_tree_connect(struct ksmbd_work *work)
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1922 {
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1923 struct ksmbd_conn *conn = work->conn;
7b7d709ef7cf28 fs/smb/server/smb2pdu.c Namjae Jeon 2023-06-24 1924 struct smb2_tree_connect_req *req;
7b7d709ef7cf28 fs/smb/server/smb2pdu.c Namjae Jeon 2023-06-24 1925 struct smb2_tree_connect_rsp *rsp;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1926 struct ksmbd_session *sess = work->sess;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1927 char *treename = NULL, *name = NULL;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1928 struct ksmbd_tree_conn_status status;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1929 struct ksmbd_share_config *share;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1930 int rc = -EINVAL;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1931
7b7d709ef7cf28 fs/smb/server/smb2pdu.c Namjae Jeon 2023-06-24 1932 WORK_BUFFERS(work, req, rsp);
7b7d709ef7cf28 fs/smb/server/smb2pdu.c Namjae Jeon 2023-06-24 1933
c6cd2e8d2d9aa7 fs/smb/server/smb2pdu.c Namjae Jeon 2024-03-19 1934 treename = smb_strndup_from_utf16((char *)req + le16_to_cpu(req->PathOffset),
070fb21e5912b6 fs/cifsd/smb2pdu.c Namjae Jeon 2021-05-26 1935 le16_to_cpu(req->PathLength), true,
070fb21e5912b6 fs/cifsd/smb2pdu.c Namjae Jeon 2021-05-26 1936 conn->local_nls);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1937 if (IS_ERR(treename)) {
bde1694aecdb53 fs/cifsd/smb2pdu.c Namjae Jeon 2021-06-28 1938 pr_err("treename is NULL\n");
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1939 status.ret = KSMBD_TREE_CONN_STATUS_ERROR;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1940 goto out_err1;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1941 }
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1942
16b5f54e30c1dd fs/ksmbd/smb2pdu.c Atte Heikkilä 2022-09-15 1943 name = ksmbd_extract_sharename(conn->um, treename);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1944 if (IS_ERR(name)) {
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1945 status.ret = KSMBD_TREE_CONN_STATUS_ERROR;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1946 goto out_err1;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1947 }
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1948
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1949 ksmbd_debug(SMB, "tree connect request for tree %s treename %s\n",
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1950 name, treename);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1951
af7c39d971e43c fs/ksmbd/smb2pdu.c Namjae Jeon 2022-07-25 1952 status = ksmbd_tree_conn_connect(conn, sess, name);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1953 if (status.ret == KSMBD_TREE_CONN_STATUS_OK)
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1954 rsp->hdr.Id.SyncId.TreeId = cpu_to_le32(status.tree_conn->id);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1955 else
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1956 goto out_err1;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1957
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1958 share = status.tree_conn->share_conf;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1959 if (test_share_config_flag(share, KSMBD_SHARE_FLAG_PIPE)) {
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1960 ksmbd_debug(SMB, "IPC share path request\n");
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1961 rsp->ShareType = SMB2_SHARE_TYPE_PIPE;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1962 rsp->MaximalAccess = FILE_READ_DATA_LE | FILE_READ_EA_LE |
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1963 FILE_EXECUTE_LE | FILE_READ_ATTRIBUTES_LE |
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1964 FILE_DELETE_LE | FILE_READ_CONTROL_LE |
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1965 FILE_WRITE_DAC_LE | FILE_WRITE_OWNER_LE |
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1966 FILE_SYNCHRONIZE_LE;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1967 } else {
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1968 rsp->ShareType = SMB2_SHARE_TYPE_DISK;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1969 rsp->MaximalAccess = FILE_READ_DATA_LE | FILE_READ_EA_LE |
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1970 FILE_EXECUTE_LE | FILE_READ_ATTRIBUTES_LE;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1971 if (test_tree_conn_flag(status.tree_conn,
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1972 KSMBD_TREE_CONN_FLAG_WRITABLE)) {
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1973 rsp->MaximalAccess |= FILE_WRITE_DATA_LE |
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1974 FILE_APPEND_DATA_LE | FILE_WRITE_EA_LE |
3aefd54da5ec6e fs/cifsd/smb2pdu.c Wan Jiabing 2021-06-07 1975 FILE_DELETE_LE | FILE_WRITE_ATTRIBUTES_LE |
3aefd54da5ec6e fs/cifsd/smb2pdu.c Wan Jiabing 2021-06-07 1976 FILE_DELETE_CHILD_LE | FILE_READ_CONTROL_LE |
3aefd54da5ec6e fs/cifsd/smb2pdu.c Wan Jiabing 2021-06-07 1977 FILE_WRITE_DAC_LE | FILE_WRITE_OWNER_LE |
3aefd54da5ec6e fs/cifsd/smb2pdu.c Wan Jiabing 2021-06-07 1978 FILE_SYNCHRONIZE_LE;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1979 }
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1980 }
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1981
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1982 status.tree_conn->maximal_access = le32_to_cpu(rsp->MaximalAccess);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1983 if (conn->posix_ext_supported)
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1984 status.tree_conn->posix_extensions = true;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1985
33b235a6e6ebe0 fs/smb/server/smb2pdu.c Namjae Jeon 2023-10-05 1986 write_lock(&sess->tree_conns_lock);
33b235a6e6ebe0 fs/smb/server/smb2pdu.c Namjae Jeon 2023-10-05 1987 status.tree_conn->t_state = TREE_CONNECTED;
33b235a6e6ebe0 fs/smb/server/smb2pdu.c Namjae Jeon 2023-10-05 1988 write_unlock(&sess->tree_conns_lock);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1989 rsp->StructureSize = cpu_to_le16(16);
cdfb2fef522d0c fs/ksmbd/smb2pdu.c Marios Makassikis 2022-12-23 1990 out_err1:
e9d8c2f95ab8ac fs/smb/server/smb2pdu.c Namjae Jeon 2024-04-20 1991 if (server_conf.flags & KSMBD_GLOBAL_FLAG_DURABLE_HANDLE &&
e9d8c2f95ab8ac fs/smb/server/smb2pdu.c Namjae Jeon 2024-04-20 @1992 test_share_config_flag(share,
e9d8c2f95ab8ac fs/smb/server/smb2pdu.c Namjae Jeon 2024-04-20 1993 KSMBD_SHARE_FLAG_CONTINUOUS_AVAILABILITY))
e9d8c2f95ab8ac fs/smb/server/smb2pdu.c Namjae Jeon 2024-04-20 1994 rsp->Capabilities = SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY;
e9d8c2f95ab8ac fs/smb/server/smb2pdu.c Namjae Jeon 2024-04-20 1995 else
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1996 rsp->Capabilities = 0;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1997 rsp->Reserved = 0;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1998 /* default manual caching */
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 1999 rsp->ShareFlags = SMB2_SHAREFLAG_MANUAL_CACHING;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2000
e2b76ab8b5c932 fs/smb/server/smb2pdu.c Namjae Jeon 2023-08-29 2001 rc = ksmbd_iov_pin_rsp(work, rsp, sizeof(struct smb2_tree_connect_rsp));
e2b76ab8b5c932 fs/smb/server/smb2pdu.c Namjae Jeon 2023-08-29 2002 if (rc)
e2b76ab8b5c932 fs/smb/server/smb2pdu.c Namjae Jeon 2023-08-29 2003 status.ret = KSMBD_TREE_CONN_STATUS_NOMEM;
e2b76ab8b5c932 fs/smb/server/smb2pdu.c Namjae Jeon 2023-08-29 2004
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2005 if (!IS_ERR(treename))
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2006 kfree(treename);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2007 if (!IS_ERR(name))
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2008 kfree(name);
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2009
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2010 switch (status.ret) {
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2011 case KSMBD_TREE_CONN_STATUS_OK:
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2012 rsp->hdr.Status = STATUS_SUCCESS;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2013 rc = 0;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2014 break;
4963d74f8a6cc0 fs/ksmbd/smb2pdu.c Atte Heikkilä 2022-08-09 2015 case -ESTALE:
fe54833dc8d97e fs/ksmbd/smb2pdu.c Namjae Jeon 2022-08-08 2016 case -ENOENT:
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2017 case KSMBD_TREE_CONN_STATUS_NO_SHARE:
fe54833dc8d97e fs/ksmbd/smb2pdu.c Namjae Jeon 2022-08-08 2018 rsp->hdr.Status = STATUS_BAD_NETWORK_NAME;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2019 break;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2020 case -ENOMEM:
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2021 case KSMBD_TREE_CONN_STATUS_NOMEM:
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2022 rsp->hdr.Status = STATUS_NO_MEMORY;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2023 break;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2024 case KSMBD_TREE_CONN_STATUS_ERROR:
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2025 case KSMBD_TREE_CONN_STATUS_TOO_MANY_CONNS:
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2026 case KSMBD_TREE_CONN_STATUS_TOO_MANY_SESSIONS:
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2027 rsp->hdr.Status = STATUS_ACCESS_DENIED;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2028 break;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2029 case -EINVAL:
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2030 rsp->hdr.Status = STATUS_INVALID_PARAMETER;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2031 break;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2032 default:
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2033 rsp->hdr.Status = STATUS_ACCESS_DENIED;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2034 }
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2035
cdfb2fef522d0c fs/ksmbd/smb2pdu.c Marios Makassikis 2022-12-23 2036 if (status.ret != KSMBD_TREE_CONN_STATUS_OK)
cdfb2fef522d0c fs/ksmbd/smb2pdu.c Marios Makassikis 2022-12-23 2037 smb2_set_err_rsp(work);
cdfb2fef522d0c fs/ksmbd/smb2pdu.c Marios Makassikis 2022-12-23 2038
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2039 return rc;
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2040 }
e2f34481b24db2 fs/cifsd/smb2pdu.c Namjae Jeon 2021-03-16 2041
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [relevance 6%]
* [PATCH 5.15 00/71] 5.15.157-rc1 review
@ 2024-04-23 21:39 5% Greg Kroah-Hartman
2024-04-23 21:39 15% ` [PATCH 5.15 01/71] ksmbd: dont send oplock break if rename fails Greg Kroah-Hartman
` (2 more replies)
0 siblings, 3 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:39 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 5.15.157 release.
There are 71 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Thu, 25 Apr 2024 21:38:28 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.157-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 5.15.157-rc1
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
Vladimir Oltean <olteanv@gmail.com>
net: dsa: introduce preferred_default_local_cpu_port and use on MT7530
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: set all CPU ports in MT7531_CPU_PMAP
Jeongjun Park <aha310510@gmail.com>
nilfs2: fix OOB in nilfs_set_de_type
Dave Airlie <airlied@redhat.com>
nouveau: fix instmem race condition around ptr stores
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Sort primary plane formats by order of preference
xinhui pan <xinhui.pan@amd.com>
drm/amdgpu: validate the parameters of bo mapping operations more clearly
Carlos Llamas <cmllamas@google.com>
binder: check offset alignment in binder_get_object()
Yuntao Wang <ytcoode@gmail.com>
init/main.c: Fix potential static_command_line memory overflow
Yaxiong Tian <tianyaxiong@kylinos.cn>
arm64: hibernate: Fix level3 translation fault in swsusp_save()
Sandipan Das <sandipan.das@amd.com>
KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
Sean Christopherson <seanjc@google.com>
KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
Alan Stern <stern@rowland.harvard.edu>
fs: sysfs: Fix reference leak in sysfs_break_active_protection()
Samuel Thibault <samuel.thibault@ens-lyon.org>
speakup: Avoid crash on very long word
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: disable RPL-S on SPS and IGN firmwares
Norihiko Hama <Norihiko.Hama@alpsalpine.com>
usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
Kai-Heng Feng <kai.heng.feng@canonical.com>
usb: Disable USB3 LPM at shutdown
Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
usb: dwc2: host: Fix dereference issue in DDMA completion flow.
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Revert "usb: cdc-wdm: close race between read and workqueue"
Daniele Palmas <dnlplm@gmail.com>
USB: serial: option: add Telit FN920C04 rmnet compositions
Vanillan Wang <vanillanwang@163.com>
USB: serial: option: add Rolling RW101-GL and RW135-GL support
Jerry Meng <jerry-meng@foxmail.com>
USB: serial: option: support Quectel EM060K sub-models
Coia Prant <coiaprant@gmail.com>
USB: serial: option: add Lonsung U8300/U9300 product
Chuanhong Guo <gch981213@gmail.com>
USB: serial: option: add support for Fibocom FM650/FG650
bolan wang <bolan.wang@fibocom.com>
USB: serial: option: add Fibocom FM135-GL variants
Finn Thain <fthain@linux-m68k.org>
serial/pmac_zilog: Remove flawed mitigation for rx irq flood
Nikita Zhandarovich <n.zhandarovich@fintech.ru>
comedi: vmk80xx: fix incomplete endpoint checking
Gil Fine <gil.fine@linux.intel.com>
thunderbolt: Fix wake configurations after device unplug
Gil Fine <gil.fine@linux.intel.com>
thunderbolt: Avoid notify PM core about runtime PM resume
Eric Biggers <ebiggers@google.com>
x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
Josh Poimboeuf <jpoimboe@kernel.org>
x86/bugs: Fix BHI retpoline check
Stephen Boyd <sboyd@kernel.org>
clk: Get runtime PM before walking tree during disable_unused
Stephen Boyd <sboyd@kernel.org>
clk: Initialize struct clk_core kref earlier
Konrad Dybcio <konrad.dybcio@linaro.org>
clk: Print an info line before disabling unused clocks
Claudiu Beznea <claudiu.beznea@microchip.com>
clk: remove extra empty line
Stephen Boyd <sboyd@kernel.org>
clk: Mark 'all_lists' as const
Stephen Boyd <sboyd@kernel.org>
clk: Remove prepare_lock hold assertion in __clk_release()
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
drm/panel: visionox-rm69299: don't unregister DSI device
Mikhail Kobuk <m.kobuk@ispras.ru>
drm: nv04: Fix out of bounds access
Peter Oberparleiter <oberpar@linux.ibm.com>
s390/cio: fix race condition during online processing
Peter Oberparleiter <oberpar@linux.ibm.com>
s390/qdio: handle deferred cc1
Michael Guralnik <michaelgur@nvidia.com>
RDMA/mlx5: Fix port number for counter query in multi-port configuration
Mark Zhang <markzhang@nvidia.com>
RDMA/cm: Print the old state when cm_destroy_id gets timeout
Yanjun.Zhu <yanjun.zhu@linux.dev>
RDMA/rxe: Fix the problem "mutex_destroy missing"
Siddharth Vadapalli <s-vadapalli@ti.com>
net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix mirroring frames received on local port
Lei Chen <lei.chen@smartx.com>
tun: limit printing rate when illegal packet received by tun dev
Kuniyuki Iwashima <kuniyu@amazon.com>
af_unix: Don't peek OOB data without MSG_OOB.
Kuniyuki Iwashima <kuniyu@amazon.com>
af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: flowtable: incorrect pppoe tuple
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: flowtable: validate pppoe header
Vlad Buslov <vladbu@nvidia.com>
netfilter: nf_flow_table: count pending offload workqueue tasks
Florian Westphal <fw@strlen.de>
netfilter: nft_set_pipapo: do not free live element
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: br_netfilter: skip conntrack input hook for promisc packets
Ziyang Xuan <william.xuanziyang@huawei.com>
netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
Ziyang Xuan <william.xuanziyang@huawei.com>
netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
Chuck Lever <chuck.lever@oracle.com>
Revert "lockd: introduce safe async lock op"
Siddh Raman Pant <siddh.raman.pant@oracle.com>
Revert "tracing/trigger: Fix to return error if failed to alloc snapshot"
Zheng Yejian <zhengyejian1@huawei.com>
kprobes: Fix possible use-after-free issue on kprobe registration
Daniel Borkmann <daniel@iogearbox.net>
bpf: Fix ringbuf memory type confusion when passing to helpers
Daniel Borkmann <daniel@iogearbox.net>
bpf: Fix out of bounds access for ringbuf helpers
Daniel Borkmann <daniel@iogearbox.net>
bpf: Generally fix helper register offset check
Daniel Borkmann <daniel@iogearbox.net>
bpf: Generalize check_ctx_reg for reuse with other types
Kumar Kartikeya Dwivedi <memxor@gmail.com>
bpf: Extend kfunc with PTR_TO_CTX, PTR_TO_MEM argument support
Yuanhe Shu <xiangzao@linux.alibaba.com>
selftests/ftrace: Limit length in subsystem-enable tests
Steven Rostedt (Google) <rostedt@goodmis.org>
SUNRPC: Fix rpcgss_context trace event acceptor field
Boris Burkov <boris@bur.io>
btrfs: record delayed inode root in transaction
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: validate payload size in ipc response
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: don't send oplock break if rename fails
-------------
Diffstat:
Documentation/filesystems/nfs/exporting.rst | 7 -
Makefile | 4 +-
arch/arm64/mm/pageattr.c | 3 -
arch/x86/include/asm/kvm_host.h | 1 +
arch/x86/kernel/cpu/bugs.c | 11 +-
arch/x86/kernel/cpu/cpuid-deps.c | 6 +-
arch/x86/kvm/cpuid.c | 1 +
arch/x86/kvm/cpuid.h | 10 ++
arch/x86/kvm/lapic.c | 3 +-
arch/x86/kvm/mmu/mmu.c | 2 +-
arch/x86/kvm/x86.c | 2 +-
drivers/accessibility/speakup/main.c | 2 +-
drivers/android/binder.c | 4 +-
drivers/clk/clk.c | 154 ++++++++++++++++-----
drivers/comedi/drivers/vmk80xx.c | 35 ++---
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 72 ++++++----
drivers/gpu/drm/nouveau/nouveau_bios.c | 13 +-
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 7 +-
drivers/gpu/drm/panel/panel-visionox-rm69299.c | 2 -
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +-
drivers/infiniband/core/cm.c | 11 +-
drivers/infiniband/hw/mlx5/mad.c | 3 +-
drivers/infiniband/sw/rxe/rxe.c | 2 +
drivers/misc/mei/pci-me.c | 2 +-
drivers/net/dsa/mt7530.c | 60 +++++---
drivers/net/dsa/mt7530.h | 6 +
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 18 +++
drivers/net/tun.c | 18 +--
drivers/s390/cio/device.c | 13 +-
drivers/s390/cio/qdio_main.c | 28 +++-
drivers/thunderbolt/switch.c | 50 +++++--
drivers/thunderbolt/tb.c | 4 +-
drivers/thunderbolt/tb.h | 3 +-
drivers/thunderbolt/usb4.c | 13 +-
drivers/tty/serial/pmac_zilog.c | 14 --
drivers/usb/class/cdc-wdm.c | 6 +-
drivers/usb/core/port.c | 4 +-
drivers/usb/dwc2/hcd_ddma.c | 4 +-
drivers/usb/gadget/function/f_ncm.c | 4 +-
drivers/usb/serial/option.c | 40 ++++++
fs/btrfs/delayed-inode.c | 3 +
fs/ksmbd/ksmbd_netlink.h | 3 +-
fs/ksmbd/mgmt/share_config.c | 7 +-
fs/ksmbd/smb2ops.c | 10 +-
fs/ksmbd/smb2pdu.c | 3 +-
fs/ksmbd/transport_ipc.c | 37 +++++
fs/lockd/svclock.c | 4 +-
fs/nfsd/nfs4state.c | 10 +-
fs/nilfs2/dir.c | 2 +-
fs/sysfs/file.c | 2 +
include/linux/bpf.h | 9 +-
include/linux/bpf_verifier.h | 4 +-
include/linux/exportfs.h | 14 --
include/net/dsa.h | 8 ++
include/net/net_namespace.h | 6 +
include/net/netfilter/nf_flow_table.h | 33 ++++-
include/net/netns/flow_table.h | 14 ++
include/trace/events/rpcgss.h | 4 +-
init/main.c | 2 +
kernel/bpf/btf.c | 93 ++++++++++---
kernel/bpf/verifier.c | 66 ++++++---
kernel/kprobes.c | 18 ++-
kernel/trace/trace_events_trigger.c | 6 +-
net/bridge/br_input.c | 15 +-
net/bridge/br_netfilter_hooks.c | 6 +
net/bridge/br_private.h | 1 +
net/bridge/netfilter/nf_conntrack_bridge.c | 14 +-
net/dsa/dsa2.c | 24 +++-
net/netfilter/Kconfig | 9 ++
net/netfilter/Makefile | 1 +
net/netfilter/nf_flow_table_core.c | 62 ++++++++-
net/netfilter/nf_flow_table_inet.c | 3 +-
net/netfilter/nf_flow_table_ip.c | 10 +-
net/netfilter/nf_flow_table_offload.c | 17 ++-
net/netfilter/nf_flow_table_procfs.c | 80 +++++++++++
net/netfilter/nf_tables_api.c | 16 ++-
net/netfilter/nft_set_pipapo.c | 14 +-
net/unix/af_unix.c | 12 +-
.../ftrace/test.d/event/subsystem-enable.tc | 6 +-
79 files changed, 973 insertions(+), 321 deletions(-)
^ permalink raw reply [relevance 5%]
* [PATCH 5.15 03/71] ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
2024-04-23 21:39 5% [PATCH 5.15 00/71] 5.15.157-rc1 review Greg Kroah-Hartman
2024-04-23 21:39 15% ` [PATCH 5.15 01/71] ksmbd: dont send oplock break if rename fails Greg Kroah-Hartman
2024-04-23 21:39 17% ` [PATCH 5.15 02/71] ksmbd: validate payload size in ipc response Greg Kroah-Hartman
@ 2024-04-23 21:39 15% ` Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:39 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, James Christopher Adduono,
Namjae Jeon, Steve French, Sasha Levin
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
[ Upstream commit 5ed11af19e56f0434ce0959376d136005745a936 ]
SMB2_GLOBAL_CAP_ENCRYPTION flag should be used only for 3.0 and
3.0.2 dialects. This flags set cause compatibility problems with
other SMB clients.
Reported-by: James Christopher Adduono <jc@adduono.com>
Tested-by: James Christopher Adduono <jc@adduono.com>
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/ksmbd/smb2ops.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/ksmbd/smb2ops.c b/fs/ksmbd/smb2ops.c
index c69943d96565a..d0db9f32c423d 100644
--- a/fs/ksmbd/smb2ops.c
+++ b/fs/ksmbd/smb2ops.c
@@ -229,6 +229,11 @@ void init_smb3_0_server(struct ksmbd_conn *conn)
conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION)
conn->vals->capabilities |= SMB2_GLOBAL_CAP_ENCRYPTION;
+ if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION ||
+ (!(server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION_OFF) &&
+ conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION))
+ conn->vals->capabilities |= SMB2_GLOBAL_CAP_ENCRYPTION;
+
if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL)
conn->vals->capabilities |= SMB2_GLOBAL_CAP_MULTI_CHANNEL;
}
@@ -276,11 +281,6 @@ int init_smb3_11_server(struct ksmbd_conn *conn)
conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING |
SMB2_GLOBAL_CAP_DIRECTORY_LEASING;
- if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION ||
- (!(server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION_OFF) &&
- conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION))
- conn->vals->capabilities |= SMB2_GLOBAL_CAP_ENCRYPTION;
-
if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL)
conn->vals->capabilities |= SMB2_GLOBAL_CAP_MULTI_CHANNEL;
--
2.43.0
^ permalink raw reply related [relevance 15%]
* [PATCH 5.15 02/71] ksmbd: validate payload size in ipc response
2024-04-23 21:39 5% [PATCH 5.15 00/71] 5.15.157-rc1 review Greg Kroah-Hartman
2024-04-23 21:39 15% ` [PATCH 5.15 01/71] ksmbd: dont send oplock break if rename fails Greg Kroah-Hartman
@ 2024-04-23 21:39 17% ` Greg Kroah-Hartman
2024-04-23 21:39 15% ` [PATCH 5.15 03/71] ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1 Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:39 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, Chao Ma, Namjae Jeon, Steve French,
Sasha Levin
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
[ Upstream commit a677ebd8ca2f2632ccdecbad7b87641274e15aac ]
If installing malicious ksmbd-tools, ksmbd.mountd can return invalid ipc
response to ksmbd kernel server. ksmbd should validate payload size of
ipc response from ksmbd.mountd to avoid memory overrun or
slab-out-of-bounds. This patch validate 3 ipc response that has payload.
Cc: stable@vger.kernel.org
Reported-by: Chao Ma <machao2019@gmail.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/ksmbd/ksmbd_netlink.h | 3 ++-
fs/ksmbd/mgmt/share_config.c | 7 ++++++-
fs/ksmbd/transport_ipc.c | 37 ++++++++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/fs/ksmbd/ksmbd_netlink.h b/fs/ksmbd/ksmbd_netlink.h
index ecffcb8a1557a..dc30cd0f6acd0 100644
--- a/fs/ksmbd/ksmbd_netlink.h
+++ b/fs/ksmbd/ksmbd_netlink.h
@@ -166,7 +166,8 @@ struct ksmbd_share_config_response {
__u16 force_uid;
__u16 force_gid;
__s8 share_name[KSMBD_REQ_MAX_SHARE_NAME];
- __u32 reserved[112]; /* Reserved room */
+ __u32 reserved[111]; /* Reserved room */
+ __u32 payload_sz;
__u32 veto_list_sz;
__s8 ____payload[];
};
diff --git a/fs/ksmbd/mgmt/share_config.c b/fs/ksmbd/mgmt/share_config.c
index 328a412259dc1..a2f0a2edceb8a 100644
--- a/fs/ksmbd/mgmt/share_config.c
+++ b/fs/ksmbd/mgmt/share_config.c
@@ -158,7 +158,12 @@ static struct ksmbd_share_config *share_config_request(struct unicode_map *um,
share->name = kstrdup(name, GFP_KERNEL);
if (!test_share_config_flag(share, KSMBD_SHARE_FLAG_PIPE)) {
- share->path = kstrdup(ksmbd_share_config_path(resp),
+ int path_len = PATH_MAX;
+
+ if (resp->payload_sz)
+ path_len = resp->payload_sz - resp->veto_list_sz;
+
+ share->path = kstrndup(ksmbd_share_config_path(resp), path_len,
GFP_KERNEL);
if (share->path)
share->path_sz = strlen(share->path);
diff --git a/fs/ksmbd/transport_ipc.c b/fs/ksmbd/transport_ipc.c
index 2c9662e327990..d62ebbff1e0f4 100644
--- a/fs/ksmbd/transport_ipc.c
+++ b/fs/ksmbd/transport_ipc.c
@@ -65,6 +65,7 @@ struct ipc_msg_table_entry {
struct hlist_node ipc_table_hlist;
void *response;
+ unsigned int msg_sz;
};
static struct delayed_work ipc_timer_work;
@@ -274,6 +275,7 @@ static int handle_response(int type, void *payload, size_t sz)
}
memcpy(entry->response, payload, sz);
+ entry->msg_sz = sz;
wake_up_interruptible(&entry->wait);
ret = 0;
break;
@@ -452,6 +454,34 @@ static int ipc_msg_send(struct ksmbd_ipc_msg *msg)
return ret;
}
+static int ipc_validate_msg(struct ipc_msg_table_entry *entry)
+{
+ unsigned int msg_sz = entry->msg_sz;
+
+ if (entry->type == KSMBD_EVENT_RPC_REQUEST) {
+ struct ksmbd_rpc_command *resp = entry->response;
+
+ msg_sz = sizeof(struct ksmbd_rpc_command) + resp->payload_sz;
+ } else if (entry->type == KSMBD_EVENT_SPNEGO_AUTHEN_REQUEST) {
+ struct ksmbd_spnego_authen_response *resp = entry->response;
+
+ msg_sz = sizeof(struct ksmbd_spnego_authen_response) +
+ resp->session_key_len + resp->spnego_blob_len;
+ } else if (entry->type == KSMBD_EVENT_SHARE_CONFIG_REQUEST) {
+ struct ksmbd_share_config_response *resp = entry->response;
+
+ if (resp->payload_sz) {
+ if (resp->payload_sz < resp->veto_list_sz)
+ return -EINVAL;
+
+ msg_sz = sizeof(struct ksmbd_share_config_response) +
+ resp->payload_sz;
+ }
+ }
+
+ return entry->msg_sz != msg_sz ? -EINVAL : 0;
+}
+
static void *ipc_msg_send_request(struct ksmbd_ipc_msg *msg, unsigned int handle)
{
struct ipc_msg_table_entry entry;
@@ -476,6 +506,13 @@ static void *ipc_msg_send_request(struct ksmbd_ipc_msg *msg, unsigned int handle
ret = wait_event_interruptible_timeout(entry.wait,
entry.response != NULL,
IPC_WAIT_TIMEOUT);
+ if (entry.response) {
+ ret = ipc_validate_msg(&entry);
+ if (ret) {
+ kvfree(entry.response);
+ entry.response = NULL;
+ }
+ }
out:
down_write(&ipc_msg_table_lock);
hash_del(&entry.ipc_table_hlist);
--
2.43.0
^ permalink raw reply related [relevance 17%]
* [PATCH 5.15 01/71] ksmbd: dont send oplock break if rename fails
2024-04-23 21:39 5% [PATCH 5.15 00/71] 5.15.157-rc1 review Greg Kroah-Hartman
@ 2024-04-23 21:39 15% ` Greg Kroah-Hartman
2024-04-23 21:39 17% ` [PATCH 5.15 02/71] ksmbd: validate payload size in ipc response Greg Kroah-Hartman
2024-04-23 21:39 15% ` [PATCH 5.15 03/71] ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1 Greg Kroah-Hartman
2 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:39 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French, Sasha Levin
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
[ Upstream commit c1832f67035dc04fb89e6b591b64e4d515843cda ]
Don't send oplock break if rename fails. This patch fix
smb2.oplock.batch20 test.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/ksmbd/smb2pdu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index 14cd86a14012f..86b1fb43104e9 100644
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -5581,8 +5581,9 @@ static int smb2_rename(struct ksmbd_work *work,
if (!file_info->ReplaceIfExists)
flags = RENAME_NOREPLACE;
- smb_break_all_levII_oplock(work, fp, 0);
rc = ksmbd_vfs_rename(work, &fp->filp->f_path, new_name, flags);
+ if (!rc)
+ smb_break_all_levII_oplock(work, fp, 0);
out:
kfree(new_name);
return rc;
--
2.43.0
^ permalink raw reply related [relevance 15%]
* [PATCH 6.1 139/141] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
2024-04-23 21:37 3% [PATCH 6.1 000/141] 6.1.88-rc1 review Greg Kroah-Hartman
2024-04-23 21:40 4% ` [PATCH 6.1 137/141] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
2024-04-23 21:40 4% ` [PATCH 6.1 138/141] ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
@ 2024-04-23 21:40 4% ` Greg Kroah-Hartman
2024-04-23 21:40 4% ` [PATCH 6.1 140/141] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info Greg Kroah-Hartman
3 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:40 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, Marios Makassikis, Namjae Jeon,
Steve French
6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marios Makassikis <mmakassikis@freebox.fr>
commit 4973b04d3ea577db80c501c5f14e68ec69fe1794 upstream.
File overwrite case is explicitly handled, so it is not necessary to
pass RENAME_NOREPLACE to vfs_rename.
Clearing the flag fixes rename operations when the share is a ntfs-3g
mount. The latter uses an older version of fuse with no support for
flags in the ->rename op.
Cc: stable@vger.kernel.org
Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/vfs.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/fs/smb/server/vfs.c
+++ b/fs/smb/server/vfs.c
@@ -746,10 +746,15 @@ retry:
goto out4;
}
+ /*
+ * explicitly handle file overwrite case, for compatibility with
+ * filesystems that may not support rename flags (e.g: fuse)
+ */
if ((flags & RENAME_NOREPLACE) && d_is_positive(new_dentry)) {
err = -EEXIST;
goto out4;
}
+ flags &= ~(RENAME_NOREPLACE);
if (old_child == trap) {
err = -EINVAL;
^ permalink raw reply [relevance 4%]
* [PATCH 6.1 140/141] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
2024-04-23 21:37 3% [PATCH 6.1 000/141] 6.1.88-rc1 review Greg Kroah-Hartman
` (2 preceding siblings ...)
2024-04-23 21:40 4% ` [PATCH 6.1 139/141] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Greg Kroah-Hartman
@ 2024-04-23 21:40 4% ` Greg Kroah-Hartman
3 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:40 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French
6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit 0268a7cc7fdc47d90b6c18859de7718d5059f6f1 upstream.
4byte padding cause the connection issue with the applications of MacOS.
smb2_close response size increases by 4 bytes by padding, And the smb
client of MacOS check it and stop the connection. This patch use
struct_group_attr instead of struct_group for network_open_info to use
__packed to avoid padding.
Fixes: 0015eb6e1238 ("smb: client, common: fix fortify warnings")
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/common/smb2pdu.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/smb/common/smb2pdu.h
+++ b/fs/smb/common/smb2pdu.h
@@ -699,7 +699,7 @@ struct smb2_close_rsp {
__le16 StructureSize; /* 60 */
__le16 Flags;
__le32 Reserved;
- struct_group(network_open_info,
+ struct_group_attr(network_open_info, __packed,
__le64 CreationTime;
__le64 LastAccessTime;
__le64 LastWriteTime;
^ permalink raw reply [relevance 4%]
* [PATCH 6.1 138/141] ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
2024-04-23 21:37 3% [PATCH 6.1 000/141] 6.1.88-rc1 review Greg Kroah-Hartman
2024-04-23 21:40 4% ` [PATCH 6.1 137/141] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
@ 2024-04-23 21:40 4% ` Greg Kroah-Hartman
2024-04-23 21:40 4% ` [PATCH 6.1 139/141] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Greg Kroah-Hartman
2024-04-23 21:40 4% ` [PATCH 6.1 140/141] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info Greg Kroah-Hartman
3 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:40 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French
6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit 17cf0c2794bdb6f39671265aa18aea5c22ee8c4a upstream.
The response buffer should be allocated in smb2_allocate_rsp_buf
before validating request. But the fields in payload as well as smb2 header
is used in smb2_allocate_rsp_buf(). This patch add simple buffer size
validation to avoid potencial out-of-bounds in request buffer.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/smb2pdu.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -534,6 +534,10 @@ int smb2_allocate_rsp_buf(struct ksmbd_w
if (cmd == SMB2_QUERY_INFO_HE) {
struct smb2_query_info_req *req;
+ if (get_rfc1002_len(work->request_buf) <
+ offsetof(struct smb2_query_info_req, OutputBufferLength))
+ return -EINVAL;
+
req = smb2_get_msg(work->request_buf);
if ((req->InfoType == SMB2_O_INFO_FILE &&
(req->FileInfoClass == FILE_FULL_EA_INFORMATION ||
^ permalink raw reply [relevance 4%]
* [PATCH 6.1 137/141] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
2024-04-23 21:37 3% [PATCH 6.1 000/141] 6.1.88-rc1 review Greg Kroah-Hartman
@ 2024-04-23 21:40 4% ` Greg Kroah-Hartman
2024-04-23 21:40 4% ` [PATCH 6.1 138/141] ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
` (2 subsequent siblings)
3 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:40 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, Norbert Szetei, Namjae Jeon, Steve French
6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit c119f4ede3fa90a9463f50831761c28f989bfb20 upstream.
If ->ProtocolId is SMB2_TRANSFORM_PROTO_NUM, smb2 request size
validation could be skipped. if request size is smaller than
sizeof(struct smb2_query_info_req), slab-out-of-bounds read can happen in
smb2_allocate_rsp_buf(). This patch allocate response buffer after
decrypting transform request. smb3_decrypt_req() will validate transform
request size and avoid slab-out-of-bound in smb2_allocate_rsp_buf().
Reported-by: Norbert Szetei <norbert@doyensec.com>
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/server.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
--- a/fs/smb/server/server.c
+++ b/fs/smb/server/server.c
@@ -167,20 +167,17 @@ static void __handle_ksmbd_work(struct k
int rc;
bool is_chained = false;
- if (conn->ops->allocate_rsp_buf(work))
- return;
-
if (conn->ops->is_transform_hdr &&
conn->ops->is_transform_hdr(work->request_buf)) {
rc = conn->ops->decrypt_req(work);
- if (rc < 0) {
- conn->ops->set_rsp_status(work, STATUS_DATA_ERROR);
- goto send;
- }
-
+ if (rc < 0)
+ return;
work->encrypted = true;
}
+ if (conn->ops->allocate_rsp_buf(work))
+ return;
+
rc = conn->ops->init_rsp_hdr(work);
if (rc) {
/* either uid or tid is not correct */
^ permalink raw reply [relevance 4%]
* [PATCH 6.1 000/141] 6.1.88-rc1 review
@ 2024-04-23 21:37 3% Greg Kroah-Hartman
2024-04-23 21:40 4% ` [PATCH 6.1 137/141] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
` (3 more replies)
0 siblings, 4 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:37 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 6.1.88 release.
There are 141 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Thu, 25 Apr 2024 21:38:28 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.88-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 6.1.88-rc1
Johan Hovold <johan+linaro@kernel.org>
PCI/ASPM: Fix deadlock when enabling ASPM
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
Marios Makassikis <mmakassikis@freebox.fr>
ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
Vladimir Oltean <olteanv@gmail.com>
net: dsa: introduce preferred_default_local_cpu_port and use on MT7530
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: set all CPU ports in MT7531_CPU_PMAP
Jeongjun Park <aha310510@gmail.com>
nilfs2: fix OOB in nilfs_set_de_type
Qiang Zhang <qiang4.zhang@intel.com>
bootconfig: use memblock_free_late to free xbc memory to buddy
Dave Airlie <airlied@redhat.com>
nouveau: fix instmem race condition around ptr stores
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix crtc's atomic check conditional
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Sort primary plane formats by order of preference
xinhui pan <xinhui.pan@amd.com>
drm/amdgpu: validate the parameters of bo mapping operations more clearly
Miaohe Lin <linmiaohe@huawei.com>
mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled
Yuntao Wang <ytcoode@gmail.com>
init/main.c: Fix potential static_command_line memory overflow
Yaxiong Tian <tianyaxiong@kylinos.cn>
arm64: hibernate: Fix level3 translation fault in swsusp_save()
Sandipan Das <sandipan.das@amd.com>
KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
Sean Christopherson <seanjc@google.com>
KVM: x86/pmu: Disable support for adaptive PEBS
Sean Christopherson <seanjc@google.com>
KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
Alan Stern <stern@rowland.harvard.edu>
fs: sysfs: Fix reference leak in sysfs_break_active_protection()
Samuel Thibault <samuel.thibault@ens-lyon.org>
speakup: Avoid crash on very long word
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: disable RPL-S on SPS and IGN firmwares
Norihiko Hama <Norihiko.Hama@alpsalpine.com>
usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
Kai-Heng Feng <kai.heng.feng@canonical.com>
usb: Disable USB3 LPM at shutdown
Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
usb: dwc2: host: Fix dereference issue in DDMA completion flow.
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Revert "usb: cdc-wdm: close race between read and workqueue"
Daniele Palmas <dnlplm@gmail.com>
USB: serial: option: add Telit FN920C04 rmnet compositions
Vanillan Wang <vanillanwang@163.com>
USB: serial: option: add Rolling RW101-GL and RW135-GL support
Jerry Meng <jerry-meng@foxmail.com>
USB: serial: option: support Quectel EM060K sub-models
Coia Prant <coiaprant@gmail.com>
USB: serial: option: add Lonsung U8300/U9300 product
Chuanhong Guo <gch981213@gmail.com>
USB: serial: option: add support for Fibocom FM650/FG650
bolan wang <bolan.wang@fibocom.com>
USB: serial: option: add Fibocom FM135-GL variants
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
serial: stm32: Reset .throttled state in .startup()
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
serial: stm32: Return IRQ_NONE in the ISR if no handling happend
Finn Thain <fthain@linux-m68k.org>
serial/pmac_zilog: Remove flawed mitigation for rx irq flood
Emil Kronborg <emil.kronborg@protonmail.com>
serial: mxs-auart: add spinlock around changing cts state
Nikita Zhandarovich <n.zhandarovich@fintech.ru>
comedi: vmk80xx: fix incomplete endpoint checking
Gil Fine <gil.fine@linux.intel.com>
thunderbolt: Fix wake configurations after device unplug
Gil Fine <gil.fine@linux.intel.com>
thunderbolt: Avoid notify PM core about runtime PM resume
Carlos Llamas <cmllamas@google.com>
binder: check offset alignment in binder_get_object()
Ai Chao <aichao@kylinos.cn>
ALSA: hda/realtek - Enable audio jacks of Haier Boyue G42 with ALC269VC
Eric Biggers <ebiggers@google.com>
x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
Josh Poimboeuf <jpoimboe@kernel.org>
x86/bugs: Fix BHI retpoline check
Pin-yen Lin <treapking@chromium.org>
clk: mediatek: Do a runtime PM get on controllers during probe
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
clk: mediatek: clk-mtk: Extend mtk_clk_simple_probe()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
clk: mediatek: clk-mux: Propagate struct device for mtk-mux
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
clk: mediatek: clk-mtk: Propagate struct device for composites
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
clk: mediatek: clk-gate: Propagate struct device with mtk_clk_register_gates()
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
clk: mediatek: mt8192: Propagate struct device for gate clocks
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
clk: mediatek: mt8192: Correctly unregister and free clocks on failure
Stephen Boyd <sboyd@kernel.org>
clk: Get runtime PM before walking tree for clk_summary
Vishal Badole <badolevishal1116@gmail.com>
clk: Show active consumers of clocks in debugfs
Yu Zhe <yuzhe@nfschina.com>
clk: remove unnecessary (void*) conversions
Stephen Boyd <sboyd@kernel.org>
clk: Get runtime PM before walking tree during disable_unused
Stephen Boyd <sboyd@kernel.org>
clk: Initialize struct clk_core kref earlier
Konrad Dybcio <konrad.dybcio@linaro.org>
clk: Print an info line before disabling unused clocks
Stephen Boyd <sboyd@kernel.org>
clk: Remove prepare_lock hold assertion in __clk_release()
Hardik Gajjar <hgajjar@de.adit-jv.com>
usb: new quirk to reduce the SET_ADDRESS request timeout
Hardik Gajjar <hgajjar@de.adit-jv.com>
usb: xhci: Add timeout argument in address_device USB HCD callback
Brenton Simpson <appsforartists@google.com>
drm: panel-orientation-quirks: Add quirk for Lenovo Legion Go
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Rename scarlett_gen2 to scarlett2
Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word()
Bjorn Helgaas <bhelgaas@google.com>
PCI/DPC: Use FIELD_GET()
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Add Focusrite Clarett 2Pre and 4Pre USB support
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Add Focusrite Clarett+ 2Pre and 4Pre support
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Add correct product series name to messages
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Default mixer driver to enabled
Niklas Schnelle <schnelle@linux.ibm.com>
usb: pci-quirks: group AMD specific quirk code together
Linus Walleij <linus.walleij@linaro.org>
ASoC: ti: Convert Pandora ASoC to GPIO descriptors
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Add support for Clarett 8Pre USB
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Move USB IDs out from device_info struct
Rob Herring <robh@kernel.org>
ARM: davinci: Drop unused includes
Kelvin Cao <kelvin.cao@microchip.com>
PCI: switchtec: Add support for PCIe Gen5 devices
Kelvin Cao <kelvin.cao@microchip.com>
PCI: switchtec: Use normal comment style
Niklas Schnelle <schnelle@linux.ibm.com>
PCI: Make quirk using inw() depend on HAS_IOPORT
Maciej W. Rozycki <macro@orcam.me.uk>
PCI: Execute quirk_enable_clear_retrain_link() earlier
Mika Westerberg <mika.westerberg@linux.intel.com>
thunderbolt: Add debug log for link controller power quirk
Mika Westerberg <mika.westerberg@linux.intel.com>
thunderbolt: Log function name of the called quirk
Arnd Bergmann <arnd@arndb.de>
x86/quirks: Include linux/pnp.h for arch_pnpbios_disabled()
Mike Pastore <mike@oobak.org>
PCI: Delay after FLR of Solidigm P44 Pro NVMe
Christophe JAILLET <christophe.jaillet@wanadoo.fr>
usb: pci-quirks: Reduce the length of a spinlock section in usb_amd_find_chipset_info()
David Yang <mmyangfl@gmail.com>
HID: kye: Sort kye devices
Alvaro Karsz <alvaro.karsz@solid-run.com>
PCI: Avoid FLR for SolidRun SNET DPU rev 1
Dmitry Torokhov <dmitry.torokhov@gmail.com>
ARM: OMAP2+: pdata-quirks: stop including wl12xx.h
Dmitry Torokhov <dmitry.torokhov@gmail.com>
ARM: omap2: n8x0: stop instantiating codec platform data
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
drm/panel: visionox-rm69299: don't unregister DSI device
Mikhail Kobuk <m.kobuk@ispras.ru>
drm: nv04: Fix out of bounds access
Peter Oberparleiter <oberpar@linux.ibm.com>
s390/cio: fix race condition during online processing
Peter Oberparleiter <oberpar@linux.ibm.com>
s390/qdio: handle deferred cc1
Michael Guralnik <michaelgur@nvidia.com>
RDMA/mlx5: Fix port number for counter query in multi-port configuration
Mark Zhang <markzhang@nvidia.com>
RDMA/cm: Print the old state when cm_destroy_id gets timeout
Yanjun.Zhu <yanjun.zhu@linux.dev>
RDMA/rxe: Fix the problem "mutex_destroy missing"
Siddharth Vadapalli <s-vadapalli@ti.com>
net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix mirroring frames received on local port
Lei Chen <lei.chen@smartx.com>
tun: limit printing rate when illegal packet received by tun dev
Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
ice: tc: allow zero flags in parsing tc flower
Carolina Jubran <cjubran@nvidia.com>
net/mlx5e: Prevent deadlock while disabling aRFS
Shay Drory <shayd@nvidia.com>
net/mlx5: Lag, restore buckets number to default after hash LAG deactivation
Kuniyuki Iwashima <kuniyu@amazon.com>
af_unix: Don't peek OOB data without MSG_OOB.
Kuniyuki Iwashima <kuniyu@amazon.com>
af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: flowtable: incorrect pppoe tuple
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: flowtable: validate pppoe header
Florian Westphal <fw@strlen.de>
netfilter: nft_set_pipapo: do not free live element
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: br_netfilter: skip conntrack input hook for promisc packets
Ziyang Xuan <william.xuanziyang@huawei.com>
netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
Ziyang Xuan <william.xuanziyang@huawei.com>
netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
Ard Biesheuvel <ardb@kernel.org>
x86/efistub: Remap kernel text read-only before dropping NX attribute
Ard Biesheuvel <ardb@kernel.org>
x86/sev: Move early startup code into .head.text section
Ard Biesheuvel <ardb@kernel.org>
x86/sme: Move early SME kernel encryption handling into .head.text
Hou Wenlong <houwenlong.hwl@antgroup.com>
x86/head/64: Move the __head definition to <asm/init.h>
Hou Wenlong <houwenlong.hwl@antgroup.com>
x86/head/64: Add missing __head annotation to startup_64_load_idt()
Pasha Tatashin <pasha.tatashin@soleen.com>
x86/mm: Remove P*D_PAGE_MASK and P*D_PAGE_SIZE macros
Ard Biesheuvel <ardb@kernel.org>
x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section
Ard Biesheuvel <ardb@kernel.org>
x86/boot: Increase section and file alignment to 4k/512
Ard Biesheuvel <ardb@kernel.org>
x86/boot: Split off PE/COFF .data section
Ard Biesheuvel <ardb@kernel.org>
x86/boot: Drop PE/COFF .reloc section
Ard Biesheuvel <ardb@kernel.org>
x86/boot: Construct PE/COFF .text section from assembler
Ard Biesheuvel <ardb@kernel.org>
x86/boot: Derive file size from _edata symbol
Ard Biesheuvel <ardb@kernel.org>
x86/boot: Define setup size in linker script
Ard Biesheuvel <ardb@kernel.org>
x86/boot: Set EFI handover offset directly in header asm
Ard Biesheuvel <ardb@kernel.org>
x86/boot: Grab kernel_info offset from zoffset header directly
Ard Biesheuvel <ardb@kernel.org>
x86/boot: Drop references to startup_64
Ard Biesheuvel <ardb@kernel.org>
x86/boot: Drop redundant code setting the root device
Ard Biesheuvel <ardb@kernel.org>
x86/boot: Omit compression buffer from PE/COFF image memory footprint
Ard Biesheuvel <ardb@kernel.org>
x86/boot: Remove the 'bugger off' message
Ard Biesheuvel <ardb@kernel.org>
x86/efi: Drop alignment flags from PE section headers
Ard Biesheuvel <ardb@kernel.org>
x86/efistub: Reinstate soft limit for initrd loading
Ard Biesheuvel <ardb@kernel.org>
x86/efi: Disregard setup header of loaded image
Ard Biesheuvel <ardb@kernel.org>
x86/efi: Drop EFI stub .bss from .data section
Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
drm/i915/vma: Fix UAF on destroy against retire race
Jose Ignacio Tornos Martinez <jtornosm@redhat.com>
net: usb: ax88179_178a: avoid writing the mac address before first reading
Jason A. Donenfeld <Jason@zx2c4.com>
random: handle creditable entropy from atomic process context
Yuanhe Shu <xiangzao@linux.alibaba.com>
selftests/ftrace: Limit length in subsystem-enable tests
Steven Rostedt (Google) <rostedt@goodmis.org>
SUNRPC: Fix rpcgss_context trace event acceptor field
Alexey Izbyshev <izbyshev@ispras.ru>
io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
Dillon Varone <dillon.varone@amd.com>
drm/amd/display: Do not recursively call manual trigger programming
Tim Huang <Tim.Huang@amd.com>
drm/amdgpu: fix incorrect number of active RBs for gfx11
Hawking Zhang <Hawking.Zhang@amd.com>
drm/amdgpu: fix incorrect active rb bitmap for gfx11
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Enable DMA mappings with SEV
-------------
Diffstat:
Documentation/admin-guide/kernel-parameters.txt | 3 +
MAINTAINERS | 2 +-
Makefile | 4 +-
arch/arm/mach-davinci/pdata-quirks.c | 2 +-
arch/arm/mach-omap2/board-n8x0.c | 5 -
arch/arm/mach-omap2/common-board-devices.h | 2 -
arch/arm/mach-omap2/pdata-quirks.c | 12 +-
arch/arm64/mm/pageattr.c | 3 -
arch/x86/boot/Makefile | 2 +-
arch/x86/boot/compressed/Makefile | 2 +-
arch/x86/boot/compressed/misc.c | 1 +
arch/x86/boot/compressed/sev.c | 3 +
arch/x86/boot/compressed/vmlinux.lds.S | 6 +-
arch/x86/boot/header.S | 211 +++++++---------
arch/x86/boot/setup.ld | 14 +-
arch/x86/boot/tools/build.c | 273 +--------------------
arch/x86/include/asm/boot.h | 1 +
arch/x86/include/asm/init.h | 2 +
arch/x86/include/asm/kvm_host.h | 1 +
arch/x86/include/asm/mem_encrypt.h | 8 +-
arch/x86/include/asm/page_types.h | 12 +-
arch/x86/include/asm/sev.h | 10 +-
arch/x86/kernel/amd_gart_64.c | 2 +-
arch/x86/kernel/cpu/bugs.c | 11 +-
arch/x86/kernel/cpu/cpuid-deps.c | 6 +-
arch/x86/kernel/head64.c | 7 +-
arch/x86/kernel/platform-quirks.c | 1 +
arch/x86/kernel/sev-shared.c | 23 +-
arch/x86/kernel/sev.c | 11 +-
arch/x86/kvm/cpuid.c | 1 +
arch/x86/kvm/cpuid.h | 10 +
arch/x86/kvm/lapic.c | 3 +-
arch/x86/kvm/mmu/mmu.c | 2 +-
arch/x86/kvm/vmx/vmx.c | 24 +-
arch/x86/kvm/x86.c | 2 +-
arch/x86/mm/mem_encrypt_boot.S | 4 +-
arch/x86/mm/mem_encrypt_identity.c | 58 ++---
arch/x86/mm/pat/set_memory.c | 6 +-
arch/x86/mm/pti.c | 2 +-
drivers/accessibility/speakup/main.c | 2 +-
drivers/android/binder.c | 4 +-
drivers/char/random.c | 10 +-
drivers/clk/clk.c | 201 +++++++++++----
drivers/clk/mediatek/clk-gate.c | 23 +-
drivers/clk/mediatek/clk-gate.h | 7 +-
drivers/clk/mediatek/clk-mt2701-aud.c | 4 +-
drivers/clk/mediatek/clk-mt2701-eth.c | 4 +-
drivers/clk/mediatek/clk-mt2701-g3d.c | 2 +-
drivers/clk/mediatek/clk-mt2701-hif.c | 4 +-
drivers/clk/mediatek/clk-mt2701-mm.c | 4 +-
drivers/clk/mediatek/clk-mt2701.c | 22 +-
drivers/clk/mediatek/clk-mt2712-mm.c | 4 +-
drivers/clk/mediatek/clk-mt2712.c | 24 +-
drivers/clk/mediatek/clk-mt6765.c | 13 +-
drivers/clk/mediatek/clk-mt6779-mm.c | 4 +-
drivers/clk/mediatek/clk-mt6779.c | 21 +-
drivers/clk/mediatek/clk-mt6795-infracfg.c | 3 +-
drivers/clk/mediatek/clk-mt6795-mm.c | 3 +-
drivers/clk/mediatek/clk-mt6795-pericfg.c | 6 +-
drivers/clk/mediatek/clk-mt6795-topckgen.c | 6 +-
drivers/clk/mediatek/clk-mt6797-mm.c | 4 +-
drivers/clk/mediatek/clk-mt6797.c | 7 +-
drivers/clk/mediatek/clk-mt7622-aud.c | 4 +-
drivers/clk/mediatek/clk-mt7622-eth.c | 8 +-
drivers/clk/mediatek/clk-mt7622-hif.c | 8 +-
drivers/clk/mediatek/clk-mt7622.c | 22 +-
drivers/clk/mediatek/clk-mt7629-eth.c | 7 +-
drivers/clk/mediatek/clk-mt7629-hif.c | 8 +-
drivers/clk/mediatek/clk-mt7629.c | 18 +-
drivers/clk/mediatek/clk-mt7986-eth.c | 10 +-
drivers/clk/mediatek/clk-mt7986-infracfg.c | 7 +-
drivers/clk/mediatek/clk-mt7986-topckgen.c | 3 +-
drivers/clk/mediatek/clk-mt8135.c | 18 +-
drivers/clk/mediatek/clk-mt8167-aud.c | 2 +-
drivers/clk/mediatek/clk-mt8167-img.c | 2 +-
drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 2 +-
drivers/clk/mediatek/clk-mt8167-mm.c | 4 +-
drivers/clk/mediatek/clk-mt8167-vdec.c | 3 +-
drivers/clk/mediatek/clk-mt8167.c | 12 +-
drivers/clk/mediatek/clk-mt8173-mm.c | 4 +-
drivers/clk/mediatek/clk-mt8173.c | 34 +--
drivers/clk/mediatek/clk-mt8183-audio.c | 4 +-
drivers/clk/mediatek/clk-mt8183-mm.c | 4 +-
drivers/clk/mediatek/clk-mt8183.c | 36 +--
drivers/clk/mediatek/clk-mt8186-mcu.c | 3 +-
drivers/clk/mediatek/clk-mt8186-mm.c | 3 +-
drivers/clk/mediatek/clk-mt8186-topckgen.c | 9 +-
drivers/clk/mediatek/clk-mt8192-aud.c | 3 +-
drivers/clk/mediatek/clk-mt8192-mm.c | 3 +-
drivers/clk/mediatek/clk-mt8192.c | 88 +++++--
drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 3 +-
drivers/clk/mediatek/clk-mt8195-topckgen.c | 9 +-
drivers/clk/mediatek/clk-mt8195-vdo0.c | 3 +-
drivers/clk/mediatek/clk-mt8195-vdo1.c | 3 +-
drivers/clk/mediatek/clk-mt8365-mm.c | 5 +-
drivers/clk/mediatek/clk-mt8365.c | 14 +-
drivers/clk/mediatek/clk-mt8516-aud.c | 2 +-
drivers/clk/mediatek/clk-mt8516.c | 12 +-
drivers/clk/mediatek/clk-mtk.c | 127 +++++++++-
drivers/clk/mediatek/clk-mtk.h | 13 +-
drivers/clk/mediatek/clk-mux.c | 14 +-
drivers/clk/mediatek/clk-mux.h | 3 +-
drivers/comedi/drivers/vmk80xx.c | 35 +--
drivers/firmware/efi/libstub/Makefile | 7 -
drivers/firmware/efi/libstub/x86-stub.c | 58 ++---
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 72 ++++--
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 80 ++++--
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 3 -
drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 +
drivers/gpu/drm/i915/i915_vma.c | 42 +++-
drivers/gpu/drm/nouveau/nouveau_bios.c | 13 +-
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 7 +-
drivers/gpu/drm/panel/panel-visionox-rm69299.c | 2 -
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 11 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +-
drivers/hid/hid-ids.h | 2 +-
drivers/hid/hid-kye.c | 66 ++---
drivers/hid/hid-quirks.c | 6 +-
drivers/infiniband/core/cm.c | 11 +-
drivers/infiniband/hw/mlx5/mad.c | 3 +-
drivers/infiniband/sw/rxe/rxe.c | 2 +
drivers/misc/mei/pci-me.c | 2 +-
drivers/net/dsa/mt7530.c | 58 +++--
drivers/net/dsa/mt7530.h | 6 +
drivers/net/ethernet/intel/ice/ice_tc_lib.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 27 +-
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 4 +-
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 18 ++
drivers/net/tun.c | 18 +-
drivers/net/usb/ax88179_178a.c | 4 +-
drivers/pci/bus.c | 49 ++--
drivers/pci/pci.c | 78 ++++--
drivers/pci/pci.h | 4 +-
drivers/pci/pcie/aspm.c | 21 +-
drivers/pci/pcie/dpc.c | 5 +-
drivers/pci/quirks.c | 70 +++++-
drivers/pci/switch/switchtec.c | 158 +++++++-----
drivers/s390/cio/device.c | 13 +-
drivers/s390/cio/qdio_main.c | 28 ++-
drivers/thunderbolt/quirks.c | 2 +
drivers/thunderbolt/switch.c | 50 +++-
drivers/thunderbolt/tb.c | 4 +-
drivers/thunderbolt/tb.h | 3 +-
drivers/thunderbolt/usb4.c | 13 +-
drivers/tty/serial/mxs-auart.c | 8 +-
drivers/tty/serial/pmac_zilog.c | 14 --
drivers/tty/serial/stm32-usart.c | 13 +-
drivers/usb/class/cdc-wdm.c | 6 +-
drivers/usb/core/hub.c | 15 +-
drivers/usb/core/port.c | 4 +-
drivers/usb/core/quirks.c | 7 +
drivers/usb/dwc2/hcd_ddma.c | 4 +-
drivers/usb/gadget/function/f_ncm.c | 4 +-
drivers/usb/host/pci-quirks.c | 123 +++++-----
drivers/usb/host/pci-quirks.h | 14 +-
drivers/usb/host/xhci-mem.c | 2 +
drivers/usb/host/xhci-ring.c | 11 +-
drivers/usb/host/xhci.c | 23 +-
drivers/usb/host/xhci.h | 9 +-
drivers/usb/serial/option.c | 40 +++
fs/nilfs2/dir.c | 2 +-
fs/smb/common/smb2pdu.h | 2 +-
fs/smb/server/server.c | 13 +-
fs/smb/server/smb2pdu.c | 4 +
fs/smb/server/vfs.c | 5 +
fs/sysfs/file.c | 2 +
include/linux/bootconfig.h | 7 +-
include/linux/pci.h | 5 +
include/linux/pci_ids.h | 2 +
include/linux/switchtec.h | 1 +
include/linux/usb/hcd.h | 5 +-
include/linux/usb/quirks.h | 3 +
include/net/dsa.h | 8 +
include/net/netfilter/nf_flow_table.h | 12 +-
include/trace/events/rpcgss.h | 4 +-
include/uapi/linux/pci_regs.h | 1 +
init/main.c | 2 +
io_uring/io_uring.c | 16 +-
lib/bootconfig.c | 19 +-
mm/memory-failure.c | 18 +-
net/bridge/br_input.c | 15 +-
net/bridge/br_netfilter_hooks.c | 6 +
net/bridge/br_private.h | 1 +
net/bridge/netfilter/nf_conntrack_bridge.c | 14 +-
net/dsa/dsa2.c | 24 +-
net/netfilter/nf_flow_table_inet.c | 3 +-
net/netfilter/nf_flow_table_ip.c | 10 +-
net/netfilter/nf_tables_api.c | 16 +-
net/netfilter/nft_set_pipapo.c | 14 +-
net/unix/af_unix.c | 12 +-
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/ti/omap3pandora.c | 63 ++---
sound/usb/Makefile | 2 +-
sound/usb/mixer_quirks.c | 9 +-
.../{mixer_scarlett_gen2.c => mixer_scarlett2.c} | 257 +++++++++++++------
sound/usb/mixer_scarlett2.h | 7 +
sound/usb/mixer_scarlett_gen2.h | 7 -
.../ftrace/test.d/event/subsystem-enable.tc | 6 +-
199 files changed, 2147 insertions(+), 1497 deletions(-)
^ permalink raw reply [relevance 3%]
* [PATCH 6.6 157/158] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
2024-04-23 21:37 3% [PATCH 6.6 000/158] 6.6.29-rc1 review Greg Kroah-Hartman
` (2 preceding siblings ...)
2024-04-23 21:39 4% ` [PATCH 6.6 156/158] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Greg Kroah-Hartman
@ 2024-04-23 21:39 4% ` Greg Kroah-Hartman
3 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:39 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit 0268a7cc7fdc47d90b6c18859de7718d5059f6f1 upstream.
4byte padding cause the connection issue with the applications of MacOS.
smb2_close response size increases by 4 bytes by padding, And the smb
client of MacOS check it and stop the connection. This patch use
struct_group_attr instead of struct_group for network_open_info to use
__packed to avoid padding.
Fixes: 0015eb6e1238 ("smb: client, common: fix fortify warnings")
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/common/smb2pdu.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/smb/common/smb2pdu.h
+++ b/fs/smb/common/smb2pdu.h
@@ -700,7 +700,7 @@ struct smb2_close_rsp {
__le16 StructureSize; /* 60 */
__le16 Flags;
__le32 Reserved;
- struct_group(network_open_info,
+ struct_group_attr(network_open_info, __packed,
__le64 CreationTime;
__le64 LastAccessTime;
__le64 LastWriteTime;
^ permalink raw reply [relevance 4%]
* [PATCH 6.6 156/158] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
2024-04-23 21:37 3% [PATCH 6.6 000/158] 6.6.29-rc1 review Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.6 154/158] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.6 155/158] ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
@ 2024-04-23 21:39 4% ` Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.6 157/158] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info Greg Kroah-Hartman
3 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:39 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, Marios Makassikis, Namjae Jeon,
Steve French
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marios Makassikis <mmakassikis@freebox.fr>
commit 4973b04d3ea577db80c501c5f14e68ec69fe1794 upstream.
File overwrite case is explicitly handled, so it is not necessary to
pass RENAME_NOREPLACE to vfs_rename.
Clearing the flag fixes rename operations when the share is a ntfs-3g
mount. The latter uses an older version of fuse with no support for
flags in the ->rename op.
Cc: stable@vger.kernel.org
Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/vfs.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/fs/smb/server/vfs.c
+++ b/fs/smb/server/vfs.c
@@ -745,10 +745,15 @@ retry:
goto out4;
}
+ /*
+ * explicitly handle file overwrite case, for compatibility with
+ * filesystems that may not support rename flags (e.g: fuse)
+ */
if ((flags & RENAME_NOREPLACE) && d_is_positive(new_dentry)) {
err = -EEXIST;
goto out4;
}
+ flags &= ~(RENAME_NOREPLACE);
if (old_child == trap) {
err = -EINVAL;
^ permalink raw reply [relevance 4%]
* [PATCH 6.6 155/158] ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
2024-04-23 21:37 3% [PATCH 6.6 000/158] 6.6.29-rc1 review Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.6 154/158] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
@ 2024-04-23 21:39 4% ` Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.6 156/158] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.6 157/158] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info Greg Kroah-Hartman
3 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:39 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit 17cf0c2794bdb6f39671265aa18aea5c22ee8c4a upstream.
The response buffer should be allocated in smb2_allocate_rsp_buf
before validating request. But the fields in payload as well as smb2 header
is used in smb2_allocate_rsp_buf(). This patch add simple buffer size
validation to avoid potencial out-of-bounds in request buffer.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/smb2pdu.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -535,6 +535,10 @@ int smb2_allocate_rsp_buf(struct ksmbd_w
if (cmd == SMB2_QUERY_INFO_HE) {
struct smb2_query_info_req *req;
+ if (get_rfc1002_len(work->request_buf) <
+ offsetof(struct smb2_query_info_req, OutputBufferLength))
+ return -EINVAL;
+
req = smb2_get_msg(work->request_buf);
if ((req->InfoType == SMB2_O_INFO_FILE &&
(req->FileInfoClass == FILE_FULL_EA_INFORMATION ||
^ permalink raw reply [relevance 4%]
* [PATCH 6.6 154/158] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
2024-04-23 21:37 3% [PATCH 6.6 000/158] 6.6.29-rc1 review Greg Kroah-Hartman
@ 2024-04-23 21:39 4% ` Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.6 155/158] ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
` (2 subsequent siblings)
3 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:39 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, Norbert Szetei, Namjae Jeon, Steve French
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit c119f4ede3fa90a9463f50831761c28f989bfb20 upstream.
If ->ProtocolId is SMB2_TRANSFORM_PROTO_NUM, smb2 request size
validation could be skipped. if request size is smaller than
sizeof(struct smb2_query_info_req), slab-out-of-bounds read can happen in
smb2_allocate_rsp_buf(). This patch allocate response buffer after
decrypting transform request. smb3_decrypt_req() will validate transform
request size and avoid slab-out-of-bound in smb2_allocate_rsp_buf().
Reported-by: Norbert Szetei <norbert@doyensec.com>
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/server.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
--- a/fs/smb/server/server.c
+++ b/fs/smb/server/server.c
@@ -167,20 +167,17 @@ static void __handle_ksmbd_work(struct k
int rc;
bool is_chained = false;
- if (conn->ops->allocate_rsp_buf(work))
- return;
-
if (conn->ops->is_transform_hdr &&
conn->ops->is_transform_hdr(work->request_buf)) {
rc = conn->ops->decrypt_req(work);
- if (rc < 0) {
- conn->ops->set_rsp_status(work, STATUS_DATA_ERROR);
- goto send;
- }
-
+ if (rc < 0)
+ return;
work->encrypted = true;
}
+ if (conn->ops->allocate_rsp_buf(work))
+ return;
+
rc = conn->ops->init_rsp_hdr(work);
if (rc) {
/* either uid or tid is not correct */
^ permalink raw reply [relevance 4%]
* [PATCH 6.6 000/158] 6.6.29-rc1 review
@ 2024-04-23 21:37 3% Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.6 154/158] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
` (3 more replies)
0 siblings, 4 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:37 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 6.6.29 release.
There are 158 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Thu, 25 Apr 2024 21:38:28 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.29-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 6.6.29-rc1
Johan Hovold <johan+linaro@kernel.org>
PCI/ASPM: Fix deadlock when enabling ASPM
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
Marios Makassikis <mmakassikis@freebox.fr>
ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
Naveen N Rao <naveen@kernel.org>
powerpc/ftrace: Ignore ftrace locations in exit text sections
Breno Leitao <leitao@debian.org>
virtio_net: Do not send RSS key if it is not supported
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
Jeongjun Park <aha310510@gmail.com>
nilfs2: fix OOB in nilfs_set_de_type
Qiang Zhang <qiang4.zhang@intel.com>
bootconfig: use memblock_free_late to free xbc memory to buddy
Dave Airlie <airlied@redhat.com>
nouveau: fix instmem race condition around ptr stores
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix crtc's atomic check conditional
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Sort primary plane formats by order of preference
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix prime import/export
Christian König <christian.koenig@amd.com>
drm/amdgpu: remove invalid resource->start check v2
Felix Kuehling <felix.kuehling@amd.com>
drm/amdkfd: Fix memory leak in create_process failure
xinhui pan <xinhui.pan@amd.com>
drm/amdgpu: validate the parameters of bo mapping operations more clearly
Danny Lin <danny@orbstack.dev>
fuse: fix leaked ENOSYS error on first statx call
Sumanth Korikkar <sumanthk@linux.ibm.com>
mm/shmem: inline shmem_is_huge() for disabled transparent hugepages
Miaohe Lin <linmiaohe@huawei.com>
mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled
Oscar Salvador <osalvador@suse.de>
mm,swapops: update check in is_pfn_swap_entry for hwpoison entries
Peter Xu <peterx@redhat.com>
mm/userfaultfd: allow hugetlb change protection upon poison entry
Yuntao Wang <ytcoode@gmail.com>
init/main.c: Fix potential static_command_line memory overflow
Yaxiong Tian <tianyaxiong@kylinos.cn>
arm64: hibernate: Fix level3 translation fault in swsusp_save()
Ard Biesheuvel <ardb@kernel.org>
arm64/head: Disable MMU at EL2 before clearing HCR_EL2.E2H
David Matlack <dmatlack@google.com>
KVM: x86/mmu: Write-protect L2 SPTEs in TDP MMU when clearing dirty status
Sandipan Das <sandipan.das@amd.com>
KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
Sean Christopherson <seanjc@google.com>
KVM: x86/pmu: Disable support for adaptive PEBS
Sean Christopherson <seanjc@google.com>
KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
sched: Add missing memory barrier in switch_mm_cid
Alan Stern <stern@rowland.harvard.edu>
fs: sysfs: Fix reference leak in sysfs_break_active_protection()
Samuel Thibault <samuel.thibault@ens-lyon.org>
speakup: Avoid crash on very long word
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: disable RPL-S on SPS and IGN firmwares
Norihiko Hama <Norihiko.Hama@alpsalpine.com>
usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
Kai-Heng Feng <kai.heng.feng@canonical.com>
usb: Disable USB3 LPM at shutdown
Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
usb: dwc2: host: Fix dereference issue in DDMA completion flow.
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Revert "usb: cdc-wdm: close race between read and workqueue"
Daniele Palmas <dnlplm@gmail.com>
USB: serial: option: add Telit FN920C04 rmnet compositions
Vanillan Wang <vanillanwang@163.com>
USB: serial: option: add Rolling RW101-GL and RW135-GL support
Jerry Meng <jerry-meng@foxmail.com>
USB: serial: option: support Quectel EM060K sub-models
Coia Prant <coiaprant@gmail.com>
USB: serial: option: add Lonsung U8300/U9300 product
Chuanhong Guo <gch981213@gmail.com>
USB: serial: option: add support for Fibocom FM650/FG650
bolan wang <bolan.wang@fibocom.com>
USB: serial: option: add Fibocom FM135-GL variants
Tony Lindgren <tony@atomide.com>
serial: core: Fix missing shutdown and startup for serial base port
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
serial: core: Clearing the circular buffer before NULLifying it
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
serial: stm32: Reset .throttled state in .startup()
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
serial: stm32: Return IRQ_NONE in the ISR if no handling happend
Finn Thain <fthain@linux-m68k.org>
serial/pmac_zilog: Remove flawed mitigation for rx irq flood
Emil Kronborg <emil.kronborg@protonmail.com>
serial: mxs-auart: add spinlock around changing cts state
Nikita Zhandarovich <n.zhandarovich@fintech.ru>
comedi: vmk80xx: fix incomplete endpoint checking
Gil Fine <gil.fine@linux.intel.com>
thunderbolt: Fix wake configurations after device unplug
Gil Fine <gil.fine@linux.intel.com>
thunderbolt: Avoid notify PM core about runtime PM resume
Carlos Llamas <cmllamas@google.com>
binder: check offset alignment in binder_get_object()
Ai Chao <aichao@kylinos.cn>
ALSA: hda/realtek - Enable audio jacks of Haier Boyue G42 with ALC269VC
Mauro Carvalho Chehab <mchehab@kernel.org>
ALSA: hda/realtek: Add quirks for Huawei Matebook D14 NBLB-WAX9N
Shenghao Ding <shenghao-ding@ti.com>
ALSA: hda/tas2781: Add new vendor_id and subsystem_id to support ThinkPad ICE-1
Shenghao Ding <shenghao-ding@ti.com>
ALSA: hda/tas2781: correct the register for pow calibrated data
Takashi Iwai <tiwai@suse.de>
ALSA: seq: ump: Fix conversion from MIDI2 to MIDI1 UMP messages
Shay Drory <shayd@nvidia.com>
net/mlx5: E-switch, store eswitch pointer before registering devlink_param
Eric Biggers <ebiggers@google.com>
x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
Josh Poimboeuf <jpoimboe@kernel.org>
x86/bugs: Fix BHI retpoline check
Pin-yen Lin <treapking@chromium.org>
clk: mediatek: Do a runtime PM get on controllers during probe
Stephen Boyd <sboyd@kernel.org>
clk: Get runtime PM before walking tree for clk_summary
Vishal Badole <badolevishal1116@gmail.com>
clk: Show active consumers of clocks in debugfs
Stephen Boyd <sboyd@kernel.org>
clk: Get runtime PM before walking tree during disable_unused
Stephen Boyd <sboyd@kernel.org>
clk: Initialize struct clk_core kref earlier
Stephen Boyd <sboyd@kernel.org>
clk: Remove prepare_lock hold assertion in __clk_release()
Mike Tipton <quic_mdtipton@quicinc.com>
interconnect: Don't access req_list while it's being manipulated
Mario Limonciello <mario.limonciello@amd.com>
platform/x86/amd/pmc: Extend Framework 13 quirk to more BIOSes
Hardik Gajjar <hgajjar@de.adit-jv.com>
usb: new quirk to reduce the SET_ADDRESS request timeout
Hardik Gajjar <hgajjar@de.adit-jv.com>
usb: xhci: Add timeout argument in address_device USB HCD callback
Brenton Simpson <appsforartists@google.com>
drm: panel-orientation-quirks: Add quirk for Lenovo Legion Go
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Rename scarlett_gen2 to scarlett2
Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word()
Bjorn Helgaas <bhelgaas@google.com>
PCI/DPC: Use FIELD_GET()
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Add Focusrite Clarett 2Pre and 4Pre USB support
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Add Focusrite Clarett+ 2Pre and 4Pre support
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Add correct product series name to messages
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Default mixer driver to enabled
Sanath S <Sanath.S@amd.com>
thunderbolt: Reset topology created by the boot firmware
Sanath S <Sanath.S@amd.com>
thunderbolt: Make tb_switch_reset() support Thunderbolt 2, 3 and USB4 routers
Sanath S <Sanath.S@amd.com>
thunderbolt: Introduce tb_path_deactivate_hop()
Sanath S <Sanath.S@amd.com>
thunderbolt: Introduce tb_port_reset()
Niklas Schnelle <schnelle@linux.ibm.com>
usb: pci-quirks: handle HAS_IOPORT dependency for UHCI handoff
Niklas Schnelle <schnelle@linux.ibm.com>
usb: pci-quirks: handle HAS_IOPORT dependency for AMD quirk
Niklas Schnelle <schnelle@linux.ibm.com>
usb: pci-quirks: group AMD specific quirk code together
Linus Walleij <linus.walleij@linaro.org>
ASoC: ti: Convert Pandora ASoC to GPIO descriptors
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Add support for Clarett 8Pre USB
Geoffrey D. Bennett <g@b4.vu>
ALSA: scarlett2: Move USB IDs out from device_info struct
Alex Deucher <alexander.deucher@amd.com>
drm/radeon: make -fstrict-flex-arrays=3 happy
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
drm/panel: visionox-rm69299: don't unregister DSI device
Mikhail Kobuk <m.kobuk@ispras.ru>
drm: nv04: Fix out of bounds access
Peter Oberparleiter <oberpar@linux.ibm.com>
s390/cio: fix race condition during online processing
Peter Oberparleiter <oberpar@linux.ibm.com>
s390/qdio: handle deferred cc1
Namhyung Kim <namhyung@kernel.org>
perf lock contention: Add a missing NULL check
Michael Guralnik <michaelgur@nvidia.com>
RDMA/mlx5: Fix port number for counter query in multi-port configuration
Mark Zhang <markzhang@nvidia.com>
RDMA/cm: Print the old state when cm_destroy_id gets timeout
Yanjun.Zhu <yanjun.zhu@linux.dev>
RDMA/rxe: Fix the problem "mutex_destroy missing"
Ville Syrjälä <ville.syrjala@linux.intel.com>
drm/i915/mst: Limit MST+DSC to TGL+
Siddharth Vadapalli <s-vadapalli@ti.com>
net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
Felix Fietkau <nbd@nbd.name>
net: ethernet: mtk_eth_soc: fix WED + wifi reset
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpiolib: swnode: Remove wrong header inclusion
Gerd Bayer <gbayer@linux.ibm.com>
s390/ism: Properly fix receive message buffer allocation
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix port mirroring for MT7988 SoC switch
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix mirroring frames received on local port
Lei Chen <lei.chen@smartx.com>
tun: limit printing rate when illegal packet received by tun dev
Marcin Szycik <marcin.szycik@linux.intel.com>
ice: Fix checking for unsupported keys on non-tunnel device
Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
ice: tc: allow zero flags in parsing tc flower
Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
ice: tc: check src_vsi in case of traffic from VF
Serge Semin <fancer.lancer@gmail.com>
net: stmmac: Fix IP-cores specific MAC capabilities
Serge Semin <fancer.lancer@gmail.com>
net: stmmac: Fix max-speed being ignored on queue re-init
Serge Semin <fancer.lancer@gmail.com>
net: stmmac: Apply half-duplex-less constraint for DW QoS Eth only
Asbjørn Sloth Tønnesen <ast@fiberby.net>
octeontx2-pf: fix FLOW_DIS_IS_FRAGMENT implementation
Yuri Benditovich <yuri.benditovich@daynix.com>
net: change maximum number of UDP segments to 128
Carolina Jubran <cjubran@nvidia.com>
net/mlx5e: Prevent deadlock while disabling aRFS
Shay Drory <shayd@nvidia.com>
net/mlx5: Lag, restore buckets number to default after hash LAG deactivation
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: sparx5: flower: fix fragment flags handling
Kuniyuki Iwashima <kuniyu@amazon.com>
af_unix: Don't peek OOB data without MSG_OOB.
Kuniyuki Iwashima <kuniyu@amazon.com>
af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: flowtable: incorrect pppoe tuple
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: flowtable: validate pppoe header
Florian Westphal <fw@strlen.de>
netfilter: nft_set_pipapo: do not free live element
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: br_netfilter: skip conntrack input hook for promisc packets
Ziyang Xuan <william.xuanziyang@huawei.com>
netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
Ziyang Xuan <william.xuanziyang@huawei.com>
netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
Manivannan Sadhasivam <mani@kernel.org>
scsi: ufs: qcom: Add missing interconnect bandwidth values for Gear 5
Gavin Shan <gshan@redhat.com>
arm64: tlb: Fix TLBI RANGE operand
Ryan Roberts <ryan.roberts@arm.com>
arm64/mm: Modify range-based tlbi to decrement scale
Jose Ignacio Tornos Martinez <jtornosm@redhat.com>
net: usb: ax88179_178a: avoid writing the mac address before first reading
Bart Van Assche <bvanassche@acm.org>
scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING
Jason A. Donenfeld <Jason@zx2c4.com>
random: handle creditable entropy from atomic process context
Yuanhe Shu <xiangzao@linux.alibaba.com>
selftests/ftrace: Limit length in subsystem-enable tests
Steven Rostedt (Google) <rostedt@goodmis.org>
SUNRPC: Fix rpcgss_context trace event acceptor field
Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
drm/i915/vma: Fix UAF on destroy against retire race
Alexey Izbyshev <izbyshev@ispras.ru>
io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
Hans Verkuil <hverkuil-cisco@xs4all.nl>
media: videobuf2: request more buffers for vb2_read
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
drm/msm/dpu: populate SSPP scaler block version
John Stultz <jstultz@google.com>
selftests: timers: Fix posix_timers ksft_print_msg() warning
NeilBrown <neilb@suse.de>
ceph: redirty page before returning AOP_WRITEPAGE_ACTIVATE
Xiubo Li <xiubli@redhat.com>
ceph: rename _to_client() to _to_fs_client()
Xiubo Li <xiubli@redhat.com>
ceph: pass the mdsc to several helpers
Dillon Varone <dillon.varone@amd.com>
drm/amd/display: Do not recursively call manual trigger programming
Oleg Nesterov <oleg@redhat.com>
selftests/timers/posix_timers: Reimplement check_timer_distribution()
Mark Brown <broonie@kernel.org>
selftests: timers: Convert posix_timers test to generate KTAP output
Ville Syrjälä <ville.syrjala@linux.intel.com>
drm/i915: Disable live M/N updates when using bigjoiner
Ville Syrjälä <ville.syrjala@linux.intel.com>
drm/i915: Adjust seamless_m_n flag behaviour
Ville Syrjälä <ville.syrjala@linux.intel.com>
drm/i915: Enable VRR later during fastsets
Ville Syrjälä <ville.syrjala@linux.intel.com>
drm/i915: Extract intel_crtc_vblank_evade_scanlines()
Ville Syrjälä <ville.syrjala@linux.intel.com>
drm/i915: Change intel_pipe_update_{start,end}() calling convention
Ville Syrjälä <ville.syrjala@linux.intel.com>
drm/i915/cdclk: Fix voltage_level programming edge case
Ville Syrjälä <ville.syrjala@linux.intel.com>
drm/i915/mst: Reject FEC+MST on ICL
Ville Syrjälä <ville.syrjala@linux.intel.com>
drm/i915: Fix FEC pipe A vs. DDI A mixup
Paulo Alcantara <pc@manguebit.com>
smb: client: refresh referral without acquiring refpath_lock
Paulo Alcantara <pc@manguebit.com>
smb: client: guarantee refcounted children from parent session
Steve French <stfrench@microsoft.com>
smb3: show beginning time for per share stats
Paulo Alcantara <pc@manguebit.com>
smb: client: fix UAF in smb2_reconnect_server()
Paulo Alcantara <pc@manguebit.com>
smb: client: remove extra @chan_count check in __cifs_put_smb_ses()
-------------
Diffstat:
Documentation/admin-guide/kernel-parameters.txt | 3 +
MAINTAINERS | 2 +-
Makefile | 4 +-
arch/arm/mach-omap2/pdata-quirks.c | 10 +
arch/arm64/include/asm/tlbflush.h | 40 ++--
arch/arm64/kernel/head.S | 5 +
arch/arm64/mm/pageattr.c | 3 -
arch/powerpc/include/asm/ftrace.h | 10 +-
arch/powerpc/include/asm/sections.h | 1 +
arch/powerpc/kernel/trace/ftrace.c | 12 +
arch/powerpc/kernel/trace/ftrace_64_pg.c | 5 +
arch/powerpc/kernel/vmlinux.lds.S | 2 +
arch/x86/include/asm/barrier.h | 3 +
arch/x86/include/asm/kvm_host.h | 1 +
arch/x86/kernel/cpu/bugs.c | 11 +-
arch/x86/kernel/cpu/cpuid-deps.c | 6 +-
arch/x86/kvm/cpuid.c | 1 +
arch/x86/kvm/cpuid.h | 10 +
arch/x86/kvm/lapic.c | 3 +-
arch/x86/kvm/mmu/mmu.c | 2 +-
arch/x86/kvm/mmu/tdp_mmu.c | 21 +-
arch/x86/kvm/vmx/vmx.c | 24 +-
arch/x86/kvm/x86.c | 2 +-
drivers/accessibility/speakup/main.c | 2 +-
drivers/android/binder.c | 4 +-
drivers/char/random.c | 10 +-
drivers/clk/clk.c | 195 ++++++++++++----
drivers/clk/mediatek/clk-mtk.c | 15 ++
drivers/comedi/drivers/vmk80xx.c | 35 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 -
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 72 +++---
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +-
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 3 -
drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 +
drivers/gpu/drm/i915/display/intel_atomic.c | 1 +
drivers/gpu/drm/i915/display/intel_cdclk.c | 37 ++-
drivers/gpu/drm/i915/display/intel_crtc.c | 96 +++++---
drivers/gpu/drm/i915/display/intel_crtc.h | 6 +-
drivers/gpu/drm/i915/display/intel_display.c | 43 ++--
.../gpu/drm/i915/display/intel_display_device.h | 1 +
drivers/gpu/drm/i915/display/intel_display_types.h | 2 +-
drivers/gpu/drm/i915/display/intel_dp.c | 13 +-
drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +-
drivers/gpu/drm/i915/i915_vma.c | 42 +++-
.../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 8 +-
.../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 8 +-
.../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 8 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 95 ++++++--
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 3 +-
drivers/gpu/drm/nouveau/nouveau_bios.c | 13 +-
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 7 +-
drivers/gpu/drm/panel/panel-visionox-rm69299.c | 2 -
drivers/gpu/drm/radeon/radeon_atombios.c | 8 +-
drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 35 ++-
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 7 +-
drivers/gpu/drm/vmwgfx/vmwgfx_bo.h | 2 +
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 3 +
drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 32 +++
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 15 +-
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 44 ++--
drivers/infiniband/core/cm.c | 11 +-
drivers/infiniband/hw/mlx5/mad.c | 3 +-
drivers/infiniband/sw/rxe/rxe.c | 2 +
drivers/interconnect/core.c | 8 +
drivers/media/common/videobuf2/videobuf2-core.c | 9 +-
drivers/misc/mei/pci-me.c | 2 +-
drivers/net/dsa/mt7530.c | 38 ++-
drivers/net/dsa/mt7530.h | 5 +
drivers/net/ethernet/intel/ice/ice_tc_lib.c | 15 +-
.../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 7 +-
drivers/net/ethernet/mediatek/mtk_wed.c | 6 +-
drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 27 ++-
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 9 +-
.../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 +
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 4 +-
.../ethernet/microchip/sparx5/sparx5_tc_flower.c | 61 +++--
drivers/net/ethernet/stmicro/stmmac/common.h | 1 +
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +
.../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +
.../net/ethernet/stmicro/stmmac/dwmac100_core.c | 2 +
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 7 +-
.../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 18 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 29 +--
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 18 ++
drivers/net/tun.c | 18 +-
drivers/net/usb/ax88179_178a.c | 4 +-
drivers/net/virtio_net.c | 27 ++-
drivers/pci/bus.c | 49 ++--
drivers/pci/pci.c | 78 ++++---
drivers/pci/pci.h | 4 +-
drivers/pci/pcie/aspm.c | 21 +-
drivers/pci/pcie/dpc.c | 5 +-
drivers/pci/quirks.c | 8 +-
drivers/platform/x86/amd/pmc/pmc-quirks.c | 9 +
drivers/s390/cio/device.c | 13 +-
drivers/s390/cio/qdio_main.c | 28 ++-
drivers/s390/net/ism_drv.c | 37 ++-
drivers/scsi/scsi_lib.c | 7 +-
drivers/thunderbolt/domain.c | 5 +-
drivers/thunderbolt/icm.c | 2 +-
drivers/thunderbolt/lc.c | 45 ++++
drivers/thunderbolt/nhi.c | 19 +-
drivers/thunderbolt/path.c | 13 ++
drivers/thunderbolt/switch.c | 180 +++++++++++++--
drivers/thunderbolt/tb.c | 30 ++-
drivers/thunderbolt/tb.h | 10 +-
drivers/thunderbolt/tb_regs.h | 6 +
drivers/thunderbolt/usb4.c | 52 ++++-
drivers/tty/serial/mxs-auart.c | 8 +-
drivers/tty/serial/pmac_zilog.c | 14 --
drivers/tty/serial/serial_base.h | 4 +
drivers/tty/serial/serial_core.c | 21 +-
drivers/tty/serial/serial_port.c | 34 +++
drivers/tty/serial/stm32-usart.c | 13 +-
drivers/ufs/host/ufs-qcom.c | 8 +-
drivers/usb/Kconfig | 10 +
drivers/usb/class/cdc-wdm.c | 6 +-
drivers/usb/core/hcd-pci.c | 3 +-
drivers/usb/core/hub.c | 15 +-
drivers/usb/core/port.c | 4 +-
drivers/usb/core/quirks.c | 7 +
drivers/usb/dwc2/hcd_ddma.c | 4 +-
drivers/usb/gadget/function/f_ncm.c | 4 +-
drivers/usb/host/pci-quirks.c | 144 ++++++------
drivers/usb/host/pci-quirks.h | 34 ++-
drivers/usb/host/xhci-mem.c | 2 +
drivers/usb/host/xhci-ring.c | 11 +-
drivers/usb/host/xhci.c | 23 +-
drivers/usb/host/xhci.h | 9 +-
drivers/usb/serial/option.c | 40 ++++
fs/ceph/addr.c | 22 +-
fs/ceph/cache.c | 2 +-
fs/ceph/caps.c | 53 +++--
fs/ceph/crypto.c | 2 +-
fs/ceph/debugfs.c | 4 +-
fs/ceph/dir.c | 24 +-
fs/ceph/export.c | 10 +-
fs/ceph/file.c | 26 +--
fs/ceph/inode.c | 14 +-
fs/ceph/ioctl.c | 8 +-
fs/ceph/mds_client.c | 41 ++--
fs/ceph/mds_client.h | 3 +-
fs/ceph/mdsmap.c | 3 +-
fs/ceph/snap.c | 18 +-
fs/ceph/super.c | 22 +-
fs/ceph/super.h | 13 +-
fs/ceph/xattr.c | 12 +-
fs/fuse/dir.c | 1 +
fs/nilfs2/dir.c | 2 +-
fs/smb/client/cifs_debug.c | 6 +-
fs/smb/client/cifsglob.h | 3 +-
fs/smb/client/cifsproto.h | 20 +-
fs/smb/client/connect.c | 135 ++++++-----
fs/smb/client/dfs.c | 51 ++--
fs/smb/client/dfs.h | 33 ++-
fs/smb/client/dfs_cache.c | 53 ++---
fs/smb/client/misc.c | 7 +-
fs/smb/common/smb2pdu.h | 2 +-
fs/smb/server/server.c | 13 +-
fs/smb/server/smb2pdu.c | 4 +
fs/smb/server/vfs.c | 5 +
fs/sysfs/file.c | 2 +
include/asm-generic/barrier.h | 8 +
include/linux/bootconfig.h | 7 +-
include/linux/ceph/mdsmap.h | 5 +-
include/linux/gpio/property.h | 1 -
include/linux/pci.h | 5 +
include/linux/shmem_fs.h | 9 +
include/linux/swapops.h | 65 +++---
include/linux/udp.h | 2 +-
include/linux/usb/hcd.h | 22 +-
include/linux/usb/quirks.h | 3 +
include/net/netfilter/nf_flow_table.h | 12 +-
include/trace/events/rpcgss.h | 4 +-
include/uapi/linux/pci_regs.h | 1 +
init/main.c | 2 +
io_uring/io_uring.c | 26 +--
kernel/sched/sched.h | 20 +-
lib/bootconfig.c | 19 +-
mm/hugetlb.c | 10 +-
mm/memory-failure.c | 18 +-
mm/shmem.c | 6 -
net/bridge/br_input.c | 15 +-
net/bridge/br_netfilter_hooks.c | 6 +
net/bridge/br_private.h | 1 +
net/bridge/netfilter/nf_conntrack_bridge.c | 14 +-
net/netfilter/nf_flow_table_inet.c | 3 +-
net/netfilter/nf_flow_table_ip.c | 10 +-
net/netfilter/nf_tables_api.c | 16 +-
net/netfilter/nft_set_pipapo.c | 14 +-
net/unix/af_unix.c | 12 +-
sound/core/seq/seq_ump_convert.c | 2 +-
sound/pci/hda/patch_realtek.c | 3 +
sound/pci/hda/tas2781_hda_i2c.c | 4 +-
sound/soc/ti/omap3pandora.c | 63 ++---
sound/usb/Makefile | 2 +-
sound/usb/mixer_quirks.c | 9 +-
.../{mixer_scarlett_gen2.c => mixer_scarlett2.c} | 257 +++++++++++++++------
sound/usb/mixer_scarlett2.h | 7 +
sound/usb/mixer_scarlett_gen2.h | 7 -
tools/perf/util/bpf_skel/lock_contention.bpf.c | 5 +-
.../ftrace/test.d/event/subsystem-enable.tc | 6 +-
tools/testing/selftests/kselftest.h | 13 ++
tools/testing/selftests/net/udpgso.c | 2 +-
tools/testing/selftests/timers/posix_timers.c | 156 ++++++-------
208 files changed, 2654 insertions(+), 1290 deletions(-)
^ permalink raw reply [relevance 3%]
* [PATCH 6.8 158/158] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
2024-04-23 21:37 3% [PATCH 6.8 000/158] 6.8.8-rc1 review Greg Kroah-Hartman
` (2 preceding siblings ...)
2024-04-23 21:39 4% ` [PATCH 6.8 157/158] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Greg Kroah-Hartman
@ 2024-04-23 21:39 4% ` Greg Kroah-Hartman
3 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:39 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French
6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit 0268a7cc7fdc47d90b6c18859de7718d5059f6f1 upstream.
4byte padding cause the connection issue with the applications of MacOS.
smb2_close response size increases by 4 bytes by padding, And the smb
client of MacOS check it and stop the connection. This patch use
struct_group_attr instead of struct_group for network_open_info to use
__packed to avoid padding.
Fixes: 0015eb6e1238 ("smb: client, common: fix fortify warnings")
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/common/smb2pdu.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/smb/common/smb2pdu.h
+++ b/fs/smb/common/smb2pdu.h
@@ -702,7 +702,7 @@ struct smb2_close_rsp {
__le16 StructureSize; /* 60 */
__le16 Flags;
__le32 Reserved;
- struct_group(network_open_info,
+ struct_group_attr(network_open_info, __packed,
__le64 CreationTime;
__le64 LastAccessTime;
__le64 LastWriteTime;
^ permalink raw reply [relevance 4%]
* [PATCH 6.8 156/158] ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
2024-04-23 21:37 3% [PATCH 6.8 000/158] 6.8.8-rc1 review Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.8 155/158] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
@ 2024-04-23 21:39 4% ` Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.8 157/158] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.8 158/158] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info Greg Kroah-Hartman
3 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:39 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, patches, Namjae Jeon, Steve French
6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit 17cf0c2794bdb6f39671265aa18aea5c22ee8c4a upstream.
The response buffer should be allocated in smb2_allocate_rsp_buf
before validating request. But the fields in payload as well as smb2 header
is used in smb2_allocate_rsp_buf(). This patch add simple buffer size
validation to avoid potencial out-of-bounds in request buffer.
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/smb2pdu.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -535,6 +535,10 @@ int smb2_allocate_rsp_buf(struct ksmbd_w
if (cmd == SMB2_QUERY_INFO_HE) {
struct smb2_query_info_req *req;
+ if (get_rfc1002_len(work->request_buf) <
+ offsetof(struct smb2_query_info_req, OutputBufferLength))
+ return -EINVAL;
+
req = smb2_get_msg(work->request_buf);
if ((req->InfoType == SMB2_O_INFO_FILE &&
(req->FileInfoClass == FILE_FULL_EA_INFORMATION ||
^ permalink raw reply [relevance 4%]
* [PATCH 6.8 157/158] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
2024-04-23 21:37 3% [PATCH 6.8 000/158] 6.8.8-rc1 review Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.8 155/158] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.8 156/158] ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
@ 2024-04-23 21:39 4% ` Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.8 158/158] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info Greg Kroah-Hartman
3 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:39 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, Marios Makassikis, Namjae Jeon,
Steve French
6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marios Makassikis <mmakassikis@freebox.fr>
commit 4973b04d3ea577db80c501c5f14e68ec69fe1794 upstream.
File overwrite case is explicitly handled, so it is not necessary to
pass RENAME_NOREPLACE to vfs_rename.
Clearing the flag fixes rename operations when the share is a ntfs-3g
mount. The latter uses an older version of fuse with no support for
flags in the ->rename op.
Cc: stable@vger.kernel.org
Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/vfs.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/fs/smb/server/vfs.c
+++ b/fs/smb/server/vfs.c
@@ -754,10 +754,15 @@ retry:
goto out4;
}
+ /*
+ * explicitly handle file overwrite case, for compatibility with
+ * filesystems that may not support rename flags (e.g: fuse)
+ */
if ((flags & RENAME_NOREPLACE) && d_is_positive(new_dentry)) {
err = -EEXIST;
goto out4;
}
+ flags &= ~(RENAME_NOREPLACE);
if (old_child == trap) {
err = -EINVAL;
^ permalink raw reply [relevance 4%]
* [PATCH 6.8 155/158] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
2024-04-23 21:37 3% [PATCH 6.8 000/158] 6.8.8-rc1 review Greg Kroah-Hartman
@ 2024-04-23 21:39 4% ` Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.8 156/158] ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
` (2 subsequent siblings)
3 siblings, 0 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:39 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, Norbert Szetei, Namjae Jeon, Steve French
6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <linkinjeon@kernel.org>
commit c119f4ede3fa90a9463f50831761c28f989bfb20 upstream.
If ->ProtocolId is SMB2_TRANSFORM_PROTO_NUM, smb2 request size
validation could be skipped. if request size is smaller than
sizeof(struct smb2_query_info_req), slab-out-of-bounds read can happen in
smb2_allocate_rsp_buf(). This patch allocate response buffer after
decrypting transform request. smb3_decrypt_req() will validate transform
request size and avoid slab-out-of-bound in smb2_allocate_rsp_buf().
Reported-by: Norbert Szetei <norbert@doyensec.com>
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/server/server.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
--- a/fs/smb/server/server.c
+++ b/fs/smb/server/server.c
@@ -167,20 +167,17 @@ static void __handle_ksmbd_work(struct k
int rc;
bool is_chained = false;
- if (conn->ops->allocate_rsp_buf(work))
- return;
-
if (conn->ops->is_transform_hdr &&
conn->ops->is_transform_hdr(work->request_buf)) {
rc = conn->ops->decrypt_req(work);
- if (rc < 0) {
- conn->ops->set_rsp_status(work, STATUS_DATA_ERROR);
- goto send;
- }
-
+ if (rc < 0)
+ return;
work->encrypted = true;
}
+ if (conn->ops->allocate_rsp_buf(work))
+ return;
+
rc = conn->ops->init_rsp_hdr(work);
if (rc) {
/* either uid or tid is not correct */
^ permalink raw reply [relevance 4%]
* [PATCH 6.8 000/158] 6.8.8-rc1 review
@ 2024-04-23 21:37 3% Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.8 155/158] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
` (3 more replies)
0 siblings, 4 replies; 200+ results
From: Greg Kroah-Hartman @ 2024-04-23 21:37 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, patches, linux-kernel, torvalds, akpm, linux,
shuah, patches, lkft-triage, pavel, jonathanh, f.fainelli,
sudipm.mukherjee, srw, rwarsow, conor, allen.lkml, broonie
This is the start of the stable review cycle for the 6.8.8 release.
There are 158 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Thu, 25 Apr 2024 21:38:28 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.8.8-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.8.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 6.8.8-rc1
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
Marios Makassikis <mmakassikis@freebox.fr>
ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
Namjae Jeon <linkinjeon@kernel.org>
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
Miaohe Lin <linmiaohe@huawei.com>
fork: defer linking file vma until vma is fully initialized
Jeongjun Park <aha310510@gmail.com>
nilfs2: fix OOB in nilfs_set_de_type
Phillip Lougher <phillip@squashfs.org.uk>
Squashfs: check the inode number is not the invalid value of zero
Qiang Zhang <qiang4.zhang@intel.com>
bootconfig: use memblock_free_late to free xbc memory to buddy
Dave Airlie <airlied@redhat.com>
nouveau: fix instmem race condition around ptr stores
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix crtc's atomic check conditional
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Sort primary plane formats by order of preference
Zack Rusin <zack.rusin@broadcom.com>
drm/vmwgfx: Fix prime import/export
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
drm/xe: Fix bo leak in intel_fb_bo_framebuffer_init
Christian König <ckoenig.leichtzumerken@gmail.com>
drm/ttm: stop pooling cached NUMA pages v2
Christian König <christian.koenig@amd.com>
drm/amdgpu: remove invalid resource->start check v2
Felix Kuehling <felix.kuehling@amd.com>
drm/amdkfd: Fix memory leak in create_process failure
xinhui pan <xinhui.pan@amd.com>
drm/amdgpu: validate the parameters of bo mapping operations more clearly
Danny Lin <danny@orbstack.dev>
fuse: fix leaked ENOSYS error on first statx call
Sumanth Korikkar <sumanthk@linux.ibm.com>
mm/shmem: inline shmem_is_huge() for disabled transparent hugepages
Miaohe Lin <linmiaohe@huawei.com>
mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled
Oscar Salvador <osalvador@suse.de>
mm,swapops: update check in is_pfn_swap_entry for hwpoison entries
Peter Xu <peterx@redhat.com>
mm/userfaultfd: allow hugetlb change protection upon poison entry
David Hildenbrand <david@redhat.com>
mm/madvise: make MADV_POPULATE_(READ|WRITE) handle VM_FAULT_RETRY properly
Yuntao Wang <ytcoode@gmail.com>
init/main.c: Fix potential static_command_line memory overflow
Yaxiong Tian <tianyaxiong@kylinos.cn>
arm64: hibernate: Fix level3 translation fault in swsusp_save()
Ard Biesheuvel <ardb@kernel.org>
arm64/head: Disable MMU at EL2 before clearing HCR_EL2.E2H
David Matlack <dmatlack@google.com>
KVM: x86/mmu: Write-protect L2 SPTEs in TDP MMU when clearing dirty status
Rick Edgecombe <rick.p.edgecombe@intel.com>
KVM: x86/mmu: x86: Don't overflow lpage_info when checking attributes
Sandipan Das <sandipan.das@amd.com>
KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
Sean Christopherson <seanjc@google.com>
KVM: x86/pmu: Disable support for adaptive PEBS
Sean Christopherson <seanjc@google.com>
KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
sched: Add missing memory barrier in switch_mm_cid
Alan Stern <stern@rowland.harvard.edu>
fs: sysfs: Fix reference leak in sysfs_break_active_protection()
Samuel Thibault <samuel.thibault@ens-lyon.org>
speakup: Avoid crash on very long word
Alexander Usyskin <alexander.usyskin@intel.com>
mei: me: disable RPL-S on SPS and IGN firmwares
Sakari Ailus <sakari.ailus@linux.intel.com>
mei: vsc: Unregister interrupt handler for system suspend
Kyle Tso <kyletso@google.com>
usb: typec: tcpm: Correct the PDO counting in pd_set
Norihiko Hama <Norihiko.Hama@alpsalpine.com>
usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
Kai-Heng Feng <kai.heng.feng@canonical.com>
usb: Disable USB3 LPM at shutdown
Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
usb: dwc2: host: Fix dereference issue in DDMA completion flow.
Sakari Ailus <sakari.ailus@linux.intel.com>
Revert "mei: vsc: Call wake_up() in the threaded IRQ handler"
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Revert "usb: cdc-wdm: close race between read and workqueue"
Daniele Palmas <dnlplm@gmail.com>
USB: serial: option: add Telit FN920C04 rmnet compositions
Vanillan Wang <vanillanwang@163.com>
USB: serial: option: add Rolling RW101-GL and RW135-GL support
Jerry Meng <jerry-meng@foxmail.com>
USB: serial: option: support Quectel EM060K sub-models
Coia Prant <coiaprant@gmail.com>
USB: serial: option: add Lonsung U8300/U9300 product
Chuanhong Guo <gch981213@gmail.com>
USB: serial: option: add support for Fibocom FM650/FG650
bolan wang <bolan.wang@fibocom.com>
USB: serial: option: add Fibocom FM135-GL variants
Tony Lindgren <tony@atomide.com>
serial: core: Fix missing shutdown and startup for serial base port
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
serial: core: Clearing the circular buffer before NULLifying it
Tony Lindgren <tony@atomide.com>
serial: core: Fix regression when runtime PM is not enabled
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
serial: stm32: Reset .throttled state in .startup()
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
serial: stm32: Return IRQ_NONE in the ISR if no handling happend
Hans de Goede <hdegoede@redhat.com>
serial: 8250_dw: Revert: Do not reclock if already at correct rate
Finn Thain <fthain@linux-m68k.org>
serial/pmac_zilog: Remove flawed mitigation for rx irq flood
Emil Kronborg <emil.kronborg@protonmail.com>
serial: mxs-auart: add spinlock around changing cts state
Nikita Zhandarovich <n.zhandarovich@fintech.ru>
comedi: vmk80xx: fix incomplete endpoint checking
Mika Westerberg <mika.westerberg@linux.intel.com>
thunderbolt: Do not create DisplayPort tunnels on adapters of the same router
Gil Fine <gil.fine@linux.intel.com>
thunderbolt: Fix wake configurations after device unplug
Gil Fine <gil.fine@linux.intel.com>
thunderbolt: Avoid notify PM core about runtime PM resume
Carlos Llamas <cmllamas@google.com>
binder: check offset alignment in binder_get_object()
Ricky Wu <ricky_wu@realtek.com>
misc: rtsx: Fix rts5264 driver status incorrect when card removed
Fabio Estevam <festevam@denx.de>
usb: misc: onboard_usb_hub: Disable the USB hub clock on failure
Ai Chao <aichao@kylinos.cn>
ALSA: hda/realtek - Enable audio jacks of Haier Boyue G42 with ALC269VC
Mauro Carvalho Chehab <mchehab@kernel.org>
ALSA: hda/realtek: Add quirks for Huawei Matebook D14 NBLB-WAX9N
Shenghao Ding <shenghao-ding@ti.com>
ALSA: hda/tas2781: Add new vendor_id and subsystem_id to support ThinkPad ICE-1
Shenghao Ding <shenghao-ding@ti.com>
ALSA: hda/tas2781: correct the register for pow calibrated data
Takashi Iwai <tiwai@suse.de>
ALSA: seq: ump: Fix conversion from MIDI2 to MIDI1 UMP messages
Shay Drory <shayd@nvidia.com>
net/mlx5: E-switch, store eswitch pointer before registering devlink_param
Christoph Hellwig <hch@lst.de>
block: propagate partition scanning errors to the BLKRRPART ioctl
Eric Biggers <ebiggers@google.com>
x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
Josh Poimboeuf <jpoimboe@kernel.org>
x86/bugs: Fix BHI retpoline check
Nathan Lynch <nathanl@linux.ibm.com>
selftests/powerpc/papr-vpd: Fix missing variable initialization
Daniel Golle <daniel@makrotopia.org>
clk: mediatek: mt7988-infracfg: fix clocks for 2nd PCIe port
Pin-yen Lin <treapking@chromium.org>
clk: mediatek: Do a runtime PM get on controllers during probe
Stephen Boyd <sboyd@kernel.org>
clk: Get runtime PM before walking tree for clk_summary
Stephen Boyd <sboyd@kernel.org>
clk: Get runtime PM before walking tree during disable_unused
Stephen Boyd <sboyd@kernel.org>
clk: Initialize struct clk_core kref earlier
Stephen Boyd <sboyd@kernel.org>
clk: Remove prepare_lock hold assertion in __clk_release()
Mike Tipton <quic_mdtipton@quicinc.com>
interconnect: Don't access req_list while it's being manipulated
Konrad Dybcio <konrad.dybcio@linaro.org>
interconnect: qcom: x1e80100: Remove inexistent ACV_PERF BCM
Mario Limonciello <mario.limonciello@amd.com>
platform/x86/amd/pmc: Extend Framework 13 quirk to more BIOSes
Rafael J. Wysocki <rafael.j.wysocki@intel.com>
thermal/debugfs: Add missing count increment to thermal_debug_tz_trip_up()
Huayu Zhang <zhanghuayu1233@qq.com>
ALSA: hda/realtek: Fix volumn control of ThinkBook 16P Gen4
Alex Deucher <alexander.deucher@amd.com>
drm/radeon: make -fstrict-flex-arrays=3 happy
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
drm/panel: visionox-rm69299: don't unregister DSI device
Sanath S <Sanath.S@amd.com>
thunderbolt: Reset topology created by the boot firmware
Sanath S <Sanath.S@amd.com>
thunderbolt: Make tb_switch_reset() support Thunderbolt 2, 3 and USB4 routers
Sanath S <Sanath.S@amd.com>
thunderbolt: Introduce tb_path_deactivate_hop()
Sanath S <Sanath.S@amd.com>
thunderbolt: Introduce tb_port_reset()
Lokesh Gidra <lokeshgidra@google.com>
userfaultfd: change src_folio after ensuring it's unpinned in UFFDIO_MOVE
Maíra Canal <mcanal@igalia.com>
drm/v3d: Don't increment `enabled_ns` twice
Mikhail Kobuk <m.kobuk@ispras.ru>
drm: nv04: Fix out of bounds access
Muhammad Usama Anjum <usama.anjum@collabora.com>
iommufd: Add config needed for iommufd_fail_nth
Jason Gunthorpe <jgg@ziepe.ca>
iommufd: Add missing IOMMUFD_DRIVER kconfig for the selftest
Peter Oberparleiter <oberpar@linux.ibm.com>
s390/cio: fix race condition during online processing
Peter Oberparleiter <oberpar@linux.ibm.com>
s390/qdio: handle deferred cc1
Namhyung Kim <namhyung@kernel.org>
perf lock contention: Add a missing NULL check
Namhyung Kim <namhyung@kernel.org>
perf annotate: Make sure to call symbol__annotate2() in TUI
Michael Guralnik <michaelgur@nvidia.com>
RDMA/mlx5: Fix port number for counter query in multi-port configuration
Mark Zhang <markzhang@nvidia.com>
RDMA/cm: Print the old state when cm_destroy_id gets timeout
Yanjun.Zhu <yanjun.zhu@linux.dev>
RDMA/rxe: Fix the problem "mutex_destroy missing"
Vasily Gorbik <gor@linux.ibm.com>
NFSD: fix endianness issue in nfsd4_encode_fattr4
Siddharth Vadapalli <s-vadapalli@ti.com>
net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
Paul Barker <paul.barker.ct@bp.renesas.com>
net: ravb: Allow RX loop to move past DMA mapping errors
Paul Barker <paul.barker.ct@bp.renesas.com>
net: ravb: Count packets instead of descriptors in R-Car RX path
Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
ravb: Group descriptor types used in Rx ring
Felix Fietkau <nbd@nbd.name>
net: ethernet: mtk_eth_soc: fix WED + wifi reset
Eric Dumazet <edumazet@google.com>
net/sched: Fix mirred deadlock on device recursion
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: nf_tables: fix memleak in map from abort path
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
gpiolib: swnode: Remove wrong header inclusion
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: nf_tables: restore set elements when delete set fails
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: nf_tables: missing iterator type in lookup walk
Gerd Bayer <gbayer@linux.ibm.com>
s390/ism: Properly fix receive message buffer allocation
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix port mirroring for MT7988 SoC switch
Arınç ÜNAL <arinc.unal@arinc9.com>
net: dsa: mt7530: fix mirroring frames received on local port
Lei Chen <lei.chen@smartx.com>
tun: limit printing rate when illegal packet received by tun dev
Marcin Szycik <marcin.szycik@linux.intel.com>
ice: Fix checking for unsupported keys on non-tunnel device
Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
ice: tc: allow zero flags in parsing tc flower
Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
ice: tc: check src_vsi in case of traffic from VF
Serge Semin <fancer.lancer@gmail.com>
net: stmmac: Fix IP-cores specific MAC capabilities
Serge Semin <fancer.lancer@gmail.com>
net: stmmac: Fix max-speed being ignored on queue re-init
Serge Semin <fancer.lancer@gmail.com>
net: stmmac: Apply half-duplex-less constraint for DW QoS Eth only
Dmitry Safonov <0x7f454c46@gmail.com>
selftests/tcp_ao: Printing fixes to confirm with format-security
Dmitry Safonov <0x7f454c46@gmail.com>
selftests/tcp_ao: Fix fscanf() call for format-security
Dmitry Safonov <0x7f454c46@gmail.com>
selftests/tcp_ao: Zero-init tcp_ao_info_opt
Dmitry Safonov <0x7f454c46@gmail.com>
selftests/tcp_ao: Make RST tests less flaky
Asbjørn Sloth Tønnesen <ast@fiberby.net>
octeontx2-pf: fix FLOW_DIS_IS_FRAGMENT implementation
Yuri Benditovich <yuri.benditovich@daynix.com>
net: change maximum number of UDP segments to 128
Carolina Jubran <cjubran@nvidia.com>
net/mlx5e: Prevent deadlock while disabling aRFS
Shay Drory <shayd@nvidia.com>
net/mlx5: Restore mistakenly dropped parts in register devlink flow
Shay Drory <shayd@nvidia.com>
net/mlx5: Lag, restore buckets number to default after hash LAG deactivation
Asbjørn Sloth Tønnesen <ast@fiberby.net>
net: sparx5: flower: fix fragment flags handling
Kuniyuki Iwashima <kuniyu@amazon.com>
af_unix: Don't peek OOB data without MSG_OOB.
Kuniyuki Iwashima <kuniyu@amazon.com>
af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: flowtable: incorrect pppoe tuple
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: flowtable: validate pppoe header
Florian Westphal <fw@strlen.de>
netfilter: nft_set_pipapo: do not free live element
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: nft_set_pipapo: walk over current view on netlink dump
Florian Westphal <fw@strlen.de>
netfilter: nft_set_pipapo: constify lookup fn args where possible
Pablo Neira Ayuso <pablo@netfilter.org>
netfilter: br_netfilter: skip conntrack input hook for promisc packets
Ziyang Xuan <william.xuanziyang@huawei.com>
netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
Ziyang Xuan <william.xuanziyang@huawei.com>
netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
scsi: ufs: qcom: Add missing interconnect bandwidth values for Gear 5
Heiner Kallweit <hkallweit1@gmail.com>
r8169: add missing conditional compiling for call to r8169_remove_leds
Heiner Kallweit <hkallweit1@gmail.com>
r8169: fix LED-related deadlock on module removal
Naohiro Aota <naohiro.aota@wdc.com>
btrfs: zoned: do not flag ZEROOUT on non-dirty extent buffer
Qu Wenruo <wqu@suse.com>
btrfs: do not wait for short bulk allocation
Jose Ignacio Tornos Martinez <jtornosm@redhat.com>
net: usb: ax88179_178a: avoid writing the mac address before first reading
Bart Van Assche <bvanassche@acm.org>
scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING
Jason A. Donenfeld <Jason@zx2c4.com>
random: handle creditable entropy from atomic process context
Yuanhe Shu <xiangzao@linux.alibaba.com>
selftests/ftrace: Limit length in subsystem-enable tests
Steven Rostedt (Google) <rostedt@goodmis.org>
SUNRPC: Fix rpcgss_context trace event acceptor field
Jason A. Donenfeld <Jason@zx2c4.com>
Revert "vmgenid: emit uevent when VMGENID updates"
Ville Syrjälä <ville.syrjala@linux.intel.com>
drm/i915/cdclk: Fix voltage_level programming edge case
Alexey Izbyshev <izbyshev@ispras.ru>
io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
-------------
Diffstat:
Makefile | 4 +-
arch/arm64/kernel/head.S | 5 +
arch/arm64/mm/pageattr.c | 3 -
arch/x86/include/asm/barrier.h | 3 +
arch/x86/include/asm/kvm_host.h | 1 +
arch/x86/kernel/cpu/bugs.c | 11 +-
arch/x86/kernel/cpu/cpuid-deps.c | 6 +-
arch/x86/kvm/cpuid.c | 1 +
arch/x86/kvm/cpuid.h | 10 ++
arch/x86/kvm/lapic.c | 3 +-
arch/x86/kvm/mmu/mmu.c | 5 +-
arch/x86/kvm/mmu/tdp_mmu.c | 21 ++-
arch/x86/kvm/vmx/vmx.c | 24 ++-
arch/x86/kvm/x86.c | 2 +-
block/bdev.c | 29 ++--
block/ioctl.c | 3 +-
drivers/accessibility/speakup/main.c | 2 +-
drivers/android/binder.c | 4 +-
drivers/char/random.c | 10 +-
drivers/clk/clk.c | 161 ++++++++++++++----
drivers/clk/mediatek/clk-mt7988-infracfg.c | 2 +-
drivers/clk/mediatek/clk-mtk.c | 15 ++
drivers/comedi/drivers/vmk80xx.c | 35 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 -
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 72 ++++++---
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +-
drivers/gpu/drm/i915/display/intel_cdclk.c | 37 +++--
drivers/gpu/drm/nouveau/nouveau_bios.c | 13 +-
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 7 +-
drivers/gpu/drm/panel/panel-visionox-rm69299.c | 2 -
drivers/gpu/drm/radeon/radeon_atombios.c | 8 +-
drivers/gpu/drm/ttm/ttm_pool.c | 38 +++--
drivers/gpu/drm/v3d/v3d_irq.c | 4 -
drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 35 +++-
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 7 +-
drivers/gpu/drm/vmwgfx/vmwgfx_bo.h | 2 +
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 3 +
drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 32 ++++
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 15 +-
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 44 +++--
drivers/gpu/drm/xe/display/intel_fb_bo.c | 8 +-
drivers/infiniband/core/cm.c | 11 +-
drivers/infiniband/hw/mlx5/mad.c | 3 +-
drivers/infiniband/sw/rxe/rxe.c | 2 +
drivers/interconnect/core.c | 8 +
drivers/interconnect/qcom/x1e80100.c | 26 ---
drivers/iommu/iommufd/Kconfig | 1 +
drivers/misc/cardreader/rtsx_pcr.c | 2 +-
drivers/misc/mei/pci-me.c | 2 +-
drivers/misc/mei/platform-vsc.c | 17 +-
drivers/misc/mei/vsc-tp.c | 84 +++++++---
drivers/misc/mei/vsc-tp.h | 3 +
drivers/net/dsa/mt7530.c | 38 +++--
drivers/net/dsa/mt7530.h | 5 +
drivers/net/ethernet/intel/ice/ice_tc_lib.c | 15 +-
.../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 7 +-
drivers/net/ethernet/mediatek/mtk_wed.c | 6 +-
drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 27 ++--
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 9 +-
.../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 +
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 4 +-
drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +-
.../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 1 -
.../ethernet/microchip/sparx5/sparx5_tc_flower.c | 61 ++++---
drivers/net/ethernet/realtek/r8169.h | 4 +-
drivers/net/ethernet/realtek/r8169_leds.c | 23 ++-
drivers/net/ethernet/realtek/r8169_main.c | 7 +-
drivers/net/ethernet/renesas/ravb.h | 6 +-
drivers/net/ethernet/renesas/ravb_main.c | 93 ++++++-----
drivers/net/ethernet/stmicro/stmmac/common.h | 1 +
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +
.../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +
.../net/ethernet/stmicro/stmmac/dwmac100_core.c | 2 +
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 7 +-
.../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 18 +--
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 29 ++--
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 18 +++
drivers/net/tun.c | 18 ++-
drivers/net/usb/ax88179_178a.c | 4 +-
drivers/platform/x86/amd/pmc/pmc-quirks.c | 9 ++
drivers/s390/cio/device.c | 13 +-
drivers/s390/cio/qdio_main.c | 28 +++-
drivers/s390/net/ism_drv.c | 37 +++--
drivers/scsi/scsi_lib.c | 7 +-
drivers/thermal/thermal_debugfs.c | 1 +
drivers/thunderbolt/domain.c | 5 +-
drivers/thunderbolt/icm.c | 2 +-
drivers/thunderbolt/lc.c | 45 ++++++
drivers/thunderbolt/nhi.c | 19 ++-
drivers/thunderbolt/path.c | 13 ++
drivers/thunderbolt/switch.c | 180 ++++++++++++++++++---
drivers/thunderbolt/tb.c | 36 +++--
drivers/thunderbolt/tb.h | 10 +-
drivers/thunderbolt/tb_regs.h | 6 +
drivers/thunderbolt/usb4.c | 52 +++++-
drivers/tty/serial/8250/8250_dw.c | 6 +-
drivers/tty/serial/mxs-auart.c | 8 +-
drivers/tty/serial/pmac_zilog.c | 14 --
drivers/tty/serial/serial_base.h | 4 +
drivers/tty/serial/serial_core.c | 23 ++-
drivers/tty/serial/serial_port.c | 34 ++++
drivers/tty/serial/stm32-usart.c | 13 +-
drivers/ufs/host/ufs-qcom.c | 8 +-
drivers/usb/class/cdc-wdm.c | 6 +-
drivers/usb/core/port.c | 4 +-
drivers/usb/dwc2/hcd_ddma.c | 4 +-
drivers/usb/gadget/function/f_ncm.c | 4 +-
drivers/usb/misc/onboard_usb_hub.c | 6 +-
drivers/usb/serial/option.c | 40 +++++
drivers/usb/typec/tcpm/tcpm.c | 4 +-
drivers/virt/vmgenid.c | 2 -
fs/btrfs/extent_io.c | 20 +--
fs/fuse/dir.c | 1 +
fs/nfsd/nfs4xdr.c | 47 +++---
fs/nilfs2/dir.c | 2 +-
fs/smb/common/smb2pdu.h | 2 +-
fs/smb/server/server.c | 13 +-
fs/smb/server/smb2pdu.c | 4 +
fs/smb/server/vfs.c | 5 +
fs/squashfs/inode.c | 5 +-
fs/sysfs/file.c | 2 +
include/asm-generic/barrier.h | 8 +
include/linux/blkdev.h | 2 +
include/linux/bootconfig.h | 7 +-
include/linux/gpio/property.h | 1 -
include/linux/shmem_fs.h | 9 ++
include/linux/swapops.h | 65 ++++----
include/linux/udp.h | 2 +-
include/net/netfilter/nf_flow_table.h | 12 +-
include/net/netfilter/nf_tables.h | 14 ++
include/net/sch_generic.h | 1 +
include/trace/events/rpcgss.h | 4 +-
init/main.c | 2 +
io_uring/io_uring.c | 26 +--
kernel/fork.c | 33 ++--
kernel/sched/sched.h | 20 ++-
lib/bootconfig.c | 19 ++-
mm/gup.c | 54 ++++---
mm/huge_memory.c | 6 +-
mm/hugetlb.c | 10 +-
mm/internal.h | 10 +-
mm/madvise.c | 17 +-
mm/memory-failure.c | 18 ++-
mm/shmem.c | 6 -
net/bridge/br_input.c | 15 +-
net/bridge/br_netfilter_hooks.c | 6 +
net/bridge/br_private.h | 1 +
net/bridge/netfilter/nf_conntrack_bridge.c | 14 +-
net/core/dev.c | 6 +
net/netfilter/nf_flow_table_inet.c | 3 +-
net/netfilter/nf_flow_table_ip.c | 10 +-
net/netfilter/nf_tables_api.c | 82 ++++++++--
net/netfilter/nft_lookup.c | 1 +
net/netfilter/nft_set_bitmap.c | 4 +-
net/netfilter/nft_set_hash.c | 8 +-
net/netfilter/nft_set_pipapo.c | 43 ++---
net/netfilter/nft_set_pipapo.h | 6 +-
net/netfilter/nft_set_pipapo_avx2.c | 59 ++++---
net/netfilter/nft_set_rbtree.c | 4 +-
net/sched/sch_generic.c | 1 +
net/unix/af_unix.c | 12 +-
sound/core/seq/seq_ump_convert.c | 2 +-
sound/pci/hda/patch_realtek.c | 7 +-
sound/pci/hda/tas2781_hda_i2c.c | 4 +-
tools/perf/ui/browsers/annotate.c | 2 +-
tools/perf/util/annotate.c | 3 +
tools/perf/util/bpf_skel/lock_contention.bpf.c | 5 +-
.../ftrace/test.d/event/subsystem-enable.tc | 6 +-
tools/testing/selftests/iommu/config | 2 +
tools/testing/selftests/net/tcp_ao/lib/proc.c | 2 +-
tools/testing/selftests/net/tcp_ao/lib/setup.c | 12 +-
tools/testing/selftests/net/tcp_ao/rst.c | 23 +--
.../selftests/net/tcp_ao/setsockopt-closed.c | 2 +-
tools/testing/selftests/net/udpgso.c | 2 +-
.../testing/selftests/powerpc/papr_vpd/papr_vpd.c | 2 +-
178 files changed, 1898 insertions(+), 827 deletions(-)
^ permalink raw reply [relevance 3%]
* Re: [PATCH][next] smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings
2024-04-23 20:47 0% ` Gustavo A. R. Silva
2024-04-23 21:08 0% ` Gustavo A. R. Silva
@ 2024-04-23 21:09 0% ` Steve French
1 sibling, 0 replies; 200+ results
From: Steve French @ 2024-04-23 21:09 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Gustavo A. R. Silva, Steve French, Paulo Alcantara,
Ronnie Sahlberg, Shyam Prasad N, Tom Talpey, Bharath SM,
Namjae Jeon, Sergey Senozhatsky, linux-cifs, samba-technical,
linux-kernel, linux-hardening, Kees Cook
On Tue, Apr 23, 2024 at 3:48 PM Gustavo A. R. Silva
<gustavo@embeddedor.com> wrote:
>
>
>
> On 23/04/24 14:15, Steve French wrote:
> > This looks reasonably safe (running the usual regression tests on it now).
> >
> > Reminds me though that we have to be careful (e.g. the recent fix for
> > regression caused by cleanup).
>
> mmh... it seems that the offending commit was never CC'd to the linux-hardening
> list, hence it wasn't reviewed by us.
>
> After reviewing both, the offending commit and the fix, both seem to be wrong.
>
> for __packed structs, you should use __struct_group():
>
> __struct_group(network_open_info, group_name, __packed, struct_members);
>
> The _packed in the commit 0268a7cc7fdc is not an attribute, it's the name
> for the group. So, it's not actually doing what the submitter thinks it does.
Do you want to submit a followup fix to fix this? Or let Namjae fix it?
> > Thoughts about whether should be sent in rc6 or wait till 6.10? 51
> > warnings does sound
> > distracting though so might be worth going in sooner rather than later.
>
> There is actually no hurry. :)
>
> Thanks
> --
> Gustavo
>
> >
> > commit 0268a7cc7fdc47d90b6c18859de7718d5059f6f1
> > Author: Namjae Jeon <linkinjeon@kernel.org>
> > Date: Fri Apr 19 23:46:34 2024 +0900
> >
> > ksmbd: common: use struct_group_attr instead of struct_group for
> > network_open_info
> >
> > 4byte padding cause the connection issue with the applications of MacOS.
> > smb2_close response size increases by 4 bytes by padding, And the smb
> > client of MacOS check it and stop the connection. This patch use
> > struct_group_attr instead of struct_group for network_open_info to use
> > __packed to avoid padding.
> >
> >
> > On Tue, Apr 23, 2024 at 1:58 PM Gustavo A. R. Silva
> > <gustavo@embeddedor.com> wrote:
> >>
> >> Hi all,
> >>
> >> Friendly ping: who can take this, please?
> >>
> >> Thanks
> >> --
> >> Gustavo
> >>
> >> On 11/04/24 09:35, Gustavo A. R. Silva wrote:
> >>> -Wflex-array-member-not-at-end is coming in GCC-14, and we are getting
> >>> ready to enable it globally.
> >>>
> >>> So, in order to avoid ending up with a flexible-array member in the
> >>> middle of multiple other structs, we use the `__struct_group()` helper
> >>> to separate the flexible array from the rest of the members in the
> >>> flexible structure, and use the tagged `struct create_context_hdr`
> >>> instead of `struct create_context`.
> >>>
> >>> So, with these changes, fix 51 of the following warnings[1]:
> >>>
> >>> fs/smb/client/../common/smb2pdu.h:1225:31: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
> >>>
> >>> Link: https://gist.github.com/GustavoARSilva/772526a39be3dd4db39e71497f0a9893 [1]
> >>> Link: https://github.com/KSPP/linux/issues/202
> >>> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> >>> ---
> >>> fs/smb/client/smb2pdu.h | 12 ++++++------
> >>> fs/smb/common/smb2pdu.h | 33 ++++++++++++++++++---------------
> >>> fs/smb/server/smb2pdu.h | 18 +++++++++---------
> >>> 3 files changed, 33 insertions(+), 30 deletions(-)
> >>>
> >>> diff --git a/fs/smb/client/smb2pdu.h b/fs/smb/client/smb2pdu.h
> >>> index c72a3b2886b7..1a02bd9e0c00 100644
> >>> --- a/fs/smb/client/smb2pdu.h
> >>> +++ b/fs/smb/client/smb2pdu.h
> >>> @@ -145,7 +145,7 @@ struct durable_context_v2 {
> >>> } __packed;
> >>>
> >>> struct create_durable_v2 {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> struct durable_context_v2 dcontext;
> >>> } __packed;
> >>> @@ -167,7 +167,7 @@ struct durable_reconnect_context_v2_rsp {
> >>> } __packed;
> >>>
> >>> struct create_durable_handle_reconnect_v2 {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> struct durable_reconnect_context_v2 dcontext;
> >>> __u8 Pad[4];
> >>> @@ -175,7 +175,7 @@ struct create_durable_handle_reconnect_v2 {
> >>>
> >>> /* See MS-SMB2 2.2.13.2.5 */
> >>> struct crt_twarp_ctxt {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> __le64 Timestamp;
> >>>
> >>> @@ -183,12 +183,12 @@ struct crt_twarp_ctxt {
> >>>
> >>> /* See MS-SMB2 2.2.13.2.9 */
> >>> struct crt_query_id_ctxt {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> } __packed;
> >>>
> >>> struct crt_sd_ctxt {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> struct smb3_sd sd;
> >>> } __packed;
> >>> @@ -415,7 +415,7 @@ struct smb2_posix_info_parsed {
> >>> };
> >>>
> >>> struct smb2_create_ea_ctx {
> >>> - struct create_context ctx;
> >>> + struct create_context_hdr ctx;
> >>> __u8 name[8];
> >>> struct smb2_file_full_ea_info ea;
> >>> } __packed;
> >>> diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h
> >>> index 1b594307c9d5..eab9d49c63ba 100644
> >>> --- a/fs/smb/common/smb2pdu.h
> >>> +++ b/fs/smb/common/smb2pdu.h
> >>> @@ -1171,12 +1171,15 @@ struct smb2_server_client_notification {
> >>> #define SMB2_CREATE_FLAG_REPARSEPOINT 0x01
> >>>
> >>> struct create_context {
> >>> - __le32 Next;
> >>> - __le16 NameOffset;
> >>> - __le16 NameLength;
> >>> - __le16 Reserved;
> >>> - __le16 DataOffset;
> >>> - __le32 DataLength;
> >>> + /* New members must be added within the struct_group() macro below. */
> >>> + __struct_group(create_context_hdr, hdr, __packed,
> >>> + __le32 Next;
> >>> + __le16 NameOffset;
> >>> + __le16 NameLength;
> >>> + __le16 Reserved;
> >>> + __le16 DataOffset;
> >>> + __le32 DataLength;
> >>> + );
> >>> __u8 Buffer[];
> >>> } __packed;
> >>>
> >>> @@ -1222,7 +1225,7 @@ struct smb2_create_rsp {
> >>> } __packed;
> >>>
> >>> struct create_posix {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[16];
> >>> __le32 Mode;
> >>> __u32 Reserved;
> >>> @@ -1230,7 +1233,7 @@ struct create_posix {
> >>>
> >>> /* See MS-SMB2 2.2.13.2.3 and MS-SMB2 2.2.13.2.4 */
> >>> struct create_durable {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> union {
> >>> __u8 Reserved[16];
> >>> @@ -1243,14 +1246,14 @@ struct create_durable {
> >>>
> >>> /* See MS-SMB2 2.2.13.2.5 */
> >>> struct create_mxac_req {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> __le64 Timestamp;
> >>> } __packed;
> >>>
> >>> /* See MS-SMB2 2.2.14.2.5 */
> >>> struct create_mxac_rsp {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> __le32 QueryStatus;
> >>> __le32 MaximalAccess;
> >>> @@ -1286,13 +1289,13 @@ struct lease_context_v2 {
> >>> } __packed;
> >>>
> >>> struct create_lease {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> struct lease_context lcontext;
> >>> } __packed;
> >>>
> >>> struct create_lease_v2 {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> struct lease_context_v2 lcontext;
> >>> __u8 Pad[4];
> >>> @@ -1300,7 +1303,7 @@ struct create_lease_v2 {
> >>>
> >>> /* See MS-SMB2 2.2.14.2.9 */
> >>> struct create_disk_id_rsp {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> __le64 DiskFileId;
> >>> __le64 VolumeId;
> >>> @@ -1309,7 +1312,7 @@ struct create_disk_id_rsp {
> >>>
> >>> /* See MS-SMB2 2.2.13.2.13 */
> >>> struct create_app_inst_id {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[16];
> >>> __le32 StructureSize; /* Must be 20 */
> >>> __u16 Reserved;
> >>> @@ -1318,7 +1321,7 @@ struct create_app_inst_id {
> >>>
> >>> /* See MS-SMB2 2.2.13.2.15 */
> >>> struct create_app_inst_id_vers {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[16];
> >>> __le32 StructureSize; /* Must be 24 */
> >>> __u16 Reserved;
> >>> diff --git a/fs/smb/server/smb2pdu.h b/fs/smb/server/smb2pdu.h
> >>> index bd1d2a0e9203..643f5e1cfe35 100644
> >>> --- a/fs/smb/server/smb2pdu.h
> >>> +++ b/fs/smb/server/smb2pdu.h
> >>> @@ -64,7 +64,7 @@ struct preauth_integrity_info {
> >>> #define SMB2_SESSION_TIMEOUT (10 * HZ)
> >>>
> >>> struct create_durable_req_v2 {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> __le32 Timeout;
> >>> __le32 Flags;
> >>> @@ -73,7 +73,7 @@ struct create_durable_req_v2 {
> >>> } __packed;
> >>>
> >>> struct create_durable_reconn_req {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> union {
> >>> __u8 Reserved[16];
> >>> @@ -85,7 +85,7 @@ struct create_durable_reconn_req {
> >>> } __packed;
> >>>
> >>> struct create_durable_reconn_v2_req {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> struct {
> >>> __u64 PersistentFileId;
> >>> @@ -96,13 +96,13 @@ struct create_durable_reconn_v2_req {
> >>> } __packed;
> >>>
> >>> struct create_alloc_size_req {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> __le64 AllocationSize;
> >>> } __packed;
> >>>
> >>> struct create_durable_rsp {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> union {
> >>> __u8 Reserved[8];
> >>> @@ -114,7 +114,7 @@ struct create_durable_rsp {
> >>> /* Flags */
> >>> #define SMB2_DHANDLE_FLAG_PERSISTENT 0x00000002
> >>> struct create_durable_v2_rsp {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> __le32 Timeout;
> >>> __le32 Flags;
> >>> @@ -122,7 +122,7 @@ struct create_durable_v2_rsp {
> >>>
> >>> /* equivalent of the contents of SMB3.1.1 POSIX open context response */
> >>> struct create_posix_rsp {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[16];
> >>> __le32 nlink;
> >>> __le32 reparse_tag;
> >>> @@ -381,13 +381,13 @@ struct smb2_ea_info {
> >>> } __packed; /* level 15 Query */
> >>>
> >>> struct create_ea_buf_req {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> struct smb2_ea_info ea;
> >>> } __packed;
> >>>
> >>> struct create_sd_buf_req {
> >>> - struct create_context ccontext;
> >>> + struct create_context_hdr ccontext;
> >>> __u8 Name[8];
> >>> struct smb_ntsd ntsd;
> >>> } __packed;
> >>
> >
> >
> > --
> > Thanks,
> >
> > Steve
--
Thanks,
Steve
^ permalink raw reply [relevance 0%]
* Re: [PATCH][next] smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings
2024-04-23 20:47 0% ` Gustavo A. R. Silva
@ 2024-04-23 21:08 0% ` Gustavo A. R. Silva
2024-04-23 21:09 0% ` Steve French
1 sibling, 0 replies; 200+ results
From: Gustavo A. R. Silva @ 2024-04-23 21:08 UTC (permalink / raw)
To: Steve French
Cc: Gustavo A. R. Silva, Steve French, Paulo Alcantara,
Ronnie Sahlberg, Shyam Prasad N, Tom Talpey, Bharath SM,
Namjae Jeon, Sergey Senozhatsky, linux-cifs, samba-technical,
linux-kernel, linux-hardening, Kees Cook
On 23/04/24 14:47, Gustavo A. R. Silva wrote:
>
>
> On 23/04/24 14:15, Steve French wrote:
>> This looks reasonably safe (running the usual regression tests on it now).
>>
>> Reminds me though that we have to be careful (e.g. the recent fix for
>> regression caused by cleanup).
>
> mmh... it seems that the offending commit was never CC'd to the linux-hardening
> list, hence it wasn't reviewed by us.
>
> After reviewing both, the offending commit and the fix, both seem to be wrong.
>
> for __packed structs, you should use __struct_group():
>
> __struct_group(network_open_info, group_name, __packed, struct_members);
>
> The _packed in the commit 0268a7cc7fdc is not an attribute, it's the name
> for the group. So, it's not actually doing what the submitter thinks it does.
Sorry about this, I'm still too sleep deprived, aghr... I confused the suffix
_attr with _tag.
The fix is correct!
Thanks!
--
Gustavo
>
>>
>> Thoughts about whether should be sent in rc6 or wait till 6.10? 51
>> warnings does sound
>> distracting though so might be worth going in sooner rather than later.
>
> There is actually no hurry. :)
>
> Thanks
> --
> Gustavo
>
>>
>> commit 0268a7cc7fdc47d90b6c18859de7718d5059f6f1
>> Author: Namjae Jeon <linkinjeon@kernel.org>
>> Date: Fri Apr 19 23:46:34 2024 +0900
>>
>> ksmbd: common: use struct_group_attr instead of struct_group for
>> network_open_info
>>
>> 4byte padding cause the connection issue with the applications of MacOS.
>> smb2_close response size increases by 4 bytes by padding, And the smb
>> client of MacOS check it and stop the connection. This patch use
>> struct_group_attr instead of struct_group for network_open_info to use
>> __packed to avoid padding.
>>
>>
>> On Tue, Apr 23, 2024 at 1:58 PM Gustavo A. R. Silva
>> <gustavo@embeddedor.com> wrote:
>>>
>>> Hi all,
>>>
>>> Friendly ping: who can take this, please?
>>>
>>> Thanks
>>> --
>>> Gustavo
>>>
>>> On 11/04/24 09:35, Gustavo A. R. Silva wrote:
>>>> -Wflex-array-member-not-at-end is coming in GCC-14, and we are getting
>>>> ready to enable it globally.
>>>>
>>>> So, in order to avoid ending up with a flexible-array member in the
>>>> middle of multiple other structs, we use the `__struct_group()` helper
>>>> to separate the flexible array from the rest of the members in the
>>>> flexible structure, and use the tagged `struct create_context_hdr`
>>>> instead of `struct create_context`.
>>>>
>>>> So, with these changes, fix 51 of the following warnings[1]:
>>>>
>>>> fs/smb/client/../common/smb2pdu.h:1225:31: warning: structure containing a flexible array member is not at the end of another structure
>>>> [-Wflex-array-member-not-at-end]
>>>>
>>>> Link: https://gist.github.com/GustavoARSilva/772526a39be3dd4db39e71497f0a9893 [1]
>>>> Link: https://github.com/KSPP/linux/issues/202
>>>> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
>>>> ---
>>>> fs/smb/client/smb2pdu.h | 12 ++++++------
>>>> fs/smb/common/smb2pdu.h | 33 ++++++++++++++++++---------------
>>>> fs/smb/server/smb2pdu.h | 18 +++++++++---------
>>>> 3 files changed, 33 insertions(+), 30 deletions(-)
>>>>
>>>> diff --git a/fs/smb/client/smb2pdu.h b/fs/smb/client/smb2pdu.h
>>>> index c72a3b2886b7..1a02bd9e0c00 100644
>>>> --- a/fs/smb/client/smb2pdu.h
>>>> +++ b/fs/smb/client/smb2pdu.h
>>>> @@ -145,7 +145,7 @@ struct durable_context_v2 {
>>>> } __packed;
>>>>
>>>> struct create_durable_v2 {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> struct durable_context_v2 dcontext;
>>>> } __packed;
>>>> @@ -167,7 +167,7 @@ struct durable_reconnect_context_v2_rsp {
>>>> } __packed;
>>>>
>>>> struct create_durable_handle_reconnect_v2 {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> struct durable_reconnect_context_v2 dcontext;
>>>> __u8 Pad[4];
>>>> @@ -175,7 +175,7 @@ struct create_durable_handle_reconnect_v2 {
>>>>
>>>> /* See MS-SMB2 2.2.13.2.5 */
>>>> struct crt_twarp_ctxt {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> __le64 Timestamp;
>>>>
>>>> @@ -183,12 +183,12 @@ struct crt_twarp_ctxt {
>>>>
>>>> /* See MS-SMB2 2.2.13.2.9 */
>>>> struct crt_query_id_ctxt {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> } __packed;
>>>>
>>>> struct crt_sd_ctxt {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> struct smb3_sd sd;
>>>> } __packed;
>>>> @@ -415,7 +415,7 @@ struct smb2_posix_info_parsed {
>>>> };
>>>>
>>>> struct smb2_create_ea_ctx {
>>>> - struct create_context ctx;
>>>> + struct create_context_hdr ctx;
>>>> __u8 name[8];
>>>> struct smb2_file_full_ea_info ea;
>>>> } __packed;
>>>> diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h
>>>> index 1b594307c9d5..eab9d49c63ba 100644
>>>> --- a/fs/smb/common/smb2pdu.h
>>>> +++ b/fs/smb/common/smb2pdu.h
>>>> @@ -1171,12 +1171,15 @@ struct smb2_server_client_notification {
>>>> #define SMB2_CREATE_FLAG_REPARSEPOINT 0x01
>>>>
>>>> struct create_context {
>>>> - __le32 Next;
>>>> - __le16 NameOffset;
>>>> - __le16 NameLength;
>>>> - __le16 Reserved;
>>>> - __le16 DataOffset;
>>>> - __le32 DataLength;
>>>> + /* New members must be added within the struct_group() macro below. */
>>>> + __struct_group(create_context_hdr, hdr, __packed,
>>>> + __le32 Next;
>>>> + __le16 NameOffset;
>>>> + __le16 NameLength;
>>>> + __le16 Reserved;
>>>> + __le16 DataOffset;
>>>> + __le32 DataLength;
>>>> + );
>>>> __u8 Buffer[];
>>>> } __packed;
>>>>
>>>> @@ -1222,7 +1225,7 @@ struct smb2_create_rsp {
>>>> } __packed;
>>>>
>>>> struct create_posix {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[16];
>>>> __le32 Mode;
>>>> __u32 Reserved;
>>>> @@ -1230,7 +1233,7 @@ struct create_posix {
>>>>
>>>> /* See MS-SMB2 2.2.13.2.3 and MS-SMB2 2.2.13.2.4 */
>>>> struct create_durable {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> union {
>>>> __u8 Reserved[16];
>>>> @@ -1243,14 +1246,14 @@ struct create_durable {
>>>>
>>>> /* See MS-SMB2 2.2.13.2.5 */
>>>> struct create_mxac_req {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> __le64 Timestamp;
>>>> } __packed;
>>>>
>>>> /* See MS-SMB2 2.2.14.2.5 */
>>>> struct create_mxac_rsp {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> __le32 QueryStatus;
>>>> __le32 MaximalAccess;
>>>> @@ -1286,13 +1289,13 @@ struct lease_context_v2 {
>>>> } __packed;
>>>>
>>>> struct create_lease {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> struct lease_context lcontext;
>>>> } __packed;
>>>>
>>>> struct create_lease_v2 {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> struct lease_context_v2 lcontext;
>>>> __u8 Pad[4];
>>>> @@ -1300,7 +1303,7 @@ struct create_lease_v2 {
>>>>
>>>> /* See MS-SMB2 2.2.14.2.9 */
>>>> struct create_disk_id_rsp {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> __le64 DiskFileId;
>>>> __le64 VolumeId;
>>>> @@ -1309,7 +1312,7 @@ struct create_disk_id_rsp {
>>>>
>>>> /* See MS-SMB2 2.2.13.2.13 */
>>>> struct create_app_inst_id {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[16];
>>>> __le32 StructureSize; /* Must be 20 */
>>>> __u16 Reserved;
>>>> @@ -1318,7 +1321,7 @@ struct create_app_inst_id {
>>>>
>>>> /* See MS-SMB2 2.2.13.2.15 */
>>>> struct create_app_inst_id_vers {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[16];
>>>> __le32 StructureSize; /* Must be 24 */
>>>> __u16 Reserved;
>>>> diff --git a/fs/smb/server/smb2pdu.h b/fs/smb/server/smb2pdu.h
>>>> index bd1d2a0e9203..643f5e1cfe35 100644
>>>> --- a/fs/smb/server/smb2pdu.h
>>>> +++ b/fs/smb/server/smb2pdu.h
>>>> @@ -64,7 +64,7 @@ struct preauth_integrity_info {
>>>> #define SMB2_SESSION_TIMEOUT (10 * HZ)
>>>>
>>>> struct create_durable_req_v2 {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> __le32 Timeout;
>>>> __le32 Flags;
>>>> @@ -73,7 +73,7 @@ struct create_durable_req_v2 {
>>>> } __packed;
>>>>
>>>> struct create_durable_reconn_req {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> union {
>>>> __u8 Reserved[16];
>>>> @@ -85,7 +85,7 @@ struct create_durable_reconn_req {
>>>> } __packed;
>>>>
>>>> struct create_durable_reconn_v2_req {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> struct {
>>>> __u64 PersistentFileId;
>>>> @@ -96,13 +96,13 @@ struct create_durable_reconn_v2_req {
>>>> } __packed;
>>>>
>>>> struct create_alloc_size_req {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> __le64 AllocationSize;
>>>> } __packed;
>>>>
>>>> struct create_durable_rsp {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> union {
>>>> __u8 Reserved[8];
>>>> @@ -114,7 +114,7 @@ struct create_durable_rsp {
>>>> /* Flags */
>>>> #define SMB2_DHANDLE_FLAG_PERSISTENT 0x00000002
>>>> struct create_durable_v2_rsp {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> __le32 Timeout;
>>>> __le32 Flags;
>>>> @@ -122,7 +122,7 @@ struct create_durable_v2_rsp {
>>>>
>>>> /* equivalent of the contents of SMB3.1.1 POSIX open context response */
>>>> struct create_posix_rsp {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[16];
>>>> __le32 nlink;
>>>> __le32 reparse_tag;
>>>> @@ -381,13 +381,13 @@ struct smb2_ea_info {
>>>> } __packed; /* level 15 Query */
>>>>
>>>> struct create_ea_buf_req {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> struct smb2_ea_info ea;
>>>> } __packed;
>>>>
>>>> struct create_sd_buf_req {
>>>> - struct create_context ccontext;
>>>> + struct create_context_hdr ccontext;
>>>> __u8 Name[8];
>>>> struct smb_ntsd ntsd;
>>>> } __packed;
>>>
>>
>>
>> --
>> Thanks,
>>
>> Steve
^ permalink raw reply [relevance 0%]
* Re: [PATCH][next] smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings
2024-04-23 20:15 4% ` Steve French
@ 2024-04-23 20:47 0% ` Gustavo A. R. Silva
2024-04-23 21:08 0% ` Gustavo A. R. Silva
2024-04-23 21:09 0% ` Steve French
0 siblings, 2 replies; 200+ results
From: Gustavo A. R. Silva @ 2024-04-23 20:47 UTC (permalink / raw)
To: Steve French
Cc: Gustavo A. R. Silva, Steve French, Paulo Alcantara,
Ronnie Sahlberg, Shyam Prasad N, Tom Talpey, Bharath SM,
Namjae Jeon, Sergey Senozhatsky, linux-cifs, samba-technical,
linux-kernel, linux-hardening, Kees Cook
On 23/04/24 14:15, Steve French wrote:
> This looks reasonably safe (running the usual regression tests on it now).
>
> Reminds me though that we have to be careful (e.g. the recent fix for
> regression caused by cleanup).
mmh... it seems that the offending commit was never CC'd to the linux-hardening
list, hence it wasn't reviewed by us.
After reviewing both, the offending commit and the fix, both seem to be wrong.
for __packed structs, you should use __struct_group():
__struct_group(network_open_info, group_name, __packed, struct_members);
The _packed in the commit 0268a7cc7fdc is not an attribute, it's the name
for the group. So, it's not actually doing what the submitter thinks it does.
>
> Thoughts about whether should be sent in rc6 or wait till 6.10? 51
> warnings does sound
> distracting though so might be worth going in sooner rather than later.
There is actually no hurry. :)
Thanks
--
Gustavo
>
> commit 0268a7cc7fdc47d90b6c18859de7718d5059f6f1
> Author: Namjae Jeon <linkinjeon@kernel.org>
> Date: Fri Apr 19 23:46:34 2024 +0900
>
> ksmbd: common: use struct_group_attr instead of struct_group for
> network_open_info
>
> 4byte padding cause the connection issue with the applications of MacOS.
> smb2_close response size increases by 4 bytes by padding, And the smb
> client of MacOS check it and stop the connection. This patch use
> struct_group_attr instead of struct_group for network_open_info to use
> __packed to avoid padding.
>
>
> On Tue, Apr 23, 2024 at 1:58 PM Gustavo A. R. Silva
> <gustavo@embeddedor.com> wrote:
>>
>> Hi all,
>>
>> Friendly ping: who can take this, please?
>>
>> Thanks
>> --
>> Gustavo
>>
>> On 11/04/24 09:35, Gustavo A. R. Silva wrote:
>>> -Wflex-array-member-not-at-end is coming in GCC-14, and we are getting
>>> ready to enable it globally.
>>>
>>> So, in order to avoid ending up with a flexible-array member in the
>>> middle of multiple other structs, we use the `__struct_group()` helper
>>> to separate the flexible array from the rest of the members in the
>>> flexible structure, and use the tagged `struct create_context_hdr`
>>> instead of `struct create_context`.
>>>
>>> So, with these changes, fix 51 of the following warnings[1]:
>>>
>>> fs/smb/client/../common/smb2pdu.h:1225:31: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
>>>
>>> Link: https://gist.github.com/GustavoARSilva/772526a39be3dd4db39e71497f0a9893 [1]
>>> Link: https://github.com/KSPP/linux/issues/202
>>> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
>>> ---
>>> fs/smb/client/smb2pdu.h | 12 ++++++------
>>> fs/smb/common/smb2pdu.h | 33 ++++++++++++++++++---------------
>>> fs/smb/server/smb2pdu.h | 18 +++++++++---------
>>> 3 files changed, 33 insertions(+), 30 deletions(-)
>>>
>>> diff --git a/fs/smb/client/smb2pdu.h b/fs/smb/client/smb2pdu.h
>>> index c72a3b2886b7..1a02bd9e0c00 100644
>>> --- a/fs/smb/client/smb2pdu.h
>>> +++ b/fs/smb/client/smb2pdu.h
>>> @@ -145,7 +145,7 @@ struct durable_context_v2 {
>>> } __packed;
>>>
>>> struct create_durable_v2 {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> struct durable_context_v2 dcontext;
>>> } __packed;
>>> @@ -167,7 +167,7 @@ struct durable_reconnect_context_v2_rsp {
>>> } __packed;
>>>
>>> struct create_durable_handle_reconnect_v2 {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> struct durable_reconnect_context_v2 dcontext;
>>> __u8 Pad[4];
>>> @@ -175,7 +175,7 @@ struct create_durable_handle_reconnect_v2 {
>>>
>>> /* See MS-SMB2 2.2.13.2.5 */
>>> struct crt_twarp_ctxt {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> __le64 Timestamp;
>>>
>>> @@ -183,12 +183,12 @@ struct crt_twarp_ctxt {
>>>
>>> /* See MS-SMB2 2.2.13.2.9 */
>>> struct crt_query_id_ctxt {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> } __packed;
>>>
>>> struct crt_sd_ctxt {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> struct smb3_sd sd;
>>> } __packed;
>>> @@ -415,7 +415,7 @@ struct smb2_posix_info_parsed {
>>> };
>>>
>>> struct smb2_create_ea_ctx {
>>> - struct create_context ctx;
>>> + struct create_context_hdr ctx;
>>> __u8 name[8];
>>> struct smb2_file_full_ea_info ea;
>>> } __packed;
>>> diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h
>>> index 1b594307c9d5..eab9d49c63ba 100644
>>> --- a/fs/smb/common/smb2pdu.h
>>> +++ b/fs/smb/common/smb2pdu.h
>>> @@ -1171,12 +1171,15 @@ struct smb2_server_client_notification {
>>> #define SMB2_CREATE_FLAG_REPARSEPOINT 0x01
>>>
>>> struct create_context {
>>> - __le32 Next;
>>> - __le16 NameOffset;
>>> - __le16 NameLength;
>>> - __le16 Reserved;
>>> - __le16 DataOffset;
>>> - __le32 DataLength;
>>> + /* New members must be added within the struct_group() macro below. */
>>> + __struct_group(create_context_hdr, hdr, __packed,
>>> + __le32 Next;
>>> + __le16 NameOffset;
>>> + __le16 NameLength;
>>> + __le16 Reserved;
>>> + __le16 DataOffset;
>>> + __le32 DataLength;
>>> + );
>>> __u8 Buffer[];
>>> } __packed;
>>>
>>> @@ -1222,7 +1225,7 @@ struct smb2_create_rsp {
>>> } __packed;
>>>
>>> struct create_posix {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[16];
>>> __le32 Mode;
>>> __u32 Reserved;
>>> @@ -1230,7 +1233,7 @@ struct create_posix {
>>>
>>> /* See MS-SMB2 2.2.13.2.3 and MS-SMB2 2.2.13.2.4 */
>>> struct create_durable {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> union {
>>> __u8 Reserved[16];
>>> @@ -1243,14 +1246,14 @@ struct create_durable {
>>>
>>> /* See MS-SMB2 2.2.13.2.5 */
>>> struct create_mxac_req {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> __le64 Timestamp;
>>> } __packed;
>>>
>>> /* See MS-SMB2 2.2.14.2.5 */
>>> struct create_mxac_rsp {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> __le32 QueryStatus;
>>> __le32 MaximalAccess;
>>> @@ -1286,13 +1289,13 @@ struct lease_context_v2 {
>>> } __packed;
>>>
>>> struct create_lease {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> struct lease_context lcontext;
>>> } __packed;
>>>
>>> struct create_lease_v2 {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> struct lease_context_v2 lcontext;
>>> __u8 Pad[4];
>>> @@ -1300,7 +1303,7 @@ struct create_lease_v2 {
>>>
>>> /* See MS-SMB2 2.2.14.2.9 */
>>> struct create_disk_id_rsp {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> __le64 DiskFileId;
>>> __le64 VolumeId;
>>> @@ -1309,7 +1312,7 @@ struct create_disk_id_rsp {
>>>
>>> /* See MS-SMB2 2.2.13.2.13 */
>>> struct create_app_inst_id {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[16];
>>> __le32 StructureSize; /* Must be 20 */
>>> __u16 Reserved;
>>> @@ -1318,7 +1321,7 @@ struct create_app_inst_id {
>>>
>>> /* See MS-SMB2 2.2.13.2.15 */
>>> struct create_app_inst_id_vers {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[16];
>>> __le32 StructureSize; /* Must be 24 */
>>> __u16 Reserved;
>>> diff --git a/fs/smb/server/smb2pdu.h b/fs/smb/server/smb2pdu.h
>>> index bd1d2a0e9203..643f5e1cfe35 100644
>>> --- a/fs/smb/server/smb2pdu.h
>>> +++ b/fs/smb/server/smb2pdu.h
>>> @@ -64,7 +64,7 @@ struct preauth_integrity_info {
>>> #define SMB2_SESSION_TIMEOUT (10 * HZ)
>>>
>>> struct create_durable_req_v2 {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> __le32 Timeout;
>>> __le32 Flags;
>>> @@ -73,7 +73,7 @@ struct create_durable_req_v2 {
>>> } __packed;
>>>
>>> struct create_durable_reconn_req {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> union {
>>> __u8 Reserved[16];
>>> @@ -85,7 +85,7 @@ struct create_durable_reconn_req {
>>> } __packed;
>>>
>>> struct create_durable_reconn_v2_req {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> struct {
>>> __u64 PersistentFileId;
>>> @@ -96,13 +96,13 @@ struct create_durable_reconn_v2_req {
>>> } __packed;
>>>
>>> struct create_alloc_size_req {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> __le64 AllocationSize;
>>> } __packed;
>>>
>>> struct create_durable_rsp {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> union {
>>> __u8 Reserved[8];
>>> @@ -114,7 +114,7 @@ struct create_durable_rsp {
>>> /* Flags */
>>> #define SMB2_DHANDLE_FLAG_PERSISTENT 0x00000002
>>> struct create_durable_v2_rsp {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> __le32 Timeout;
>>> __le32 Flags;
>>> @@ -122,7 +122,7 @@ struct create_durable_v2_rsp {
>>>
>>> /* equivalent of the contents of SMB3.1.1 POSIX open context response */
>>> struct create_posix_rsp {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[16];
>>> __le32 nlink;
>>> __le32 reparse_tag;
>>> @@ -381,13 +381,13 @@ struct smb2_ea_info {
>>> } __packed; /* level 15 Query */
>>>
>>> struct create_ea_buf_req {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> struct smb2_ea_info ea;
>>> } __packed;
>>>
>>> struct create_sd_buf_req {
>>> - struct create_context ccontext;
>>> + struct create_context_hdr ccontext;
>>> __u8 Name[8];
>>> struct smb_ntsd ntsd;
>>> } __packed;
>>
>
>
> --
> Thanks,
>
> Steve
^ permalink raw reply [relevance 0%]
* Re: [PATCH][next] smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings
@ 2024-04-23 20:15 4% ` Steve French
2024-04-23 20:47 0% ` Gustavo A. R. Silva
0 siblings, 1 reply; 200+ results
From: Steve French @ 2024-04-23 20:15 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Gustavo A. R. Silva, Steve French, Paulo Alcantara,
Ronnie Sahlberg, Shyam Prasad N, Tom Talpey, Bharath SM,
Namjae Jeon, Sergey Senozhatsky, linux-cifs, samba-technical,
linux-kernel, linux-hardening, Kees Cook
This looks reasonably safe (running the usual regression tests on it now).
Reminds me though that we have to be careful (e.g. the recent fix for
regression caused by cleanup).
Thoughts about whether should be sent in rc6 or wait till 6.10? 51
warnings does sound
distracting though so might be worth going in sooner rather than later.
commit 0268a7cc7fdc47d90b6c18859de7718d5059f6f1
Author: Namjae Jeon <linkinjeon@kernel.org>
Date: Fri Apr 19 23:46:34 2024 +0900
ksmbd: common: use struct_group_attr instead of struct_group for
network_open_info
4byte padding cause the connection issue with the applications of MacOS.
smb2_close response size increases by 4 bytes by padding, And the smb
client of MacOS check it and stop the connection. This patch use
struct_group_attr instead of struct_group for network_open_info to use
__packed to avoid padding.
On Tue, Apr 23, 2024 at 1:58 PM Gustavo A. R. Silva
<gustavo@embeddedor.com> wrote:
>
> Hi all,
>
> Friendly ping: who can take this, please?
>
> Thanks
> --
> Gustavo
>
> On 11/04/24 09:35, Gustavo A. R. Silva wrote:
> > -Wflex-array-member-not-at-end is coming in GCC-14, and we are getting
> > ready to enable it globally.
> >
> > So, in order to avoid ending up with a flexible-array member in the
> > middle of multiple other structs, we use the `__struct_group()` helper
> > to separate the flexible array from the rest of the members in the
> > flexible structure, and use the tagged `struct create_context_hdr`
> > instead of `struct create_context`.
> >
> > So, with these changes, fix 51 of the following warnings[1]:
> >
> > fs/smb/client/../common/smb2pdu.h:1225:31: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
> >
> > Link: https://gist.github.com/GustavoARSilva/772526a39be3dd4db39e71497f0a9893 [1]
> > Link: https://github.com/KSPP/linux/issues/202
> > Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> > ---
> > fs/smb/client/smb2pdu.h | 12 ++++++------
> > fs/smb/common/smb2pdu.h | 33 ++++++++++++++++++---------------
> > fs/smb/server/smb2pdu.h | 18 +++++++++---------
> > 3 files changed, 33 insertions(+), 30 deletions(-)
> >
> > diff --git a/fs/smb/client/smb2pdu.h b/fs/smb/client/smb2pdu.h
> > index c72a3b2886b7..1a02bd9e0c00 100644
> > --- a/fs/smb/client/smb2pdu.h
> > +++ b/fs/smb/client/smb2pdu.h
> > @@ -145,7 +145,7 @@ struct durable_context_v2 {
> > } __packed;
> >
> > struct create_durable_v2 {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > struct durable_context_v2 dcontext;
> > } __packed;
> > @@ -167,7 +167,7 @@ struct durable_reconnect_context_v2_rsp {
> > } __packed;
> >
> > struct create_durable_handle_reconnect_v2 {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > struct durable_reconnect_context_v2 dcontext;
> > __u8 Pad[4];
> > @@ -175,7 +175,7 @@ struct create_durable_handle_reconnect_v2 {
> >
> > /* See MS-SMB2 2.2.13.2.5 */
> > struct crt_twarp_ctxt {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > __le64 Timestamp;
> >
> > @@ -183,12 +183,12 @@ struct crt_twarp_ctxt {
> >
> > /* See MS-SMB2 2.2.13.2.9 */
> > struct crt_query_id_ctxt {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > } __packed;
> >
> > struct crt_sd_ctxt {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > struct smb3_sd sd;
> > } __packed;
> > @@ -415,7 +415,7 @@ struct smb2_posix_info_parsed {
> > };
> >
> > struct smb2_create_ea_ctx {
> > - struct create_context ctx;
> > + struct create_context_hdr ctx;
> > __u8 name[8];
> > struct smb2_file_full_ea_info ea;
> > } __packed;
> > diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h
> > index 1b594307c9d5..eab9d49c63ba 100644
> > --- a/fs/smb/common/smb2pdu.h
> > +++ b/fs/smb/common/smb2pdu.h
> > @@ -1171,12 +1171,15 @@ struct smb2_server_client_notification {
> > #define SMB2_CREATE_FLAG_REPARSEPOINT 0x01
> >
> > struct create_context {
> > - __le32 Next;
> > - __le16 NameOffset;
> > - __le16 NameLength;
> > - __le16 Reserved;
> > - __le16 DataOffset;
> > - __le32 DataLength;
> > + /* New members must be added within the struct_group() macro below. */
> > + __struct_group(create_context_hdr, hdr, __packed,
> > + __le32 Next;
> > + __le16 NameOffset;
> > + __le16 NameLength;
> > + __le16 Reserved;
> > + __le16 DataOffset;
> > + __le32 DataLength;
> > + );
> > __u8 Buffer[];
> > } __packed;
> >
> > @@ -1222,7 +1225,7 @@ struct smb2_create_rsp {
> > } __packed;
> >
> > struct create_posix {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[16];
> > __le32 Mode;
> > __u32 Reserved;
> > @@ -1230,7 +1233,7 @@ struct create_posix {
> >
> > /* See MS-SMB2 2.2.13.2.3 and MS-SMB2 2.2.13.2.4 */
> > struct create_durable {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > union {
> > __u8 Reserved[16];
> > @@ -1243,14 +1246,14 @@ struct create_durable {
> >
> > /* See MS-SMB2 2.2.13.2.5 */
> > struct create_mxac_req {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > __le64 Timestamp;
> > } __packed;
> >
> > /* See MS-SMB2 2.2.14.2.5 */
> > struct create_mxac_rsp {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > __le32 QueryStatus;
> > __le32 MaximalAccess;
> > @@ -1286,13 +1289,13 @@ struct lease_context_v2 {
> > } __packed;
> >
> > struct create_lease {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > struct lease_context lcontext;
> > } __packed;
> >
> > struct create_lease_v2 {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > struct lease_context_v2 lcontext;
> > __u8 Pad[4];
> > @@ -1300,7 +1303,7 @@ struct create_lease_v2 {
> >
> > /* See MS-SMB2 2.2.14.2.9 */
> > struct create_disk_id_rsp {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > __le64 DiskFileId;
> > __le64 VolumeId;
> > @@ -1309,7 +1312,7 @@ struct create_disk_id_rsp {
> >
> > /* See MS-SMB2 2.2.13.2.13 */
> > struct create_app_inst_id {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[16];
> > __le32 StructureSize; /* Must be 20 */
> > __u16 Reserved;
> > @@ -1318,7 +1321,7 @@ struct create_app_inst_id {
> >
> > /* See MS-SMB2 2.2.13.2.15 */
> > struct create_app_inst_id_vers {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[16];
> > __le32 StructureSize; /* Must be 24 */
> > __u16 Reserved;
> > diff --git a/fs/smb/server/smb2pdu.h b/fs/smb/server/smb2pdu.h
> > index bd1d2a0e9203..643f5e1cfe35 100644
> > --- a/fs/smb/server/smb2pdu.h
> > +++ b/fs/smb/server/smb2pdu.h
> > @@ -64,7 +64,7 @@ struct preauth_integrity_info {
> > #define SMB2_SESSION_TIMEOUT (10 * HZ)
> >
> > struct create_durable_req_v2 {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > __le32 Timeout;
> > __le32 Flags;
> > @@ -73,7 +73,7 @@ struct create_durable_req_v2 {
> > } __packed;
> >
> > struct create_durable_reconn_req {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > union {
> > __u8 Reserved[16];
> > @@ -85,7 +85,7 @@ struct create_durable_reconn_req {
> > } __packed;
> >
> > struct create_durable_reconn_v2_req {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > struct {
> > __u64 PersistentFileId;
> > @@ -96,13 +96,13 @@ struct create_durable_reconn_v2_req {
> > } __packed;
> >
> > struct create_alloc_size_req {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > __le64 AllocationSize;
> > } __packed;
> >
> > struct create_durable_rsp {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > union {
> > __u8 Reserved[8];
> > @@ -114,7 +114,7 @@ struct create_durable_rsp {
> > /* Flags */
> > #define SMB2_DHANDLE_FLAG_PERSISTENT 0x00000002
> > struct create_durable_v2_rsp {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > __le32 Timeout;
> > __le32 Flags;
> > @@ -122,7 +122,7 @@ struct create_durable_v2_rsp {
> >
> > /* equivalent of the contents of SMB3.1.1 POSIX open context response */
> > struct create_posix_rsp {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[16];
> > __le32 nlink;
> > __le32 reparse_tag;
> > @@ -381,13 +381,13 @@ struct smb2_ea_info {
> > } __packed; /* level 15 Query */
> >
> > struct create_ea_buf_req {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > struct smb2_ea_info ea;
> > } __packed;
> >
> > struct create_sd_buf_req {
> > - struct create_context ccontext;
> > + struct create_context_hdr ccontext;
> > __u8 Name[8];
> > struct smb_ntsd ntsd;
> > } __packed;
>
--
Thanks,
Steve
^ permalink raw reply [relevance 4%]
* Re: [PATCH AUTOSEL 6.1 15/17] smb: client, common: fix fortify warnings
@ 2024-04-23 18:57 6% ` Steve French
0 siblings, 0 replies; 200+ results
From: Steve French @ 2024-04-23 18:57 UTC (permalink / raw)
To: Sasha Levin
Cc: linux-kernel, stable, Dmitry Antipov, Namjae Jeon, Steve French,
sfrench, linux-cifs, samba-technical
Note that kernels that backported this fix will also need this ksmbd
fix (fixes a bug when Macs mount to ksmbd)
commit 0268a7cc7fdc47d90b6c18859de7718d5059f6f1
Author: Namjae Jeon <linkinjeon@kernel.org>
Date: Fri Apr 19 23:46:34 2024 +0900
ksmbd: common: use struct_group_attr instead of struct_group for
network_open_info
4byte padding cause the connection issue with the applications of MacOS.
smb2_close response size increases by 4 bytes by padding, And the smb
client of MacOS check it and stop the connection. This patch use
struct_group_attr instead of struct_group for network_open_info to use
__packed to avoid padding.
Fixes: 0015eb6e1238 ("smb: client, common: fix fortify warnings")
Cc: stable@vger.kernel.org
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
On Mon, Dec 4, 2023 at 2:36 PM Sasha Levin <sashal@kernel.org> wrote:
>
> From: Dmitry Antipov <dmantipov@yandex.ru>
>
> [ Upstream commit 0015eb6e12384ff1c589928e84deac2ad1ceb236 ]
>
> When compiling with gcc version 14.0.0 20231126 (experimental)
> and CONFIG_FORTIFY_SOURCE=y, I've noticed the following:
>
> In file included from ./include/linux/string.h:295,
> from ./include/linux/bitmap.h:12,
> from ./include/linux/cpumask.h:12,
> from ./arch/x86/include/asm/paravirt.h:17,
> from ./arch/x86/include/asm/cpuid.h:62,
> from ./arch/x86/include/asm/processor.h:19,
> from ./arch/x86/include/asm/cpufeature.h:5,
> from ./arch/x86/include/asm/thread_info.h:53,
> from ./include/linux/thread_info.h:60,
> from ./arch/x86/include/asm/preempt.h:9,
> from ./include/linux/preempt.h:79,
> from ./include/linux/spinlock.h:56,
> from ./include/linux/wait.h:9,
> from ./include/linux/wait_bit.h:8,
> from ./include/linux/fs.h:6,
> from fs/smb/client/smb2pdu.c:18:
> In function 'fortify_memcpy_chk',
> inlined from '__SMB2_close' at fs/smb/client/smb2pdu.c:3480:4:
> ./include/linux/fortify-string.h:588:25: warning: call to '__read_overflow2_field'
> declared with attribute warning: detected read beyond size of field (2nd parameter);
> maybe use struct_group()? [-Wattribute-warning]
> 588 | __read_overflow2_field(q_size_field, size);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> and:
>
> In file included from ./include/linux/string.h:295,
> from ./include/linux/bitmap.h:12,
> from ./include/linux/cpumask.h:12,
> from ./arch/x86/include/asm/paravirt.h:17,
> from ./arch/x86/include/asm/cpuid.h:62,
> from ./arch/x86/include/asm/processor.h:19,
> from ./arch/x86/include/asm/cpufeature.h:5,
> from ./arch/x86/include/asm/thread_info.h:53,
> from ./include/linux/thread_info.h:60,
> from ./arch/x86/include/asm/preempt.h:9,
> from ./include/linux/preempt.h:79,
> from ./include/linux/spinlock.h:56,
> from ./include/linux/wait.h:9,
> from ./include/linux/wait_bit.h:8,
> from ./include/linux/fs.h:6,
> from fs/smb/client/cifssmb.c:17:
> In function 'fortify_memcpy_chk',
> inlined from 'CIFS_open' at fs/smb/client/cifssmb.c:1248:3:
> ./include/linux/fortify-string.h:588:25: warning: call to '__read_overflow2_field'
> declared with attribute warning: detected read beyond size of field (2nd parameter);
> maybe use struct_group()? [-Wattribute-warning]
> 588 | __read_overflow2_field(q_size_field, size);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> In both cases, the fortification logic inteprets calls to 'memcpy()' as an
> attempts to copy an amount of data which exceeds the size of the specified
> field (i.e. more than 8 bytes from __le64 value) and thus issues an overread
> warning. Both of these warnings may be silenced by using the convenient
> 'struct_group()' quirk.
>
> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
> Acked-by: Namjae Jeon <linkinjeon@kernel.org>
> Signed-off-by: Steve French <stfrench@microsoft.com>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
> fs/smb/client/cifspdu.h | 24 ++++++++++++++----------
> fs/smb/client/cifssmb.c | 6 ++++--
> fs/smb/client/smb2pdu.c | 8 +++-----
> fs/smb/client/smb2pdu.h | 16 +++++++++-------
> fs/smb/common/smb2pdu.h | 17 ++++++++++-------
> 5 files changed, 40 insertions(+), 31 deletions(-)
>
> diff --git a/fs/smb/client/cifspdu.h b/fs/smb/client/cifspdu.h
> index c403816d0b6c1..97bb1838555b4 100644
> --- a/fs/smb/client/cifspdu.h
> +++ b/fs/smb/client/cifspdu.h
> @@ -882,11 +882,13 @@ typedef struct smb_com_open_rsp {
> __u8 OplockLevel;
> __u16 Fid;
> __le32 CreateAction;
> - __le64 CreationTime;
> - __le64 LastAccessTime;
> - __le64 LastWriteTime;
> - __le64 ChangeTime;
> - __le32 FileAttributes;
> + struct_group(common_attributes,
> + __le64 CreationTime;
> + __le64 LastAccessTime;
> + __le64 LastWriteTime;
> + __le64 ChangeTime;
> + __le32 FileAttributes;
> + );
> __le64 AllocationSize;
> __le64 EndOfFile;
> __le16 FileType;
> @@ -2268,11 +2270,13 @@ typedef struct {
> /* QueryFileInfo/QueryPathinfo (also for SetPath/SetFile) data buffer formats */
> /******************************************************************************/
> typedef struct { /* data block encoding of response to level 263 QPathInfo */
> - __le64 CreationTime;
> - __le64 LastAccessTime;
> - __le64 LastWriteTime;
> - __le64 ChangeTime;
> - __le32 Attributes;
> + struct_group(common_attributes,
> + __le64 CreationTime;
> + __le64 LastAccessTime;
> + __le64 LastWriteTime;
> + __le64 ChangeTime;
> + __le32 Attributes;
> + );
> __u32 Pad1;
> __le64 AllocationSize;
> __le64 EndOfFile; /* size ie offset to first free byte in file */
> diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c
> index c90d4ec9292ca..67c5fc2b2db94 100644
> --- a/fs/smb/client/cifssmb.c
> +++ b/fs/smb/client/cifssmb.c
> @@ -1234,8 +1234,10 @@ CIFS_open(const unsigned int xid, struct cifs_open_parms *oparms, int *oplock,
> *oplock |= CIFS_CREATE_ACTION;
>
> if (buf) {
> - /* copy from CreationTime to Attributes */
> - memcpy((char *)buf, (char *)&rsp->CreationTime, 36);
> + /* copy commonly used attributes */
> + memcpy(&buf->common_attributes,
> + &rsp->common_attributes,
> + sizeof(buf->common_attributes));
> /* the file_info buf is endian converted by caller */
> buf->AllocationSize = rsp->AllocationSize;
> buf->EndOfFile = rsp->EndOfFile;
> diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
> index 847d69d327c2a..aea7770fb5631 100644
> --- a/fs/smb/client/smb2pdu.c
> +++ b/fs/smb/client/smb2pdu.c
> @@ -3425,12 +3425,10 @@ __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
> } else {
> trace_smb3_close_done(xid, persistent_fid, tcon->tid,
> ses->Suid);
> - /*
> - * Note that have to subtract 4 since struct network_open_info
> - * has a final 4 byte pad that close response does not have
> - */
> if (pbuf)
> - memcpy(pbuf, (char *)&rsp->CreationTime, sizeof(*pbuf) - 4);
> + memcpy(&pbuf->network_open_info,
> + &rsp->network_open_info,
> + sizeof(pbuf->network_open_info));
> }
>
> atomic_dec(&tcon->num_remote_opens);
> diff --git a/fs/smb/client/smb2pdu.h b/fs/smb/client/smb2pdu.h
> index 1237bb86e93a8..8ac99563487c1 100644
> --- a/fs/smb/client/smb2pdu.h
> +++ b/fs/smb/client/smb2pdu.h
> @@ -339,13 +339,15 @@ struct smb2_file_reparse_point_info {
> } __packed;
>
> struct smb2_file_network_open_info {
> - __le64 CreationTime;
> - __le64 LastAccessTime;
> - __le64 LastWriteTime;
> - __le64 ChangeTime;
> - __le64 AllocationSize;
> - __le64 EndOfFile;
> - __le32 Attributes;
> + struct_group(network_open_info,
> + __le64 CreationTime;
> + __le64 LastAccessTime;
> + __le64 LastWriteTime;
> + __le64 ChangeTime;
> + __le64 AllocationSize;
> + __le64 EndOfFile;
> + __le32 Attributes;
> + );
> __le32 Reserved;
> } __packed; /* level 34 Query also similar returned in close rsp and open rsp */
>
> diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h
> index 9619015d78f29..778c1e3b70bc1 100644
> --- a/fs/smb/common/smb2pdu.h
> +++ b/fs/smb/common/smb2pdu.h
> @@ -699,13 +699,16 @@ struct smb2_close_rsp {
> __le16 StructureSize; /* 60 */
> __le16 Flags;
> __le32 Reserved;
> - __le64 CreationTime;
> - __le64 LastAccessTime;
> - __le64 LastWriteTime;
> - __le64 ChangeTime;
> - __le64 AllocationSize; /* Beginning of FILE_STANDARD_INFO equivalent */
> - __le64 EndOfFile;
> - __le32 Attributes;
> + struct_group(network_open_info,
> + __le64 CreationTime;
> + __le64 LastAccessTime;
> + __le64 LastWriteTime;
> + __le64 ChangeTime;
> + /* Beginning of FILE_STANDARD_INFO equivalent */
> + __le64 AllocationSize;
> + __le64 EndOfFile;
> + __le32 Attributes;
> + );
> } __packed;
>
>
> --
> 2.42.0
>
>
--
Thanks,
Steve
^ permalink raw reply [relevance 6%]
* linux-next: Tree for Apr 23
@ 2024-04-23 6:52 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-04-23 6:52 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 40024 bytes --]
Hi all,
Changes since 20240422:
The gpio-brgl-fixes tree gained a build failure so I used the version
from next-20240422.
The mm tree gained a build failure for which I applied a patch.
The vhost tree gained a conflict against the mm tree.
Non-merge commits (relative to Linus' tree): 7047
7151 files changed, 298686 insertions(+), 166799 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 370 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (a2c63a3f3d68 Merge tag 'bcachefs-2024-04-22' of https://evilpiepirate.org/git/bcachefs)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (bab29f1a77ba maple_tree: fix mas_empty_area_rev() null pointer dereference)
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (61231eb8113c ARC: [plat-hsdk]: Remove misplaced interrupt-cells property)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (210cfef57926 selftests/powerpc/papr-vpd: Fix missing variable initialization)
Merging s390-fixes/fixes (412050af2ea3 s390/mm: Fix clearing storage keys for huge pages)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (a4e3899065ff net: dsa: mv88e6xx: fix supported_interfaces setup in mv88e6250_phylink_get_caps())
Merging bpf/master (5bcf0dcbf906 xdp: use flags field to disambiguate broadcast redirect)
Merging ipsec/master (8b06a24bb625 xfrm: fix possible derferencing in error path)
Merging netfilter/main (a9176f7c66f0 Merge branch 'mlxsw-fixes')
Merging ipvs/main (7eaf837a4eb5 netfilter: nf_tables: Fix a memory leak in nf_tables_updchain)
Merging wireless/for-next (91112fc6212a wifi: iwlwifi: mvm: fix link ID management)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (be121ffb384f RDMA/mlx5: Fix port number for counter query in multi-port configuration)
Merging sound-current/for-linus (f25f17dc5c6a ALSA: seq: ump: Fix conversion from MIDI2 to MIDI1 UMP messages)
Merging sound-asoc-fixes/for-linus (32ac501957e5 ASoC: codecs: wsa881x: set clk_stop_mode1 flag)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (68adb581a39a regulator: vqmmc-ipq4019: fix module autoloading)
Merging spi-fixes/for-linus (7430764f5a85 spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (156539fd6501 Documentation: embargoed-hardware-issues.rst: Add myself for Power)
Merging tty.current/tty-linus (ea2624b5b829 serial: stm32: Reset .throttled state in .startup())
Merging usb.current/usb-linus (7a9a30406981 Merge tag 'usb-serial-6.9-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (74a72baf204f iio:imu: adis16475: Fix sync mode setting)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (ebaed6d4def8 peci: linux/peci.h: fix Excess kernel-doc description warning)
Merging soundwire-fixes/fixes (63dc588e7af1 soundwire: amd: fix for wake interrupt handling for clockstop mode)
Merging thunderbolt-fixes/fixes (dcd12acaf384 thunderbolt: Avoid notify PM core about runtime PM resume)
Merging input-current/for-linus (57ed9567e63b Merge branch 'next' into for-linus)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (f221033f5c24 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (44ecfa3e5f1c Merge branch 'svm' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (4b759dd57655 cxl/core: Fix potential payload size confusion in cxl_mem_get_poison())
Merging btrfs-fixes/next-fixes (08487fb4f2bd Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (f609e7b1b49e platform/x86/amd/pmc: Extend Framework 13 quirk to more BIOSes)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (ca91259b775f scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING)
Merging drm-fixes/drm-fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging drm-intel-fixes/for-linux-next-fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging mmc-fixes/fixes (ace323f80b9b mmc: sdhci-of-dwcmshc: th1520: Increase tuning loop count to 128)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (a373a36fb6b0 Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (6b0856ee585d cache: sifive_ccache: Silence unused variable warning)
Merging fpga-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (62326f7cefc2 gpio: tegra186: Fix tegra186_gpio_is_accessible() check)
$ git reset --hard HEAD^
Merging next-20240422 version of gpio-brgl-fixes
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7557d296ad43 MAINTAINERS: erofs: add myself as reviewer)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (32cf5a4eda46 Revert "svcrdma: Add Write chunk WRs to the RPC's Send WR chain")
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (decd347c2a75 x86/efistub: Reinstate soft limit for initrd loading)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (fed40cbb3412 kbuild: rust: force `alloc` extern to allow "empty" Rust files)
Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (ed30a4a51bb1 Linux 6.9-rc5)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (d3e8a91a848a clk: mediatek: mt7988-infracfg: fix clocks for 2nd PCIe port)
Merging drm-misc-fixes/for-linux-next-fixes (a386c3041045 drm/atomic-helper: fix parameter order in drm_format_conv_state_copy() call)
Merging mm-stable/mm-stable (640958fde130 Merge branch 'master' into mm-stable)
Merging mm-nonmm-stable/mm-nonmm-stable (0bbac3facb5d Linux 6.9-rc4)
Merging mm/mm-everything (2541ee5668b0 Merge branch 'mm-nonmm-unstable' into mm-everything)
Applying: fixup for "writeback: support retrieving per group debug writeback stats of bdi"
Merging kbuild/for-next (8246a1e9b922 kconfig: use menu_for_each_entry() to traverse menu tree)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (61ba075d9911 Revert "tools headers: Remove almost unused copy of uapi/stat.h, add few conditional defines")
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (7befe2ef9384 Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (4052ce07d5d7 perf/arm-spe: Assign parents for event_source device)
Merging arm-soc/for-next (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging amlogic/for-next (70ce74fbef7e Merge branch 'v6.10/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (0696ed223eb6 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (b7c6f4085cba Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (310cdb567f73 Merge branch 'v6.9-next/dts64' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (2a1e301bf479 Merge branch 'omap-for-v6.10/dt' into for-next)
Merging qcom/for-next (010828bc2067 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (9ac9686acef8 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (70641cfcd0dd Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (a74fbb1dc2c6 Merge branch 'next/clk' into for-next)
Merging scmi/for-linux-next (fa66660a8905 Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (886776ca23f2 riscv: dts: sophgo: use real clock for sdhci)
Merging stm32/stm32-next (b12a916d30dc ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1)
Merging sunxi/sunxi/for-next (8f328223944a Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/dt into for-next)
Merging ti/ti-next (592695bed5f8 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (92e92dc84e17 Merge branch 'clk-scmi' into clk-next)
2641ee13c449 ("clk: scmi: Allocate CLK operations dynamically")
87af9481af53 ("clk: scmi: Add support for get/set duty_cycle operations")
a1b8faf8784c ("clk: scmi: Add support for state control restricted clocks")
c3ad1d0a7ef2 ("clk: scmi: Add support for rate change restricted clocks")
fa23e091236b ("clk: scmi: Add support for re-parenting restricted clocks")
Merging clk-imx/for-next (5224b189462f clk: imx: add i.MX95 BLK CTL clk driver)
Merging clk-renesas/renesas-clk (c0516eb4cf04 clk: renesas: r8a779h0: Add timer clocks)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (cdec0d455d32 LoongArch: Fix access error when read fault on a write-only VMA)
Merging m68k/for-next (70d830e337f9 m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER)
Merging m68knommu/for-next (2a92aed55942 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (6613476e225e Linux 6.8-rc1)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (e8f897f4afef Linux 6.8)
Merging powerpc/next (f318c8be797f powerpc/ptdump: Fix walk_vmemmap() to also print first vmemmap entry)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (ba5ea59f768f riscv: Do not save the scratch CSR during suspend)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (5db2c4dc413e riscv: dts: add initial canmv-k230 and k230-evb dts)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (d30edd25a7b5 Merge branch 'shared-zeropage' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (84b76d05828a lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (11cca8ccf2c3 tty: xtensa/iss: Use min() to fix Coccinelle warning)
Merging bcachefs/for-next (711f072a8f7f bcachefs: Clean up inode alloc)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (33e209409638 Merge branch 'for-next-next-v6.9-20240419' into for-next-20240419)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (77d8aa79ecfb cifs: reinstate original behavior again for forceuid/forcegid)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (d7ed5232f0f1 exfat: fix timing of synchronizing bitmap and inode)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (96bd46017ee5 Merge fsnotify UAF fixup.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (b2cf5a1ff236 f2fs: allow direct io of pinned files for zoned storage)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (f628eae08ac8 fuse: Convert fuse_readpages_end() to use folio_end_read())
Merging gfs2/for-next (29efef6907aa gfs2: Remove and replace gfs2_glock_queue_work)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (71b1543c83d6 Merge tag '6.9-rc5-ksmbd-fixes' of git://git.samba.org/ksmbd)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (6251e2abfc40 lockd: host: Remove unnecessary statements＇host = NULL;＇)
Merging ntfs3/master (21b6b5bc6774 fs/ntfs3: Taking DOS names into account during link counting)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (c414a87ff750 xfs: Remove unused function is_rt_data_fork)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (4efbdf2eca99 Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in fs/ntfs3/ntfs_fs.h
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (ccd0bdb57e31 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5ceeabb0eb2e Merge tag 'i2c-host-fixes-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current)
Merging i2c-host/i2c/i2c-host (507a2da9539c i2c: uniphier: remove printout on handled timeouts)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (cf770af5645a firmware: dmi-id: add a release callback function)
Merging hwmon-staging/hwmon-next (e723f6ca39fb hwmon: jc42: Remove I2C_CLASS_SPD support)
Merging jc_docs/docs-next (2309181eb018 Merge branch 'docs-fixes' into docs-next)
Merging v4l-dvb/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging v4l-dvb-next/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging pm/linux-next (1787743232cf Merge branches 'pm-em', 'pm-powercap' and 'pm-docs' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (8c24b5f2eb4f cpufreq: mediatek: Add support for MT7988A)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (0cebf7cb2d70 pmdomain: core: Don't clear suspended_count at genpd_prepare())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M)
Merging dlm/next (7b012732d005 dlm: fix sleep in atomic context)
Merging rdma/for-next (349e85995228 RDMA/hns: Modify the print level of CQE error)
Merging net-next/main (077633afe07f net: ethernet: mtk_eth_soc: flower: validate control flags)
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging bpf-next/for-next (a7de265cb2d8 bpf: Fix typos in comments)
Merging ipsec-next/master (aeb48a428d7d udpencap: Remove Obsolete UDP_ENCAP_ESPINUDP_NON_IKE Support)
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (958efeeef2d3 Bluetooth: Remove 3 repeated macro definitions)
Merging wireless-next/for-next (b0d2d8f996c1 wifi: mac80211: handle link ID during management Tx)
CONFLICT (content): Merge conflict in net/mac80211/chan.c
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1)
Merging crypto/master (543ea178fbfa crypto: x86/aes-xts - optimize size of instructions operating on lengths)
Merging drm/drm-next (2871ec409949 Merge tag 'drm-misc-next-2024-04-19' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next)
394ae0603a67 ("drm/amdgpu: fix visible VRAM handling during faults")
69c0f070531c ("drm/radeon: make -fstrict-flex-arrays=3 happy")
98856136c485 ("drm/amdgpu: validate the parameters of bo mapping operations more clearly")
9c8a10bf1f34 ("drm/nouveau/kms/nv50-: Disable AUX bus for disconnected DP ports")
a6ebaca1fbfb ("Revert "drm/amd/display: fix USB-C flag update after enc10 feature init"")
efade6fe50e7 ("drm/radeon: silence UBSAN warning (v3)")
fe6660b661c3 ("drm/nouveau/dp: Don't probe eDP ports twice harder")
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cdclk.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c
Merging drm-exynos/for-linux-next (5d2c7cc9c1b3 drm/exynos: mixer: drop driver owner initialization)
Merging drm-misc/for-linux-next (6221deb716b9 drm/rockchip: rk3066_hdmi: switch to struct drm_edid)
Merging amdgpu/drm-next (81bf14519a8c drm/amdkfd: make sure VM is ready for updating operations)
Merging drm-intel/for-linux-next (e9913f0bd2e1 drm/i915/display: move dmc_firmware_path to display params)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (3e5a516f3bf1 Merge tag 'phy_dp_modes_6.10' into msm-next-lumag)
Merging drm-msm-lumag/msm-next-lumag (33edc5592466 drm/msm/dpu: Add callback function pointer check before its call)
Merging drm-xe/drm-xe-next (48c64d495fbe drm/xe/guc: Fix arguments passed to relay G2H handlers)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm_types.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (fb3b9c2d217f video: logo: Drop full path of the input filename in generated file)
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (3a56855bb549 ALSA: scarlett2: Zero initialize ret in scarlett2_ag_target_ctl_get())
Merging ieee1394/for-next (0d4149e5e9b0 firewire: ohci: use pci_irq_vector() to retrieve allocated interrupt line)
Merging sound-asoc/for-next (bb2057e0d80b Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (c75781a6e4c0 kallsyms: replace deprecated strncpy with strscpy)
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (9e0631695eac input: pm8xxx-vibrator: add new SPMI vibrator support)
Merging block/for-next (a8149d6e9b6e Merge branch 'for-6.10/io_uring' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (a98ecf716e30 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (bce42d6108c9 mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (15f992fa81eb Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (74560bb3685b lsm: remove the now superfluous sentinel element from ctl_table array)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (37c34331f194 Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (d02a66d84baa Merge branches 'memory-observability' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (58d4b25c8831 dt-bindings: timer: renesas,tmu: Add R-Car V4M support)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
Merging dt-krzk/for-next (adfecb01c288 Merge branches 'next/dt' and 'next/dt64' into for-next)
Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU)
Merging spi/for-next (c17534112a33 Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (88b063eac6bd Merge branch into tip/master: 'x86/shstk')
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (8e95536e9495 Merge branch ras/edac-misc into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (b93b7b4635f1 ftrace: Asynchronous grace period for register_ftrace_direct())
Merging kvm/next (a96cb3bf390e Merge x86 bugfixes from Linux 6.9-rc3)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging kvm-arm/next (c2d5bebcb94f Merge branch kvm-arm64/nv-eret-pauth into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (f1c48c1ec735 RISC-V: KVM: selftests: Add ebreak test support)
Merging kvm-x86/next (7b076c6a308e Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests' and 'vmx')
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (be1f2b9c3135 Merge branch 'for-6.10' into for-next)
Merging drivers-x86/for-next (88c0ef69dd88 platform/x86: asus-wmi: cleanup main struct to avoid some holes)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (70a5f3005008 platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD))
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (66bc1a173328 treewide: Use sysfs_bin_attr_simple_read() helper)
Merging usb/usb-next (684e9f5f97eb usb: dwc3: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions)
CONFLICT (modify/delete): drivers/usb/misc/onboard_usb_hub.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/misc/onboard_usb_hub.c left in tree.
$ git rm -f drivers/usb/misc/onboard_usb_hub.c
Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev"
Merging thunderbolt/next (c936e287df26 thunderbolt: Get rid of TB_CFG_PKG_PREPARE_TO_SLEEP)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (f70f95b485d7 serial: msm: check dma_map_sg() return value properly)
CONFLICT (content): Merge conflict in drivers/tty/serial/serial_core.c
Merging char-misc/char-misc-next (ebbc1a4789c6 uio: update kerneldoc comments for interrupt functions)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (d6fc00d0f640 coresight: etm4x: Fix access to resource selector registers)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (89bd68b99b17 fpga: dfl: remove unused member pdata from struct dfl_{afu,fme})
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (b80ad8e3cd27 iio: adc: ti-ads131e08: Use device_for_each_child_node_scoped() to simplify error paths.)
Merging phy-next/next (9c79b779643e phy: rockchip: fix CONFIG_TYPEC dependency)
Merging soundwire/next (4cd5ea6de156 soundwire: intel_init: resume all devices on exit.)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (7447d911af69 vfio/fsl-mc: Block calling interrupt handler without trigger)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (ee2098c0b512 spmi: pmic-arb: Add multi bus support)
Merging staging/staging-next (75ff53c44f5e staging: vc04_services: Drop completed TODO item)
Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (98f2233a5c20 dmaengine: pl08x: Use kcalloc() instead of kzalloc())
Merging cgroup/for-next (8996f93fc388 cgroup/cpuset: Statically initialize more members of top_cpuset)
Merging scsi/for-next (99033e81ab05 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (f92141e18c8b Merge patch series "convert SCSI to atomic queue limits, part 1 (v3)")
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging vhost/linux-next (24ddee0ff8c3 Merge tag 'stable/vduse-virtio-net' into vhost)
6ee63c01e1a2 ("misc/pvpanic: add shutdown event definition")
718330fcd40b ("misc/pvpanic: use bit macros")
CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c
Merging rpmsg/for-next (e99fcac055b3 Merge branches 'rproc-next' and 'rpmsg-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (8a7a61032587 gpiolib: Get rid of never false gpio_is_valid() calls)
Merging gpio-intel/for-next (1736df17fea0 gpiolib: acpi: Set label for IRQ only lines)
Merging pinctrl/for-next (85fb4a0fad95 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (02cd2d3be1c3 pinctrl: renesas: rzg2l: Configure the interrupt type on resume)
Merging pinctrl-samsung/for-next (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants)
Merging pwm/pwm/for-next (8f33f980dcfe dt-bindings: pwm: mediatek,pwm-disp: add compatible for mt8365 SoC)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (00ab560eb0e3 selftests: Mark ksft_exit_fail_perror() as __noreturn)
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (63761ec5971e kunit: unregister the device on error)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (5b6d8ef6f056 kdb: Use str_plural() to fix Coccinelle warning)
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (813e0ae613d6 bus: mhi: host: Add mhi_power_down_keep_dev() API to support system suspend/hibernation)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (87971c973f5c cxl/hdm: dev_warn() on unsupported mixed mode decoder)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (cda30c6542c8 efi: Clear up misconceptions about a maximum variable name size)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (b6f00c4ef020 slub: use count_partial_free_approx() in slab_out_of_memory())
Merging random/master (2668e3ae2ef3 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging landlock/next (dc792a74600a fs/ioctl: Add a comment to keep the logic in sync with LSM policies)
Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature)
Merging sysctl/sysctl-next (12e78b868481 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (a9c3475dd67b Replace macro "ARCH_HAVE_EXTRA_ELF_NOTES" with kconfig)
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (716bc9b1c255 Merge branch 'for-next/hardening' into for-next/kspp)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Re: [GIT PULL] ksmbd server fixes
2024-04-22 23:20 11% [GIT PULL] ksmbd server fixes Steve French
@ 2024-04-22 23:51 4% ` pr-tracker-bot
0 siblings, 0 replies; 200+ results
From: pr-tracker-bot @ 2024-04-22 23:51 UTC (permalink / raw)
To: Steve French; +Cc: Linus Torvalds, LKML, Namjae Jeon, CIFS
The pull request you sent on Mon, 22 Apr 2024 18:20:31 -0500:
> git://git.samba.org/ksmbd.git tags/6.9-rc5-ksmbd-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/71b1543c83d65af8215d7558d70fc2ecbee77dcf
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [relevance 4%]
* [GIT PULL] ksmbd server fixes
@ 2024-04-22 23:20 11% Steve French
2024-04-22 23:51 4% ` pr-tracker-bot
0 siblings, 1 reply; 200+ results
From: Steve French @ 2024-04-22 23:20 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, Namjae Jeon, CIFS
Please pull the following changes since commit
0bbac3facb5d6cc0171c45c9873a2dc96bea9680:
Linux 6.9-rc4 (2024-04-14 13:38:39 -0700)
are available in the Git repository at:
git://git.samba.org/ksmbd.git tags/6.9-rc5-ksmbd-fixes
for you to fetch changes up to e9d8c2f95ab8acaf3f4d4a53682a4afa3c263692:
ksmbd: add continuous availability share parameter (2024-04-19 20:48:47 -0500)
----------------------------------------------------------------
Five ksmbd server fixes, most also for stable
- rename fix
- fix for two potential out of bounds
- fix for connections from MacOS (padding in close response)
- fix for when to enable persistent handles
----------------------------------------------------------------
Marios Makassikis (1):
ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
Namjae Jeon (4):
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
ksmbd: common: use struct_group_attr instead of struct_group for
network_open_info
ksmbd: add continuous availability share parameter
fs/smb/common/smb2pdu.h | 2 +-
fs/smb/server/ksmbd_netlink.h | 35 ++++++++++++++++++-----------------
fs/smb/server/server.c | 13 +++++--------
fs/smb/server/smb2pdu.c | 15 +++++++++++++--
fs/smb/server/vfs.c | 5 +++++
5 files changed, 42 insertions(+), 28 deletions(-)
--
Thanks,
Steve
^ permalink raw reply [relevance 11%]
* linux-next: Tree for Apr 22
@ 2024-04-22 5:38 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-04-22 5:38 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 40181 bytes --]
Hi all,
Changes since 20240419:
The perf tree lost its build failure.
The wireless-next tree gained a conflict against the wireless tree.
Non-merge commits (relative to Linus' tree): 6570
6647 files changed, 267553 insertions(+), 159181 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 370 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (ed30a4a51bb1 Linux 6.9-rc5)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (b8de39bd1b76 init: fix allocated page overlapping with PTR_ERR)
20c9b0ca4082 ("bootconfig: use memblock_free_late to free xbc memory to buddy")
CONFLICT (content): Merge conflict in lib/bootconfig.c
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (61231eb8113c ARC: [plat-hsdk]: Remove misplaced interrupt-cells property)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save())
Merging arm-soc-fixes/arm/fixes (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (210cfef57926 selftests/powerpc/papr-vpd: Fix missing variable initialization)
Merging s390-fixes/fixes (d111855ab7ff s390/mm: Fix NULL pointer dereference)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (a9176f7c66f0 Merge branch 'mlxsw-fixes')
Merging bpf/master (10541b374aa0 riscv, bpf: Fix incorrect runtime stats)
Merging ipsec/master (bccb798e07f8 octeontx2-pf: Fix transmit scheduler resource leak)
Merging netfilter/main (a9176f7c66f0 Merge branch 'mlxsw-fixes')
Merging ipvs/main (7eaf837a4eb5 netfilter: nf_tables: Fix a memory leak in nf_tables_updchain)
Merging wireless/for-next (c53d8a59351e wifi: mac80211: fix unaligned le16 access)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (be121ffb384f RDMA/mlx5: Fix port number for counter query in multi-port configuration)
Merging sound-current/for-linus (f25f17dc5c6a ALSA: seq: ump: Fix conversion from MIDI2 to MIDI1 UMP messages)
Merging sound-asoc-fixes/for-linus (32ac501957e5 ASoC: codecs: wsa881x: set clk_stop_mode1 flag)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (68adb581a39a regulator: vqmmc-ipq4019: fix module autoloading)
Merging spi-fixes/for-linus (7430764f5a85 spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (156539fd6501 Documentation: embargoed-hardware-issues.rst: Add myself for Power)
Merging tty.current/tty-linus (ea2624b5b829 serial: stm32: Reset .throttled state in .startup())
Merging usb.current/usb-linus (7a9a30406981 Merge tag 'usb-serial-6.9-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (74a72baf204f iio:imu: adis16475: Fix sync mode setting)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (ebaed6d4def8 peci: linux/peci.h: fix Excess kernel-doc description warning)
Merging soundwire-fixes/fixes (63dc588e7af1 soundwire: amd: fix for wake interrupt handling for clockstop mode)
Merging thunderbolt-fixes/fixes (dcd12acaf384 thunderbolt: Avoid notify PM core about runtime PM resume)
Merging input-current/for-linus (57ed9567e63b Merge branch 'next' into for-linus)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (f221033f5c24 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (44ecfa3e5f1c Merge branch 'svm' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (7bcf809b1e78 cxl: Add checks to access_coordinate calculation to fail missing data)
Merging btrfs-fixes/next-fixes (08487fb4f2bd Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (f609e7b1b49e platform/x86/amd/pmc: Extend Framework 13 quirk to more BIOSes)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (ca91259b775f scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING)
Merging drm-fixes/drm-fixes (52c8b6e1c007 Merge tag 'drm-xe-fixes-2024-04-18' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging mmc-fixes/fixes (ace323f80b9b mmc: sdhci-of-dwcmshc: th1520: Increase tuning loop count to 128)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (30d18df6567b Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted)
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (a373a36fb6b0 Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (6b0856ee585d cache: sifive_ccache: Silence unused variable warning)
Merging fpga-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (69ffed4b6252 gpiolib: swnode: Remove wrong header inclusion)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7557d296ad43 MAINTAINERS: erofs: add myself as reviewer)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (32cf5a4eda46 Revert "svcrdma: Add Write chunk WRs to the RPC's Send WR chain")
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (decd347c2a75 x86/efistub: Reinstate soft limit for initrd loading)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (8933cf4651e0 rust: make mutually exclusive with CFI_CLANG)
Merging v9fs-fixes/fixes/next (75e3f8fb2578 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (d3e8a91a848a clk: mediatek: mt7988-infracfg: fix clocks for 2nd PCIe port)
Merging drm-misc-fixes/for-linux-next-fixes (a386c3041045 drm/atomic-helper: fix parameter order in drm_format_conv_state_copy() call)
Merging mm-stable/mm-stable (640958fde130 Merge branch 'master' into mm-stable)
Merging mm-nonmm-stable/mm-nonmm-stable (0bbac3facb5d Linux 6.9-rc4)
Merging mm/mm-everything (08ac004bd4a2 Merge branch 'mm-nonmm-unstable' into mm-everything)
Merging kbuild/for-next (34987a8e973a vmlinux: Avoid weak reference to notes section)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (61ba075d9911 Revert "tools headers: Remove almost unused copy of uapi/stat.h, add few conditional defines")
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (7befe2ef9384 Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (4052ce07d5d7 perf/arm-spe: Assign parents for event_source device)
Merging arm-soc/for-next (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging amlogic/for-next (70ce74fbef7e Merge branch 'v6.10/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (0696ed223eb6 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (6cf256f63478 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (310cdb567f73 Merge branch 'v6.9-next/dts64' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (2a1e301bf479 Merge branch 'omap-for-v6.10/dt' into for-next)
Merging qcom/for-next (4264566ea5da Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (f4a6540ae2c4 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (70641cfcd0dd Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (b7b2fe24038b Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (fa66660a8905 Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (65fcc08b4cfe riscv: dts: sophgo: cv18xx: Add i2c devices)
Merging stm32/stm32-next (b12a916d30dc ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1)
Merging sunxi/sunxi/for-next (8f328223944a Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/dt into for-next)
Merging ti/ti-next (592695bed5f8 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (410ed109e977 Merge branch 'clk-renesas' into clk-next)
Merging clk-imx/for-next (13269dc6c704 clk: imx: imx8mp: Fix SAI_MCLK_SEL definition)
Merging clk-renesas/renesas-clk (c0516eb4cf04 clk: renesas: r8a779h0: Add timer clocks)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (cdec0d455d32 LoongArch: Fix access error when read fault on a write-only VMA)
Merging m68k/for-next (70d830e337f9 m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER)
Merging m68knommu/for-next (2a92aed55942 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (6613476e225e Linux 6.8-rc1)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (e8f897f4afef Linux 6.8)
Merging powerpc/next (f318c8be797f powerpc/ptdump: Fix walk_vmemmap() to also print first vmemmap entry)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (ba5ea59f768f riscv: Do not save the scratch CSR during suspend)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (5db2c4dc413e riscv: dts: add initial canmv-k230 and k230-evb dts)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (037f934e2ea0 Merge branch 'shared-zeropage' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (84b76d05828a lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (11cca8ccf2c3 tty: xtensa/iss: Use min() to fix Coccinelle warning)
Merging bcachefs/for-next (ad29cf999a91 bcachefs: set_btree_iter_dontneed also clears should_be_locked)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (33e209409638 Merge branch 'for-next-next-v6.9-20240419' into for-next-20240419)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (0ed223399559 cifs: reinstate original behavior again for forceuid/forcegid)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (d7ed5232f0f1 exfat: fix timing of synchronizing bitmap and inode)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (96bd46017ee5 Merge fsnotify UAF fixup.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (b2cf5a1ff236 f2fs: allow direct io of pinned files for zoned storage)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (09492cb45100 cuse: add kernel-doc comments to cuse_process_init_reply())
Merging gfs2/for-next (29efef6907aa gfs2: Remove and replace gfs2_glock_queue_work)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (e9d8c2f95ab8 ksmbd: add continuous availability share parameter)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (6251e2abfc40 lockd: host: Remove unnecessary statements＇host = NULL;＇)
Merging ntfs3/master (21b6b5bc6774 fs/ntfs3: Taking DOS names into account during link counting)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (e23d7e82b707 xfs: allow cross-linking special files without project quota)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (4efbdf2eca99 Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in fs/ntfs3/ntfs_fs.h
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (ccd0bdb57e31 Merge branch 'pci/misc')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5ceeabb0eb2e Merge tag 'i2c-host-fixes-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current)
Merging i2c-host/i2c/i2c-host (974161980d5b i2c: i801: Annotate apanel_addr as __ro_after_init)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (cf770af5645a firmware: dmi-id: add a release callback function)
Merging hwmon-staging/hwmon-next (e723f6ca39fb hwmon: jc42: Remove I2C_CLASS_SPD support)
Merging jc_docs/docs-next (2309181eb018 Merge branch 'docs-fixes' into docs-next)
Merging v4l-dvb/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging v4l-dvb-next/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging pm/linux-next (7a7eea8d02f0 Merge branch 'thermal-fixes' into linux-next)
6711564863de ("thermal/debugfs: Add missing count increment to thermal_debug_tz_trip_up()")
Merging cpufreq-arm/cpufreq/arm/linux-next (09d0aaa0ae9c arm64: dts: allwinner: h616: enable DVFS for all boards)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (0cebf7cb2d70 pmdomain: core: Don't clear suspended_count at genpd_prepare())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M)
Merging dlm/next (7b012732d005 dlm: fix sleep in atomic context)
Merging rdma/for-next (349e85995228 RDMA/hns: Modify the print level of CQE error)
Merging net-next/main (8442f8ba269f Merge branch 'testing-make-netfilter-selftests-functional-in-vng-environment')
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging bpf-next/for-next (735f5b8a7ccf bpf, docs: Fix formatting nit in instruction-set.rst)
Merging ipsec-next/master (267e31750ae8 Merge branch 'phy-listing-link_topology-tracking')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (6764ab72237d Bluetooth: btusb: mediatek: Fix double free of skb in coredump)
Merging wireless-next/for-next (b0d2d8f996c1 wifi: mac80211: handle link ID during management Tx)
CONFLICT (content): Merge conflict in net/mac80211/chan.c
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1)
Merging crypto/master (543ea178fbfa crypto: x86/aes-xts - optimize size of instructions operating on lengths)
Merging drm/drm-next (fad3dad8326d Merge tag 'drm-intel-next-2024-04-17-1' of https://anongit.freedesktop.org/git/drm/drm-intel into drm-next)
34d127e2bdef ("drm/i915/cdclk: Fix voltage_level programming edge case")
3aecee90ac12 ("drm/i915/cdclk: Fix CDCLK programming order when pipes are active")
4135899209f9 ("drm/amdkfd: Fix memory leak in create_process failure")
5a1da42b50f3 ("drm/i915/dp: Fix the computation for compressed_bpp for DISPLAY < 13")
6809f9246d43 ("drm/i915/hdcp: Fix get remote hdcp capability function")
7a51a2aa2384 ("drm/i915/dp: Fix DSC state HW readout for SST connectors")
b37e1347b991 ("drm/i915: Disable port sync when bigjoiner is used")
b52c4093b0c9 ("drm/i915/psr: Move writing early transport pipe src")
b648ce2a28ba ("drm/i915/mst: Reject FEC+MST on ICL")
c8962679af35 ("drm/amdgpu: remove invalid resource->start check v2")
c9c92f286dbd ("drm/i915/mst: Limit MST+DSC to TGL+")
d37b3dac68e2 ("drm/i915/psr: Fix intel_psr2_sel_fetch_et_alignment usage")
ddf8a8bbb564 ("drm/i915/dp: Remove support for UHBR13.5")
ef79820db723 ("drm/i915: Disable live M/N updates when using bigjoiner")
f3b899f0b4b1 ("drm/i915/psr: Calculate PIPE_SRCSZ_ERLY_TPT value")
f9d5e51db656 ("drm/i915/vrr: Disable VRR when using bigjoiner")
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cdclk.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c
Merging drm-exynos/for-linux-next (5d2c7cc9c1b3 drm/exynos: mixer: drop driver owner initialization)
Merging drm-misc/for-linux-next (0e353133816b drm/rockchip: cdn-dp: drop driver owner assignment)
Merging amdgpu/drm-next (81bf14519a8c drm/amdkfd: make sure VM is ready for updating operations)
394ae0603a67 ("drm/amdgpu: fix visible VRAM handling during faults")
69c0f070531c ("drm/radeon: make -fstrict-flex-arrays=3 happy")
98856136c485 ("drm/amdgpu: validate the parameters of bo mapping operations more clearly")
a6ebaca1fbfb ("Revert "drm/amd/display: fix USB-C flag update after enc10 feature init"")
efade6fe50e7 ("drm/radeon: silence UBSAN warning (v3)")
Merging drm-intel/for-linux-next (d08184aa9065 drm/i915: Enable per-lane DP drive settings for bxt/glk)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (3e5a516f3bf1 Merge tag 'phy_dp_modes_6.10' into msm-next-lumag)
Merging drm-msm-lumag/msm-next-lumag (4aaa296aa14b drm/msm/dpu: Rename `ctx` parameter to `intf` to match other functions)
Merging drm-xe/drm-xe-next (62422b7be49e drm/xe: Define all possible engines in media IP descriptors)
83967c57320d ("drm/xe/vm: prevent UAF with asid based lookup")
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm_types.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (fb3b9c2d217f video: logo: Drop full path of the input filename in generated file)
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (3a56855bb549 ALSA: scarlett2: Zero initialize ret in scarlett2_ag_target_ctl_get())
Merging ieee1394/for-next (0d4149e5e9b0 firewire: ohci: use pci_irq_vector() to retrieve allocated interrupt line)
Merging sound-asoc/for-next (19cba5ce16ea Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (c75781a6e4c0 kallsyms: replace deprecated strncpy with strscpy)
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (9e0631695eac input: pm8xxx-vibrator: add new SPMI vibrator support)
Merging block/for-next (537b5b6f6e6e Merge branch 'for-6.10/block' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (a98ecf716e30 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (bce42d6108c9 mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (15f992fa81eb Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (74560bb3685b lsm: remove the now superfluous sentinel element from ctl_table array)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (37c34331f194 Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (d02a66d84baa Merge branches 'memory-observability' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (58d4b25c8831 dt-bindings: timer: renesas,tmu: Add R-Car V4M support)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
Merging dt-krzk/for-next (adfecb01c288 Merge branches 'next/dt' and 'next/dt64' into for-next)
Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU)
Merging spi/for-next (c17534112a33 Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (88b063eac6bd Merge branch into tip/master: 'x86/shstk')
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (8e95536e9495 Merge branch ras/edac-misc into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (b93b7b4635f1 ftrace: Asynchronous grace period for register_ftrace_direct())
Merging kvm/next (a96cb3bf390e Merge x86 bugfixes from Linux 6.9-rc3)
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging kvm-arm/next (0b4ec377eb53 Merge branch kvm-arm64/nv-eret-pauth into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (f1c48c1ec735 RISC-V: KVM: selftests: Add ebreak test support)
Merging kvm-x86/next (2d181d84af38 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'svm' and 'vmx')
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (8a8a4bfdbe85 Merge branch 'for-6.10' into for-next)
Merging drivers-x86/for-next (88c0ef69dd88 platform/x86: asus-wmi: cleanup main struct to avoid some holes)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (70a5f3005008 platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD))
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (66bc1a173328 treewide: Use sysfs_bin_attr_simple_read() helper)
Merging usb/usb-next (684e9f5f97eb usb: dwc3: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions)
CONFLICT (modify/delete): drivers/usb/misc/onboard_usb_hub.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/misc/onboard_usb_hub.c left in tree.
$ git rm -f drivers/usb/misc/onboard_usb_hub.c
Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev"
Merging thunderbolt/next (c936e287df26 thunderbolt: Get rid of TB_CFG_PKG_PREPARE_TO_SLEEP)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (f70f95b485d7 serial: msm: check dma_map_sg() return value properly)
CONFLICT (content): Merge conflict in drivers/tty/serial/serial_core.c
Merging char-misc/char-misc-next (ebbc1a4789c6 uio: update kerneldoc comments for interrupt functions)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (e0b97ddaf4b5 dt-bindings: arm: qcom,coresight-tpda: fix indentation in the example)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (89bd68b99b17 fpga: dfl: remove unused member pdata from struct dfl_{afu,fme})
Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment)
Merging iio/togreg (62d3fb9dcc09 iio: dac: ad5755: make use of of_device_id table)
Merging phy-next/next (9c79b779643e phy: rockchip: fix CONFIG_TYPEC dependency)
Merging soundwire/next (4cd5ea6de156 soundwire: intel_init: resume all devices on exit.)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (7447d911af69 vfio/fsl-mc: Block calling interrupt handler without trigger)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (ee2098c0b512 spmi: pmic-arb: Add multi bus support)
Merging staging/staging-next (75ff53c44f5e staging: vc04_services: Drop completed TODO item)
Merging counter-next/counter-next (916baadd293a counter: ti-ecap-capture: Utilize COUNTER_COMP_FREQUENCY macro)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (98f2233a5c20 dmaengine: pl08x: Use kcalloc() instead of kzalloc())
Merging cgroup/for-next (19fc8a896565 cgroup: Avoid unnecessary looping in cgroup_no_v1())
Merging scsi/for-next (99033e81ab05 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (f92141e18c8b Merge patch series "convert SCSI to atomic queue limits, part 1 (v3)")
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging vhost/linux-next (5b9f214d0540 vhost: Merge tag 'vduse-virtio-net' into vhost)
Merging rpmsg/for-next (912ebe48bec5 Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (8a7a61032587 gpiolib: Get rid of never false gpio_is_valid() calls)
Merging gpio-intel/for-next (1736df17fea0 gpiolib: acpi: Set label for IRQ only lines)
Merging pinctrl/for-next (85fb4a0fad95 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (aa43c15a790c pinctrl: renesas: rzg2l: Execute atomically the interrupt configuration)
Merging pinctrl-samsung/for-next (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants)
Merging pwm/pwm/for-next (60535cce6a11 dt-bindings: pwm: mediatek,pwm-disp: add compatible for mt8365 SoC)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (00ab560eb0e3 selftests: Mark ksft_exit_fail_perror() as __noreturn)
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (8f571fc2488c kunit: Fix race condition in try-catch completion)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local())
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (813e0ae613d6 bus: mhi: host: Add mhi_power_down_keep_dev() API to support system suspend/hibernation)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (ed1ff2fba7af Merge branch 'for-6.9/cxl-einj' into for-6.9/cxl)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (cda30c6542c8 efi: Clear up misconceptions about a maximum variable name size)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (5b15f3fb89fc slub: Set __GFP_COMP in kmem_cache by default)
Merging random/master (2668e3ae2ef3 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging landlock/next (dc792a74600a fs/ioctl: Add a comment to keep the logic in sync with LSM policies)
Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature)
Merging sysctl/sysctl-next (12e78b868481 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (a9c3475dd67b Replace macro "ARCH_HAVE_EXTRA_ELF_NOTES" with kconfig)
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (716bc9b1c255 Merge branch 'for-next/hardening' into for-next/kspp)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* [PATCH 2/2] ksmbd: add continuous availability share parameter
2024-04-20 0:43 4% [PATCH 1/2] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info Namjae Jeon
@ 2024-04-20 0:43 8% ` Namjae Jeon
0 siblings, 0 replies; 200+ results
From: Namjae Jeon @ 2024-04-20 0:43 UTC (permalink / raw)
To: linux-cifs; +Cc: smfrench, senozhatsky, tom, atteh.mailbox, Namjae Jeon
If capabilities of the share is not SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY,
ksmbd should not grant a persistent handle to the client.
This patch add continuous availability share parameter to control it.
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
---
fs/smb/server/ksmbd_netlink.h | 35 ++++++++++++++++++-----------------
fs/smb/server/smb2pdu.c | 11 +++++++++--
2 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/fs/smb/server/ksmbd_netlink.h b/fs/smb/server/ksmbd_netlink.h
index 686b321c5a8b..f4e55199938d 100644
--- a/fs/smb/server/ksmbd_netlink.h
+++ b/fs/smb/server/ksmbd_netlink.h
@@ -340,23 +340,24 @@ enum KSMBD_TREE_CONN_STATUS {
/*
* Share config flags.
*/
-#define KSMBD_SHARE_FLAG_INVALID (0)
-#define KSMBD_SHARE_FLAG_AVAILABLE BIT(0)
-#define KSMBD_SHARE_FLAG_BROWSEABLE BIT(1)
-#define KSMBD_SHARE_FLAG_WRITEABLE BIT(2)
-#define KSMBD_SHARE_FLAG_READONLY BIT(3)
-#define KSMBD_SHARE_FLAG_GUEST_OK BIT(4)
-#define KSMBD_SHARE_FLAG_GUEST_ONLY BIT(5)
-#define KSMBD_SHARE_FLAG_STORE_DOS_ATTRS BIT(6)
-#define KSMBD_SHARE_FLAG_OPLOCKS BIT(7)
-#define KSMBD_SHARE_FLAG_PIPE BIT(8)
-#define KSMBD_SHARE_FLAG_HIDE_DOT_FILES BIT(9)
-#define KSMBD_SHARE_FLAG_INHERIT_OWNER BIT(10)
-#define KSMBD_SHARE_FLAG_STREAMS BIT(11)
-#define KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS BIT(12)
-#define KSMBD_SHARE_FLAG_ACL_XATTR BIT(13)
-#define KSMBD_SHARE_FLAG_UPDATE BIT(14)
-#define KSMBD_SHARE_FLAG_CROSSMNT BIT(15)
+#define KSMBD_SHARE_FLAG_INVALID (0)
+#define KSMBD_SHARE_FLAG_AVAILABLE BIT(0)
+#define KSMBD_SHARE_FLAG_BROWSEABLE BIT(1)
+#define KSMBD_SHARE_FLAG_WRITEABLE BIT(2)
+#define KSMBD_SHARE_FLAG_READONLY BIT(3)
+#define KSMBD_SHARE_FLAG_GUEST_OK BIT(4)
+#define KSMBD_SHARE_FLAG_GUEST_ONLY BIT(5)
+#define KSMBD_SHARE_FLAG_STORE_DOS_ATTRS BIT(6)
+#define KSMBD_SHARE_FLAG_OPLOCKS BIT(7)
+#define KSMBD_SHARE_FLAG_PIPE BIT(8)
+#define KSMBD_SHARE_FLAG_HIDE_DOT_FILES BIT(9)
+#define KSMBD_SHARE_FLAG_INHERIT_OWNER BIT(10)
+#define KSMBD_SHARE_FLAG_STREAMS BIT(11)
+#define KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS BIT(12)
+#define KSMBD_SHARE_FLAG_ACL_XATTR BIT(13)
+#define KSMBD_SHARE_FLAG_UPDATE BIT(14)
+#define KSMBD_SHARE_FLAG_CROSSMNT BIT(15)
+#define KSMBD_SHARE_FLAG_CONTINUOUS_AVAILABILITY BIT(16)
/*
* Tree connect request flags.
diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index ee4b2875a021..355824151c2d 100644
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -1988,7 +1988,12 @@ int smb2_tree_connect(struct ksmbd_work *work)
write_unlock(&sess->tree_conns_lock);
rsp->StructureSize = cpu_to_le16(16);
out_err1:
- rsp->Capabilities = 0;
+ if (server_conf.flags & KSMBD_GLOBAL_FLAG_DURABLE_HANDLE &&
+ test_share_config_flag(share,
+ KSMBD_SHARE_FLAG_CONTINUOUS_AVAILABILITY))
+ rsp->Capabilities = SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY;
+ else
+ rsp->Capabilities = 0;
rsp->Reserved = 0;
/* default manual caching */
rsp->ShareFlags = SMB2_SHAREFLAG_MANUAL_CACHING;
@@ -3502,7 +3507,9 @@ int smb2_open(struct ksmbd_work *work)
memcpy(fp->client_guid, conn->ClientGUID, SMB2_CLIENT_GUID_SIZE);
if (dh_info.type == DURABLE_REQ_V2 || dh_info.type == DURABLE_REQ) {
- if (dh_info.type == DURABLE_REQ_V2 && dh_info.persistent)
+ if (dh_info.type == DURABLE_REQ_V2 && dh_info.persistent &&
+ test_share_config_flag(work->tcon->share_conf,
+ KSMBD_SHARE_FLAG_CONTINUOUS_AVAILABILITY))
fp->is_persistent = true;
else
fp->is_durable = true;
--
2.25.1
^ permalink raw reply related [relevance 8%]
* [PATCH 1/2] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
@ 2024-04-20 0:43 4% Namjae Jeon
2024-04-20 0:43 8% ` [PATCH 2/2] ksmbd: add continuous availability share parameter Namjae Jeon
0 siblings, 1 reply; 200+ results
From: Namjae Jeon @ 2024-04-20 0:43 UTC (permalink / raw)
To: linux-cifs; +Cc: smfrench, senozhatsky, tom, atteh.mailbox, Namjae Jeon
4byte padding cause the connection issue with the applications of MacOS.
smb2_close response size increases by 4 bytes by padding, And the smb
client of MacOS check it and stop the connection. This patch use
struct_group_attr instead of struct_group for network_open_info to use
__packed to avoid padding.
Fixes: 0015eb6e1238 ("smb: client, common: fix fortify warnings")
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
---
fs/smb/common/smb2pdu.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h
index 1b594307c9d5..202ff9128156 100644
--- a/fs/smb/common/smb2pdu.h
+++ b/fs/smb/common/smb2pdu.h
@@ -711,7 +711,7 @@ struct smb2_close_rsp {
__le16 StructureSize; /* 60 */
__le16 Flags;
__le32 Reserved;
- struct_group(network_open_info,
+ struct_group_attr(network_open_info, __packed,
__le64 CreationTime;
__le64 LastAccessTime;
__le64 LastWriteTime;
--
2.25.1
^ permalink raw reply related [relevance 4%]
* Re: [RFC PATCH net-next 0/5] net: In-kernel QUIC implementation with Userspace handshake
2024-04-19 14:07 0% ` Stefan Metzmacher
@ 2024-04-19 18:09 0% ` Xin Long
0 siblings, 1 reply; 200+ results
From: Xin Long @ 2024-04-19 18:09 UTC (permalink / raw)
To: Stefan Metzmacher
Cc: network dev, davem, kuba, Eric Dumazet, Paolo Abeni,
Steve French, Namjae Jeon, Chuck Lever III, Jeff Layton,
Sabrina Dubroca, Tyler Fanelli, Pengtao He, linux-cifs,
Samba Technical
On Fri, Apr 19, 2024 at 10:07 AM Stefan Metzmacher <metze@samba.org> wrote:
>
> Hi Xin Long,
>
> >>>>>> first many thanks for working on this topic!
> >>>>>>
> >>>>> Hi, Stefan
> >>>>>
> >>>>> Thanks for the comment!
> >>>>>
> >>>>>>> Usage
> >>>>>>> =====
> >>>>>>>
> >>>>>>> This implementation supports a mapping of QUIC into sockets APIs. Similar
> >>>>>>> to TCP and SCTP, a typical Server and Client use the following system call
> >>>>>>> sequence to communicate:
> >>>>>>>
> >>>>>>> Client Server
> >>>>>>> ------------------------------------------------------------------
> >>>>>>> sockfd = socket(IPPROTO_QUIC) listenfd = socket(IPPROTO_QUIC)
> >>>>>>> bind(sockfd) bind(listenfd)
> >>>>>>> listen(listenfd)
> >>>>>>> connect(sockfd)
> >>>>>>> quic_client_handshake(sockfd)
> >>>>>>> sockfd = accecpt(listenfd)
> >>>>>>> quic_server_handshake(sockfd, cert)
> >>>>>>>
> >>>>>>> sendmsg(sockfd) recvmsg(sockfd)
> >>>>>>> close(sockfd) close(sockfd)
> >>>>>>> close(listenfd)
> >>>>>>>
> >>>>>>> Please note that quic_client_handshake() and quic_server_handshake() functions
> >>>>>>> are currently sourced from libquic in the github lxin/quic repository, and might
> >>>>>>> be integrated into ktls-utils in the future. These functions are responsible for
> >>>>>>> receiving and processing the raw TLS handshake messages until the completion of
> >>>>>>> the handshake process.
> >>>>>>
> >>>>>> I see a problem with this design for the server, as one reason to
> >>>>>> have SMB over QUIC is to use udp port 443 in order to get through
> >>>>>> firewalls. As QUIC has the concept of ALPN it should be possible
> >>>>>> let a conumer only listen on a specif ALPN, so that the smb server
> >>>>>> and web server on "h3" could both accept connections.
> >>>>> We do provide a sockopt to set ALPN before bind or handshaking:
> >>>>>
> >>>>> https://github.com/lxin/quic/wiki/man#quic_sockopt_alpn
> >>>>>
> >>>>> But it's used more like to verify if the ALPN set on the server
> >>>>> matches the one received from the client, instead of to find
> >>>>> the correct server.
> >>>>
> >>>> Ah, ok.
> >>> Just note that, with a bit change in the current libquic, it still
> >>> allows users to use ALPN to find the correct function or thread in
> >>> the *same* process, usage be like:
> >>>
> >>> listenfd = socket(IPPROTO_QUIC);
> >>> /* match all during handshake with wildcard ALPN */
> >>> setsockopt(listenfd, QUIC_SOCKOPT_ALPN, "*");
> >>> bind(listenfd)
> >>> listen(listenfd)
> >>>
> >>> while (1) {
> >>> sockfd = accept(listenfd);
> >>> /* the alpn from client will be set to sockfd during handshake */
> >>> quic_server_handshake(sockfd, cert);
> >>>
> >>> getsockopt(sockfd, QUIC_SOCKOPT_ALPN, alpn);
> >>
> >> Would quic_server_handshake() call setsockopt()?
> > Yes, I just made a bit change in the userspace libquic:
> >
> > https://github.com/lxin/quic/commit/9c75bd42769a8cbc1652e2f4c8d77780f23afde6
> >
> > So you can set up multple ALPNs on listen sock:
> >
> > setsockopt(listenfd, QUIC_SOCKOPT_ALPN, "smbd, h3, ksmbd");
> >
> > Then during handshake, the matched ALPN from client will be set into
> > the accept socket, then users can get it later after handshake.
> >
> > Note that userspace libquic is a very light lib (a couple of hundred lines
> > of code), you can add more TLS related support without touching Kernel code,
> > including the SNI support you mentioned.
> >
> >>
> >>> switch (alpn) {
> >>> case "smbd": smbd_thread(sockfd);
> >>> case "h3": h3_thread(sockfd);
> >>> case "ksmbd": ksmbd_thread(sockfd);
> >>> }
> >>> }
> >>
> >> Ok, but that would mean all application need to be aware of each other,
> >> but it would be possible and socket fds could be passed to other
> >> processes.
> > It doesn't sound common to me, but yes, I think Unix Domain Sockets
> > can pass it to another process.
>
> I think it will be extremely common to have multiple services
> based on udp port 443.
>
> People will expect to find web services, smb and maybe more
> behind the same dnshost name. And multiple dnshostnames pointing
> to the same ip address is also very likely.
>
> With plain tcp/udp it's also possible to independent sockets
> per port. There's no single userspace daemon that listens on
> 'tcp' and will dispatch into different process base on the port.
>
> And with QUIC the port space is the ALPN and/or SNI
> combination.
>
> And I think this should be addressed before this becomes an
> unchangeable kernel ABI, written is stone.
>
> >>>>> So you expect (k)smbd server and web server both to listen on UDP
> >>>>> port 443 on the same host, and which APP server accepts the request
> >>>>> from a client depends on ALPN, right?
> >>>>
> >>>> yes.
> >>> Got you. This can be done by also moving TLS 1.3 message exchange to
> >>> kernel where we can get the ALPN before looking up the listening socket.
> >>> However, In-kernel TLS 1.3 Handshake had been NACKed by both kernel
> >>> netdev maintainers and userland ssl lib developers with good reasons.
> >>>
> >>>>
> >>>>> Currently, in Kernel, this implementation doesn't process any raw TLS
> >>>>> MSG/EXTs but deliver them to userspace after decryption, and the accept
> >>>>> socket is created before processing handshake.
> >>>>>
> >>>>> I'm actually curious how userland QUIC handles this, considering
> >>>>> that the UDP sockets('listening' on the same IP:PORT) are used in
> >>>>> two different servers' processes. I think socket lookup with ALPN
> >>>>> has to be done in Kernel Space. Do you know any userland QUIC
> >>>>> implementation for this?
> >>>>
> >>>> I don't now, but I guess QUIC is only used for http so
> >>>> far and maybe dns, but that seems to use port 853.
> >>>>
> >>>> So there's no strict need for it and the web server
> >>>> would handle all relevant ALPNs.
> >>> Honestly, I don't think any userland QUIC can use ALPN to lookup for
> >>> different sockets used by different servers/processes. As such thing
> >>> can be only done in Kernel Space.
> >>>
> >>>>
> >>>>>>
> >>>>>> So the server application should have a way to specify the desired
> >>>>>> ALPN before or during the bind() call. I'm not sure if the
> >>>>>> ALPN is available in cleartext before any crypto is needed,
> >>>>>> so if the ALPN is encrypted it might be needed to also register
> >>>>>> a server certificate and key together with the ALPN.
> >>>>>> Because multiple application may not want to share the same key.
> >>>>> On send side, ALPN extension is in raw TLS messages created in userspace
> >>>>> and passed into the kernel and encoded into QUIC crypto frame and then
> >>>>> *encrypted* before sending out.
> >>>>
> >>>> Ok.
> >>>>
> >>>>> On recv side, after decryption, the raw TLS messages are decoded from
> >>>>> the QUIC crypto frame and then delivered to userspace, so in userspace
> >>>>> it processes certificate validation and also see cleartext ALPN.
> >>>>>
> >>>>> Let me know if I don't make it clear.
> >>>>
> >>>> But the first "new" QUIC pdu from will trigger the accept() to
> >>>> return and userspace (or the kernel helper function) will to
> >>>> all crypto? Or does the first decryption happen in kernel (before accept returns)?
> >>> Good question!
> >>>
> >>> The first "new" QUIC pdu will cause to create a 'request sock' (contains
> >>> 4-tuple and connection IDs only) and queue up to reqsk list of the listen
> >>> sock (if validate_peer_address param is not set), and this pdu is enqueued
> >>> in the inq->backlog_list of the listen sock.
> >>>
> >>> When accept() is called, in Kernel, it dequeues the "request sock" from the
> >>> reqsk list of the listen sock, and creates the accept socket based on this
> >>> reqsk. Then it processes the pdu for this new accept socket from the
> >>> inq->backlog_list of the listen sock, including *decrypting* QUIC packet
> >>> and decoding CRYPTO frame, then deliver the raw/cleartext TLS message to
> >>> the Userspace libquic.
> >>
> >> Ok, when the kernel already decrypts it could already
> >> look find the ALPN. It doesn't mean it should do the full
> >> handshake, but parse enough to find the ALPN.
> > Correct, in-kernel QUIC should only do the QUIC related things,
> > and all TLS handshake msgs must be handled in Userspace.
> > This won't cause "layering violation", as Nick Banks said.
>
> But I think its unavoidable for the ALPN and SNI fields on
> the server side. As every service tries to use udp port 443
> and somehow that needs to be shared if multiple services want to
> use it.
>
> I guess on the acceptor side we would need to somehow detach low level
> udp struct sock from the logical listen struct sock.
>
> And quic_do_listen_rcv() would need to find the correct logical listening
> socket and call quic_request_sock_enqueue() on the logical socket
> not the lowlevel udo socket. The same for all stuff happening after
> quic_request_sock_enqueue() at the end of quic_do_listen_rcv.
>
The implementation allows one low level UDP sock to serve for multiple
QUIC socks.
Currently, if your 3 quic applications listen to the same address:port
with SO_REUSEPORT socket option set, the incoming connection will choose
one of your applications randomly with hash(client_addr+port) via
reuseport_select_sock() in quic_sock_lookup().
It should be easy to do a further match with ALPN between these 3 quic
socks that listens to the same address:port to get the right quic sock,
instead of that randomly choosing.
The problem is to parse the TLS Client_Hello message to get the ALPN in
quic_sock_lookup(), which is not a proper thing to do in kernel, and
might be rejected by networking maintainers, I need to check with them.
Will you be able to work around this by using Unix Domain Sockets pass
the sockfd to another process?
(Note that we're assuming all your 3 applications are using in-kernel QUIC)
> >> But I don't yet understand how the kernel gets the key to
> >> do the initlal decryption, I'd assume some call before listen()
> >> need to tell the kernel about the keys.
> > For initlal decryption, the keys can be derived with the initial packet.
> > basically, it only needs the dst_connection_id from the client initial
> > packet. see:
> >
> > https://datatracker.ietf.org/doc/html/rfc9001#name-initial-secrets
> >
> > so we don't need to set up anything to kernel for initial's keys.
>
> I got it thanks!
>
> metze
>
^ permalink raw reply [relevance 0%]
* Re: Missing protocol features that could help Linux
2024-04-19 16:53 0% ` Ralph Boehme
@ 2024-04-19 16:55 0% ` Jeremy Allison
0 siblings, 0 replies; 200+ results
From: Jeremy Allison @ 2024-04-19 16:55 UTC (permalink / raw)
To: Ralph Boehme; +Cc: Steve French, samba-technical, CIFS, Namjae Jeon
On Fri, Apr 19, 2024 at 06:53:01PM +0200, Ralph Boehme wrote:
>On 4/18/24 22:21, Steve French via samba-technical wrote:
>>Was following up on a recent question about support for Linux features
>>that are missing that could help us pass more xfstests
>>
>>Looking at the standard fstests for Linux (xfstests that are skipped
>>or fail for cifs.ko) to find 'features' that would help, perhaps
>>extending the current POSIX Extensions or adding a couple of SMB3.1.1
>>FSCTLs, I spotted a few obvious ones:
>>
>> 1) renameat2 (RENAME_EXCHANGE) and renameat2(WHITEOUT) 2) FITRIM
>>support 3) trusted namespace (perhaps xattr/EA extension) 4) attr
>>namespace 5) deduplication 6) chattr -i 7) unshare (namespace command)
>>8) delayed allocation 9) dax 10) attr namespace security 11) fstrim
>>12) chattr +s 13) exchange range
>>
>>Any thoughts on which of these which would be 'easy' for samba and/or
>>ksmbd server to implement (e.g. as new fsctls)?
>
>well, I guess none of these will be really "easy".
>
>Iirc when I last brough up file attributes, we vetted towards
>postponing this kind of stuff until we have full support for the core
>SMB3 POSIX features in Samba. Iirc the only real thing missing there
>is symlink/reparse point handling and for that we need to settle on
>which reparse type to use (WSL vs NFS) as discussed yesterday. It
>would be a *huge* help Steve, if you can pursue this internally, this
>has been a blocker for the whole project since quite some time...
renameat2 (RENAME_EXCHANGE) and renameat2(WHITEOUT) need to be
mapped into Windows SMB3 operations. We should not (IMHO) add new
SMB3 operation semantics into POSIX that overlap existing Windows
SMB3 operations.
^ permalink raw reply [relevance 0%]
* Re: Missing protocol features that could help Linux
2024-04-18 20:21 4% Missing protocol features that could help Linux Steve French
2024-04-19 1:40 0% ` Andrew Bartlett
@ 2024-04-19 16:53 0% ` Ralph Boehme
2024-04-19 16:55 0% ` Jeremy Allison
1 sibling, 1 reply; 200+ results
From: Ralph Boehme @ 2024-04-19 16:53 UTC (permalink / raw)
To: Steve French, samba-technical; +Cc: CIFS, Namjae Jeon, Jeremy Allison
[-- Attachment #1.1: Type: text/plain, Size: 1453 bytes --]
On 4/18/24 22:21, Steve French via samba-technical wrote:
> Was following up on a recent question about support for Linux features
> that are missing that could help us pass more xfstests
>
> Looking at the standard fstests for Linux (xfstests that are skipped
> or fail for cifs.ko) to find 'features' that would help, perhaps
> extending the current POSIX Extensions or adding a couple of SMB3.1.1
> FSCTLs, I spotted a few obvious ones:
>
> 1) renameat2 (RENAME_EXCHANGE) and renameat2(WHITEOUT) 2) FITRIM
> support 3) trusted namespace (perhaps xattr/EA extension) 4) attr
> namespace 5) deduplication 6) chattr -i 7) unshare (namespace command)
> 8) delayed allocation 9) dax 10) attr namespace security 11) fstrim
> 12) chattr +s 13) exchange range
>
> Any thoughts on which of these which would be 'easy' for samba and/or
> ksmbd server to implement (e.g. as new fsctls)?
well, I guess none of these will be really "easy".
Iirc when I last brough up file attributes, we vetted towards postponing
this kind of stuff until we have full support for the core SMB3 POSIX
features in Samba. Iirc the only real thing missing there is
symlink/reparse point handling and for that we need to settle on which
reparse type to use (WSL vs NFS) as discussed yesterday. It would be a
*huge* help Steve, if you can pursue this internally, this has been a
blocker for the whole project since quite some time...
-slow
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [relevance 0%]
* Re: [RFC PATCH net-next 0/5] net: In-kernel QUIC implementation with Userspace handshake
@ 2024-04-19 14:07 0% ` Stefan Metzmacher
2024-04-19 18:09 0% ` Xin Long
0 siblings, 1 reply; 200+ results
From: Stefan Metzmacher @ 2024-04-19 14:07 UTC (permalink / raw)
To: Xin Long
Cc: network dev, davem, kuba, Eric Dumazet, Paolo Abeni,
Steve French, Namjae Jeon, Chuck Lever III, Jeff Layton,
Sabrina Dubroca, Tyler Fanelli, Pengtao He, linux-cifs,
Samba Technical
Hi Xin Long,
>>>>>> first many thanks for working on this topic!
>>>>>>
>>>>> Hi, Stefan
>>>>>
>>>>> Thanks for the comment!
>>>>>
>>>>>>> Usage
>>>>>>> =====
>>>>>>>
>>>>>>> This implementation supports a mapping of QUIC into sockets APIs. Similar
>>>>>>> to TCP and SCTP, a typical Server and Client use the following system call
>>>>>>> sequence to communicate:
>>>>>>>
>>>>>>> Client Server
>>>>>>> ------------------------------------------------------------------
>>>>>>> sockfd = socket(IPPROTO_QUIC) listenfd = socket(IPPROTO_QUIC)
>>>>>>> bind(sockfd) bind(listenfd)
>>>>>>> listen(listenfd)
>>>>>>> connect(sockfd)
>>>>>>> quic_client_handshake(sockfd)
>>>>>>> sockfd = accecpt(listenfd)
>>>>>>> quic_server_handshake(sockfd, cert)
>>>>>>>
>>>>>>> sendmsg(sockfd) recvmsg(sockfd)
>>>>>>> close(sockfd) close(sockfd)
>>>>>>> close(listenfd)
>>>>>>>
>>>>>>> Please note that quic_client_handshake() and quic_server_handshake() functions
>>>>>>> are currently sourced from libquic in the github lxin/quic repository, and might
>>>>>>> be integrated into ktls-utils in the future. These functions are responsible for
>>>>>>> receiving and processing the raw TLS handshake messages until the completion of
>>>>>>> the handshake process.
>>>>>>
>>>>>> I see a problem with this design for the server, as one reason to
>>>>>> have SMB over QUIC is to use udp port 443 in order to get through
>>>>>> firewalls. As QUIC has the concept of ALPN it should be possible
>>>>>> let a conumer only listen on a specif ALPN, so that the smb server
>>>>>> and web server on "h3" could both accept connections.
>>>>> We do provide a sockopt to set ALPN before bind or handshaking:
>>>>>
>>>>> https://github.com/lxin/quic/wiki/man#quic_sockopt_alpn
>>>>>
>>>>> But it's used more like to verify if the ALPN set on the server
>>>>> matches the one received from the client, instead of to find
>>>>> the correct server.
>>>>
>>>> Ah, ok.
>>> Just note that, with a bit change in the current libquic, it still
>>> allows users to use ALPN to find the correct function or thread in
>>> the *same* process, usage be like:
>>>
>>> listenfd = socket(IPPROTO_QUIC);
>>> /* match all during handshake with wildcard ALPN */
>>> setsockopt(listenfd, QUIC_SOCKOPT_ALPN, "*");
>>> bind(listenfd)
>>> listen(listenfd)
>>>
>>> while (1) {
>>> sockfd = accept(listenfd);
>>> /* the alpn from client will be set to sockfd during handshake */
>>> quic_server_handshake(sockfd, cert);
>>>
>>> getsockopt(sockfd, QUIC_SOCKOPT_ALPN, alpn);
>>
>> Would quic_server_handshake() call setsockopt()?
> Yes, I just made a bit change in the userspace libquic:
>
> https://github.com/lxin/quic/commit/9c75bd42769a8cbc1652e2f4c8d77780f23afde6
>
> So you can set up multple ALPNs on listen sock:
>
> setsockopt(listenfd, QUIC_SOCKOPT_ALPN, "smbd, h3, ksmbd");
>
> Then during handshake, the matched ALPN from client will be set into
> the accept socket, then users can get it later after handshake.
>
> Note that userspace libquic is a very light lib (a couple of hundred lines
> of code), you can add more TLS related support without touching Kernel code,
> including the SNI support you mentioned.
>
>>
>>> switch (alpn) {
>>> case "smbd": smbd_thread(sockfd);
>>> case "h3": h3_thread(sockfd);
>>> case "ksmbd": ksmbd_thread(sockfd);
>>> }
>>> }
>>
>> Ok, but that would mean all application need to be aware of each other,
>> but it would be possible and socket fds could be passed to other
>> processes.
> It doesn't sound common to me, but yes, I think Unix Domain Sockets
> can pass it to another process.
I think it will be extremely common to have multiple services
based on udp port 443.
People will expect to find web services, smb and maybe more
behind the same dnshost name. And multiple dnshostnames pointing
to the same ip address is also very likely.
With plain tcp/udp it's also possible to independent sockets
per port. There's no single userspace daemon that listens on
'tcp' and will dispatch into different process base on the port.
And with QUIC the port space is the ALPN and/or SNI
combination.
And I think this should be addressed before this becomes an
unchangeable kernel ABI, written is stone.
>>>>> So you expect (k)smbd server and web server both to listen on UDP
>>>>> port 443 on the same host, and which APP server accepts the request
>>>>> from a client depends on ALPN, right?
>>>>
>>>> yes.
>>> Got you. This can be done by also moving TLS 1.3 message exchange to
>>> kernel where we can get the ALPN before looking up the listening socket.
>>> However, In-kernel TLS 1.3 Handshake had been NACKed by both kernel
>>> netdev maintainers and userland ssl lib developers with good reasons.
>>>
>>>>
>>>>> Currently, in Kernel, this implementation doesn't process any raw TLS
>>>>> MSG/EXTs but deliver them to userspace after decryption, and the accept
>>>>> socket is created before processing handshake.
>>>>>
>>>>> I'm actually curious how userland QUIC handles this, considering
>>>>> that the UDP sockets('listening' on the same IP:PORT) are used in
>>>>> two different servers' processes. I think socket lookup with ALPN
>>>>> has to be done in Kernel Space. Do you know any userland QUIC
>>>>> implementation for this?
>>>>
>>>> I don't now, but I guess QUIC is only used for http so
>>>> far and maybe dns, but that seems to use port 853.
>>>>
>>>> So there's no strict need for it and the web server
>>>> would handle all relevant ALPNs.
>>> Honestly, I don't think any userland QUIC can use ALPN to lookup for
>>> different sockets used by different servers/processes. As such thing
>>> can be only done in Kernel Space.
>>>
>>>>
>>>>>>
>>>>>> So the server application should have a way to specify the desired
>>>>>> ALPN before or during the bind() call. I'm not sure if the
>>>>>> ALPN is available in cleartext before any crypto is needed,
>>>>>> so if the ALPN is encrypted it might be needed to also register
>>>>>> a server certificate and key together with the ALPN.
>>>>>> Because multiple application may not want to share the same key.
>>>>> On send side, ALPN extension is in raw TLS messages created in userspace
>>>>> and passed into the kernel and encoded into QUIC crypto frame and then
>>>>> *encrypted* before sending out.
>>>>
>>>> Ok.
>>>>
>>>>> On recv side, after decryption, the raw TLS messages are decoded from
>>>>> the QUIC crypto frame and then delivered to userspace, so in userspace
>>>>> it processes certificate validation and also see cleartext ALPN.
>>>>>
>>>>> Let me know if I don't make it clear.
>>>>
>>>> But the first "new" QUIC pdu from will trigger the accept() to
>>>> return and userspace (or the kernel helper function) will to
>>>> all crypto? Or does the first decryption happen in kernel (before accept returns)?
>>> Good question!
>>>
>>> The first "new" QUIC pdu will cause to create a 'request sock' (contains
>>> 4-tuple and connection IDs only) and queue up to reqsk list of the listen
>>> sock (if validate_peer_address param is not set), and this pdu is enqueued
>>> in the inq->backlog_list of the listen sock.
>>>
>>> When accept() is called, in Kernel, it dequeues the "request sock" from the
>>> reqsk list of the listen sock, and creates the accept socket based on this
>>> reqsk. Then it processes the pdu for this new accept socket from the
>>> inq->backlog_list of the listen sock, including *decrypting* QUIC packet
>>> and decoding CRYPTO frame, then deliver the raw/cleartext TLS message to
>>> the Userspace libquic.
>>
>> Ok, when the kernel already decrypts it could already
>> look find the ALPN. It doesn't mean it should do the full
>> handshake, but parse enough to find the ALPN.
> Correct, in-kernel QUIC should only do the QUIC related things,
> and all TLS handshake msgs must be handled in Userspace.
> This won't cause "layering violation", as Nick Banks said.
But I think its unavoidable for the ALPN and SNI fields on
the server side. As every service tries to use udp port 443
and somehow that needs to be shared if multiple services want to
use it.
I guess on the acceptor side we would need to somehow detach low level
udp struct sock from the logical listen struct sock.
And quic_do_listen_rcv() would need to find the correct logical listening
socket and call quic_request_sock_enqueue() on the logical socket
not the lowlevel udo socket. The same for all stuff happening after
quic_request_sock_enqueue() at the end of quic_do_listen_rcv.
>> But I don't yet understand how the kernel gets the key to
>> do the initlal decryption, I'd assume some call before listen()
>> need to tell the kernel about the keys.
> For initlal decryption, the keys can be derived with the initial packet.
> basically, it only needs the dst_connection_id from the client initial
> packet. see:
>
> https://datatracker.ietf.org/doc/html/rfc9001#name-initial-secrets
>
> so we don't need to set up anything to kernel for initial's keys.
I got it thanks!
metze
^ permalink raw reply [relevance 0%]
* linux-next: Tree for Apr 19
@ 2024-04-19 6:09 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-04-19 6:09 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 38636 bytes --]
Hi all,
Changes since 20240418:
The mm-hotfixes tree gained a conflict against Linus' tree.
The perf tree still had its build failure for which I applied a supplied
patch.
The tty tree gained a conflict against the tty.current tree.
Non-merge commits (relative to Linus' tree): 6262
6441 files changed, 254530 insertions(+), 154414 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 370 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (2668e3ae2ef3 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (b8de39bd1b76 init: fix allocated page overlapping with PTR_ERR)
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (61231eb8113c ARC: [plat-hsdk]: Remove misplaced interrupt-cells property)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (34e526cb7d46 arm64/head: Disable MMU at EL2 before clearing HCR_EL2.E2H)
Merging arm-soc-fixes/arm/fixes (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (210cfef57926 selftests/powerpc/papr-vpd: Fix missing variable initialization)
Merging s390-fixes/fixes (d111855ab7ff s390/mm: Fix NULL pointer dereference)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (7586c8501d09 Merge tag 'net-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf/master (10541b374aa0 riscv, bpf: Fix incorrect runtime stats)
Merging ipsec/master (bccb798e07f8 octeontx2-pf: Fix transmit scheduler resource leak)
Merging netfilter/main (ac1a21db32ed Merge tag 'nf-24-04-18' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf)
Merging ipvs/main (7eaf837a4eb5 netfilter: nf_tables: Fix a memory leak in nf_tables_updchain)
Merging wireless/for-next (bada85a3f584 wifi: iwlwifi: mvm: return uid from iwl_mvm_build_scan_cmd)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (be121ffb384f RDMA/mlx5: Fix port number for counter query in multi-port configuration)
Merging sound-current/for-linus (7caf3daaaf04 ALSA: hda/realtek: Add quirks for Huawei Matebook D14 NBLB-WAX9N)
Merging sound-asoc-fixes/for-linus (9a039db9273b ASoC: SOF: Core: Handle error returned by sof_select_ipc_and_paths)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (68adb581a39a regulator: vqmmc-ipq4019: fix module autoloading)
Merging spi-fixes/for-linus (7430764f5a85 spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (156539fd6501 Documentation: embargoed-hardware-issues.rst: Add myself for Power)
Merging tty.current/tty-linus (ea2624b5b829 serial: stm32: Reset .throttled state in .startup())
Merging usb.current/usb-linus (f2e0eee47038 usb: dwc3: ep0: Don't reset resource alloc flag)
Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (74a72baf204f iio:imu: adis16475: Fix sync mode setting)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (ebaed6d4def8 peci: linux/peci.h: fix Excess kernel-doc description warning)
Merging soundwire-fixes/fixes (63dc588e7af1 soundwire: amd: fix for wake interrupt handling for clockstop mode)
Merging thunderbolt-fixes/fixes (dcd12acaf384 thunderbolt: Avoid notify PM core about runtime PM resume)
Merging input-current/for-linus (57ed9567e63b Merge branch 'next' into for-linus)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (f221033f5c24 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (4cece7649650 Linux 6.9-rc1)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (1c3bed800669 Merge tag 'kvm-x86-fixes-6.9-rcN' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (7bcf809b1e78 cxl: Add checks to access_coordinate calculation to fail missing data)
Merging btrfs-fixes/next-fixes (08487fb4f2bd Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (f609e7b1b49e platform/x86/amd/pmc: Extend Framework 13 quirk to more BIOSes)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (ca91259b775f scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING)
Merging drm-fixes/drm-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging drm-intel-fixes/for-linux-next-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging mmc-fixes/fixes (ace323f80b9b mmc: sdhci-of-dwcmshc: th1520: Increase tuning loop count to 128)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (30d18df6567b Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted)
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (a373a36fb6b0 Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (6b0856ee585d cache: sifive_ccache: Silence unused variable warning)
Merging fpga-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (69ffed4b6252 gpiolib: swnode: Remove wrong header inclusion)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7557d296ad43 MAINTAINERS: erofs: add myself as reviewer)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (f488138b5267 NFSD: fix endianness issue in nfsd4_encode_fattr4)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (decd347c2a75 x86/efistub: Reinstate soft limit for initrd loading)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (8933cf4651e0 rust: make mutually exclusive with CFI_CLANG)
Merging v9fs-fixes/fixes/next (75e3f8fb2578 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (d3e8a91a848a clk: mediatek: mt7988-infracfg: fix clocks for 2nd PCIe port)
Merging drm-misc-fixes/for-linux-next-fixes (6aff4c26ed67 drm/gma500: Remove lid code)
Merging mm-stable/mm-stable (640958fde130 Merge branch 'master' into mm-stable)
Merging mm-nonmm-stable/mm-nonmm-stable (0bbac3facb5d Linux 6.9-rc4)
Merging mm/mm-everything (08ac004bd4a2 Merge branch 'mm-nonmm-unstable' into mm-everything)
Merging kbuild/for-next (961664cd2955 parisc: vdso: remove unused C build rule in vdso32/Makefile)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (a5a00497b9df perf annotate-data: Handle RSP if it's not the FB register)
Applying: Revert "tools headers: Remove almost unused copy of uapi/stat.h, add few conditional defines"
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (b5d2afe8745b Merge branches 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (b782e8d07baa arm64: arm_pmuv3: Correctly extract and check the PMUVer)
Merging arm-soc/for-next (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging amlogic/for-next (70ce74fbef7e Merge branch 'v6.10/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (0696ed223eb6 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (6cf256f63478 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (310cdb567f73 Merge branch 'v6.9-next/dts64' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (2a1e301bf479 Merge branch 'omap-for-v6.10/dt' into for-next)
Merging qcom/for-next (4bec154a3f10 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (f4a6540ae2c4 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (70641cfcd0dd Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (b7b2fe24038b Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (615f2476e23d Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (65fcc08b4cfe riscv: dts: sophgo: cv18xx: Add i2c devices)
Merging stm32/stm32-next (b12a916d30dc ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1)
Merging sunxi/sunxi/for-next (7152a15f8c1d Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/dt into for-next)
Merging ti/ti-next (592695bed5f8 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (071d51e4acf5 Merge branch 'clk-stm' into clk-next)
Merging clk-imx/for-next (13269dc6c704 clk: imx: imx8mp: Fix SAI_MCLK_SEL definition)
Merging clk-renesas/renesas-clk (c0516eb4cf04 clk: renesas: r8a779h0: Add timer clocks)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (cdec0d455d32 LoongArch: Fix access error when read fault on a write-only VMA)
079a1101fe0d ("LoongArch: Fix a build error due to __tlb_remove_tlb_entry()")
Merging m68k/for-next (70d830e337f9 m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER)
Merging m68knommu/for-next (8e0b6631dd62 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (6613476e225e Linux 6.8-rc1)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (e8f897f4afef Linux 6.8)
Merging powerpc/next (f318c8be797f powerpc/ptdump: Fix walk_vmemmap() to also print first vmemmap entry)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (ba5ea59f768f riscv: Do not save the scratch CSR during suspend)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (5db2c4dc413e riscv: dts: add initial canmv-k230 and k230-evb dts)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (037f934e2ea0 Merge branch 'shared-zeropage' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (84b76d05828a lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (11cca8ccf2c3 tty: xtensa/iss: Use min() to fix Coccinelle warning)
Merging bcachefs/for-next (ad29cf999a91 bcachefs: set_btree_iter_dontneed also clears should_be_locked)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (46b3498aaf76 Merge branch 'for-next-next-v6.9-20240416' into for-next-20240416)
040702ff5478 ("btrfs: scrub: run relocation repair when/only needed")
37590e1de8dc ("btrfs: fallback if compressed IO fails for ENOSPC")
43832980f44a ("btrfs: fix wrong block_start calculation for btrfs_drop_extent_map_range()")
5093db2d7628 ("btrfs: remove colon from messages with state")
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (96823cae3892 cifs: Fix reacquisition of volume cookie on still-live connection)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (d7ed5232f0f1 exfat: fix timing of synchronizing bitmap and inode)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (96bd46017ee5 Merge fsnotify UAF fixup.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (b2cf5a1ff236 f2fs: allow direct io of pinned files for zoned storage)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (09492cb45100 cuse: add kernel-doc comments to cuse_process_init_reply())
Merging gfs2/for-next (29efef6907aa gfs2: Remove and replace gfs2_glock_queue_work)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (3988f90cfe11 ksmbd: clear RENAME_NOREPLACE before calling vfs_rename)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (79f29ae1617d lockd: host: Remove unnecessary statements＇host = NULL;＇)
Merging ntfs3/master (21b6b5bc6774 fs/ntfs3: Taking DOS names into account during link counting)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (e23d7e82b707 xfs: allow cross-linking special files without project quota)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (4efbdf2eca99 Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in fs/ntfs3/ntfs_fs.h
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (6e47dcb2ca22 Merge branch 'pci/endpoint')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5ceeabb0eb2e Merge tag 'i2c-host-fixes-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current)
Merging i2c-host/i2c/i2c-host (974161980d5b i2c: i801: Annotate apanel_addr as __ro_after_init)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (cf770af5645a firmware: dmi-id: add a release callback function)
Merging hwmon-staging/hwmon-next (e723f6ca39fb hwmon: jc42: Remove I2C_CLASS_SPD support)
Merging jc_docs/docs-next (2309181eb018 Merge branch 'docs-fixes' into docs-next)
Merging v4l-dvb/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging v4l-dvb-next/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging pm/linux-next (7a7eea8d02f0 Merge branch 'thermal-fixes' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (4cece7649650 Linux 6.9-rc1)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (0cebf7cb2d70 pmdomain: core: Don't clear suspended_count at genpd_prepare())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M)
Merging dlm/next (7b012732d005 dlm: fix sleep in atomic context)
Merging rdma/for-next (dfcdb38b21e4 RDMA/rxe: Return the correct errno)
Merging net-next/main (80d953c83262 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue)
CONFLICT (content): Merge conflict in drivers/of/property.c
Merging bpf-next/for-next (462e5e2a5938 bpf: Fix JIT of is_mov_percpu_addr instruction.)
Merging ipsec-next/master (267e31750ae8 Merge branch 'phy-listing-link_topology-tracking')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (0b4bd88b3b94 Bluetooth: MGMT: Fix failing to MGMT_OP_ADD_UUID/MGMT_OP_REMOVE_UUID)
Merging wireless-next/for-next (f236464f1db7 wifi: wilc1000: convert list management to RCU)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1)
Merging crypto/master (751fb2528c12 crypto: x86/aes-xts - make non-AVX implementation use new glue code)
Merging drm/drm-next (34633158b8eb Merge tag 'amd-drm-next-6.10-2024-04-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Merging drm-exynos/for-linux-next (5d2c7cc9c1b3 drm/exynos: mixer: drop driver owner initialization)
Merging drm-misc/for-linux-next (069a6c0e94f9 drm: panel: Add LG sw43408 panel driver)
Merging amdgpu/drm-next (efade6fe50e7 drm/radeon: silence UBSAN warning (v3))
Merging drm-intel/for-linux-next (2a956ad8d10b drm/i915/dmc: use struct intel_display more)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cdclk.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (3e5a516f3bf1 Merge tag 'phy_dp_modes_6.10' into msm-next-lumag)
Merging drm-msm-lumag/msm-next-lumag (ab556156cafa drm/msm: drop A6xx header)
Merging drm-xe/drm-xe-next (5bc9de065b8b drm/i915/hwmon: Get rid of devm)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm_types.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (fb3b9c2d217f video: logo: Drop full path of the input filename in generated file)
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (3e2f2235b526 ALSA: aloop: add support for up to 768kHz sample rate)
Merging ieee1394/for-next (0d4149e5e9b0 firewire: ohci: use pci_irq_vector() to retrieve allocated interrupt line)
Merging sound-asoc/for-next (724ed17089cd Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (c75781a6e4c0 kallsyms: replace deprecated strncpy with strscpy)
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (9e0631695eac input: pm8xxx-vibrator: add new SPMI vibrator support)
Merging block/for-next (403649b85c34 Merge branch 'for-6.10/io_uring' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (a98ecf716e30 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (bce42d6108c9 mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (15f992fa81eb Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (74560bb3685b lsm: remove the now superfluous sentinel element from ctl_table array)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (37c34331f194 Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (d02a66d84baa Merge branches 'memory-observability' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (58d4b25c8831 dt-bindings: timer: renesas,tmu: Add R-Car V4M support)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
Merging dt-krzk/for-next (adfecb01c288 Merge branches 'next/dt' and 'next/dt64' into for-next)
Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU)
Merging spi/for-next (f8caa72271f8 Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (1e0fd81e4f32 Merge branch into tip/master: 'x86/shstk')
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (8e95536e9495 Merge branch ras/edac-misc into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (b93b7b4635f1 ftrace: Asynchronous grace period for register_ftrace_direct())
Merging kvm/next (1ab157ce573f KVM: SEV: use u64_to_user_ptr throughout)
Merging kvm-arm/next (9ac5bab4deee Merge branch kvm-arm64/misc-6.10 into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (f1c48c1ec735 RISC-V: KVM: selftests: Add ebreak test support)
Merging kvm-x86/next (2d181d84af38 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'svm' and 'vmx')
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (8a8a4bfdbe85 Merge branch 'for-6.10' into for-next)
Merging drivers-x86/for-next (88c0ef69dd88 platform/x86: asus-wmi: cleanup main struct to avoid some holes)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (70a5f3005008 platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD))
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (66bc1a173328 treewide: Use sysfs_bin_attr_simple_read() helper)
Merging usb/usb-next (3d122e6d27e4 usb: typec: mux: gpio-sbu: Allow GPIO operations to sleep)
CONFLICT (modify/delete): drivers/usb/misc/onboard_usb_hub.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/misc/onboard_usb_hub.c left in tree.
$ git rm -f drivers/usb/misc/onboard_usb_hub.c
Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev"
Merging thunderbolt/next (25d905d2b819 thunderbolt: Allow USB3 bandwidth to be lower than maximum supported)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (b86ae40ffcf5 serial: exar: adding missing CTI and Exar PCI ids)
CONFLICT (content): Merge conflict in drivers/tty/serial/serial_core.c
Merging char-misc/char-misc-next (ebbc1a4789c6 uio: update kerneldoc comments for interrupt functions)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (e0b97ddaf4b5 dt-bindings: arm: qcom,coresight-tpda: fix indentation in the example)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (4d2bc3f7dea4 fpga: tests: use KUnit devices instead of platform devices)
Merging icc/icc-next (7af14fe58e5e Merge branch 'icc-fixes' into icc-next)
Merging iio/togreg (aabc0aa90c92 Documentation: ABI: document in_temp_input file)
Merging phy-next/next (9c79b779643e phy: rockchip: fix CONFIG_TYPEC dependency)
Merging soundwire/next (4cd5ea6de156 soundwire: intel_init: resume all devices on exit.)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (7447d911af69 vfio/fsl-mc: Block calling interrupt handler without trigger)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (897268aef3fa spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe())
Merging staging/staging-next (e4d5e3a9ae68 staging: nvec: update TODO)
Merging counter-next/counter-next (916baadd293a counter: ti-ecap-capture: Utilize COUNTER_COMP_FREQUENCY macro)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (98f2233a5c20 dmaengine: pl08x: Use kcalloc() instead of kzalloc())
Merging cgroup/for-next (a6b8daba00e6 cgroup_freezer: update comment for freezer_css_online())
Merging scsi/for-next (99033e81ab05 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (f92141e18c8b Merge patch series "convert SCSI to atomic queue limits, part 1 (v3)")
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging vhost/linux-next (5b9f214d0540 vhost: Merge tag 'vduse-virtio-net' into vhost)
Merging rpmsg/for-next (912ebe48bec5 Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (8a7a61032587 gpiolib: Get rid of never false gpio_is_valid() calls)
Merging gpio-intel/for-next (1736df17fea0 gpiolib: acpi: Set label for IRQ only lines)
Merging pinctrl/for-next (85fb4a0fad95 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (aa43c15a790c pinctrl: renesas: rzg2l: Execute atomically the interrupt configuration)
Merging pinctrl-samsung/for-next (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants)
Merging pwm/pwm/for-next (60535cce6a11 dt-bindings: pwm: mediatek,pwm-disp: add compatible for mt8365 SoC)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (00ab560eb0e3 selftests: Mark ksft_exit_fail_perror() as __noreturn)
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (8f571fc2488c kunit: Fix race condition in try-catch completion)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local())
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (813e0ae613d6 bus: mhi: host: Add mhi_power_down_keep_dev() API to support system suspend/hibernation)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (ed1ff2fba7af Merge branch 'for-6.9/cxl-einj' into for-6.9/cxl)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (cda30c6542c8 efi: Clear up misconceptions about a maximum variable name size)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (5b15f3fb89fc slub: Set __GFP_COMP in kmem_cache by default)
Merging random/master (360a348fd7fe Merge tag 'gpio-fixes-for-v6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux)
Merging landlock/next (028243655456 fs/ioctl: Add a comment to keep the logic in sync with LSM policies)
Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature)
Merging sysctl/sysctl-next (12e78b868481 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (a9c3475dd67b Replace macro "ARCH_HAVE_EXTRA_ELF_NOTES" with kconfig)
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (c8f53f9b777a Merge branches 'for-next/hardening' and 'for-linus/hardening' into for-next/kspp)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Re: Missing protocol features that could help Linux
2024-04-18 20:21 4% Missing protocol features that could help Linux Steve French
@ 2024-04-19 1:40 0% ` Andrew Bartlett
2024-04-19 16:53 0% ` Ralph Boehme
1 sibling, 0 replies; 200+ results
From: Andrew Bartlett @ 2024-04-19 1:40 UTC (permalink / raw)
To: Steve French, samba-technical; +Cc: CIFS, Namjae Jeon
On Thu, 2024-04-18 at 15:21 -0500, Steve French via samba-technical
wrote:
> Was following up on a recent question about support for Linux features
> that are missing that could help us pass more xfstests
>
> Looking at the standard fstests for Linux (xfstests that are skipped
> or fail for cifs.ko) to find 'features' that would help, perhaps
> extending the current POSIX Extensions or adding a couple of SMB3.1.1
> FSCTLs, I spotted a few obvious ones:
>
> 1) renameat2 (RENAME_EXCHANGE) and renameat2(WHITEOUT) 2) FITRIM
> support 3) trusted namespace (perhaps xattr/EA extension) 4) attr
> namespace 5) deduplication 6) chattr -i 7) unshare (namespace command)
> 8) delayed allocation 9) dax 10) attr namespace security 11) fstrim
> 12) chattr +s 13) exchange range
>
> Any thoughts on which of these which would be 'easy' for samba and/or
> ksmbd server to implement (e.g. as new fsctls)?
POSIX <-> POSIX locking over SMB is something I have a client trying to
get working with SMB3.
They have a use case where, as I understand it so far, the mapping of
POSIX fcntl() read and write locks to SMB locks isn't 1-1, because they
expect advisory locks, but SMB locks are mandatory as far as I read
it.
They use cifs.ko and Samba, so it isn't about working with Windows, it
is about running Libreoffice on LInux against Samba.
Andrew Bartlett
^ permalink raw reply [relevance 0%]
* Missing protocol features that could help Linux
@ 2024-04-18 20:21 4% Steve French
2024-04-19 1:40 0% ` Andrew Bartlett
2024-04-19 16:53 0% ` Ralph Boehme
0 siblings, 2 replies; 200+ results
From: Steve French @ 2024-04-18 20:21 UTC (permalink / raw)
To: samba-technical; +Cc: Namjae Jeon, CIFS
Was following up on a recent question about support for Linux features
that are missing that could help us pass more xfstests
Looking at the standard fstests for Linux (xfstests that are skipped
or fail for cifs.ko) to find 'features' that would help, perhaps
extending the current POSIX Extensions or adding a couple of SMB3.1.1
FSCTLs, I spotted a few obvious ones:
1) renameat2 (RENAME_EXCHANGE) and renameat2(WHITEOUT) 2) FITRIM
support 3) trusted namespace (perhaps xattr/EA extension) 4) attr
namespace 5) deduplication 6) chattr -i 7) unshare (namespace command)
8) delayed allocation 9) dax 10) attr namespace security 11) fstrim
12) chattr +s 13) exchange range
Any thoughts on which of these which would be 'easy' for samba and/or
ksmbd server to implement (e.g. as new fsctls)?
--
Thanks,
Steve
^ permalink raw reply [relevance 4%]
* WARNING: modpost: "__udelay" [drivers/net/ethernet/adi/adin1110.ko] has no CRC!
@ 2024-04-18 9:32 1% kernel test robot
0 siblings, 0 replies; 200+ results
From: kernel test robot @ 2024-04-18 9:32 UTC (permalink / raw)
To: Ciprian Regus
Cc: oe-kbuild-all, linux-kernel, Paolo Abeni, Nuno Sa, Andrew Lunn
tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
head: 8cd26fd90c1ad7acdcfb9f69ca99d13aa7b24561
commit: 2322467a0f5d6cf05752092938e6db1250a0b28e net: ethernet: adi: adin1110: Reduce the MDIO_TRDONE poll interval
date: 7 weeks ago
config: sparc-randconfig-r024-20230516 (https://download.01.org/0day-ci/archive/20240418/202404181703.iqYeTcsV-lkp@intel.com/config)
compiler: sparc-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240418/202404181703.iqYeTcsV-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202404181703.iqYeTcsV-lkp@intel.com/
All warnings (new ones prefixed by >>, old ones prefixed by <<):
Is "___rw_read_enter" prototyped in <asm/asm-prototypes.h>?
WARNING: modpost: EXPORT symbol "___rw_read_exit" [vmlinux] version generation failed, symbol will not be versioned.
Is "___rw_read_exit" prototyped in <asm/asm-prototypes.h>?
WARNING: modpost: EXPORT symbol "___rw_read_try" [vmlinux] version generation failed, symbol will not be versioned.
Is "___rw_read_try" prototyped in <asm/asm-prototypes.h>?
WARNING: modpost: EXPORT symbol "___rw_write_enter" [vmlinux] version generation failed, symbol will not be versioned.
Is "___rw_write_enter" prototyped in <asm/asm-prototypes.h>?
WARNING: modpost: EXPORT symbol "__lshrdi3" [vmlinux] version generation failed, symbol will not be versioned.
Is "__lshrdi3" prototyped in <asm/asm-prototypes.h>?
WARNING: modpost: EXPORT symbol "__muldi3" [vmlinux] version generation failed, symbol will not be versioned.
Is "__muldi3" prototyped in <asm/asm-prototypes.h>?
WARNING: modpost: "__udelay" [kernel/rcu/rcutorture.ko] has no CRC!
WARNING: modpost: "___rw_read_exit" [fs/smb/server/ksmbd.ko] has no CRC!
WARNING: modpost: "___rw_read_exit" [fs/binfmt_misc.ko] has no CRC!
WARNING: modpost: "___rw_read_exit" [fs/udf/udf.ko] has no CRC!
WARNING: modpost: "__ashldi3" [fs/ocfs2/ocfs2.ko] has no CRC!
WARNING: modpost: "___rw_read_exit" [fs/ocfs2/ocfs2.ko] has no CRC!
WARNING: modpost: "__lshrdi3" [fs/ocfs2/ocfs2.ko] has no CRC!
WARNING: modpost: "___rw_read_exit" [fs/ocfs2/cluster/ocfs2_nodemanager.ko] has no CRC!
WARNING: modpost: "__ashldi3" [fs/btrfs/btrfs.ko] has no CRC!
WARNING: modpost: "___rw_read_exit" [fs/btrfs/btrfs.ko] has no CRC!
WARNING: modpost: "__lshrdi3" [fs/btrfs/btrfs.ko] has no CRC!
WARNING: modpost: "__ashrdi3" [fs/btrfs/btrfs.ko] has no CRC!
WARNING: modpost: "__ashldi3" [fs/gfs2/gfs2.ko] has no CRC!
WARNING: modpost: "empty_zero_page" [security/keys/encrypted-keys/encrypted-keys.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/bus/mhi/host/mhi.ko] has no CRC!
WARNING: modpost: "___rw_read_exit" [drivers/bus/mhi/host/mhi.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/amlogic/phy-meson8b-usb2.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/amlogic/phy-meson-g12a-usb2.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/amlogic/phy-meson-axg-pcie.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/broadcom/phy-bcm-ns2-usbdrd.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/cadence/phy-cadence-salvo.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/intel/phy-intel-keembay-emmc.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/intel/phy-intel-lgm-emmc.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/lantiq/phy-lantiq-vrx200-pcie.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/marvell/phy-armada38x-comphy.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/marvell/phy-pxa-usb.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/mediatek/phy-mtk-ufs.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/rockchip/phy-rockchip-inno-dsidphy.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/rockchip/phy-rockchip-pcie.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/phy/rockchip/phy-rockchip-snps-pcie3.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/video/backlight/ili9320.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/video/backlight/l4f00242t03.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/video/backlight/lms283gf05.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/video/backlight/vgg2432a4.ko] has no CRC!
WARNING: modpost: "__ndelay" [drivers/video/backlight/ktd253-backlight.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/video/fbdev/omap2/omapfb/dss/omapdss.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/video/fbdev/broadsheetfb.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/video/fbdev/s1d13xxxfb.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/video/fbdev/sm501fb.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/char/ipmi/ipmi_si.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/dma/sh/rcar-dmac.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/dma/sh/usb-dmac.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/dma/mediatek/mtk-cqdma.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/dma/qcom/qcom_adm.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/dma/ti/omap-dma.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/dma/altera-msgdma.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/soc/ixp4xx/ixp4xx-npe.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/soc/mediatek/mtk-mutex.ko] has no CRC!
WARNING: modpost: "___rw_read_exit" [drivers/vdpa/vdpa_user/vduse.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/regulator/qcom_spmi-regulator.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/tty/serial/8250/8250_base.ko] has no CRC!
WARNING: modpost: "__ndelay" [drivers/tty/serial/8250/8250_base.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/tty/serial/8250/8250_dw.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/tty/serial/msm_serial.ko] has no CRC!
WARNING: modpost: "__ndelay" [drivers/tty/serial/sccnxp.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/char/hw_random/ba431-rng.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/char/hw_random/stm32-rng.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/char/hw_random/meson-rng.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/char/hw_random/ks-sa-rng.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/iommu/mtk_iommu.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/block/floppy.ko] has no CRC!
WARNING: modpost: "__ndelay" [drivers/misc/eeprom/eeprom_93cx6.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/misc/altera-stapl/altera-stapl.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/mfd/sm501.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/mfd/ene-kb3930.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/mfd/si476x-core.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/mfd/ssbi.ko] has no CRC!
WARNING: modpost: "__lshrdi3" [drivers/scsi/sd_mod.ko] has no CRC!
WARNING: modpost: "__lshrdi3" [drivers/nvme/host/nvme-core.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/ata/ahci_imx.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/ata/pata_arasan_cf.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/ata/sata_mv.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/ata/sata_rcar.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/ata/pata_ixp4xx_cf.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/spi/spi-armada-3700.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/spi/spi-davinci.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/spi/spi-imx.ko] has no CRC!
WARNING: modpost: "__ndelay" [drivers/spi/spi-pic32.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/spi/spi-sh.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/spi/spi-sprd-adi.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/spi/spi-st-ssc4.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/spi/spi-tegra20-sflash.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/phy/sfp.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/phy/bcm7xxx.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/phy/icplus.ko] has no CRC!
WARNING: modpost: "__ndelay" [drivers/net/mdio/mdio-bitbang.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/mdio/mdio-mscc-miim.ko] has no CRC!
>> WARNING: modpost: "__udelay" [drivers/net/ethernet/adi/adin1110.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/broadcom/bcmsysport.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/freescale/gianfar_driver.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/marvell/mvmdio.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/marvell/mv643xx_eth.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/marvell/pxa168_eth.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/mediatek/mtk_eth.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/mediatek/mtk_star_emac.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/mscc/mscc_ocelot_switch_lib.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/renesas/sh_eth.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/renesas/ravb.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/socionext/sni_ave.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/sun/sunqe.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/sunplus/sp7021_emac.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/wiznet/w5100.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/calxeda/xgmac.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/davicom/dm9000.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/ethernet/korina.ko] has no CRC!
WARNING: modpost: "___rw_read_exit" [drivers/net/hamradio/mkiss.ko] has no CRC!
WARNING: modpost: "___rw_read_exit" [drivers/net/hamradio/6pack.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/ath/ath9k/ath9k_hw.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/ath/ath9k/ath9k_htc.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/ath/ath10k/ath10k_core.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/ath/ath10k/ath10k_sdio.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/intersil/p54/p54usb.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/mediatek/mt7601u/mt7601u.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/mediatek/mt76/mt76.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/mediatek/mt76/mt76x02-lib.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/mediatek/mt76/mt792x-lib.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2-common.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/microchip/wilc1000/wilc1000-spi.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/ralink/rt2x00/rt2x00usb.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/ralink/rt2x00/rt2500usb.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/realtek/rtlwifi/rtlwifi.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/realtek/rtlwifi/rtl8192c/rtl8192c-common.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rtl8192cu.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/realtek/rtw88/rtw88_core.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/realtek/rtw88/rtw88_8822b.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/realtek/rtw88/rtw88_8822c.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/realtek/rtw88/rtw88_8723d.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/wireless/silabs/wfx/wfx.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/usb/sr9800.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/usb/smsc75xx.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/dsa/b53/b53_common.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/dsa/mt7530.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/net/dsa/vitesse-vsc73xx-core.ko] has no CRC!
WARNING: modpost: "___rw_read_exit" [drivers/net/ppp/ppp_async.ko] has no CRC!
WARNING: modpost: "___rw_read_exit" [drivers/net/ppp/ppp_synctty.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/host/ehci-hcd.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/host/ehci-platform.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/host/ohci-hcd.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/host/ohci-s3c2410.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/host/xhci-hcd.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/host/xhci-rcar-hcd.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/host/xhci-mtk-hcd.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/host/sl811-hcd.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/host/ehci-fsl.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/host/ssb-hcd.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/typec/tipd/tps6598x.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/dwc2/dwc2.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/cdns3/cdns-usb-common.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/cdns3/cdns3.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/cdns3/cdns3-imx.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/fotg210/fotg210.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/chipidea/ci_hdrc.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/chipidea/ci_hdrc_msm.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/chipidea/ci_hdrc_tegra.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/renesas_usbhs/renesas_usbhs.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/gadget/udc/pxa27x_udc.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/gadget/udc/m66592-udc.ko] has no CRC!
WARNING: modpost: "__ndelay" [drivers/usb/gadget/udc/m66592-udc.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/gadget/udc/renesas_usb3.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/gadget/udc/mv_udc.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/gadget/udc/mv_u3d_core.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/gadget/udc/udc-xilinx.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/gadget/udc/aspeed-vhub/aspeed-vhub.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/usb/gadget/udc/bdc/bdc.ko] has no CRC!
WARNING: modpost: "__ashldi3" [drivers/usb/gadget/function/usb_f_mass_storage.ko] has no CRC!
WARNING: modpost: "__ashrdi3" [drivers/usb/gadget/function/usb_f_mass_storage.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/serio/i8042.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/serio/olpc_apsp.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/keyboard/tegra-kbc.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/mouse/vsxxxaa.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/joystick/as5011.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/joystick/analog.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/joystick/grip_mp.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/touchscreen/edt-ft5x06.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/touchscreen/elants_i2c.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/touchscreen/ili210x.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/touchscreen/ilitek_ts_i2c.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/touchscreen/mms114.ko] has no CRC!
WARNING: modpost: "__ndelay" [drivers/input/touchscreen/pixcir_i2c_ts.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/touchscreen/raydium_i2c_ts.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/touchscreen/sx8654.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/touchscreen/zforce_ts.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/touchscreen/rohm_bu21023.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/input/touchscreen/zinitix.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/rtc/rtc-meson.ko] has no CRC!
WARNING: modpost: "__udelay" [drivers/rtc/rtc-moxart.ko] has no CRC!
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [relevance 1%]
* [ANNOUNCE] Release v6.1.86-cip19
@ 2024-04-18 8:57 3% nobuhiro1.iwamatsu
0 siblings, 0 replies; 200+ results
From: nobuhiro1.iwamatsu @ 2024-04-18 8:57 UTC (permalink / raw)
To: cip-dev; +Cc: pavel, jan.kiszka, uli, Chris.Paterson2, masami.ichikawa
Hi all,
CIP kernel team has released Linux kernel v6.1.86-cip19.
The linux-6.1.y-cip tree has been updated base version from v6.1.83 to v6.1.86.
You can get this release via the git tree at:
v6.1.86-cip19:
repository:
https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git
branch:
linux-6.1.y-cip
commit hash:
b72d10576403db55c087e515da69d332717119cd
Fixed CVEs:
CVE-2024-26817: amdkfd: use calloc instead of kzalloc to avoid integer overflow
CVE-2024-24857: Integer overflow bug was found in bluetooth device driver
CVE-2024-24859: Race condition bug in sniff_{min,max}_interval_set() in bluetooth driver causes DoS
CVE-2024-2201: Mitigations for the native BHI hardware vulnerabilty
CVE-2024-26811: ksmbd: validate payload size in ipc response
CVE-2024-24858: Race condition bug in bluetooth driver causes DoS
CVE-2024-24861: Race condition bug was found in media/xc4000 device driver in xc4000 xc4000_get_frequency()
CVE-2024-27437: vfio/pci: Disable auto-enable of exclusive INTx IRQ
CVE-2023-47233: Use after Free bug in brcmf_cfg80211_detach
CVE-2024-26584: net: tls: handle backlogging of crypto requests
CVE-2024-26642: netfilter: nf_tables: disallow anonymous set with timeout flag
CVE-2024-25739: ubi: Check for too small LEB size in VTBL code
CVE-2024-26810: vfio/pci: Lock external INTx masking ops
CVE-2024-26813: vfio/platform: Create persistent IRQ handlers
CVE-2024-26800: tls: fix use-after-free on failed backlog decryption
CVE-2024-26814: vfio/fsl-mc: Block calling interrupt handler without trigger
CVE-2024-26654: ALSA: sh: aica: reorder cleanup operations to avoid UAF bugs
CVE-2024-26585: tls: fix race between tx work scheduling and socket close
CVE-2024-26812: vfio/pci: Create persistent INTx handler
CVE-2024-23307: Integer Overflow bug was found md/raid/raid5 modules
CVE-2024-26643: netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
added commits:
CIP: Bump version suffix to -cip19 after merge from stable
Best regards,
Nobuhiro
^ permalink raw reply [relevance 3%]
* linux-next: Tree for Apr 18
@ 2024-04-18 6:47 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-04-18 6:47 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 40210 bytes --]
Hi all,
Changes since 20240417:
The perf tree still had its build failure, but doing a clean then
rebuilding works.
The vfs-brauner tree gained a conflict against the ntfs3 tree.
The net-next tree gained a conflict against the stm32 tree.
The scsi-mkp tree gained a conflict against the block tree.
Non-merge commits (relative to Linus' tree): 6151
6324 files changed, 247004 insertions(+), 152373 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 370 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (4b6b51322118 Merge tag 'pwm/for-6.9-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (e5a5cd543574 mm/hugetlb: fix missing hugetlb_lock for resv uncharge)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (61231eb8113c ARC: [plat-hsdk]: Remove misplaced interrupt-cells property)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (015a12a4a670 arm64/hugetlb: Fix page table walk in huge_pte_alloc())
Merging arm-soc-fixes/arm/fixes (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (210cfef57926 selftests/powerpc/papr-vpd: Fix missing variable initialization)
Merging s390-fixes/fixes (d111855ab7ff s390/mm: Fix NULL pointer dereference)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (83781384a96b s390/ism: Properly fix receive message buffer allocation)
Merging bpf/master (10541b374aa0 riscv, bpf: Fix incorrect runtime stats)
Merging ipsec/master (bccb798e07f8 octeontx2-pf: Fix transmit scheduler resource leak)
Merging netfilter/main (6db5dc7b351b netfilter: flowtable: incorrect pppoe tuple)
Merging ipvs/main (7eaf837a4eb5 netfilter: nf_tables: Fix a memory leak in nf_tables_updchain)
Merging wireless/for-next (bada85a3f584 wifi: iwlwifi: mvm: return uid from iwl_mvm_build_scan_cmd)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (be121ffb384f RDMA/mlx5: Fix port number for counter query in multi-port configuration)
Merging sound-current/for-linus (0b6f0ff01a4a ALSA: hda/tas2781: correct the register for pow calibrated data)
Merging sound-asoc-fixes/for-linus (cebfbc89ae25 ASoC: rt715: add vendor clear control register)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (68adb581a39a regulator: vqmmc-ipq4019: fix module autoloading)
Merging spi-fixes/for-linus (7430764f5a85 spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (156539fd6501 Documentation: embargoed-hardware-issues.rst: Add myself for Power)
Merging tty.current/tty-linus (ea2624b5b829 serial: stm32: Reset .throttled state in .startup())
Merging usb.current/usb-linus (c281d18dda40 Merge tag 'thunderbolt-for-v6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus)
Merging usb-serial-fixes/usb-linus (fb1f4584b121 USB: serial: option: add support for Fibocom FM650/FG650)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (74a72baf204f iio:imu: adis16475: Fix sync mode setting)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (ebaed6d4def8 peci: linux/peci.h: fix Excess kernel-doc description warning)
Merging soundwire-fixes/fixes (63dc588e7af1 soundwire: amd: fix for wake interrupt handling for clockstop mode)
Merging thunderbolt-fixes/fixes (dcd12acaf384 thunderbolt: Avoid notify PM core about runtime PM resume)
Merging input-current/for-linus (57ed9567e63b Merge branch 'next' into for-linus)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (f221033f5c24 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (4cece7649650 Linux 6.9-rc1)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (1c3bed800669 Merge tag 'kvm-x86-fixes-6.9-rcN' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (7bcf809b1e78 cxl: Add checks to access_coordinate calculation to fail missing data)
Merging btrfs-fixes/next-fixes (9d6283f337cb Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (e71c84816925 platform/x86: lg-laptop: fix %s null argument warning)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (ca91259b775f scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING)
Merging drm-fixes/drm-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging drm-intel-fixes/for-linux-next-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging mmc-fixes/fixes (ace323f80b9b mmc: sdhci-of-dwcmshc: th1520: Increase tuning loop count to 128)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (30d18df6567b Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted)
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (a373a36fb6b0 Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (6b0856ee585d cache: sifive_ccache: Silence unused variable warning)
Merging fpga-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (69ffed4b6252 gpiolib: swnode: Remove wrong header inclusion)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7557d296ad43 MAINTAINERS: erofs: add myself as reviewer)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (f488138b5267 NFSD: fix endianness issue in nfsd4_encode_fattr4)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (decd347c2a75 x86/efistub: Reinstate soft limit for initrd loading)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (8933cf4651e0 rust: make mutually exclusive with CFI_CLANG)
Merging v9fs-fixes/fixes/next (75e3f8fb2578 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (d3e8a91a848a clk: mediatek: mt7988-infracfg: fix clocks for 2nd PCIe port)
Merging drm-misc-fixes/for-linux-next-fixes (941c0bdbc176 drm/panel: novatek-nt36682e: don't unregister DSI device)
Merging mm-stable/mm-stable (640958fde130 Merge branch 'master' into mm-stable)
Merging mm-nonmm-stable/mm-nonmm-stable (0bbac3facb5d Linux 6.9-rc4)
Merging mm/mm-everything (2c65903ca2d4 Merge branch 'mm-nonmm-unstable' into mm-everything)
Merging kbuild/for-next (961664cd2955 parisc: vdso: remove unused C build rule in vdso32/Makefile)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (a5a00497b9df perf annotate-data: Handle RSP if it's not the FB register)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (b5d2afe8745b Merge branches 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (b782e8d07baa arm64: arm_pmuv3: Correctly extract and check the PMUVer)
Merging arm-soc/for-next (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging amlogic/for-next (70ce74fbef7e Merge branch 'v6.10/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (0696ed223eb6 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (6cf256f63478 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (675a217e4e7c Merge branch 'v6.9-next/soc' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (2a1e301bf479 Merge branch 'omap-for-v6.10/dt' into for-next)
Merging qcom/for-next (4bec154a3f10 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (f4a6540ae2c4 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (70641cfcd0dd Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (b7b2fe24038b Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (614b5ab9f92c Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (65fcc08b4cfe riscv: dts: sophgo: cv18xx: Add i2c devices)
Merging stm32/stm32-next (b12a916d30dc ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1)
Merging sunxi/sunxi/for-next (7152a15f8c1d Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/dt into for-next)
Merging ti/ti-next (592695bed5f8 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (071d51e4acf5 Merge branch 'clk-stm' into clk-next)
Merging clk-imx/for-next (13269dc6c704 clk: imx: imx8mp: Fix SAI_MCLK_SEL definition)
Merging clk-renesas/renesas-clk (c0516eb4cf04 clk: renesas: r8a779h0: Add timer clocks)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (1f1d13414caa LoongArch: Fix access error when read fault on a write-only VMA)
34248ae447d5 ("LoongArch: Fix Kconfig item and left code related to CRASH_CORE")
ffc3e380b629 ("LoongArch: Fix a build error due to __tlb_remove_tlb_entry()")
Merging m68k/for-next (70d830e337f9 m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER)
Merging m68knommu/for-next (8e0b6631dd62 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (6613476e225e Linux 6.8-rc1)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (e8f897f4afef Linux 6.8)
Merging powerpc/next (8884fc918f6a powerpc: Fix fatal warnings flag for LLVM's integrated assembler)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (ba5ea59f768f riscv: Do not save the scratch CSR during suspend)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (5db2c4dc413e riscv: dts: add initial canmv-k230 and k230-evb dts)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (51d6050aa98c Merge branch 'features' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (84b76d05828a lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (11cca8ccf2c3 tty: xtensa/iss: Use min() to fix Coccinelle warning)
Merging bcachefs/for-next (ad29cf999a91 bcachefs: set_btree_iter_dontneed also clears should_be_locked)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (46b3498aaf76 Merge branch 'for-next-next-v6.9-20240416' into for-next-20240416)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (96823cae3892 cifs: Fix reacquisition of volume cookie on still-live connection)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (d7ed5232f0f1 exfat: fix timing of synchronizing bitmap and inode)
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (96bd46017ee5 Merge fsnotify UAF fixup.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (b2cf5a1ff236 f2fs: allow direct io of pinned files for zoned storage)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (09492cb45100 cuse: add kernel-doc comments to cuse_process_init_reply())
Merging gfs2/for-next (29efef6907aa gfs2: Remove and replace gfs2_glock_queue_work)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (3988f90cfe11 ksmbd: clear RENAME_NOREPLACE before calling vfs_rename)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (79f29ae1617d lockd: host: Remove unnecessary statements＇host = NULL;＇)
Merging ntfs3/master (21b6b5bc6774 fs/ntfs3: Taking DOS names into account during link counting)
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (e23d7e82b707 xfs: allow cross-linking special files without project quota)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (4efbdf2eca99 Merge branch 'vfs.iomap' into vfs.all)
CONFLICT (content): Merge conflict in fs/ntfs3/ntfs_fs.h
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (6e47dcb2ca22 Merge branch 'pci/endpoint')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5ceeabb0eb2e Merge tag 'i2c-host-fixes-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current)
Merging i2c-host/i2c/i2c-host (974161980d5b i2c: i801: Annotate apanel_addr as __ro_after_init)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (cf770af5645a firmware: dmi-id: add a release callback function)
Merging hwmon-staging/hwmon-next (e723f6ca39fb hwmon: jc42: Remove I2C_CLASS_SPD support)
Merging jc_docs/docs-next (2309181eb018 Merge branch 'docs-fixes' into docs-next)
Merging v4l-dvb/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging v4l-dvb-next/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging pm/linux-next (7a7eea8d02f0 Merge branch 'thermal-fixes' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (4cece7649650 Linux 6.9-rc1)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (02e2a4b3638c cpuidle: psci: Update init level to core_initcall())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M)
Merging dlm/next (7b012732d005 dlm: fix sleep in atomic context)
Merging rdma/for-next (dfcdb38b21e4 RDMA/rxe: Return the correct errno)
Merging net-next/main (2bd99aef1b19 tcp: accept bare FIN packets under memory pressure)
CONFLICT (content): Merge conflict in drivers/of/property.c
CONFLICT (content): Merge conflict in include/trace/events/rpcgss.h
Merging bpf-next/for-next (e739e01d8df8 libbpf: Fix dump of subsequent char arrays)
Merging ipsec-next/master (267e31750ae8 Merge branch 'phy-listing-link_topology-tracking')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (0b4bd88b3b94 Bluetooth: MGMT: Fix failing to MGMT_OP_ADD_UUID/MGMT_OP_REMOVE_UUID)
Merging wireless-next/for-next (f236464f1db7 wifi: wilc1000: convert list management to RCU)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1)
Merging crypto/master (751fb2528c12 crypto: x86/aes-xts - make non-AVX implementation use new glue code)
Merging drm/drm-next (34633158b8eb Merge tag 'amd-drm-next-6.10-2024-04-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
029faefb7302 ("drm/amdgpu: implement IRQ_STATE_ENABLE for SDMA v4.4.2")
05e40141685f ("drm/amdgpu: clear set_q_mode_offs when VM changed")
108ab31be9d5 ("drm/amdgpu/umsch: reinitialize write pointer in hw init")
24e9727b39ca ("drm/amd/display: Do not recursively call manual trigger programming")
27e718ac8b81 ("drm/amd/display: fix disable otg wa logic in DCN316")
2dbe9c2b2685 ("drm/amd/display: add DCN 351 version for microcode load")
364b1c1de6de ("drm/amd/display: Adjust dprefclk by down spread percentage.")
4a5b171299e5 ("drm/amd/display: always reset ODM mode in context when adding first plane")
526b184e8883 ("drm/amdgpu: differentiate external rev id for gfx 11.5.0")
7c1d9e10e664 ("drm/amd/pm: fix the high voltage issue after unload")
8966c3167402 ("drm/amdgpu : Increase the mes log buffer size as per new MES FW version")
91bc86011661 ("drm/amdgpu: Fix VCN allocation in CPX partition")
af1c41858da1 ("drm/amd/display: Return max resolution supported by DWB")
cd409dbc6986 ("drm/amdgpu: Refine IB schedule error logging")
cf82a80a1456 ("drm/amd/display: Skip on writeback when it's not applicable")
d045f4ad7700 ("drm/amd/swsmu: Update smu v14.0.0 headers to be 14.0.1 compatible")
d6d6561f936b ("drm/amdgpu: fix incorrect number of active RBs for gfx11")
d7f148764355 ("drm/amdgpu: always force full reset for SOC21")
df3c7dc5c58b ("drm/amdgpu: Reset dGPU if suspend got aborted")
dfb15c4ab586 ("amd/amdkfd: sync all devices to wait all processes being evicted")
e58acb7613aa ("drm/amdgpu : Add mes_log_enable to control mes log feature")
f5a3507c4abf ("drm/amdgpu: add smu 14.0.1 discovery support")
fedb6ae49758 ("drm/amd/pm: fixes a random hang in S4 for SMU v13.0.4/11")
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Merging drm-exynos/for-linux-next (5d2c7cc9c1b3 drm/exynos: mixer: drop driver owner initialization)
Merging drm-misc/for-linux-next (f7ad2ce5fd89 drm/panel: simple: Add Innolux G121XCE-L01 LVDS display support)
Merging amdgpu/drm-next (efade6fe50e7 drm/radeon: silence UBSAN warning (v3))
Merging drm-intel/for-linux-next (4bbb89328fe3 drm/i915: Suck snps/cx0 PLL states into dpll_hw_state)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cdclk.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (3e5a516f3bf1 Merge tag 'phy_dp_modes_6.10' into msm-next-lumag)
Merging drm-msm-lumag/msm-next-lumag (ab556156cafa drm/msm: drop A6xx header)
Merging drm-xe/drm-xe-next (2817a1f1bfb1 drm/xe/lnl: Apply GuC Wa_13011645652)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm_types.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (fb3b9c2d217f video: logo: Drop full path of the input filename in generated file)
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (a9b16d591874 Merge branch 'topic/emu10k1-fix' into for-next)
Merging ieee1394/for-next (0d4149e5e9b0 firewire: ohci: use pci_irq_vector() to retrieve allocated interrupt line)
Merging sound-asoc/for-next (724ed17089cd Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (c75781a6e4c0 kallsyms: replace deprecated strncpy with strscpy)
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (9e0631695eac input: pm8xxx-vibrator: add new SPMI vibrator support)
Merging block/for-next (403649b85c34 Merge branch 'for-6.10/io_uring' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (a98ecf716e30 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (bce42d6108c9 mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (15f992fa81eb Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (74560bb3685b lsm: remove the now superfluous sentinel element from ctl_table array)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (37c34331f194 Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (d02a66d84baa Merge branches 'memory-observability' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (ad366e350291 dt-bindings: kbuild: Add separate target/dependency for processed-schema.json)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
Merging dt-krzk/for-next (364be3ecd30d Merge branch 'next/dt' into for-next)
Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU)
Merging spi/for-next (f8caa72271f8 Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (1e0fd81e4f32 Merge branch into tip/master: 'x86/shstk')
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (8e95536e9495 Merge branch ras/edac-misc into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (5fd10857f131 rcu/tree: Reduce wake up for synchronize_rcu() common case)
CONFLICT (content): Merge conflict in arch/riscv/include/asm/cmpxchg.h
Applying: finish revert of "riscv: Emulate one-byte cmpxchg"
Merging kvm/next (1ab157ce573f KVM: SEV: use u64_to_user_ptr throughout)
Merging kvm-arm/next (9ac5bab4deee Merge branch kvm-arm64/misc-6.10 into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (f1c48c1ec735 RISC-V: KVM: selftests: Add ebreak test support)
Merging kvm-x86/next (2d181d84af38 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'svm' and 'vmx')
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (8a8a4bfdbe85 Merge branch 'for-6.10' into for-next)
Merging drivers-x86/for-next (88c0ef69dd88 platform/x86: asus-wmi: cleanup main struct to avoid some holes)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (70a5f3005008 platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD))
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (66bc1a173328 treewide: Use sysfs_bin_attr_simple_read() helper)
Merging usb/usb-next (3d122e6d27e4 usb: typec: mux: gpio-sbu: Allow GPIO operations to sleep)
CONFLICT (modify/delete): drivers/usb/misc/onboard_usb_hub.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/misc/onboard_usb_hub.c left in tree.
$ git rm -f drivers/usb/misc/onboard_usb_hub.c
Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev"
Merging thunderbolt/next (25d905d2b819 thunderbolt: Allow USB3 bandwidth to be lower than maximum supported)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (35fad98ed25a serial: meson+qcom: don't advance the kfifo twice)
CONFLICT (content): Merge conflict in drivers/tty/serial/serial_core.c
Merging char-misc/char-misc-next (ebbc1a4789c6 uio: update kerneldoc comments for interrupt functions)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (e0b97ddaf4b5 dt-bindings: arm: qcom,coresight-tpda: fix indentation in the example)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (4d2bc3f7dea4 fpga: tests: use KUnit devices instead of platform devices)
Merging icc/icc-next (7af14fe58e5e Merge branch 'icc-fixes' into icc-next)
Merging iio/togreg (aabc0aa90c92 Documentation: ABI: document in_temp_input file)
Merging phy-next/next (9c79b779643e phy: rockchip: fix CONFIG_TYPEC dependency)
Merging soundwire/next (4cd5ea6de156 soundwire: intel_init: resume all devices on exit.)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (7447d911af69 vfio/fsl-mc: Block calling interrupt handler without trigger)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (897268aef3fa spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe())
Merging staging/staging-next (e4d5e3a9ae68 staging: nvec: update TODO)
Merging counter-next/counter-next (916baadd293a counter: ti-ecap-capture: Utilize COUNTER_COMP_FREQUENCY macro)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (4665be0e952f dmaengine: pch_dma: remove unused function chan2parent)
Merging cgroup/for-next (a6b8daba00e6 cgroup_freezer: update comment for freezer_css_online())
Merging scsi/for-next (99033e81ab05 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (f92141e18c8b Merge patch series "convert SCSI to atomic queue limits, part 1 (v3)")
CONFLICT (content): Merge conflict in block/blk-settings.c
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging vhost/linux-next (5b9f214d0540 vhost: Merge tag 'vduse-virtio-net' into vhost)
Merging rpmsg/for-next (912ebe48bec5 Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (8a7a61032587 gpiolib: Get rid of never false gpio_is_valid() calls)
Merging gpio-intel/for-next (57b60ec4b30d gpiolib: acpi: Pass con_id instead of property into acpi_dev_gpio_irq_get_by())
Merging pinctrl/for-next (85fb4a0fad95 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (aa43c15a790c pinctrl: renesas: rzg2l: Execute atomically the interrupt configuration)
Merging pinctrl-samsung/for-next (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants)
Merging pwm/pwm/for-next (bdcfd0997bd4 pwm: meson: Add generic compatible for meson8 to sm1)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (00ab560eb0e3 selftests: Mark ksft_exit_fail_perror() as __noreturn)
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (8f571fc2488c kunit: Fix race condition in try-catch completion)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema)
Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local())
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (813e0ae613d6 bus: mhi: host: Add mhi_power_down_keep_dev() API to support system suspend/hibernation)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (ed1ff2fba7af Merge branch 'for-6.9/cxl-einj' into for-6.9/cxl)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (cda30c6542c8 efi: Clear up misconceptions about a maximum variable name size)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (5b15f3fb89fc slub: Set __GFP_COMP in kmem_cache by default)
Merging random/master (e871abcda3b6 random: handle creditable entropy from atomic process context)
Merging landlock/next (028243655456 fs/ioctl: Add a comment to keep the logic in sync with LSM policies)
Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature)
Merging sysctl/sysctl-next (12e78b868481 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (a9c3475dd67b Replace macro "ARCH_HAVE_EXTRA_ELF_NOTES" with kconfig)
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (f4626c12e4b5 ubsan: Add awareness of signed integer overflow traps)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* [regression 6.1.80+] "CIFS: VFS: directory entry name would overflow frame end of buf" and invisible files under certain conditions and at least with noserverino mount option
@ 2024-04-17 21:44 3% Salvatore Bonaccorso
0 siblings, 0 replies; 200+ results
From: Salvatore Bonaccorso @ 2024-04-17 21:44 UTC (permalink / raw)
To: regressions, Paulo Alcantara, Steve French
Cc: gregkh, sashal, stable, linux-cifs
Hi Paulo, hi all
In Debian we got two reports of cifs mounts not functioning, hiding
certain files. The two reports are:
https://bugs.debian.org/1069102
https://bugs.debian.org/1069092
On those cases kernel logs error
[ 23.225952] CIFS: VFS: directory entry name would overflow frame end of buf 00000000a44b272c
I do not have yet a minimal reproducing setup, but I was able to
reproduce the the issue cerating a simple share (done for simplicity
with ksmbd):
[global]
...
[poc]
path = /srv/data
valid users = root
read only = no
Within /srv/data create an empty file libfoo:
# touch /srv/data/libfoo
The share is mounted with noserverino (the issue is not reproducible
without at least in my case):
mount -t cifs -o noserverino //server/poc /mnt
On each access of /mnt a new error is logged, while not showing the
libfoo file:
[ 23.225952] CIFS: VFS: directory entry name would overflow frame end of buf 00000000a44b272c
[ 603.494356] CIFS: VFS: directory entry name would overflow frame end of buf 000000001dbf54e1
[ 633.217689] CIFS: VFS: directory entry name would overflow frame end of buf 00000000fb4597c4
[ 642.791862] CIFS: VFS: directory entry name would overflow frame end of buf 0000000023b48528
I have verified that reverting in 6.1.y the commit 0947d0d463d4 ("smb:
client: set correct d_type for reparse points under DFS mounts") on
top of 6.1.87 fixes the issue.
#regzbot introduced: 0947d0d463d4
I can try to make a clean environment to reproeduce the issue, but I'm
not yet there. But the regression is related to 0947d0d463d4 ("smb:
client: set correct d_type for reparse points under DFS mounts").
The mentioned commit was as well part of 6.7.7 at least, but I'm not
able to reproduce the issue from another client running 6.7,9.
Does that ring some bell?
Regards,
Salvatore
^ permalink raw reply [relevance 3%]
* linux-next: Tree for Apr 17
@ 2024-04-17 5:38 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-04-17 5:38 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 37954 bytes --]
Hi all,
Changes since 20240416:
The perf tree still had its build failure, but doing a clean then
rebuilding works.
The block tree gained conflicts against the vfs-brauner, vfs trees.
The iommu tree gained a conflict against the mm tree.
The devicetree tree gained a conflict against Linus' tree.
Non-merge commits (relative to Linus' tree): 5938
6194 files changed, 240287 insertions(+), 150880 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 370 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (96fca68c4fbf Merge tag 'nfsd-6.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (2db870d5c1d8 selftests: mm: fix unused and uninitialized variable warning)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (ebfc2fd8873b ARC: Fix typos)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (015a12a4a670 arm64/hugetlb: Fix page table walk in huge_pte_alloc())
Merging arm-soc-fixes/arm/fixes (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (210cfef57926 selftests/powerpc/papr-vpd: Fix missing variable initialization)
Merging s390-fixes/fixes (6f76592ef63a s390/cio: log fake IRB events)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (e226eade8f50 Merge branch 'net-stmmac-fix-mac-capabilities-procedure')
Merging bpf/master (10541b374aa0 riscv, bpf: Fix incorrect runtime stats)
Merging ipsec/master (bccb798e07f8 octeontx2-pf: Fix transmit scheduler resource leak)
Merging netfilter/main (6db5dc7b351b netfilter: flowtable: incorrect pppoe tuple)
Merging ipvs/main (7eaf837a4eb5 netfilter: nf_tables: Fix a memory leak in nf_tables_updchain)
Merging wireless/for-next (feafe59c8975 wifi: ath11k: use RCU when accessing struct inet6_dev::ac_list)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (b68e1acb5834 RDMA/cm: Print the old state when cm_destroy_id gets timeout)
Merging sound-current/for-linus (0b6f0ff01a4a ALSA: hda/tas2781: correct the register for pow calibrated data)
Merging sound-asoc-fixes/for-linus (cebfbc89ae25 ASoC: rt715: add vendor clear control register)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (68adb581a39a regulator: vqmmc-ipq4019: fix module autoloading)
Merging spi-fixes/for-linus (0064db9ce4aa spi: axi-spi-engine: fix version format string)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (156539fd6501 Documentation: embargoed-hardware-issues.rst: Add myself for Power)
Merging tty.current/tty-linus (1aa4ad4eb695 serial: core: Fix missing shutdown and startup for serial base port)
Merging usb.current/usb-linus (c281d18dda40 Merge tag 'thunderbolt-for-v6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus)
Merging usb-serial-fixes/usb-linus (c840244aba7a USB: serial: option: support Quectel EM060K sub-models)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (74a72baf204f iio:imu: adis16475: Fix sync mode setting)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (ebaed6d4def8 peci: linux/peci.h: fix Excess kernel-doc description warning)
Merging soundwire-fixes/fixes (63dc588e7af1 soundwire: amd: fix for wake interrupt handling for clockstop mode)
Merging thunderbolt-fixes/fixes (dcd12acaf384 thunderbolt: Avoid notify PM core about runtime PM resume)
Merging input-current/for-linus (57ed9567e63b Merge branch 'next' into for-linus)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (f221033f5c24 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (4cece7649650 Linux 6.9-rc1)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (1c3bed800669 Merge tag 'kvm-x86-fixes-6.9-rcN' of https://github.com/kvm-x86/linux into HEAD)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (7bcf809b1e78 cxl: Add checks to access_coordinate calculation to fail missing data)
Merging btrfs-fixes/next-fixes (9d6283f337cb Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (e71c84816925 platform/x86: lg-laptop: fix %s null argument warning)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (ca91259b775f scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING)
Merging drm-fixes/drm-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging drm-intel-fixes/for-linux-next-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging mmc-fixes/fixes (ace323f80b9b mmc: sdhci-of-dwcmshc: th1520: Increase tuning loop count to 128)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (30d18df6567b Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted)
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (a373a36fb6b0 Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements")
Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware)
Merging riscv-soc-fixes/riscv-soc-fixes (6b0856ee585d cache: sifive_ccache: Silence unused variable warning)
Merging fpga-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (11baa36d3173 gpio: lpc32xx: fix module autoloading)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7557d296ad43 MAINTAINERS: erofs: add myself as reviewer)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (f488138b5267 NFSD: fix endianness issue in nfsd4_encode_fattr4)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (decd347c2a75 x86/efistub: Reinstate soft limit for initrd loading)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (8933cf4651e0 rust: make mutually exclusive with CFI_CLANG)
Merging v9fs-fixes/fixes/next (6ae7784008d9 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (d3e8a91a848a clk: mediatek: mt7988-infracfg: fix clocks for 2nd PCIe port)
Merging drm-misc-fixes/for-linux-next-fixes (941c0bdbc176 drm/panel: novatek-nt36682e: don't unregister DSI device)
Merging mm-stable/mm-stable (640958fde130 Merge branch 'master' into mm-stable)
Merging mm-nonmm-stable/mm-nonmm-stable (0bbac3facb5d Linux 6.9-rc4)
Merging mm/mm-everything (962694438027 Merge branch 'mm-nonmm-unstable' into mm-everything)
Merging kbuild/for-next (961664cd2955 parisc: vdso: remove unused C build rule in vdso32/Makefile)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (a5a00497b9df perf annotate-data: Handle RSP if it's not the FB register)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (b5d2afe8745b Merge branches 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (b782e8d07baa arm64: arm_pmuv3: Correctly extract and check the PMUVer)
Merging arm-soc/for-next (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging amlogic/for-next (70ce74fbef7e Merge branch 'v6.10/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (2d32c3cbc47b Merge branch 'defconfig-arm64/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (6cf256f63478 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (675a217e4e7c Merge branch 'v6.9-next/soc' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (2a1e301bf479 Merge branch 'omap-for-v6.10/dt' into for-next)
Merging qcom/for-next (4bec154a3f10 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (f4a6540ae2c4 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (02c40b260a87 Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (b7b2fe24038b Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (614b5ab9f92c Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (65fcc08b4cfe riscv: dts: sophgo: cv18xx: Add i2c devices)
Merging stm32/stm32-next (b12a916d30dc ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1)
Merging sunxi/sunxi/for-next (7152a15f8c1d Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/dt into for-next)
Merging ti/ti-next (592695bed5f8 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (071d51e4acf5 Merge branch 'clk-stm' into clk-next)
Merging clk-imx/for-next (13269dc6c704 clk: imx: imx8mp: Fix SAI_MCLK_SEL definition)
Merging clk-renesas/renesas-clk (c0516eb4cf04 clk: renesas: r8a779h0: Add timer clocks)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (a07c772fa658 LoongArch: Include linux/sizes.h in addrspace.h to prevent build errors)
Merging m68k/for-next (70d830e337f9 m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER)
Merging m68knommu/for-next (8e0b6631dd62 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (6613476e225e Linux 6.8-rc1)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (e8f897f4afef Linux 6.8)
Merging powerpc/next (8884fc918f6a powerpc: Fix fatal warnings flag for LLVM's integrated assembler)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (ba5ea59f768f riscv: Do not save the scratch CSR during suspend)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (5db2c4dc413e riscv: dts: add initial canmv-k230 and k230-evb dts)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (583a8db15968 Merge branch 'features' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (84b76d05828a lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (11cca8ccf2c3 tty: xtensa/iss: Use min() to fix Coccinelle warning)
Merging bcachefs/for-next (ad29cf999a91 bcachefs: set_btree_iter_dontneed also clears should_be_locked)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (46b3498aaf76 Merge branch 'for-next-next-v6.9-20240416' into for-next-20240416)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (0bbac3facb5d Linux 6.9-rc4)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (6397cc21e5c0 exfat: move extend valid_size into ->page_mkwrite())
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (d010696e06d5 Merge quota error handling improvements and reiserfs README fixup.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (b2cf5a1ff236 f2fs: allow direct io of pinned files for zoned storage)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (09492cb45100 cuse: add kernel-doc comments to cuse_process_init_reply())
Merging gfs2/for-next (de5bd4a04417 gfs2: Remove and replace gfs2_glock_queue_work)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (b762f0a3e8b8 ksmbd: validate request buffer size in smb2_allocate_rsp_buf())
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (2c4b6138e4de nfsd: don't create nfsv4recoverydir in nfsdfs when not used.)
Merging ntfs3/master (622cd3daa8ea fs/ntfs3: Slightly simplify ntfs_inode_printk())
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (e23d7e82b707 xfs: allow cross-linking special files without project quota)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (7d84b5666ea7 Merge branch 'vfs.super' into vfs.all)
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (6e47dcb2ca22 Merge branch 'pci/endpoint')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5ceeabb0eb2e Merge tag 'i2c-host-fixes-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current)
Merging i2c-host/i2c/i2c-host (08944c074592 i2c: i801: Annotate apanel_addr as __ro_after_init)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (cf770af5645a firmware: dmi-id: add a release callback function)
Merging hwmon-staging/hwmon-next (e723f6ca39fb hwmon: jc42: Remove I2C_CLASS_SPD support)
Merging jc_docs/docs-next (2309181eb018 Merge branch 'docs-fixes' into docs-next)
Merging v4l-dvb/master (4cece7649650 Linux 6.9-rc1)
Merging v4l-dvb-next/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging pm/linux-next (13b4807b53ff Merge branch 'thermal' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (4cece7649650 Linux 6.9-rc1)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (02e2a4b3638c cpuidle: psci: Update init level to core_initcall())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M)
Merging dlm/next (15fd7e55177a dlm: use rwlock for lkbidr)
Merging rdma/for-next (dfcdb38b21e4 RDMA/rxe: Return the correct errno)
Merging net-next/main (86600ea11dc1 ip6_vti: fix memleak on netns dismantle)
CONFLICT (content): Merge conflict in include/trace/events/rpcgss.h
Merging bpf-next/for-next (ad2d22b617b7 bpftool: Address minor issues in bash completion)
Merging ipsec-next/master (267e31750ae8 Merge branch 'phy-listing-link_topology-tracking')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (00567f70051a Bluetooth: qca: fix invalid device address check)
Merging wireless-next/for-next (f236464f1db7 wifi: wilc1000: convert list management to RCU)
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1)
Merging crypto/master (751fb2528c12 crypto: x86/aes-xts - make non-AVX implementation use new glue code)
Merging drm/drm-next (6e1f415e7129 Merge tag 'drm-misc-next-2024-04-10' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next)
Merging drm-exynos/for-linux-next (6633c7d2fd31 drm/exynos: mixer: drop driver owner initialization)
Merging drm-misc/for-linux-next (5289ed190643 drm/fb_dma: Fix parameter name in htmldocs)
Merging amdgpu/drm-next (ab956ed95b8b drm/amd/display: Add a function for checking tmds mode)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c
Merging drm-intel/for-linux-next (578ff98403ce drm/i915: Allow bigjoiner for MST)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cdclk.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (9dc23cba0927 drm/msm/adreno: Set highest_bank_bit for A619)
Merging drm-msm-lumag/msm-next-lumag (ab556156cafa drm/msm: drop A6xx header)
Merging drm-xe/drm-xe-next (67a9e86dc130 drm/xe: select X86_PLATFORM_DEVICES when ACPI_WMI is selected)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device_types.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (fb3b9c2d217f video: logo: Drop full path of the input filename in generated file)
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (a9b16d591874 Merge branch 'topic/emu10k1-fix' into for-next)
Merging ieee1394/for-next (0d4149e5e9b0 firewire: ohci: use pci_irq_vector() to retrieve allocated interrupt line)
Merging sound-asoc/for-next (889c8eda1ea4 Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (c75781a6e4c0 kallsyms: replace deprecated strncpy with strscpy)
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (48c0687a322d Input: pm8xxx-vibrator - correct VIB_MAX_LEVELS calculation)
Merging block/for-next (25d4ec36d5f6 Merge branch 'for-6.10/io_uring' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (a98ecf716e30 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (bce42d6108c9 mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (15f992fa81eb Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (74560bb3685b lsm: remove the now superfluous sentinel element from ctl_table array)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (37c34331f194 Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (d02a66d84baa Merge branches 'memory-observability' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (58d4b25c8831 dt-bindings: timer: renesas,tmu: Add R-Car V4M support)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
Merging dt-krzk/for-next (364be3ecd30d Merge branch 'next/dt' into for-next)
Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU)
Merging spi/for-next (67eb8a648c71 Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (367dc2b68007 Merge branch into tip/master: 'sched/urgent')
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (8e95536e9495 Merge branch ras/edac-misc into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (5fd10857f131 rcu/tree: Reduce wake up for synchronize_rcu() common case)
CONFLICT (content): Merge conflict in arch/riscv/include/asm/cmpxchg.h
Applying: finish revert of "riscv: Emulate one-byte cmpxchg"
Merging kvm/next (1ab157ce573f KVM: SEV: use u64_to_user_ptr throughout)
Merging kvm-arm/next (9ac5bab4deee Merge branch kvm-arm64/misc-6.10 into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (f1c48c1ec735 RISC-V: KVM: selftests: Add ebreak test support)
Merging kvm-x86/next (2d181d84af38 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'svm' and 'vmx')
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (8a8a4bfdbe85 Merge branch 'for-6.10' into for-next)
Merging drivers-x86/for-next (88c0ef69dd88 platform/x86: asus-wmi: cleanup main struct to avoid some holes)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (70a5f3005008 platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD))
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (6b4c04178660 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (66bc1a173328 treewide: Use sysfs_bin_attr_simple_read() helper)
Merging usb/usb-next (3d122e6d27e4 usb: typec: mux: gpio-sbu: Allow GPIO operations to sleep)
CONFLICT (modify/delete): drivers/usb/misc/onboard_usb_hub.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/misc/onboard_usb_hub.c left in tree.
$ git rm -f drivers/usb/misc/onboard_usb_hub.c
Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev"
Merging thunderbolt/next (25d905d2b819 thunderbolt: Allow USB3 bandwidth to be lower than maximum supported)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (b20172ca6bf4 serial: core: Fix ifdef for serial base console functions)
CONFLICT (content): Merge conflict in drivers/tty/serial/serial_core.c
Merging char-misc/char-misc-next (ebbc1a4789c6 uio: update kerneldoc comments for interrupt functions)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (e0b97ddaf4b5 dt-bindings: arm: qcom,coresight-tpda: fix indentation in the example)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (4d2bc3f7dea4 fpga: tests: use KUnit devices instead of platform devices)
Merging icc/icc-next (7af14fe58e5e Merge branch 'icc-fixes' into icc-next)
Merging iio/togreg (aabc0aa90c92 Documentation: ABI: document in_temp_input file)
Merging phy-next/next (a1fe1eca0d8b phy: rockchip-snps-pcie3: add support for rockchip,rx-common-refclk-mode)
Merging soundwire/next (4cd5ea6de156 soundwire: intel_init: resume all devices on exit.)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (7447d911af69 vfio/fsl-mc: Block calling interrupt handler without trigger)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (897268aef3fa spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe())
Merging staging/staging-next (e4d5e3a9ae68 staging: nvec: update TODO)
Merging counter-next/counter-next (916baadd293a counter: ti-ecap-capture: Utilize COUNTER_COMP_FREQUENCY macro)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (4665be0e952f dmaengine: pch_dma: remove unused function chan2parent)
Merging cgroup/for-next (fc29e04ae1ad cgroup/rstat: add cgroup_rstat_lock helpers and tracepoints)
Merging scsi/for-next (99033e81ab05 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (f92141e18c8b Merge patch series "convert SCSI to atomic queue limits, part 1 (v3)")
Merging vhost/linux-next (5b9f214d0540 vhost: Merge tag 'vduse-virtio-net' into vhost)
Merging rpmsg/for-next (912ebe48bec5 Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (9aeb26e3beaa gpio: sch: Switch to memory mapped IO accessors)
Merging gpio-intel/for-next (2d485d47560e gpio: sch: Utilise temporary variable for struct device)
abaed898da91 ("gpio: sch: Switch to memory mapped IO accessors")
Merging pinctrl/for-next (cdbd87951e21 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (aa43c15a790c pinctrl: renesas: rzg2l: Execute atomically the interrupt configuration)
Merging pinctrl-samsung/for-next (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants)
Merging pwm/pwm/for-next (bdcfd0997bd4 pwm: meson: Add generic compatible for meson8 to sm1)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (00ab560eb0e3 selftests: Mark ksft_exit_fail_perror() as __noreturn)
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (8f571fc2488c kunit: Fix race condition in try-catch completion)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (393e3d290f61 rtc: mcp795: drop unneeded MODULE_ALIAS)
Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local())
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (813e0ae613d6 bus: mhi: host: Add mhi_power_down_keep_dev() API to support system suspend/hibernation)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (ed1ff2fba7af Merge branch 'for-6.9/cxl-einj' into for-6.9/cxl)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (cda30c6542c8 efi: Clear up misconceptions about a maximum variable name size)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (5b15f3fb89fc slub: Set __GFP_COMP in kmem_cache by default)
Merging random/master (4cece7649650 Linux 6.9-rc1)
Merging landlock/next (028243655456 fs/ioctl: Add a comment to keep the logic in sync with LSM policies)
Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature)
Merging sysctl/sysctl-next (12e78b868481 sysctl: drop now unnecessary out-of-bounds check)
Merging execve/for-next/execve (a9c3475dd67b Replace macro "ARCH_HAVE_EXTRA_ELF_NOTES" with kconfig)
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (f4626c12e4b5 ubsan: Add awareness of signed integer overflow traps)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
^ permalink raw reply [relevance 2%]
* Re: [PATCH 0/6] Add an option for running fstests on CIFS
2024-04-12 20:52 0% ` [PATCH 0/6] Add an option for running fstests on CIFS Chuck Lever III
@ 2024-04-16 21:54 0% ` Scott Mayhew
0 siblings, 0 replies; 200+ results
From: Scott Mayhew @ 2024-04-16 21:54 UTC (permalink / raw)
To: Chuck Lever III; +Cc: kdevops
On Fri, 12 Apr 2024, Chuck Lever III wrote:
>
>
> > On Apr 12, 2024, at 4:49 PM, Scott Mayhew <smayhew@redhat.com> wrote:
> >
> > These patches add the ability to run fstests on CIFS. The playbooks are
> > very similar to their NFS counterparts. The smbd playbook sets up a
> > Samba server, but could be expanded to set up ksmbd in the future. The
> > following options are available: plain SMB3, SMB3 with signing, and
> > SMB3 with encryption.
>
> You could also add SMB direct using siw, but maybe Samba doesn't
> support that.
I looked at it today, and it doesn't look like Samba supports SMB Direct
yet.
-Scott
>
>
> > The expunge files are based on the tests that were consistently failing
> > on 6.8.4-200.fc39.x86_64, plus some tests that just take way too long
> > (generic/476, generic/650).
> >
> > -Scott
> >
> > Scott Mayhew (6):
> > oscheck.sh: add some special cases for cifs
> > gendisks.sh: add special case for cifs
> > bringup: add a playbook to bring up an SMB server
> > playbooks: add a playbook to create smb shares
> > fstests: add an option for testing on CIFS
> > fstests: add expunges for cifs
> >
> > Makefile | 1 +
> > kconfigs/Kconfig.bringup.goals | 1 +
> > kconfigs/Kconfig.smbd | 72 ++++++++++++
> > playbooks/roles/fstests/defaults/main.yml | 6 +
> > .../tasks/install-deps/debian/main.yml | 1 +
> > .../tasks/install-deps/redhat/main.yml | 1 +
> > .../fstests/tasks/install-deps/suse/main.yml | 11 ++
> > playbooks/roles/fstests/tasks/main.yml | 39 +++++++
> > .../roles/fstests/templates/cifs/cifs.config | 33 ++++++
> > playbooks/roles/gen_hosts/defaults/main.yml | 1 +
> > .../roles/gen_hosts/templates/fstests.j2 | 6 +
> > playbooks/roles/gen_nodes/defaults/main.yml | 1 +
> > playbooks/roles/gen_nodes/tasks/main.yml | 19 ++++
> > playbooks/roles/smbd/defaults/main.yml | 5 +
> > .../smbd/tasks/install-deps/debian/main.yml | 31 ++++++
> > .../roles/smbd/tasks/install-deps/main.yml | 12 ++
> > .../smbd/tasks/install-deps/redhat/main.yml | 33 ++++++
> > .../smbd/tasks/install-deps/suse/main.yml | 29 +++++
> > playbooks/roles/smbd/tasks/main.yml | 95 ++++++++++++++++
> > playbooks/roles/smbd/templates/smb.conf.j2 | 11 ++
> > playbooks/roles/smbd/vars/Debian.yml | 10 ++
> > playbooks/roles/smbd/vars/RedHat.yml | 12 ++
> > playbooks/roles/smbd/vars/Suse.yml | 10 ++
> > playbooks/roles/smbd_add_share/README.md | 57 ++++++++++
> > .../roles/smbd_add_share/defaults/main.yml | 5 +
> > playbooks/roles/smbd_add_share/tasks/main.yml | 103 ++++++++++++++++++
> > .../roles/smbd_add_share/templates/share.j2 | 7 ++
> > playbooks/smbd.yml | 4 +
> > scripts/smbd.Makefile | 20 ++++
> > workflows/fstests/Kconfig | 20 +++-
> > workflows/fstests/Makefile | 4 +
> > workflows/fstests/cifs/Kconfig | 75 +++++++++++++
> > workflows/fstests/cifs/Makefile | 17 +++
> > .../expunges/any/cifs/unassigned/all.txt | 60 ++++++++++
> > .../any/cifs/unassigned/cifs_smb3_sign.txt | 2 +
> > workflows/fstests/scripts/gendisks.sh | 2 +-
> > workflows/fstests/scripts/oscheck.sh | 8 +-
> > 37 files changed, 818 insertions(+), 6 deletions(-)
> > create mode 100644 kconfigs/Kconfig.smbd
> > create mode 100644 playbooks/roles/fstests/templates/cifs/cifs.config
> > create mode 100644 playbooks/roles/smbd/defaults/main.yml
> > create mode 100644 playbooks/roles/smbd/tasks/install-deps/debian/main.yml
> > create mode 100644 playbooks/roles/smbd/tasks/install-deps/main.yml
> > create mode 100644 playbooks/roles/smbd/tasks/install-deps/redhat/main.yml
> > create mode 100644 playbooks/roles/smbd/tasks/install-deps/suse/main.yml
> > create mode 100644 playbooks/roles/smbd/tasks/main.yml
> > create mode 100644 playbooks/roles/smbd/templates/smb.conf.j2
> > create mode 100644 playbooks/roles/smbd/vars/Debian.yml
> > create mode 100644 playbooks/roles/smbd/vars/RedHat.yml
> > create mode 100644 playbooks/roles/smbd/vars/Suse.yml
> > create mode 100644 playbooks/roles/smbd_add_share/README.md
> > create mode 100644 playbooks/roles/smbd_add_share/defaults/main.yml
> > create mode 100644 playbooks/roles/smbd_add_share/tasks/main.yml
> > create mode 100644 playbooks/roles/smbd_add_share/templates/share.j2
> > create mode 100644 playbooks/smbd.yml
> > create mode 100644 scripts/smbd.Makefile
> > create mode 100644 workflows/fstests/cifs/Kconfig
> > create mode 100644 workflows/fstests/cifs/Makefile
> > create mode 100644 workflows/fstests/expunges/any/cifs/unassigned/all.txt
> > create mode 100644 workflows/fstests/expunges/any/cifs/unassigned/cifs_smb3_sign.txt
> >
> > --
> > 2.44.0
> >
> >
>
> --
> Chuck Lever
>
>
^ permalink raw reply [relevance 0%]
* Re: [PATCH v2] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
2024-04-15 13:12 4% ` [PATCH v2] " Marios Makassikis
@ 2024-04-16 12:40 8% ` Namjae Jeon
0 siblings, 0 replies; 200+ results
From: Namjae Jeon @ 2024-04-16 12:40 UTC (permalink / raw)
To: Marios Makassikis; +Cc: linux-cifs
2024년 4월 15일 (월) 오후 10:13, Marios Makassikis <mmakassikis@freebox.fr>님이 작성:
>
> File overwrite case is explicitly handled, so it is not necessary to
> pass RENAME_NOREPLACE to vfs_rename.
>
> Clearing the flag fixes rename operations when the share is a ntfs-3g
> mount. The latter uses an older version of fuse with no support for
> flags in the ->rename op.
>
> Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
Applied it to #ksmbd-for-next-next.
Thanks for your patch!
^ permalink raw reply [relevance 8%]
* linux-next: Tree for Apr 16
@ 2024-04-16 7:55 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-04-16 7:55 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 38428 bytes --]
Hi all,
Changes since 20240415:
The perf tree still had its build failure, but doing a clean then
rebuilding works.
The block tree gained conflicts against the vfs-brauner, vfs trees.
The iommu tree gained a conflict against the mm tree.
The devicetree tree gained a conflict against Linus' tree.
Non-merge commits (relative to Linus' tree): 5766
6014 files changed, 231888 insertions(+), 135667 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 370 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (96fca68c4fbf Merge tag 'nfsd-6.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (aaeda6237dec bootconfig: use memblock_free_late to free xbc memory to buddy)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (ebfc2fd8873b ARC: Fix typos)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (015a12a4a670 arm64/hugetlb: Fix page table walk in huge_pte_alloc())
Merging arm-soc-fixes/arm/fixes (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (210cfef57926 selftests/powerpc/papr-vpd: Fix missing variable initialization)
Merging s390-fixes/fixes (6f76592ef63a s390/cio: log fake IRB events)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (75ce9506ee3d octeontx2-pf: fix FLOW_DIS_IS_FRAGMENT implementation)
Merging bpf/master (37eacb9f6e89 bpf: Fix a verifier verbose message)
Merging ipsec/master (bccb798e07f8 octeontx2-pf: Fix transmit scheduler resource leak)
Merging netfilter/main (6db5dc7b351b netfilter: flowtable: incorrect pppoe tuple)
Merging ipvs/main (7eaf837a4eb5 netfilter: nf_tables: Fix a memory leak in nf_tables_updchain)
Merging wireless/for-next (9ef369973cd2 wifi: cfg80211: fix the order of arguments for trace events of the tx_rx_evt class)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (b68e1acb5834 RDMA/cm: Print the old state when cm_destroy_id gets timeout)
Merging sound-current/for-linus (0b6f0ff01a4a ALSA: hda/tas2781: correct the register for pow calibrated data)
Merging sound-asoc-fixes/for-linus (eefb831d2e4d ASoC: cs35l41: Update DSP1RX5/6 Sources for DSP config)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (68adb581a39a regulator: vqmmc-ipq4019: fix module autoloading)
Merging spi-fixes/for-linus (0064db9ce4aa spi: axi-spi-engine: fix version format string)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (156539fd6501 Documentation: embargoed-hardware-issues.rst: Add myself for Power)
Merging tty.current/tty-linus (1aa4ad4eb695 serial: core: Fix missing shutdown and startup for serial base port)
Merging usb.current/usb-linus (c281d18dda40 Merge tag 'thunderbolt-for-v6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus)
Merging usb-serial-fixes/usb-linus (c840244aba7a USB: serial: option: support Quectel EM060K sub-models)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (74a72baf204f iio:imu: adis16475: Fix sync mode setting)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (ebaed6d4def8 peci: linux/peci.h: fix Excess kernel-doc description warning)
Merging soundwire-fixes/fixes (63dc588e7af1 soundwire: amd: fix for wake interrupt handling for clockstop mode)
Merging thunderbolt-fixes/fixes (dcd12acaf384 thunderbolt: Avoid notify PM core about runtime PM resume)
Merging input-current/for-linus (57ed9567e63b Merge branch 'next' into for-linus)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (f221033f5c24 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging at91-fixes/at91-fixes (4cece7649650 Linux 6.9-rc1)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (49ff3b4aec51 KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (7bcf809b1e78 cxl: Add checks to access_coordinate calculation to fail missing data)
Merging btrfs-fixes/next-fixes (07475cc36e03 Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (e71c84816925 platform/x86: lg-laptop: fix %s null argument warning)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (dab6bc78e981 of: module: add buffer overflow check in of_modalias())
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (ca91259b775f scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING)
Merging drm-fixes/drm-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging drm-intel-fixes/for-linux-next-fixes (0bbac3facb5d Linux 6.9-rc4)
Merging mmc-fixes/fixes (ace323f80b9b mmc: sdhci-of-dwcmshc: th1520: Increase tuning loop count to 128)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (0bbac3facb5d Linux 6.9-rc4)
Merging hyperv-fixes/hyperv-fixes (30d18df6567b Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted)
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (a373a36fb6b0 Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements")
Merging riscv-dt-fixes/riscv-dt-fixes (0f74c64f0a9f riscv: dts: starfive: Remove PMIC interrupt info for Visionfive 2 board)
Merging riscv-soc-fixes/riscv-soc-fixes (6b0856ee585d cache: sifive_ccache: Silence unused variable warning)
Merging fpga-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (11baa36d3173 gpio: lpc32xx: fix module autoloading)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7557d296ad43 MAINTAINERS: erofs: add myself as reviewer)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (f488138b5267 NFSD: fix endianness issue in nfsd4_encode_fattr4)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (decd347c2a75 x86/efistub: Reinstate soft limit for initrd loading)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (761a8f0a776b rust: make mutually exclusive with CFI_CLANG)
Merging v9fs-fixes/fixes/next (6ae7784008d9 fs/9p: mitigate inode collisions)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (525c07969201 MAINTAINERS: adjust file entry in ARM/LPC32XX SOC SUPPORT)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (d3e8a91a848a clk: mediatek: mt7988-infracfg: fix clocks for 2nd PCIe port)
Merging drm-misc-fixes/for-linux-next-fixes (bf52d7f9b206 drm/nouveau/dp: Don't probe eDP ports twice harder)
Merging mm-stable/mm-stable (4e2e36129225 Merge branch 'master' into mm-stable)
Merging mm-nonmm-stable/mm-nonmm-stable (39cd87c4eb2b Linux 6.9-rc2)
Merging mm/mm-everything (1755f72d5a85 Merge branch 'mm-nonmm-unstable' into mm-everything)
f790609f8167 ("fix-missing-vmalloch-includes-fix-3")
CONFLICT (content): Merge conflict in arch/x86/mm/numa_32.c
Merging kbuild/for-next (bfa8f18691ed Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (988052f4bfcc perf bench uprobe: Add uretprobe variant of uprobe benchmarks)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (b5d2afe8745b Merge branches 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (b782e8d07baa arm64: arm_pmuv3: Correctly extract and check the PMUVer)
Merging arm-soc/for-next (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging amlogic/for-next (70ce74fbef7e Merge branch 'v6.10/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (2d32c3cbc47b Merge branch 'defconfig-arm64/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (6cf256f63478 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (675a217e4e7c Merge branch 'v6.9-next/soc' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (2a1e301bf479 Merge branch 'omap-for-v6.10/dt' into for-next)
Merging qcom/for-next (4bec154a3f10 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (f4a6540ae2c4 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (02c40b260a87 Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (b7b2fe24038b Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (614b5ab9f92c Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (65fcc08b4cfe riscv: dts: sophgo: cv18xx: Add i2c devices)
Merging stm32/stm32-next (b12a916d30dc ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1)
Merging sunxi/sunxi/for-next (7152a15f8c1d Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/dt into for-next)
Merging ti/ti-next (592695bed5f8 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (071d51e4acf5 Merge branch 'clk-stm' into clk-next)
Merging clk-imx/for-next (13269dc6c704 clk: imx: imx8mp: Fix SAI_MCLK_SEL definition)
Merging clk-renesas/renesas-clk (c0516eb4cf04 clk: renesas: r8a779h0: Add timer clocks)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (a07c772fa658 LoongArch: Include linux/sizes.h in addrspace.h to prevent build errors)
Merging m68k/for-next (70d830e337f9 m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER)
Merging m68knommu/for-next (8e0b6631dd62 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (6613476e225e Linux 6.8-rc1)
Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq())
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (e8f897f4afef Linux 6.8)
Merging powerpc/next (8884fc918f6a powerpc: Fix fatal warnings flag for LLVM's integrated assembler)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (ba5ea59f768f riscv: Do not save the scratch CSR during suspend)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (5db2c4dc413e riscv: dts: add initial canmv-k230 and k230-evb dts)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (1fd78e225f7e Merge branch 'features' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (84b76d05828a lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (11cca8ccf2c3 tty: xtensa/iss: Use min() to fix Coccinelle warning)
Merging bcachefs/for-next (ad29cf999a91 bcachefs: set_btree_iter_dontneed also clears should_be_locked)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (7218664bf91d Merge branch 'for-next-next-v6.9-20240409' into for-next-20240409)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (0bbac3facb5d Linux 6.9-rc4)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (6397cc21e5c0 exfat: move extend valid_size into ->page_mkwrite())
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (d010696e06d5 Merge quota error handling improvements and reiserfs README fixup.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (b2cf5a1ff236 f2fs: allow direct io of pinned files for zoned storage)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (09492cb45100 cuse: add kernel-doc comments to cuse_process_init_reply())
Merging gfs2/for-next (5ede6353b3d3 gfs2: Fix do_xmote locking error)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (b762f0a3e8b8 ksmbd: validate request buffer size in smb2_allocate_rsp_buf())
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (964b1571f8b0 nfsd: optimise recalculate_deny_mode() for a common case)
Merging ntfs3/master (622cd3daa8ea fs/ntfs3: Slightly simplify ntfs_inode_printk())
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (e23d7e82b707 xfs: allow cross-linking special files without project quota)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (7dad3e0bd4e4 Merge branch 'vfs.super' into vfs.all)
Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (6e47dcb2ca22 Merge branch 'pci/endpoint')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (78e3412a0ebb Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5ceeabb0eb2e Merge tag 'i2c-host-fixes-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current)
Merging i2c-host/i2c/i2c-host (32204e57f3fb dt-bindings: i2c: qcom-cci: Document sc8280xp compatible)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (cf770af5645a firmware: dmi-id: add a release callback function)
Merging hwmon-staging/hwmon-next (e723f6ca39fb hwmon: jc42: Remove I2C_CLASS_SPD support)
Merging jc_docs/docs-next (2309181eb018 Merge branch 'docs-fixes' into docs-next)
Merging v4l-dvb/master (4cece7649650 Linux 6.9-rc1)
Merging v4l-dvb-next/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging pm/linux-next (13b4807b53ff Merge branch 'thermal' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (4cece7649650 Linux 6.9-rc1)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (02e2a4b3638c cpuidle: psci: Update init level to core_initcall())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M)
Merging dlm/next (92d59adfaf71 dlm: do message processing in softirq context)
Merging rdma/for-next (dfcdb38b21e4 RDMA/rxe: Return the correct errno)
Merging net-next/main (bb72159c0ad1 Merge branch 'selftests-net-exercise-page-pool-reporting-via-netlink')
CONFLICT (content): Merge conflict in include/trace/events/rpcgss.h
Merging bpf-next/for-next (4d4992ff5876 selftests/bpf: Add read_trace_pipe_iter function)
Merging ipsec-next/master (267e31750ae8 Merge branch 'phy-listing-link_topology-tracking')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (e00fc2700a3f Bluetooth: btusb: Fix triggering coredump implementation for QCA)
Merging wireless-next/for-next (d26a0a66f929 wifi: brcmfmac: Fix spelling mistake "ivalid" -> "invalid")
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1)
Merging crypto/master (751fb2528c12 crypto: x86/aes-xts - make non-AVX implementation use new glue code)
Merging drm/drm-next (6e1f415e7129 Merge tag 'drm-misc-next-2024-04-10' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next)
Merging drm-exynos/for-linux-next (6633c7d2fd31 drm/exynos: mixer: drop driver owner initialization)
Merging drm-misc/for-linux-next (7b0062036c3b drm/vmwgfx: Implement virtual crc generation)
9c8a10bf1f34 ("drm/nouveau/kms/nv50-: Disable AUX bus for disconnected DP ports")
fe6660b661c3 ("drm/nouveau/dp: Don't probe eDP ports twice harder")
Merging amdgpu/drm-next (ab956ed95b8b drm/amd/display: Add a function for checking tmds mode)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c
Merging drm-intel/for-linux-next (578ff98403ce drm/i915: Allow bigjoiner for MST)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cdclk.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (9dc23cba0927 drm/msm/adreno: Set highest_bank_bit for A619)
Merging drm-msm-lumag/msm-next-lumag (ab556156cafa drm/msm: drop A6xx header)
Merging drm-xe/drm-xe-next (5f36d1ce4df2 drm/xe/gt: Add L3 bank mask to GT topology)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device_types.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (fb3b9c2d217f video: logo: Drop full path of the input filename in generated file)
Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check)
Merging sound/for-next (a9b16d591874 Merge branch 'topic/emu10k1-fix' into for-next)
Merging ieee1394/for-next (0d4149e5e9b0 firewire: ohci: use pci_irq_vector() to retrieve allocated interrupt line)
Merging sound-asoc/for-next (bb85a27856fd Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (c75781a6e4c0 kallsyms: replace deprecated strncpy with strscpy)
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (48c0687a322d Input: pm8xxx-vibrator - correct VIB_MAX_LEVELS calculation)
Merging block/for-next (25d4ec36d5f6 Merge branch 'for-6.10/io_uring' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (4f0eecb15f2b dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (bce42d6108c9 mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (15f992fa81eb Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (74560bb3685b lsm: remove the now superfluous sentinel element from ctl_table array)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (37c34331f194 Documentation: tpm_tis)
Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4)
Merging iommu/next (d02a66d84baa Merge branches 'memory-observability' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (a5737b210574 of: Use scope based of_node_put() cleanups)
CONFLICT (content): Merge conflict in drivers/of/dynamic.c
Merging dt-krzk/for-next (364be3ecd30d Merge branch 'next/dt' into for-next)
Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU)
Merging spi/for-next (e0fa51d2ab0b Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (ec78c20fbe01 Merge branch into tip/master: 'x86/shstk')
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (8e95536e9495 Merge branch ras/edac-misc into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (5fd10857f131 rcu/tree: Reduce wake up for synchronize_rcu() common case)
CONFLICT (content): Merge conflict in arch/riscv/include/asm/cmpxchg.h
Applying: finish revert of "riscv: Emulate one-byte cmpxchg"
Merging kvm/next (1ab157ce573f KVM: SEV: use u64_to_user_ptr throughout)
Merging kvm-arm/next (9ac5bab4deee Merge branch kvm-arm64/misc-6.10 into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (f1c48c1ec735 RISC-V: KVM: selftests: Add ebreak test support)
Merging kvm-x86/next (2d181d84af38 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'svm' and 'vmx')
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (8a8a4bfdbe85 Merge branch 'for-6.10' into for-next)
Merging drivers-x86/for-next (88c0ef69dd88 platform/x86: asus-wmi: cleanup main struct to avoid some holes)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (70a5f3005008 platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD))
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (4cece7649650 Linux 6.9-rc1)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (6b4c04178660 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (66bc1a173328 treewide: Use sysfs_bin_attr_simple_read() helper)
Merging usb/usb-next (3d122e6d27e4 usb: typec: mux: gpio-sbu: Allow GPIO operations to sleep)
CONFLICT (modify/delete): drivers/usb/misc/onboard_usb_hub.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/misc/onboard_usb_hub.c left in tree.
$ git rm -f drivers/usb/misc/onboard_usb_hub.c
Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev"
Merging thunderbolt/next (25d905d2b819 thunderbolt: Allow USB3 bandwidth to be lower than maximum supported)
Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2)
Merging tty/tty-next (b20172ca6bf4 serial: core: Fix ifdef for serial base console functions)
CONFLICT (content): Merge conflict in drivers/tty/serial/serial_core.c
Merging char-misc/char-misc-next (ebbc1a4789c6 uio: update kerneldoc comments for interrupt functions)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (a4f3057d19ff coresight-tpda: Change qcom,dsb-element-size to qcom,dsb-elem-bits)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (4d2bc3f7dea4 fpga: tests: use KUnit devices instead of platform devices)
Merging icc/icc-next (7af14fe58e5e Merge branch 'icc-fixes' into icc-next)
Merging iio/togreg (aabc0aa90c92 Documentation: ABI: document in_temp_input file)
Merging phy-next/next (a1fe1eca0d8b phy: rockchip-snps-pcie3: add support for rockchip,rx-common-refclk-mode)
Merging soundwire/next (4cd5ea6de156 soundwire: intel_init: resume all devices on exit.)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4)
Merging vfio/next (7447d911af69 vfio/fsl-mc: Block calling interrupt handler without trigger)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (897268aef3fa spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe())
Merging staging/staging-next (e4d5e3a9ae68 staging: nvec: update TODO)
Merging counter-next/counter-next (916baadd293a counter: ti-ecap-capture: Utilize COUNTER_COMP_FREQUENCY macro)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (4665be0e952f dmaengine: pch_dma: remove unused function chan2parent)
Merging cgroup/for-next (a24e3b7d27c6 docs: cgroup-v1: Fix description for css_online)
Merging scsi/for-next (99033e81ab05 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (f92141e18c8b Merge patch series "convert SCSI to atomic queue limits, part 1 (v3)")
Merging vhost/linux-next (5b9f214d0540 vhost: Merge tag 'vduse-virtio-net' into vhost)
Merging rpmsg/for-next (4d5aabb68439 Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (8d1e84ab0176 gpio: regmap: Use -ENOTSUPP consistently)
Merging gpio-intel/for-next (2d485d47560e gpio: sch: Utilise temporary variable for struct device)
Merging pinctrl/for-next (07bd48cca03b Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (aa43c15a790c pinctrl: renesas: rzg2l: Execute atomically the interrupt configuration)
Merging pinctrl-samsung/for-next (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants)
Merging pwm/pwm/for-next (bdcfd0997bd4 pwm: meson: Add generic compatible for meson8 to sm1)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (4f4ade6863ce selftests/clone3: Correct log message for waitpid() failures)
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest.h
CONFLICT (content): Merge conflict in tools/testing/selftests/timers/valid-adjtimex.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (82b0beff3497 kunit: Add tests for fault)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (8b59a11fb8e6 rtc: nuvoton: Modify part number value)
Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local())
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (813e0ae613d6 bus: mhi: host: Add mhi_power_down_keep_dev() API to support system suspend/hibernation)
Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry)
Merging cxl/next (ed1ff2fba7af Merge branch 'for-6.9/cxl-einj' into for-6.9/cxl)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (cda30c6542c8 efi: Clear up misconceptions about a maximum variable name size)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (5b15f3fb89fc slub: Set __GFP_COMP in kmem_cache by default)
Merging random/master (4cece7649650 Linux 6.9-rc1)
Merging landlock/next (028243655456 fs/ioctl: Add a comment to keep the logic in sync with LSM policies)
Merging rust/rust-next (8db31d3f3bd5 rust: workqueue: add `#[pin_data]` to `Work`)
Merging sysctl/sysctl-next (c2e128726bdd security: Remove the now superfluous sentinel element from ctl_table array)
c2e128726bdd ("security: Remove the now superfluous sentinel element from ctl_table array")
Merging execve/for-next/execve (a9c3475dd67b Replace macro "ARCH_HAVE_EXTRA_ELF_NOTES" with kconfig)
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (9c573cd31343 randomize_kstack: Improve entropy diffusion)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2))
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Re: current ksmbd
2024-04-15 16:54 10% current ksmbd Steve French
@ 2024-04-16 0:28 4% ` Namjae Jeon
0 siblings, 0 replies; 200+ results
From: Namjae Jeon @ 2024-04-16 0:28 UTC (permalink / raw)
To: Steve French; +Cc: CIFS, samba-technical
2024년 4월 16일 (화) 오전 1:54, Steve French <smfrench@gmail.com>님이 작성:
>
> We are up to 221 fstests run vs. ksmbd, and buildbot tests pass with
> current ksmb (this is with 6.9-rc4):
> http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/10/builds/52
>
> There are lots of minor features (and some fixes) that should be able
> to be doable to increase this number even more.
>
> Note that Samba passes some tests that are skipped when run to ksmbd
> that should be investigated:
> e.g. generic/022 ("xfs_io fcollapse") and generic/351 ("xfs_io
> fsinsert") and also generic/021 and 031 ("fallocate: Invalid argument)
> and generic/525 ("pread: invalid argument") and generic/568 (which
> looks like fallocate bug)
Okay. I will check it after sambaXP.
Thanks for your check!
>
> Samba fails two tests that pass to ksmbd generic/286 ("create sparse
> file failed") and generic/591 (splice test) that also should be
> investigated.
>
>
> --
> Thanks,
>
> Steve
^ permalink raw reply [relevance 4%]
* current ksmbd
@ 2024-04-15 16:54 10% Steve French
2024-04-16 0:28 4% ` Namjae Jeon
0 siblings, 1 reply; 200+ results
From: Steve French @ 2024-04-15 16:54 UTC (permalink / raw)
To: Namjae Jeon, CIFS, samba-technical
We are up to 221 fstests run vs. ksmbd, and buildbot tests pass with
current ksmb (this is with 6.9-rc4):
http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/10/builds/52
There are lots of minor features (and some fixes) that should be able
to be doable to increase this number even more.
Note that Samba passes some tests that are skipped when run to ksmbd
that should be investigated:
e.g. generic/022 ("xfs_io fcollapse") and generic/351 ("xfs_io
fsinsert") and also generic/021 and 031 ("fallocate: Invalid argument)
and generic/525 ("pread: invalid argument") and generic/568 (which
looks like fallocate bug)
Samba fails two tests that pass to ksmbd generic/286 ("create sparse
file failed") and generic/591 (splice test) that also should be
investigated.
--
Thanks,
Steve
^ permalink raw reply [relevance 10%]
* [PATCH 4.14-openela 046/190] ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE
[not found] <20240415105208.3137874-1-sashal@kernel.org>
@ 2024-04-15 10:49 9% ` Sasha Levin
0 siblings, 0 replies; 200+ results
From: Sasha Levin @ 2024-04-15 10:49 UTC (permalink / raw)
To: kernel-lts
Cc: Namjae Jeon, stable, Paulo Alcantara, Steve French, Sasha Levin
From: Namjae Jeon <linkinjeon@kernel.org>
[ Upstream commit 13736654481198e519059d4a2e2e3b20fa9fdb3e ]
MS confirm that "AISi" name of SMB2_CREATE_ALLOCATION_SIZE in MS-SMB2
specification is a typo. cifs/ksmbd have been using this wrong name from
MS-SMB2. It should be "AlSi". Also It will cause problem when running
smb2.create.open test in smbtorture against ksmbd.
Cc: stable@vger.kernel.org
Fixes: 12197a7fdda9 ("Clarify SMB2/SMB3 create context and add missing ones")
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Reviewed-by: Paulo Alcantara (SUSE) <pc@manguebit.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/cifs/smb2pdu.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
index 407425d31b2eb..9ba9412c392f1 100644
--- a/fs/cifs/smb2pdu.h
+++ b/fs/cifs/smb2pdu.h
@@ -485,7 +485,7 @@ struct smb2_tree_disconnect_rsp {
#define SMB2_CREATE_SD_BUFFER "SecD" /* security descriptor */
#define SMB2_CREATE_DURABLE_HANDLE_REQUEST "DHnQ"
#define SMB2_CREATE_DURABLE_HANDLE_RECONNECT "DHnC"
-#define SMB2_CREATE_ALLOCATION_SIZE "AISi"
+#define SMB2_CREATE_ALLOCATION_SIZE "AlSi"
#define SMB2_CREATE_QUERY_MAXIMAL_ACCESS_REQUEST "MxAc"
#define SMB2_CREATE_TIMEWARP_REQUEST "TWrp"
#define SMB2_CREATE_QUERY_ON_DISK_ID "QFid"
--
2.43.0
^ permalink raw reply related [relevance 9%]
* [PATCH v2] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
2024-04-15 12:55 4% ` Namjae Jeon
@ 2024-04-15 13:12 4% ` Marios Makassikis
2024-04-16 12:40 8% ` Namjae Jeon
0 siblings, 1 reply; 200+ results
From: Marios Makassikis @ 2024-04-15 13:12 UTC (permalink / raw)
To: linkinjeon; +Cc: linux-cifs, mmakassikis
File overwrite case is explicitly handled, so it is not necessary to
pass RENAME_NOREPLACE to vfs_rename.
Clearing the flag fixes rename operations when the share is a ntfs-3g
mount. The latter uses an older version of fuse with no support for
flags in the ->rename op.
Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
---
v2 change:
fix checkpatch warning:
WARNING: Block comments use a trailing */ on a separate line
fs/smb/server/vfs.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/fs/smb/server/vfs.c b/fs/smb/server/vfs.c
index 22f0f3db3ac9..51b1b0bed616 100644
--- a/fs/smb/server/vfs.c
+++ b/fs/smb/server/vfs.c
@@ -754,10 +754,15 @@ int ksmbd_vfs_rename(struct ksmbd_work *work, const struct path *old_path,
goto out4;
}
+ /*
+ * explicitly handle file overwrite case, for compatibility with
+ * filesystems that may not support rename flags (e.g: fuse)
+ */
if ((flags & RENAME_NOREPLACE) && d_is_positive(new_dentry)) {
err = -EEXIST;
goto out4;
}
+ flags &= ~(RENAME_NOREPLACE);
if (old_child == trap) {
err = -EINVAL;
--
2.34.1
^ permalink raw reply related [relevance 4%]
* Re: [PATCH] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
2024-04-15 12:36 10% ` Marios Makassikis
@ 2024-04-15 12:55 4% ` Namjae Jeon
2024-04-15 13:12 4% ` [PATCH v2] " Marios Makassikis
0 siblings, 1 reply; 200+ results
From: Namjae Jeon @ 2024-04-15 12:55 UTC (permalink / raw)
To: Marios Makassikis; +Cc: linux-cifs
2024년 4월 15일 (월) 오후 9:36, Marios Makassikis <mmakassikis@freebox.fr>님이 작성:
>
> On Mon, Apr 15, 2024 at 12:51 PM Namjae Jeon <linkinjeon@kernel.org> wrote:
> >
> > 2024년 4월 15일 (월) 오후 6:01, Marios Makassikis <mmakassikis@freebox.fr>님이 작성:
> > >
> > > On Wed, Mar 13, 2024 at 2:07 PM Marios Makassikis
> > > <mmakassikis@freebox.fr> wrote:
> > > >
> > > > File overwrite case is explicitly handled, so it is not necessary to
> > > > pass RENAME_NOREPLACE to vfs_rename.
> > > >
> > > > Clearing the flag fixes rename operations when the share is a ntfs-3g
> > > > mount. The latter uses an older version of fuse with no support for
> > > > flags in the ->rename op.
> > > >
> > > > Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
> > > > ---
> > > > fs/smb/server/vfs.c | 3 +++
> > > > 1 file changed, 3 insertions(+)
> > > >
> > >
> > > Bumping this as I haven't received any feedback.
> > > Are there any issues with the patch ?
> > Sorry for missing this patch. Please cc me when submitting the patch
> > to the list next time.
> > I didn't understand why it is a problem with ntfs-3g yet.
> > Is it just clean-up patch ? or this flags cause some issue with ntfs-3g ?
> > Could you please elaborate more ?
> >
> > Thanks!
>
> Until commit 74d7970febf ("ksmbd: fix racy issue from using ->d_parent
> and ->d_name"),
> the logic to overwrite a file or fail depending on the ReplaceIfExists
> flag was open-coded.
> This is the same as calling vfs_rename() with the RENAME_NOREPLACE flag, so it
> makes sense to use that instead.
>
> When using FUSE, the behaviour depends on the userland application implementing
> the fs. On the kernel side, this is the function that ends up being called:
>
> fs/fuse/dir.c:
> static int fuse_rename2(struct mnt_idmap *idmap, struct inode *olddir,
> struct dentry *oldent, struct inode *newdir,
> struct dentry *newent, unsigned int flags)
> {
> struct fuse_conn *fc = get_fuse_conn(olddir);
> int err;
>
> if (fuse_is_bad(olddir))
> return -EIO;
>
> if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT))
> return -EINVAL;
>
> if (flags) {
> if (fc->no_rename2 || fc->minor < 23)
> return -EINVAL;
>
> err = fuse_rename_common(olddir, oldent, newdir, newent, flags,
> FUSE_RENAME2,
> sizeof(struct fuse_rename2_in));
> if (err == -ENOSYS) {
> fc->no_rename2 = 1;
> err = -EINVAL;
> }
> } else {
> err = fuse_rename_common(olddir, oldent, newdir, newent, 0,
> FUSE_RENAME,
> sizeof(struct fuse_rename_in));
> }
>
> return err;
> }
>
> Because ntfs-3g uses an older version of the FUSE API and flags are
> passed by ksmbd,
> rename attempts fail because of this bit:
>
> if (flags) {
> if (fc->no_rename2 || fc->minor < 23)
> return -EINVAL;
>
> ksmbd already handles the overwrite case before even calling
> vfs_rename(). So passing
> the flag doesn't add much.
Okay, Thanks for your detailed explanation:)
Can you fix a warning from checkpatch.pl ?
WARNING: Block comments use a trailing */ on a separate line
#123: FILE: fs/smb/server/vfs.c:758:
+ * filesystems that may not support rename flags (e.g: fuse) */
total: 0 errors, 1 warnings, 13 lines checked
Thanks.
>
> --
> Marios
^ permalink raw reply [relevance 4%]
* Re: [PATCH] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
2024-04-15 10:51 4% ` Namjae Jeon
@ 2024-04-15 12:36 10% ` Marios Makassikis
2024-04-15 12:55 4% ` Namjae Jeon
0 siblings, 1 reply; 200+ results
From: Marios Makassikis @ 2024-04-15 12:36 UTC (permalink / raw)
To: Namjae Jeon; +Cc: linux-cifs
On Mon, Apr 15, 2024 at 12:51 PM Namjae Jeon <linkinjeon@kernel.org> wrote:
>
> 2024년 4월 15일 (월) 오후 6:01, Marios Makassikis <mmakassikis@freebox.fr>님이 작성:
> >
> > On Wed, Mar 13, 2024 at 2:07 PM Marios Makassikis
> > <mmakassikis@freebox.fr> wrote:
> > >
> > > File overwrite case is explicitly handled, so it is not necessary to
> > > pass RENAME_NOREPLACE to vfs_rename.
> > >
> > > Clearing the flag fixes rename operations when the share is a ntfs-3g
> > > mount. The latter uses an older version of fuse with no support for
> > > flags in the ->rename op.
> > >
> > > Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
> > > ---
> > > fs/smb/server/vfs.c | 3 +++
> > > 1 file changed, 3 insertions(+)
> > >
> >
> > Bumping this as I haven't received any feedback.
> > Are there any issues with the patch ?
> Sorry for missing this patch. Please cc me when submitting the patch
> to the list next time.
> I didn't understand why it is a problem with ntfs-3g yet.
> Is it just clean-up patch ? or this flags cause some issue with ntfs-3g ?
> Could you please elaborate more ?
>
> Thanks!
Until commit 74d7970febf ("ksmbd: fix racy issue from using ->d_parent
and ->d_name"),
the logic to overwrite a file or fail depending on the ReplaceIfExists
flag was open-coded.
This is the same as calling vfs_rename() with the RENAME_NOREPLACE flag, so it
makes sense to use that instead.
When using FUSE, the behaviour depends on the userland application implementing
the fs. On the kernel side, this is the function that ends up being called:
fs/fuse/dir.c:
static int fuse_rename2(struct mnt_idmap *idmap, struct inode *olddir,
struct dentry *oldent, struct inode *newdir,
struct dentry *newent, unsigned int flags)
{
struct fuse_conn *fc = get_fuse_conn(olddir);
int err;
if (fuse_is_bad(olddir))
return -EIO;
if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT))
return -EINVAL;
if (flags) {
if (fc->no_rename2 || fc->minor < 23)
return -EINVAL;
err = fuse_rename_common(olddir, oldent, newdir, newent, flags,
FUSE_RENAME2,
sizeof(struct fuse_rename2_in));
if (err == -ENOSYS) {
fc->no_rename2 = 1;
err = -EINVAL;
}
} else {
err = fuse_rename_common(olddir, oldent, newdir, newent, 0,
FUSE_RENAME,
sizeof(struct fuse_rename_in));
}
return err;
}
Because ntfs-3g uses an older version of the FUSE API and flags are
passed by ksmbd,
rename attempts fail because of this bit:
if (flags) {
if (fc->no_rename2 || fc->minor < 23)
return -EINVAL;
ksmbd already handles the overwrite case before even calling
vfs_rename(). So passing
the flag doesn't add much.
--
Marios
^ permalink raw reply [relevance 10%]
* Re: [PATCH] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
2024-04-15 9:00 4% ` Marios Makassikis
@ 2024-04-15 10:51 4% ` Namjae Jeon
2024-04-15 12:36 10% ` Marios Makassikis
0 siblings, 1 reply; 200+ results
From: Namjae Jeon @ 2024-04-15 10:51 UTC (permalink / raw)
To: Marios Makassikis; +Cc: linux-cifs
2024년 4월 15일 (월) 오후 6:01, Marios Makassikis <mmakassikis@freebox.fr>님이 작성:
>
> On Wed, Mar 13, 2024 at 2:07 PM Marios Makassikis
> <mmakassikis@freebox.fr> wrote:
> >
> > File overwrite case is explicitly handled, so it is not necessary to
> > pass RENAME_NOREPLACE to vfs_rename.
> >
> > Clearing the flag fixes rename operations when the share is a ntfs-3g
> > mount. The latter uses an older version of fuse with no support for
> > flags in the ->rename op.
> >
> > Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
> > ---
> > fs/smb/server/vfs.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
>
> Bumping this as I haven't received any feedback.
> Are there any issues with the patch ?
Sorry for missing this patch. Please cc me when submitting the patch
to the list next time.
I didn't understand why it is a problem with ntfs-3g yet.
Is it just clean-up patch ? or this flags cause some issue with ntfs-3g ?
Could you please elaborate more ?
Thanks!
^ permalink raw reply [relevance 4%]
* Re: [PATCH] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
@ 2024-04-15 9:00 4% ` Marios Makassikis
2024-04-15 10:51 4% ` Namjae Jeon
0 siblings, 1 reply; 200+ results
From: Marios Makassikis @ 2024-04-15 9:00 UTC (permalink / raw)
To: linux-cifs; +Cc: Namjae Jeon
On Wed, Mar 13, 2024 at 2:07 PM Marios Makassikis
<mmakassikis@freebox.fr> wrote:
>
> File overwrite case is explicitly handled, so it is not necessary to
> pass RENAME_NOREPLACE to vfs_rename.
>
> Clearing the flag fixes rename operations when the share is a ntfs-3g
> mount. The latter uses an older version of fuse with no support for
> flags in the ->rename op.
>
> Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
> ---
> fs/smb/server/vfs.c | 3 +++
> 1 file changed, 3 insertions(+)
>
Bumping this as I haven't received any feedback.
Are there any issues with the patch ?
^ permalink raw reply [relevance 4%]
* linux-next: Tree for Apr 15
@ 2024-04-15 5:56 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-04-15 5:56 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 38451 bytes --]
Hi all,
Changes since 20240412:
New tree: dmi
The mm tree lost its build failures.
The perf tree still had its build failure, but doing a clean then
rebuilding works.
The rcu tree gained a conflict against the risc-v tree.
The kvm tree lost its build failure.
The drivers-x86 tree gained a conflict against the arm64 tree.
The tty tree lost its build failure.
The fpga tree lost its build failure.
The scsi-mkp tree lost its build failure.
The kselftest tree gained conflicts against Linus' tree.
Non-merge commits (relative to Linus' tree): 5554
5721 files changed, 223163 insertions(+), 133117 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 370 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (0bbac3facb5d Linux 6.9-rc4)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (88af83ab7d27 MAINTAINERS: update Naoya Horiguchi's email address)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (ebfc2fd8873b ARC: Fix typos)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (e3ba51ab24fd arm64: tlb: Fix TLBI RANGE operand)
Merging arm-soc-fixes/arm/fixes (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (36ba64b4cbc6 selftests/powerpc/papr-vpd: Fix missing variable initialization)
Merging s390-fixes/fixes (6f76592ef63a s390/cio: log fake IRB events)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (1382e3b6a350 net: change maximum number of UDP segments to 128)
Merging bpf/master (37eacb9f6e89 bpf: Fix a verifier verbose message)
Merging ipsec/master (bccb798e07f8 octeontx2-pf: Fix transmit scheduler resource leak)
Merging netfilter/main (6db5dc7b351b netfilter: flowtable: incorrect pppoe tuple)
Merging ipvs/main (7eaf837a4eb5 netfilter: nf_tables: Fix a memory leak in nf_tables_updchain)
Merging wireless/for-next (9ef369973cd2 wifi: cfg80211: fix the order of arguments for trace events of the tx_rx_evt class)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (b68e1acb5834 RDMA/cm: Print the old state when cm_destroy_id gets timeout)
Merging sound-current/for-linus (0b6f0ff01a4a ALSA: hda/tas2781: correct the register for pow calibrated data)
Merging sound-asoc-fixes/for-linus (eefb831d2e4d ASoC: cs35l41: Update DSP1RX5/6 Sources for DSP config)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (68adb581a39a regulator: vqmmc-ipq4019: fix module autoloading)
Merging spi-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1)
Merging driver-core.current/driver-core-linus (156539fd6501 Documentation: embargoed-hardware-issues.rst: Add myself for Power)
Merging tty.current/tty-linus (1aa4ad4eb695 serial: core: Fix missing shutdown and startup for serial base port)
Merging usb.current/usb-linus (34b990e9bb54 usb: misc: onboard_usb_hub: Disable the USB hub clock on failure)
Merging usb-serial-fixes/usb-linus (d206a76d7d27 Linux 6.8-rc6)
Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (74a72baf204f iio:imu: adis16475: Fix sync mode setting)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (ebaed6d4def8 peci: linux/peci.h: fix Excess kernel-doc description warning)
Merging soundwire-fixes/fixes (63dc588e7af1 soundwire: amd: fix for wake interrupt handling for clockstop mode)
Merging thunderbolt-fixes/fixes (dcd12acaf384 thunderbolt: Avoid notify PM core about runtime PM resume)
Merging input-current/for-linus (57ed9567e63b Merge branch 'next' into for-linus)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (f221033f5c24 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (21c9fb611c25 mtd: diskonchip: work around ubsan link failure)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (4370b673ccf2 MIPS: scall: Save thread_info.syscall unconditionally on entry)
Merging at91-fixes/at91-fixes (4cece7649650 Linux 6.9-rc1)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (49ff3b4aec51 KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (7bcf809b1e78 cxl: Add checks to access_coordinate calculation to fail missing data)
Merging btrfs-fixes/next-fixes (07475cc36e03 Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (e71c84816925 platform/x86: lg-laptop: fix %s null argument warning)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so)
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (ca91259b775f scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING)
Merging drm-fixes/drm-fixes (3b0daecfeac0 amdkfd: use calloc instead of kzalloc to avoid integer overflow)
Merging drm-intel-fixes/for-linux-next-fixes (dcd8992e47f1 drm/i915/vrr: Disable VRR when using bigjoiner)
Merging mmc-fixes/fixes (ace323f80b9b mmc: sdhci-of-dwcmshc: th1520: Increase tuning loop count to 128)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (54be6c6c5ae8 Linux 6.8-rc3)
Merging hyperv-fixes/hyperv-fixes (30d18df6567b Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted)
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (a373a36fb6b0 Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements")
Merging riscv-dt-fixes/riscv-dt-fixes (0f74c64f0a9f riscv: dts: starfive: Remove PMIC interrupt info for Visionfive 2 board)
Merging riscv-soc-fixes/riscv-soc-fixes (6b0856ee585d cache: sifive_ccache: Silence unused variable warning)
Merging fpga-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (11baa36d3173 gpio: lpc32xx: fix module autoloading)
Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7557d296ad43 MAINTAINERS: erofs: add myself as reviewer)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (f488138b5267 NFSD: fix endianness issue in nfsd4_encode_fattr4)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources)
Merging efi-fixes/urgent (decd347c2a75 x86/efistub: Reinstate soft limit for initrd loading)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (bcbdcffd94ce power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (8bbe73fab029 iommufd: Add config needed for iommufd_fail_nth)
Merging rust-fixes/rust-fixes (761a8f0a776b rust: make mutually exclusive with CFI_CLANG)
Merging v9fs-fixes/fixes/next (7fd524b9bd1b fs/9p: drop inodes immediately on non-.L too)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (3731629ddb80 MAINTAINERS: adjust file entry in ARM/LPC32XX SOC SUPPORT)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (d3e8a91a848a clk: mediatek: mt7988-infracfg: fix clocks for 2nd PCIe port)
Merging drm-misc-fixes/for-linux-next-fixes (4c08f01934ab drm/vmwgfx: Enable DMA mappings with SEV)
Merging mm-stable/mm-stable (4e2e36129225 Merge branch 'master' into mm-stable)
Merging mm-nonmm-stable/mm-nonmm-stable (39cd87c4eb2b Linux 6.9-rc2)
Merging mm/mm-everything (1e01d6d52e9c Merge branch 'mm-nonmm-unstable' into mm-everything)
dd7f7184a746 ("fix-missing-vmalloch-includes-fix-3")
CONFLICT (content): Merge conflict in arch/x86/mm/numa_32.c
Merging kbuild/for-next (bfa8f18691ed Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (988052f4bfcc perf bench uprobe: Add uretprobe variant of uprobe benchmarks)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (b5d2afe8745b Merge branches 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' into for-next/core)
Merging arm-perf/for-next/perf (b782e8d07baa arm64: arm_pmuv3: Correctly extract and check the PMUVer)
Merging arm-soc/for-next (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging amlogic/for-next (70ce74fbef7e Merge branch 'v6.10/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (2d32c3cbc47b Merge branch 'defconfig-arm64/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (6cf256f63478 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (67d5303fe655 Merge branch 'v6.9-next/dts64' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (2a1e301bf479 Merge branch 'omap-for-v6.10/dt' into for-next)
Merging qcom/for-next (4bec154a3f10 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (957eed54b7b6 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (02c40b260a87 Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (b7b2fe24038b Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (722ba6ef209f Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates', tags 'ffa-fix-6.9' and 'scmi-fixes-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (65fcc08b4cfe riscv: dts: sophgo: cv18xx: Add i2c devices)
Merging stm32/stm32-next (b12a916d30dc ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1)
Merging sunxi/sunxi/for-next (c1d7282e4e92 Merge branch 'sunxi/dt-for-6.9' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/dt into for-next)
Merging ti/ti-next (592695bed5f8 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (071d51e4acf5 Merge branch 'clk-stm' into clk-next)
Merging clk-imx/for-next (13269dc6c704 clk: imx: imx8mp: Fix SAI_MCLK_SEL definition)
Merging clk-renesas/renesas-clk (c0516eb4cf04 clk: renesas: r8a779h0: Add timer clocks)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (a07c772fa658 LoongArch: Include linux/sizes.h in addrspace.h to prevent build errors)
Merging m68k/for-next (70d830e337f9 m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER)
Merging m68knommu/for-next (8e0b6631dd62 m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (6613476e225e Linux 6.8-rc1)
Merging mips/mips-next (4cece7649650 Linux 6.9-rc1)
Merging openrisc/for-next (68b70ab43cec openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (e8f897f4afef Linux 6.8)
Merging powerpc/next (8884fc918f6a powerpc: Fix fatal warnings flag for LLVM's integrated assembler)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (ba5ea59f768f riscv: Do not save the scratch CSR during suspend)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (5db2c4dc413e riscv: dts: add initial canmv-k230 and k230-evb dts)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (1fd78e225f7e Merge branch 'features' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (84b76d05828a lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (11cca8ccf2c3 tty: xtensa/iss: Use min() to fix Coccinelle warning)
Merging bcachefs/for-next (e49eae85a101 bcachefs: Check for backpointer bucket_offset >= bucket size)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (7218664bf91d Merge branch 'for-next-next-v6.9-20240409' into for-next-20240409)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (0bbac3facb5d Linux 6.9-rc4)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (6397cc21e5c0 exfat: move extend valid_size into ->page_mkwrite())
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (d010696e06d5 Merge quota error handling improvements and reiserfs README fixup.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (b2cf5a1ff236 f2fs: allow direct io of pinned files for zoned storage)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (f5008996ea06 fuse: fix parallel dio write on file open in passthrough mode)
Merging gfs2/for-next (5ede6353b3d3 gfs2: Fix do_xmote locking error)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (b762f0a3e8b8 ksmbd: validate request buffer size in smb2_allocate_rsp_buf())
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (e5ca63b09c65 nfsd: optimise recalculate_deny_mode() for a common case)
Merging ntfs3/master (622cd3daa8ea fs/ntfs3: Slightly simplify ntfs_inode_printk())
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (e23d7e82b707 xfs: allow cross-linking special files without project quota)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (7dad3e0bd4e4 Merge branch 'vfs.super' into vfs.all)
Merging vfs/for-next (052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (6e47dcb2ca22 Merge branch 'pci/endpoint')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (78e3412a0ebb Merge branch 'for-6.10/sony' into for-next)
Merging i2c/i2c/for-next (5ceeabb0eb2e Merge tag 'i2c-host-fixes-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current)
Merging i2c-host/i2c/i2c-host (ab9713bb8844 i2c: i801: Fix missing Kconfig dependency)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging dmi/dmi-for-next (cf770af5645a firmware: dmi-id: add a release callback function)
Merging hwmon-staging/hwmon-next (db85dba9fee5 hwmon: (aspeed-g6-pwm-tach) Convert to platform remove callback returning void)
Merging jc_docs/docs-next (8819b60eed72 docs/zh_CN: Add dev-tools/kmemleak Chinese translation)
Merging v4l-dvb/master (4cece7649650 Linux 6.9-rc1)
Merging v4l-dvb-next/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging pm/linux-next (53c477378d23 Merge branch 'acpica' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (4cece7649650 Linux 6.9-rc1)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (02e2a4b3638c cpuidle: psci: Update init level to core_initcall())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M)
Merging dlm/next (92d59adfaf71 dlm: do message processing in softirq context)
Merging rdma/for-next (dfcdb38b21e4 RDMA/rxe: Return the correct errno)
Merging net-next/main (32affa5578f0 fib: rules: no longer hold RTNL in fib_nl_dumprule())
CONFLICT (content): Merge conflict in include/trace/events/rpcgss.h
Merging bpf-next/for-next (4d4992ff5876 selftests/bpf: Add read_trace_pipe_iter function)
Merging ipsec-next/master (267e31750ae8 Merge branch 'phy-listing-link_topology-tracking')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (e00fc2700a3f Bluetooth: btusb: Fix triggering coredump implementation for QCA)
Merging wireless-next/for-next (d26a0a66f929 wifi: brcmfmac: Fix spelling mistake "ivalid" -> "invalid")
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (3ef4600f1226 mtd: maps: sa1100-flash: Prefer struct_size over open coded arithmetic)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1)
Merging crypto/master (751fb2528c12 crypto: x86/aes-xts - make non-AVX implementation use new glue code)
Merging drm/drm-next (6e1f415e7129 Merge tag 'drm-misc-next-2024-04-10' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next)
Merging drm-exynos/for-linux-next (6633c7d2fd31 drm/exynos: mixer: drop driver owner initialization)
Merging drm-misc/for-linux-next (42d34193f9c9 accel/qaic: mark debugfs stub functions as static inline)
Merging amdgpu/drm-next (ab956ed95b8b drm/amd/display: Add a function for checking tmds mode)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c
Merging drm-intel/for-linux-next (578ff98403ce drm/i915: Allow bigjoiner for MST)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cdclk.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (9dc23cba0927 drm/msm/adreno: Set highest_bank_bit for A619)
Merging drm-msm-lumag/msm-next-lumag (ab556156cafa drm/msm: drop A6xx header)
Merging drm-xe/drm-xe-next (48b05e3c3dbb drm/xe/pf: Add support to configure GuC SR-IOV policies)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device_types.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (fb3b9c2d217f video: logo: Drop full path of the input filename in generated file)
Merging regmap/for-next (135cec6ba82e regmap: spi: Add missing MODULE_DESCRIPTION())
Merging sound/for-next (a9b16d591874 Merge branch 'topic/emu10k1-fix' into for-next)
Merging ieee1394/for-next (0d4149e5e9b0 firewire: ohci: use pci_irq_vector() to retrieve allocated interrupt line)
Merging sound-asoc/for-next (47c44619b51c Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (c75781a6e4c0 kallsyms: replace deprecated strncpy with strscpy)
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (8984e0b56923 Input: adafruit-seesaw - only report buttons that changed state)
Merging block/for-next (f2738f2440eb Merge branch 'for-6.10/io_uring' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (4b00f92cd36f dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue)
Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg())
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (bce42d6108c9 mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (15f992fa81eb Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (4cece7649650 Linux 6.9-rc1)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm)
Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (37c34331f194 Documentation: tpm_tis)
Merging watchdog/master (6fe5aabf7fc6 watchdog: intel-mid_wdt: Get platform data via dev_get_platdata())
Merging iommu/next (2633f0cad3e1 Merge branches 'iommu/fixes' and 'core' into next)
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (3cef9e08b6f4 dt-bindings: usb: mtk-xhci: add compatible for MT7988)
Merging dt-krzk/for-next (364be3ecd30d Merge branch 'next/dt' into for-next)
Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU)
Merging spi/for-next (2152c37dd20d Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (0dbd00dda011 Merge branch into tip/master: 'x86/shstk')
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (8e95536e9495 Merge branch ras/edac-misc into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (5fd10857f131 rcu/tree: Reduce wake up for synchronize_rcu() common case)
CONFLICT (content): Merge conflict in arch/riscv/include/asm/cmpxchg.h
Applying: finish revert of "riscv: Emulate one-byte cmpxchg"
Merging kvm/next (1ab157ce573f KVM: SEV: use u64_to_user_ptr throughout)
Merging kvm-arm/next (9ac5bab4deee Merge branch kvm-arm64/misc-6.10 into kvmarm-master/next)
Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (f1c48c1ec735 RISC-V: KVM: selftests: Add ebreak test support)
Merging kvm-x86/next (2d181d84af38 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'svm' and 'vmx')
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (8a8a4bfdbe85 Merge branch 'for-6.10' into for-next)
Merging drivers-x86/for-next (88c0ef69dd88 platform/x86: asus-wmi: cleanup main struct to avoid some holes)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging chrome-platform/for-next (70a5f3005008 platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD))
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (4cece7649650 Linux 6.9-rc1)
Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2)
Merging ipmi/for-next (6b4c04178660 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (66bc1a173328 treewide: Use sysfs_bin_attr_simple_read() helper)
Merging usb/usb-next (3d122e6d27e4 usb: typec: mux: gpio-sbu: Allow GPIO operations to sleep)
CONFLICT (modify/delete): drivers/usb/misc/onboard_usb_hub.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/misc/onboard_usb_hub.c left in tree.
$ git rm -f drivers/usb/misc/onboard_usb_hub.c
Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev"
Merging thunderbolt/next (25d905d2b819 thunderbolt: Allow USB3 bandwidth to be lower than maximum supported)
Merging usb-serial/usb-next (b1a8da9ff139 USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M)
Merging tty/tty-next (b20172ca6bf4 serial: core: Fix ifdef for serial base console functions)
CONFLICT (content): Merge conflict in drivers/tty/serial/serial_core.c
Merging char-misc/char-misc-next (4b9f86214c05 cdx: Convert to platform remove callback returning void)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (a4f3057d19ff coresight-tpda: Change qcom,dsb-element-size to qcom,dsb-elem-bits)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (4d2bc3f7dea4 fpga: tests: use KUnit devices instead of platform devices)
Merging icc/icc-next (7af14fe58e5e Merge branch 'icc-fixes' into icc-next)
Merging iio/togreg (aabc0aa90c92 Documentation: ABI: document in_temp_input file)
Merging phy-next/next (a1fe1eca0d8b phy: rockchip-snps-pcie3: add support for rockchip,rx-common-refclk-mode)
Merging soundwire/next (4cd5ea6de156 soundwire: intel_init: resume all devices on exit.)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (54be6c6c5ae8 Linux 6.8-rc3)
Merging vfio/next (7447d911af69 vfio/fsl-mc: Block calling interrupt handler without trigger)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (897268aef3fa spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe())
Merging staging/staging-next (e4d5e3a9ae68 staging: nvec: update TODO)
Merging counter-next/counter-next (916baadd293a counter: ti-ecap-capture: Utilize COUNTER_COMP_FREQUENCY macro)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (4665be0e952f dmaengine: pch_dma: remove unused function chan2parent)
Merging cgroup/for-next (a24e3b7d27c6 docs: cgroup-v1: Fix description for css_online)
Merging scsi/for-next (99033e81ab05 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (f92141e18c8b Merge patch series "convert SCSI to atomic queue limits, part 1 (v3)")
Merging vhost/linux-next (5b9f214d0540 vhost: Merge tag 'vduse-virtio-net' into vhost)
Merging rpmsg/for-next (4d5aabb68439 Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (8d1e84ab0176 gpio: regmap: Use -ENOTSUPP consistently)
Merging gpio-intel/for-next (d8a26a18d971 gpiolib: acpi: Check for errors first in acpi_find_gpio())
Merging pinctrl/for-next (07bd48cca03b Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (aa43c15a790c pinctrl: renesas: rzg2l: Execute atomically the interrupt configuration)
Merging pinctrl-samsung/for-next (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants)
Merging pwm/pwm/for-next (2452c141487f pwm: meson: Add generic compatible for meson8 to sm1)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (4f4ade6863ce selftests/clone3: Correct log message for waitpid() failures)
398d99519758 ("selftests/perf_events: Test FASYNC with watermark wakeups.")
CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest.h
CONFLICT (content): Merge conflict in tools/testing/selftests/timers/valid-adjtimex.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (82b0beff3497 kunit: Add tests for fault)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (8b59a11fb8e6 rtc: nuvoton: Modify part number value)
Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local())
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (813e0ae613d6 bus: mhi: host: Add mhi_power_down_keep_dev() API to support system suspend/hibernation)
Merging memblock/for-next (2159bd4e9057 memblock: Return NUMA_NO_NODE instead of -1 to improve code readability)
Merging cxl/next (ed1ff2fba7af Merge branch 'for-6.9/cxl-einj' into for-6.9/cxl)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (cda30c6542c8 efi: Clear up misconceptions about a maximum variable name size)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (5aa5c7b9a09d mm/slub: remove duplicate initialization for early_kmem_cache_node_alloc())
Merging random/master (4cece7649650 Linux 6.9-rc1)
Merging landlock/next (028243655456 fs/ioctl: Add a comment to keep the logic in sync with LSM policies)
Merging rust/rust-next (8db31d3f3bd5 rust: workqueue: add `#[pin_data]` to `Work`)
Merging sysctl/sysctl-next (4f1136a55dc8 scripts: check-sysctl-docs: handle per-namespace sysctls)
Merging execve/for-next/execve (c82389947d90 tracing: Add sched_prepare_exec tracepoint)
Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane())
Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void)
Merging kspp/for-next/kspp (9c573cd31343 randomize_kstack: Improve entropy diffusion)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (4cece7649650 Linux 6.9-rc1)
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
* Re: [PATCH 0/6] Add an option for running fstests on CIFS
2024-04-12 20:49 3% [PATCH 0/6] Add an option for running fstests on CIFS Scott Mayhew
2024-04-12 20:49 2% ` [PATCH 3/6] bringup: add a playbook to bring up an SMB server Scott Mayhew
2024-04-12 20:52 0% ` [PATCH 0/6] Add an option for running fstests on CIFS Chuck Lever III
@ 2024-04-12 21:46 0% ` Luis Chamberlain
2 siblings, 0 replies; 200+ results
From: Luis Chamberlain @ 2024-04-12 21:46 UTC (permalink / raw)
To: Scott Mayhew; +Cc: kdevops
On Fri, Apr 12, 2024 at 04:49:54PM -0400, Scott Mayhew wrote:
> These patches add the ability to run fstests on CIFS. The playbooks are
> very similar to their NFS counterparts. The smbd playbook sets up a
> Samba server, but could be expanded to set up ksmbd in the future. The
> following options are available: plain SMB3, SMB3 with signing, and
> SMB3 with encryption.
>
> The expunge files are based on the tests that were consistently failing
> on 6.8.4-200.fc39.x86_64, plus some tests that just take way too long
> (generic/476, generic/650).
Seems like a great start:
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Luis
^ permalink raw reply [relevance 0%]
* Re: [PATCH 0/6] Add an option for running fstests on CIFS
2024-04-12 20:49 3% [PATCH 0/6] Add an option for running fstests on CIFS Scott Mayhew
2024-04-12 20:49 2% ` [PATCH 3/6] bringup: add a playbook to bring up an SMB server Scott Mayhew
@ 2024-04-12 20:52 0% ` Chuck Lever III
2024-04-16 21:54 0% ` Scott Mayhew
2024-04-12 21:46 0% ` Luis Chamberlain
2 siblings, 1 reply; 200+ results
From: Chuck Lever III @ 2024-04-12 20:52 UTC (permalink / raw)
To: Scott Mayhew; +Cc: kdevops
> On Apr 12, 2024, at 4:49 PM, Scott Mayhew <smayhew@redhat.com> wrote:
>
> These patches add the ability to run fstests on CIFS. The playbooks are
> very similar to their NFS counterparts. The smbd playbook sets up a
> Samba server, but could be expanded to set up ksmbd in the future. The
> following options are available: plain SMB3, SMB3 with signing, and
> SMB3 with encryption.
You could also add SMB direct using siw, but maybe Samba doesn't
support that.
> The expunge files are based on the tests that were consistently failing
> on 6.8.4-200.fc39.x86_64, plus some tests that just take way too long
> (generic/476, generic/650).
>
> -Scott
>
> Scott Mayhew (6):
> oscheck.sh: add some special cases for cifs
> gendisks.sh: add special case for cifs
> bringup: add a playbook to bring up an SMB server
> playbooks: add a playbook to create smb shares
> fstests: add an option for testing on CIFS
> fstests: add expunges for cifs
>
> Makefile | 1 +
> kconfigs/Kconfig.bringup.goals | 1 +
> kconfigs/Kconfig.smbd | 72 ++++++++++++
> playbooks/roles/fstests/defaults/main.yml | 6 +
> .../tasks/install-deps/debian/main.yml | 1 +
> .../tasks/install-deps/redhat/main.yml | 1 +
> .../fstests/tasks/install-deps/suse/main.yml | 11 ++
> playbooks/roles/fstests/tasks/main.yml | 39 +++++++
> .../roles/fstests/templates/cifs/cifs.config | 33 ++++++
> playbooks/roles/gen_hosts/defaults/main.yml | 1 +
> .../roles/gen_hosts/templates/fstests.j2 | 6 +
> playbooks/roles/gen_nodes/defaults/main.yml | 1 +
> playbooks/roles/gen_nodes/tasks/main.yml | 19 ++++
> playbooks/roles/smbd/defaults/main.yml | 5 +
> .../smbd/tasks/install-deps/debian/main.yml | 31 ++++++
> .../roles/smbd/tasks/install-deps/main.yml | 12 ++
> .../smbd/tasks/install-deps/redhat/main.yml | 33 ++++++
> .../smbd/tasks/install-deps/suse/main.yml | 29 +++++
> playbooks/roles/smbd/tasks/main.yml | 95 ++++++++++++++++
> playbooks/roles/smbd/templates/smb.conf.j2 | 11 ++
> playbooks/roles/smbd/vars/Debian.yml | 10 ++
> playbooks/roles/smbd/vars/RedHat.yml | 12 ++
> playbooks/roles/smbd/vars/Suse.yml | 10 ++
> playbooks/roles/smbd_add_share/README.md | 57 ++++++++++
> .../roles/smbd_add_share/defaults/main.yml | 5 +
> playbooks/roles/smbd_add_share/tasks/main.yml | 103 ++++++++++++++++++
> .../roles/smbd_add_share/templates/share.j2 | 7 ++
> playbooks/smbd.yml | 4 +
> scripts/smbd.Makefile | 20 ++++
> workflows/fstests/Kconfig | 20 +++-
> workflows/fstests/Makefile | 4 +
> workflows/fstests/cifs/Kconfig | 75 +++++++++++++
> workflows/fstests/cifs/Makefile | 17 +++
> .../expunges/any/cifs/unassigned/all.txt | 60 ++++++++++
> .../any/cifs/unassigned/cifs_smb3_sign.txt | 2 +
> workflows/fstests/scripts/gendisks.sh | 2 +-
> workflows/fstests/scripts/oscheck.sh | 8 +-
> 37 files changed, 818 insertions(+), 6 deletions(-)
> create mode 100644 kconfigs/Kconfig.smbd
> create mode 100644 playbooks/roles/fstests/templates/cifs/cifs.config
> create mode 100644 playbooks/roles/smbd/defaults/main.yml
> create mode 100644 playbooks/roles/smbd/tasks/install-deps/debian/main.yml
> create mode 100644 playbooks/roles/smbd/tasks/install-deps/main.yml
> create mode 100644 playbooks/roles/smbd/tasks/install-deps/redhat/main.yml
> create mode 100644 playbooks/roles/smbd/tasks/install-deps/suse/main.yml
> create mode 100644 playbooks/roles/smbd/tasks/main.yml
> create mode 100644 playbooks/roles/smbd/templates/smb.conf.j2
> create mode 100644 playbooks/roles/smbd/vars/Debian.yml
> create mode 100644 playbooks/roles/smbd/vars/RedHat.yml
> create mode 100644 playbooks/roles/smbd/vars/Suse.yml
> create mode 100644 playbooks/roles/smbd_add_share/README.md
> create mode 100644 playbooks/roles/smbd_add_share/defaults/main.yml
> create mode 100644 playbooks/roles/smbd_add_share/tasks/main.yml
> create mode 100644 playbooks/roles/smbd_add_share/templates/share.j2
> create mode 100644 playbooks/smbd.yml
> create mode 100644 scripts/smbd.Makefile
> create mode 100644 workflows/fstests/cifs/Kconfig
> create mode 100644 workflows/fstests/cifs/Makefile
> create mode 100644 workflows/fstests/expunges/any/cifs/unassigned/all.txt
> create mode 100644 workflows/fstests/expunges/any/cifs/unassigned/cifs_smb3_sign.txt
>
> --
> 2.44.0
>
>
--
Chuck Lever
^ permalink raw reply [relevance 0%]
* [PATCH 0/6] Add an option for running fstests on CIFS
@ 2024-04-12 20:49 3% Scott Mayhew
2024-04-12 20:49 2% ` [PATCH 3/6] bringup: add a playbook to bring up an SMB server Scott Mayhew
` (2 more replies)
0 siblings, 3 replies; 200+ results
From: Scott Mayhew @ 2024-04-12 20:49 UTC (permalink / raw)
To: kdevops
These patches add the ability to run fstests on CIFS. The playbooks are
very similar to their NFS counterparts. The smbd playbook sets up a
Samba server, but could be expanded to set up ksmbd in the future. The
following options are available: plain SMB3, SMB3 with signing, and
SMB3 with encryption.
The expunge files are based on the tests that were consistently failing
on 6.8.4-200.fc39.x86_64, plus some tests that just take way too long
(generic/476, generic/650).
-Scott
Scott Mayhew (6):
oscheck.sh: add some special cases for cifs
gendisks.sh: add special case for cifs
bringup: add a playbook to bring up an SMB server
playbooks: add a playbook to create smb shares
fstests: add an option for testing on CIFS
fstests: add expunges for cifs
Makefile | 1 +
kconfigs/Kconfig.bringup.goals | 1 +
kconfigs/Kconfig.smbd | 72 ++++++++++++
playbooks/roles/fstests/defaults/main.yml | 6 +
.../tasks/install-deps/debian/main.yml | 1 +
.../tasks/install-deps/redhat/main.yml | 1 +
.../fstests/tasks/install-deps/suse/main.yml | 11 ++
playbooks/roles/fstests/tasks/main.yml | 39 +++++++
.../roles/fstests/templates/cifs/cifs.config | 33 ++++++
playbooks/roles/gen_hosts/defaults/main.yml | 1 +
.../roles/gen_hosts/templates/fstests.j2 | 6 +
playbooks/roles/gen_nodes/defaults/main.yml | 1 +
playbooks/roles/gen_nodes/tasks/main.yml | 19 ++++
playbooks/roles/smbd/defaults/main.yml | 5 +
.../smbd/tasks/install-deps/debian/main.yml | 31 ++++++
.../roles/smbd/tasks/install-deps/main.yml | 12 ++
.../smbd/tasks/install-deps/redhat/main.yml | 33 ++++++
.../smbd/tasks/install-deps/suse/main.yml | 29 +++++
playbooks/roles/smbd/tasks/main.yml | 95 ++++++++++++++++
playbooks/roles/smbd/templates/smb.conf.j2 | 11 ++
playbooks/roles/smbd/vars/Debian.yml | 10 ++
playbooks/roles/smbd/vars/RedHat.yml | 12 ++
playbooks/roles/smbd/vars/Suse.yml | 10 ++
playbooks/roles/smbd_add_share/README.md | 57 ++++++++++
.../roles/smbd_add_share/defaults/main.yml | 5 +
playbooks/roles/smbd_add_share/tasks/main.yml | 103 ++++++++++++++++++
.../roles/smbd_add_share/templates/share.j2 | 7 ++
playbooks/smbd.yml | 4 +
scripts/smbd.Makefile | 20 ++++
workflows/fstests/Kconfig | 20 +++-
workflows/fstests/Makefile | 4 +
workflows/fstests/cifs/Kconfig | 75 +++++++++++++
workflows/fstests/cifs/Makefile | 17 +++
.../expunges/any/cifs/unassigned/all.txt | 60 ++++++++++
.../any/cifs/unassigned/cifs_smb3_sign.txt | 2 +
workflows/fstests/scripts/gendisks.sh | 2 +-
workflows/fstests/scripts/oscheck.sh | 8 +-
37 files changed, 818 insertions(+), 6 deletions(-)
create mode 100644 kconfigs/Kconfig.smbd
create mode 100644 playbooks/roles/fstests/templates/cifs/cifs.config
create mode 100644 playbooks/roles/smbd/defaults/main.yml
create mode 100644 playbooks/roles/smbd/tasks/install-deps/debian/main.yml
create mode 100644 playbooks/roles/smbd/tasks/install-deps/main.yml
create mode 100644 playbooks/roles/smbd/tasks/install-deps/redhat/main.yml
create mode 100644 playbooks/roles/smbd/tasks/install-deps/suse/main.yml
create mode 100644 playbooks/roles/smbd/tasks/main.yml
create mode 100644 playbooks/roles/smbd/templates/smb.conf.j2
create mode 100644 playbooks/roles/smbd/vars/Debian.yml
create mode 100644 playbooks/roles/smbd/vars/RedHat.yml
create mode 100644 playbooks/roles/smbd/vars/Suse.yml
create mode 100644 playbooks/roles/smbd_add_share/README.md
create mode 100644 playbooks/roles/smbd_add_share/defaults/main.yml
create mode 100644 playbooks/roles/smbd_add_share/tasks/main.yml
create mode 100644 playbooks/roles/smbd_add_share/templates/share.j2
create mode 100644 playbooks/smbd.yml
create mode 100644 scripts/smbd.Makefile
create mode 100644 workflows/fstests/cifs/Kconfig
create mode 100644 workflows/fstests/cifs/Makefile
create mode 100644 workflows/fstests/expunges/any/cifs/unassigned/all.txt
create mode 100644 workflows/fstests/expunges/any/cifs/unassigned/cifs_smb3_sign.txt
--
2.44.0
^ permalink raw reply [relevance 3%]
* [PATCH 3/6] bringup: add a playbook to bring up an SMB server
2024-04-12 20:49 3% [PATCH 0/6] Add an option for running fstests on CIFS Scott Mayhew
@ 2024-04-12 20:49 2% ` Scott Mayhew
2024-04-12 20:52 0% ` [PATCH 0/6] Add an option for running fstests on CIFS Chuck Lever III
2024-04-12 21:46 0% ` Luis Chamberlain
2 siblings, 0 replies; 200+ results
From: Scott Mayhew @ 2024-04-12 20:49 UTC (permalink / raw)
To: kdevops
Add a playbook to bring up an SMB server so that we can do CIFS testing.
Right now we're just setting up Samba but it could be extended to add an
option to configure ksmbd instead.
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
Makefile | 1 +
kconfigs/Kconfig.bringup.goals | 1 +
kconfigs/Kconfig.smbd | 72 ++++++++++++++
playbooks/roles/gen_hosts/defaults/main.yml | 1 +
.../roles/gen_hosts/templates/fstests.j2 | 6 ++
playbooks/roles/gen_nodes/defaults/main.yml | 1 +
playbooks/roles/gen_nodes/tasks/main.yml | 19 ++++
playbooks/roles/smbd/defaults/main.yml | 5 +
.../smbd/tasks/install-deps/debian/main.yml | 31 ++++++
.../roles/smbd/tasks/install-deps/main.yml | 12 +++
.../smbd/tasks/install-deps/redhat/main.yml | 33 +++++++
.../smbd/tasks/install-deps/suse/main.yml | 29 ++++++
playbooks/roles/smbd/tasks/main.yml | 95 +++++++++++++++++++
playbooks/roles/smbd/templates/smb.conf.j2 | 11 +++
playbooks/roles/smbd/vars/Debian.yml | 10 ++
playbooks/roles/smbd/vars/RedHat.yml | 12 +++
playbooks/roles/smbd/vars/Suse.yml | 10 ++
playbooks/smbd.yml | 4 +
scripts/smbd.Makefile | 20 ++++
19 files changed, 373 insertions(+)
create mode 100644 kconfigs/Kconfig.smbd
create mode 100644 playbooks/roles/smbd/defaults/main.yml
create mode 100644 playbooks/roles/smbd/tasks/install-deps/debian/main.yml
create mode 100644 playbooks/roles/smbd/tasks/install-deps/main.yml
create mode 100644 playbooks/roles/smbd/tasks/install-deps/redhat/main.yml
create mode 100644 playbooks/roles/smbd/tasks/install-deps/suse/main.yml
create mode 100644 playbooks/roles/smbd/tasks/main.yml
create mode 100644 playbooks/roles/smbd/templates/smb.conf.j2
create mode 100644 playbooks/roles/smbd/vars/Debian.yml
create mode 100644 playbooks/roles/smbd/vars/RedHat.yml
create mode 100644 playbooks/roles/smbd/vars/Suse.yml
create mode 100644 playbooks/smbd.yml
create mode 100644 scripts/smbd.Makefile
diff --git a/Makefile b/Makefile
index cd4e639..266eccd 100644
--- a/Makefile
+++ b/Makefile
@@ -107,6 +107,7 @@ endif # CONFIG_WORKFLOWS
include scripts/siw.Makefile
include scripts/ktls.Makefile
include scripts/nfsd.Makefile
+include scripts/smbd.Makefile
include scripts/krb5.Makefile
include scripts/devconfig.Makefile
diff --git a/kconfigs/Kconfig.bringup.goals b/kconfigs/Kconfig.bringup.goals
index dd7f449..e6d3b18 100644
--- a/kconfigs/Kconfig.bringup.goals
+++ b/kconfigs/Kconfig.bringup.goals
@@ -97,4 +97,5 @@ config KDEVOPS_SETUP_KTLS
necessary for testing RPC over TLS, or NVMe over TCP.
source "kconfigs/Kconfig.nfsd"
+source "kconfigs/Kconfig.smbd"
source "kconfigs/Kconfig.krb5"
diff --git a/kconfigs/Kconfig.smbd b/kconfigs/Kconfig.smbd
new file mode 100644
index 0000000..251327d
--- /dev/null
+++ b/kconfigs/Kconfig.smbd
@@ -0,0 +1,72 @@
+# FIXME: need defaults for terraform hosts
+config KDEVOPS_SETUP_SMBD
+ bool "Set up the Samba SMB server"
+ default n
+ help
+ Configure and bring up the Samba SMB server. This will provision
+ a filesystem on a block device, mount it, share it and start up the
+ smb server and associated daemons.
+
+if KDEVOPS_SETUP_SMBD
+
+menu "Configure the Samba SMB server"
+
+config SMBD_SHARE_DEVICE_PREFIX
+ string "The device prefix to use for LVM PVs"
+ default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
+ default "/dev/disk/by-id/virtio-kdevops" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
+ default "/dev/disk/by-id/ata-QEMU_HARDDISK_kdevops" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
+ default ""
+ help
+ To set up smbd for testing, we give it filesystems to share. This string
+ will be the prefix for the block devices used as PVs for LVM.
+
+config SMBD_SHARE_DEVICE_COUNT
+ int "Number of devices to add as LVM PVs"
+ default 3 if LIBVIRT
+ help
+ The number of disk devices to dedicate as LVM PVs. In general, we
+ avoid using device index 0 as that is used for /data.
+
+choice
+ prompt "Type of filesystem to share"
+ default SMBD_SHARE_FSTYPE_BTRFS
+
+config SMBD_SHARE_FSTYPE_BTRFS
+ bool "btrfs"
+
+config SMBD_SHARE_FSTYPE_XFS
+ bool "xfs"
+
+config SMBD_SHARE_FSTYPE_EXT4
+ bool "ext4"
+
+config SMBD_SHARE_FSTYPE_TMPFS
+ bool "tmpfs"
+
+endchoice
+
+config SMBD_SHARE_FSTYPE
+ string
+ default "btrfs" if SMBD_SHARE_FSTYPE_BTRFS
+ default "xfs" if SMBD_SHARE_FSTYPE_XFS
+ default "ext4" if SMBD_SHARE_FSTYPE_EXT4
+ default "tmpfs" if SMBD_SHARE_FSTYPE_TMPFS
+
+config SMBD_SHARE_PATH
+ string "The path under which to mount the devices to be shared."
+ default "/share"
+ help
+ This is the path that will be shared from the smbd server. The
+ share devices are mounted here under numbered directories starting
+ with 0.
+
+config SMB_ROOT_PW
+ string "SMB root password"
+ default "kdevops"
+ help
+ SMB password to use for the root user.
+
+endmenu
+
+endif
diff --git a/playbooks/roles/gen_hosts/defaults/main.yml b/playbooks/roles/gen_hosts/defaults/main.yml
index 5cd941c..8d0ca3b 100644
--- a/playbooks/roles/gen_hosts/defaults/main.yml
+++ b/playbooks/roles/gen_hosts/defaults/main.yml
@@ -33,4 +33,5 @@ fs_config_role_path: "/dev/null"
fs_config_data: "[section_1]"
kdevops_nfsd_enable: False
+kdevops_smbd_enable: False
kdevops_krb5_enable: False
diff --git a/playbooks/roles/gen_hosts/templates/fstests.j2 b/playbooks/roles/gen_hosts/templates/fstests.j2
index 985e3f7..eb01088 100644
--- a/playbooks/roles/gen_hosts/templates/fstests.j2
+++ b/playbooks/roles/gen_hosts/templates/fstests.j2
@@ -27,6 +27,12 @@ ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
[nfsd:vars]
ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
{% endif %}
+{% if kdevops_smbd_enable %}
+[smbd]
+{{ kdevops_hosts_prefix }}-smbd
+[smbd:vars]
+ansible_python_interpreter = "{{ kdevops_python_interpreter }}"
+{% endif %}
{% if kdevops_krb5_enable %}
[kdc]
{{ kdevops_hosts_prefix }}-kdc
diff --git a/playbooks/roles/gen_nodes/defaults/main.yml b/playbooks/roles/gen_nodes/defaults/main.yml
index d03306b..a5e31ac 100644
--- a/playbooks/roles/gen_nodes/defaults/main.yml
+++ b/playbooks/roles/gen_nodes/defaults/main.yml
@@ -14,6 +14,7 @@ kdevops_workflow_enable_gitr: False
kdevops_workflow_enable_ltp: False
kdevops_workflow_enable_selftests: False
kdevops_nfsd_enable: False
+kdevops_smbd_enable: False
kdevops_krb5_enable: False
virtualbox_provider: False
diff --git a/playbooks/roles/gen_nodes/tasks/main.yml b/playbooks/roles/gen_nodes/tasks/main.yml
index ee175f4..bc55c4b 100644
--- a/playbooks/roles/gen_nodes/tasks/main.yml
+++ b/playbooks/roles/gen_nodes/tasks/main.yml
@@ -55,6 +55,18 @@
when:
- kdevops_nfsd_enable|bool
+- name: Set smbd_nodes list
+ set_fact:
+ smbd_nodes: "{{ [ kdevops_host_prefix + '-smbd' ] }}"
+ when:
+ - kdevops_smbd_enable|bool
+
+- name: Add an smb server if one was selected
+ set_fact:
+ generic_nodes: "{{ generic_nodes + smbd_nodes }}"
+ when:
+ - kdevops_smbd_enable|bool
+
- name: Set kdc_nodes list
set_fact:
kdc_nodes: "{{ [ kdevops_host_prefix + '-kdc' ] }}"
@@ -285,6 +297,13 @@
- is_fstests|bool
- kdevops_nfsd_enable|bool
+- name: Add the smb server if one was selected
+ set_fact:
+ fstests_enabled_nodes: "{{ fstests_enabled_nodes + smbd_nodes }}"
+ when:
+ - is_fstests|bool
+ - kdevops_smbd_enable|bool
+
- name: Add the KRB5 KDC if one was selected
set_fact:
fstests_enabled_nodes: "{{ fstests_enabled_nodes + kdc_nodes }}"
diff --git a/playbooks/roles/smbd/defaults/main.yml b/playbooks/roles/smbd/defaults/main.yml
new file mode 100644
index 0000000..d75cc0b
--- /dev/null
+++ b/playbooks/roles/smbd/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+smbd_lvm_pvs: []
+smbd_share_device_prefix: ""
+smbd_share_device_count: 0
+smbd_share_label: "share"
diff --git a/playbooks/roles/smbd/tasks/install-deps/debian/main.yml b/playbooks/roles/smbd/tasks/install-deps/debian/main.yml
new file mode 100644
index 0000000..beb1acd
--- /dev/null
+++ b/playbooks/roles/smbd/tasks/install-deps/debian/main.yml
@@ -0,0 +1,31 @@
+---
+- name: Get OS-specific variables
+ ansible.builtin.include_vars: "{{ lookup('ansible.builtin.first_found', params) }}"
+ vars:
+ params:
+ files:
+ - '{{ansible_distribution}}.yml'
+ - '{{ansible_os_family}}.yml'
+ - default.yml
+ paths:
+ - 'vars'
+
+- name: Determine which fsprogs package is needed for "{{ smbd_share_fstype }}"
+ set_fact:
+ fsprogs: "{{ fstype_userspace_progs[smbd_share_fstype] | default() }}"
+
+- name: Add {{ fsprogs }} to the smbd packages list
+ set_fact:
+ smbd_packages: "{{ smbd_packages + [fsprogs] }}"
+ when:
+ - fsprogs is defined
+ - fsprogs
+
+- name: Install smbd dependencies
+ become: yes
+ become_method: sudo
+ apt:
+ name: "{{ smbd_packages }}"
+ state: present
+ update_cache: yes
+ tags: [ 'deps' ]
diff --git a/playbooks/roles/smbd/tasks/install-deps/main.yml b/playbooks/roles/smbd/tasks/install-deps/main.yml
new file mode 100644
index 0000000..c4d2ed1
--- /dev/null
+++ b/playbooks/roles/smbd/tasks/install-deps/main.yml
@@ -0,0 +1,12 @@
+---
+- name: Debian-specific set up
+ ansible.builtin.include_tasks: roles/tasks/nfsd/install-deps/debian/main.yml
+ when: ansible_os_family == 'Debian'
+
+- name: SuSE-specific set up
+ ansible.builtin.include_tasks: roles/tasks/nfsd/install-deps/suse/main.yml
+ when: ansible_os_family == 'Suse'
+
+- name: Red Hat-specific set up
+ ansible.builtin.include_tasks: roles/tasks/nfsd/install-deps/redhat/main.yml
+ when: ansible_os_family == 'RedHat'
diff --git a/playbooks/roles/smbd/tasks/install-deps/redhat/main.yml b/playbooks/roles/smbd/tasks/install-deps/redhat/main.yml
new file mode 100644
index 0000000..1f4e62b
--- /dev/null
+++ b/playbooks/roles/smbd/tasks/install-deps/redhat/main.yml
@@ -0,0 +1,33 @@
+---
+- name: Get OS-specific variables
+ ansible.builtin.include_vars: "{{ lookup('ansible.builtin.first_found', params) }}"
+ vars:
+ params:
+ files:
+ - '{{ansible_distribution}}.yml'
+ - '{{ansible_os_family}}.yml'
+ - default.yml
+ paths:
+ - 'vars'
+
+- name: Determine which fsprogs package is needed for "{{ smbd_share_fstype }}"
+ set_fact:
+ fsprogs: "{{ fstype_userspace_progs[smbd_share_fstype] | default() }}"
+
+- name: Add {{ fsprogs }} to the smbd packages list
+ set_fact:
+ smbd_packages: "{{ smbd_packages + [fsprogs] }}"
+ when:
+ - fsprogs is defined
+ - fsprogs
+
+- name: Install smbd dependencies
+ become: yes
+ become_method: sudo
+ yum:
+ update_cache: yes
+ name: "{{ smbd_packages }}"
+ retries: 3
+ delay: 5
+ register: result
+ until: result.rc == 0
diff --git a/playbooks/roles/smbd/tasks/install-deps/suse/main.yml b/playbooks/roles/smbd/tasks/install-deps/suse/main.yml
new file mode 100644
index 0000000..e90fe89
--- /dev/null
+++ b/playbooks/roles/smbd/tasks/install-deps/suse/main.yml
@@ -0,0 +1,29 @@
+---
+- name: Get OS-specific variables
+ ansible.builtin.include_vars: "{{ lookup('ansible.builtin.first_found', params) }}"
+ vars:
+ params:
+ files:
+ - '{{ansible_distribution}}.yml'
+ - '{{ansible_os_family}}.yml'
+ - default.yml
+ paths:
+ - 'vars'
+
+- name: Determine which fsprogs package is needed for "{{ smbd_share_fstype }}"
+ set_fact:
+ fsprogs: "{{ fstype_userspace_progs[smbd_share_fstype] | default() }}"
+
+- name: Add {{ fsprogs }} to the smbd packages list
+ set_fact:
+ smbd_packages: "{{ smbd_packages + [fsprogs] }}"
+ when:
+ - fsprogs is defined
+ - fsprogs
+
+- name: Install smbd dependencies
+ become: yes
+ become_method: sudo
+ ansible.builtin.package:
+ name: "{{ smbd_packages }}"
+ state: present
diff --git a/playbooks/roles/smbd/tasks/main.yml b/playbooks/roles/smbd/tasks/main.yml
new file mode 100644
index 0000000..bb19009
--- /dev/null
+++ b/playbooks/roles/smbd/tasks/main.yml
@@ -0,0 +1,95 @@
+---
+- name: Debian-specific setup
+ ansible.builtin.include_tasks: roles/smbd/tasks/install-deps/debian/main.yml
+ when: ansible_os_family == 'Debian'
+
+- name: SuSE-specific setup
+ ansible.builtin.include_tasks: roles/smbd/tasks/install-deps/suse/main.yml
+ when: ansible_os_family == 'Suse'
+
+- name: Red Hat-specific setup
+ ansible.builtin.include_tasks: roles/smbd/tasks/install-deps/redhat/main.yml
+ when: ansible_os_family == 'RedHat'
+
+- name: Create smb.conf
+ become: yes
+ become_flags: 'su - -c'
+ become_method: sudo
+ ansible.builtin.template:
+ src: smb.conf.j2
+ dest: /etc/samba/smb.conf
+ owner: root
+ group: root
+ mode: 0644
+
+- name: Build string of devices to use as PVs
+ set_fact:
+ smbd_lvm_pvs: "{{ smbd_lvm_pvs + [ smbd_share_device_prefix + item|string ] }}"
+ with_items: "{{ range(1, smbd_share_device_count + 1) }}"
+
+- name: Print the PV list
+ ansible.builtin.debug:
+ var: smbd_lvm_pvs
+
+- name: Create a new LVM VG
+ become: yes
+ become_flags: 'su - -c'
+ become_method: sudo
+ community.general.lvg:
+ vg: "shares"
+ pvs: "{{ smbd_lvm_pvs | join(',') }}"
+
+- name: Create {{ smbd_share_path }}
+ become: yes
+ become_flags: 'su - -c'
+ become_method: sudo
+ ansible.builtin.file:
+ path: "{{ smbd_share_path }}"
+ state: directory
+ mode: 0755
+
+- name: Test whether SELinux is enabled
+ command: /usr/sbin/selinuxenabled
+ register: selinux_status
+ changed_when: False
+ failed_when: False
+
+- name: Set samba_export_all_rw selinux boolean
+ become: yes
+ become_flags: 'su - -c'
+ become_method: sudo
+ ansible.posix.seboolean:
+ name: samba_export_all_rw
+ state: true
+ persistent: true
+ when: selinux_status.rc == 0
+
+- name: Populate service facts
+ ansible.builtin.service_facts:
+
+- name: Allow access to samba in firewalld
+ become: yes
+ become_flags: 'su - -c'
+ become_method: sudo
+ ansible.posix.firewalld:
+ service: samba
+ permanent: true
+ immediate: true
+ state: enabled
+ when: '"firewalld.service" in ansible_facts.services'
+
+- name: Start and enable samba systemd service
+ become: yes
+ become_flags: 'su - -c'
+ become_method: sudo
+ ansible.builtin.systemd:
+ name: smb
+ enabled: true
+ state: started
+
+- name: Set SMB password for root
+ become: yes
+ become_flags: 'su - -c'
+ become_method: sudo
+ ansible.builtin.shell:
+ cmd: printf "{{ smb_root_pw }}\n{{ smb_root_pw }}" | smbpasswd -a root -s
diff --git a/playbooks/roles/smbd/templates/smb.conf.j2 b/playbooks/roles/smbd/templates/smb.conf.j2
new file mode 100644
index 0000000..7665142
--- /dev/null
+++ b/playbooks/roles/smbd/templates/smb.conf.j2
@@ -0,0 +1,11 @@
+[global]
+ workgroup = SAMBA
+ security = user
+
+ passdb backend = tdbsam
+
+ printing = cups
+ printcap name = cups
+ load printers = yes
+ cups options = raw
+
diff --git a/playbooks/roles/smbd/vars/Debian.yml b/playbooks/roles/smbd/vars/Debian.yml
new file mode 100644
index 0000000..1ad76f2
--- /dev/null
+++ b/playbooks/roles/smbd/vars/Debian.yml
@@ -0,0 +1,10 @@
+---
+smbd_packages:
+ - lvm2
+ - policycoreutils
+ - samba
+
+fstype_userspace_progs:
+ btrfs: btrfs-progs
+ ext4: e2fsprogs
+ xfs: xfsprogs
diff --git a/playbooks/roles/smbd/vars/RedHat.yml b/playbooks/roles/smbd/vars/RedHat.yml
new file mode 100644
index 0000000..a95eca0
--- /dev/null
+++ b/playbooks/roles/smbd/vars/RedHat.yml
@@ -0,0 +1,12 @@
+---
+smbd_packages:
+ - checkpolicy
+ - lvm2
+ - policycoreutils
+ - python3-policycoreutils
+ - samba
+
+fstype_userspace_progs:
+ btrfs: btrfs-progs
+ ext4: e2fsprogs
+ xfs: xfsprogs
diff --git a/playbooks/roles/smbd/vars/Suse.yml b/playbooks/roles/smbd/vars/Suse.yml
new file mode 100644
index 0000000..219ba05
--- /dev/null
+++ b/playbooks/roles/smbd/vars/Suse.yml
@@ -0,0 +1,10 @@
+---
+smbd_packages:
+ - lvm2
+ - policycoreutils
+ - samba
+
+fstype_userspace_progs:
+ btrfs: btrfsprogs
+ ext4: e2fsprogs
+ xfs: xfsprogs
diff --git a/playbooks/smbd.yml b/playbooks/smbd.yml
new file mode 100644
index 0000000..47cd022
--- /dev/null
+++ b/playbooks/smbd.yml
@@ -0,0 +1,4 @@
+---
+- hosts: all
+ roles:
+ - role: smbd
diff --git a/scripts/smbd.Makefile b/scripts/smbd.Makefile
new file mode 100644
index 0000000..ae23497
--- /dev/null
+++ b/scripts/smbd.Makefile
@@ -0,0 +1,20 @@
+ifeq (y,$(CONFIG_KDEVOPS_SETUP_SMBD))
+
+SMBD_EXTRA_ARGS += smbd_share_device_prefix='$(subst ",,$(CONFIG_SMBD_SHARE_DEVICE_PREFIX))'
+SMBD_EXTRA_ARGS += smbd_share_device_count='$(subst ",,$(CONFIG_SMBD_SHARE_DEVICE_COUNT))'
+SMBD_EXTRA_ARGS += smbd_share_fstype='$(subst ",,$(CONFIG_SMBD_SHARE_FSTYPE))'
+SMBD_EXTRA_ARGS += smbd_share_path='$(subst ",,$(CONFIG_SMBD_SHARE_PATH))'
+SMBD_EXTRA_ARGS += smb_root_pw='$(subst ",,$(CONFIG_SMB_ROOT_PW))'
+SMBD_EXTRA_ARGS += kdevops_smbd_enable=True
+
+ANSIBLE_EXTRA_ARGS += $(SMBD_EXTRA_ARGS)
+
+smbd:
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
+ -f 30 -i hosts -l smbd playbooks/smbd.yml
+
+KDEVOPS_BRING_UP_DEPS += smbd
+
+PHONY += smbd
+
+endif
--
2.44.0
^ permalink raw reply related [relevance 2%]
* linux-next: Tree for Apr 12
@ 2024-04-12 7:09 2% Stephen Rothwell
0 siblings, 0 replies; 200+ results
From: Stephen Rothwell @ 2024-04-12 7:09 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 42177 bytes --]
Hi all,
Changes since 20240411:
The net tree lost its build failure.
The mm tree gained 2 build failures for which I applied patches.
The perf tree still had its build failure, but doing a clean then
rebuilding works.
The hid tree lost its build failure.
The net-next tree gained a conflict against the nfsd-fixes tree.
The net-next tree lost its build failure.
The modules tree gained a conflict against the mm tree.
The kvm tree gained a build failure for which I applied a partial revert
of a commit.
The kvm-x86 tree gained a conflict against the kvm tree.
The usb tree gained a conflict against the usb.current tree.
The tty tree still had its build failure, so I used the version from
next-20240410.
The fpga tree gained a build failure so I used the version from
next-20240411.
The scsi-mkp tree gained a build failure so I used the version from
next-20240411.
Non-merge commits (relative to Linus' tree): 5139
5213 files changed, 199137 insertions(+), 124106 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 369 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (00dcf5d862e8 Merge tag 'acpi-6.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (2f61e5f50dcb fork: defer linking file vma until vma is fully initialized)
Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT)
Merging arc-current/for-curr (ebfc2fd8873b ARC: Fix typos)
Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
Merging arm64-fixes/for-next/fixes (e3ba51ab24fd arm64: tlb: Fix TLBI RANGE operand)
Merging arm-soc-fixes/arm/fixes (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1)
Merging drivers-memory-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1)
Merging powerpc-fixes/fixes (36ba64b4cbc6 selftests/powerpc/papr-vpd: Fix missing variable initialization)
Merging s390-fixes/fixes (378ca2d2ad41 s390/entry: align system call table on 8 bytes)
Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1)
Merging net/main (2ae9a8972ce0 Merge tag 'net-6.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf/master (6648e613226e bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue)
Merging ipsec/master (bccb798e07f8 octeontx2-pf: Fix transmit scheduler resource leak)
Merging netfilter/main (6db5dc7b351b netfilter: flowtable: incorrect pppoe tuple)
Merging ipvs/main (7eaf837a4eb5 netfilter: nf_tables: Fix a memory leak in nf_tables_updchain)
Merging wireless/for-next (9ef369973cd2 wifi: cfg80211: fix the order of arguments for trace events of the tx_rx_evt class)
Merging wpan/master (b85ea95d0864 Linux 6.7-rc1)
Merging rdma-fixes/for-rc (b68e1acb5834 RDMA/cm: Print the old state when cm_destroy_id gets timeout)
Merging sound-current/for-linus (0b6f0ff01a4a ALSA: hda/tas2781: correct the register for pow calibrated data)
Merging sound-asoc-fixes/for-linus (2e411e939da9 ASoC: cs35l56: Fixes to handling of ASP1 config)
Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging regulator-fixes/for-linus (68adb581a39a regulator: vqmmc-ipq4019: fix module autoloading)
Merging spi-fixes/for-linus (fec50db7033e Linux 6.9-rc3)
Merging pci-current/for-linus (302b84e84d10 Revert "PCI: Mark LSI FW643 to avoid bus reset")
Merging driver-core.current/driver-core-linus (156539fd6501 Documentation: embargoed-hardware-issues.rst: Add myself for Power)
156539fd6501 ("Documentation: embargoed-hardware-issues.rst: Add myself for Power")
Merging tty.current/tty-linus (1aa4ad4eb695 serial: core: Fix missing shutdown and startup for serial base port)
Merging usb.current/usb-linus (34b990e9bb54 usb: misc: onboard_usb_hub: Disable the USB hub clock on failure)
Merging usb-serial-fixes/usb-linus (d206a76d7d27 Linux 6.8-rc6)
Merging phy/fixes (47b3e2f3914a phy: qcom: m31: match requested regulator name with dt schema)
Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2)
Merging iio-fixes/fixes-togreg (74a72baf204f iio:imu: adis16475: Fix sync mode setting)
Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2)
Merging char-misc.current/char-misc-linus (ebaed6d4def8 peci: linux/peci.h: fix Excess kernel-doc description warning)
Merging soundwire-fixes/fixes (63dc588e7af1 soundwire: amd: fix for wake interrupt handling for clockstop mode)
Merging thunderbolt-fixes/fixes (dcd12acaf384 thunderbolt: Avoid notify PM core about runtime PM resume)
Merging input-current/for-linus (57ed9567e63b Merge branch 'next' into for-linus)
Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN)
Merging dmaengine-fixes/fixes (f221033f5c24 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms)
Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1)
Merging mtd-fixes/mtd/fixes (21c9fb611c25 mtd: diskonchip: work around ubsan link failure)
Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1)
Merging v4l-dvb-fixes/fixes (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (4370b673ccf2 MIPS: scall: Save thread_info.syscall unconditionally on entry)
Merging at91-fixes/at91-fixes (4cece7649650 Linux 6.9-rc1)
Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb)
Merging kvm-fixes/master (49ff3b4aec51 KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms)
Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP)
Merging hwmon-fixes/hwmon (4cece7649650 Linux 6.9-rc1)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (7bcf809b1e78 cxl: Add checks to access_coordinate calculation to fail missing data)
Merging btrfs-fixes/next-fixes (07475cc36e03 Merge branch 'misc-6.9' into next-fixes)
Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (e71c84816925 platform/x86: lg-laptop: fix %s null argument warning)
Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging devicetree-fixes/dt/linus (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so)
Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging scsi-fixes/fixes (ca91259b775f scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING)
Merging drm-fixes/drm-fixes (1bafeaf26264 Merge tag 'drm-xe-fixes-2024-04-11' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (dcd8992e47f1 drm/i915/vrr: Disable VRR when using bigjoiner)
Merging mmc-fixes/fixes (ace323f80b9b mmc: sdhci-of-dwcmshc: th1520: Increase tuning loop count to 128)
Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1)
Merging gnss-fixes/gnss-linus (54be6c6c5ae8 Linux 6.8-rc3)
Merging hyperv-fixes/hyperv-fixes (30d18df6567b Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted)
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (a373a36fb6b0 Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements")
Merging riscv-dt-fixes/riscv-dt-fixes (0f74c64f0a9f riscv: dts: starfive: Remove PMIC interrupt info for Visionfive 2 board)
Merging riscv-soc-fixes/riscv-soc-fixes (6b0856ee585d cache: sifive_ccache: Silence unused variable warning)
Merging fpga-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1)
Merging gpio-brgl-fixes/gpio/for-current (e43c2feb8f32 Merge tag 'intel-gpio-v6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-current)
Merging gpio-intel-fixes/fixes (ace0ebe5c98d gpio: crystalcove: Use -ENOTSUPP consistently)
Merging pinctrl-intel-fixes/fixes (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging erofs-fixes/fixes (7557d296ad43 MAINTAINERS: erofs: add myself as reviewer)
Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests)
Merging memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT')
Merging nfsd-fixes/nfsd-fixes (f488138b5267 NFSD: fix endianness issue in nfsd4_encode_fattr4)
Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes)
Merging perf-current/perf-tools (25e973a0e077 perf annotate: Make sure to call symbol__annotate2() in TUI)
Merging efi-fixes/urgent (decd347c2a75 x86/efistub: Reinstate soft limit for initrd loading)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (452d8950db3e power: rt9455: hide unused rt9455_boost_voltage_values)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging iommufd-fixes/for-rc (39cd87c4eb2b Linux 6.9-rc2)
Merging rust-fixes/rust-fixes (761a8f0a776b rust: make mutually exclusive with CFI_CLANG)
Merging v9fs-fixes/fixes/next (7a84602297d3 9p: explicitly deny setlease attempts)
Merging w1-fixes/fixes (4cece7649650 Linux 6.9-rc1)
Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2)
Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area())
Merging i2c-host-fixes/i2c/i2c-host-fixes (fec50db7033e Linux 6.9-rc3)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (d3e8a91a848a clk: mediatek: mt7988-infracfg: fix clocks for 2nd PCIe port)
Merging drm-misc-fixes/for-linux-next-fixes (4c08f01934ab drm/vmwgfx: Enable DMA mappings with SEV)
Merging mm-stable/mm-stable (4e2e36129225 Merge branch 'master' into mm-stable)
Merging mm-nonmm-stable/mm-nonmm-stable (39cd87c4eb2b Linux 6.9-rc2)
Merging mm/mm-everything (ed7c95c95397 Merge branch 'mm-nonmm-unstable' into mm-everything)
925cc828a1ef ("fix-missing-vmalloch-includes-fix-3")
CONFLICT (content): Merge conflict in arch/x86/mm/numa_32.c
Applying: fix up for ""mm: add per-order mTHP anon_alloc and anon_alloc_fallback counters"
Merging kbuild/for-next (bfa8f18691ed Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (9c3e9af74326 perf metrics: Remove the "No_group" metric group)
Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL)
Merging dma-mapping/for-next (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files())
Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (fec50db7033e Linux 6.9-rc3)
Merging arm-perf/for-next/perf (8f9f5041c646 perf/arm-cmn: Set PMU device parent)
Merging arm-soc/for-next (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address)
Merging amlogic/for-next (4ee46d40d625 Merge branch 'v6.10/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project)
Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' into at91-next)
Merging broadcom/next (ebe9ff485efc Merge branch 'drivers/next' into next)
Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1)
Merging drivers-memory/for-next (bf11908757ee memory: mtk-smi: fix module autoloading)
Merging imx-mxs/for-next (6cf256f63478 Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (67d5303fe655 Merge branch 'v6.9-next/dts64' into for-next)
Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status")
Merging omap/for-next (2a1e301bf479 Merge branch 'omap-for-v6.10/dt' into for-next)
Merging qcom/for-next (3cd1977804fb Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-for-6.10', 'clk-fixes-for-6.9' and 'drivers-for-6.10' into for-next)
Merging renesas/next (957eed54b7b6 Merge branch 'renesas-dts-for-v6.10' into renesas-next)
Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void)
Merging rockchip/for-next (56f939cce5e1 Merge branch 'v6.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (b7b2fe24038b Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (a4200c1395dc Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates', tags 'ffa-fix-6.9' and 'scmi-fixes-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging sophgo/for-next (65fcc08b4cfe riscv: dts: sophgo: cv18xx: Add i2c devices)
Merging stm32/stm32-next (b12a916d30dc ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1)
Merging sunxi/sunxi/for-next (c1d7282e4e92 Merge branch 'sunxi/dt-for-6.9' into sunxi/for-next)
Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next)
Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/dt into for-next)
Merging ti/ti-next (592695bed5f8 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
Merging clk/clk-next (deb01ebcc734 Merge branch 'clk-loongson' into clk-next)
Merging clk-imx/for-next (13269dc6c704 clk: imx: imx8mp: Fix SAI_MCLK_SEL definition)
Merging clk-renesas/renesas-clk (c0516eb4cf04 clk: renesas: r8a779h0: Add timer clocks)
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (a07c772fa658 LoongArch: Include linux/sizes.h in addrspace.h to prevent build errors)
Merging m68k/for-next (70d830e337f9 m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER)
Merging m68knommu/for-next (d677c24fccee m68k: Avoid CONFIG_COLDFIRE switch in uapi header)
Merging microblaze/next (6613476e225e Linux 6.8-rc1)
Merging mips/mips-next (4cece7649650 Linux 6.9-rc1)
Merging openrisc/for-next (68b70ab43cec openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (e8f897f4afef Linux 6.8)
Merging powerpc/next (8884fc918f6a powerpc: Fix fatal warnings flag for LLVM's integrated assembler)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (ba5ea59f768f riscv: Do not save the scratch CSR during suspend)
CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst
Merging riscv-dt/riscv-dt-for-next (5db2c4dc413e riscv: dts: add initial canmv-k230 and k230-evb dts)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next)
Merging s390/for-next (9fb83b5a1bdb Merge branch 'features' into for-next)
Merging sh/for-next (4cece7649650 Linux 6.9-rc1)
Merging sparc/for-next (84b76d05828a lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console)
Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory)
Merging xtensa/xtensa-for-next (11cca8ccf2c3 tty: xtensa/iss: Use min() to fix Coccinelle warning)
Merging bcachefs/for-next (1189bdda6c99 bcachefs: Fix __bch2_btree_and_journal_iter_init_node_iter())
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (7218664bf91d Merge branch 'for-next-next-v6.9-20240409' into for-next-20240409)
Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph)
Merging cifs/for-next (4e996f9d30cb smb: client: Fix hang in smb2_reconnect)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible)
Merging exfat/dev (6397cc21e5c0 exfat: move extend valid_size into ->page_mkwrite())
Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8)
Merging ext3/for_next (172dc02ca6ec Merge UDF time conversion fix.)
Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test)
Merging f2fs/dev (bf3a69c6861f Merge tag 'for-linus-6.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux)
Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock)
Merging fuse/for-next (cdf6ac2a03d2 fuse: get rid of ff->readdir.lock)
Merging gfs2/for-next (cac2ca6ca549 gfs2: Fix do_xmote locking error)
Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin")
Merging ksmbd/ksmbd-for-next (405ac6a57277 Merge tag '6.9-rc2-ksmbd-server-fixes' of git://git.samba.org/ksmbd)
Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().)
Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel)
Merging nfsd/nfsd-next (e5ca63b09c65 nfsd: optimise recalculate_deny_mode() for a common case)
Merging ntfs3/master (622cd3daa8ea fs/ntfs3: Slightly simplify ntfs_inode_printk())
Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.)
Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting)
Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems)
Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage)
Merging v9fs-ericvh/ericvh/for-next (4cece7649650 Linux 6.9-rc1)
Merging xfs/for-next (e23d7e82b707 xfs: allow cross-linking special files without project quota)
Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (7dad3e0bd4e4 Merge branch 'vfs.super' into vfs.all)
Merging vfs/for-next (052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat)
Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' into for-next)
Merging pci/next (ced360f2a021 Merge branch 'pci/dt-bindings')
Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy)
Merging hid/for-next (a8d38c4a9f9f Merge branch 'for-6.10/hid-bpf' into for-next)
Merging i2c/i2c/for-next (5ceeabb0eb2e Merge tag 'i2c-host-fixes-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current)
Merging i2c-host/i2c/i2c-host (ab9713bb8844 i2c: i801: Fix missing Kconfig dependency)
Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const)
Merging hwmon-staging/hwmon-next (db85dba9fee5 hwmon: (aspeed-g6-pwm-tach) Convert to platform remove callback returning void)
Merging jc_docs/docs-next (8819b60eed72 docs/zh_CN: Add dev-tools/kmemleak Chinese translation)
Merging v4l-dvb/master (4cece7649650 Linux 6.9-rc1)
Merging v4l-dvb-next/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity)
Merging pm/linux-next (53c477378d23 Merge branch 'acpica' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (4cece7649650 Linux 6.9-rc1)
Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1)
Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void)
Merging pmdomain/next (02e2a4b3638c cpuidle: psci: Update init level to core_initcall())
Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1)
Merging thermal/thermal/linux-next (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M)
Merging dlm/next (92d59adfaf71 dlm: do message processing in softirq context)
Merging rdma/for-next (dfcdb38b21e4 RDMA/rxe: Return the correct errno)
Merging net-next/main (94426ed2137a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
CONFLICT (content): Merge conflict in include/trace/events/rpcgss.h
Merging bpf-next/for-next (c53e853c2d81 Merge branch 'export send_recv_data')
Merging ipsec-next/master (267e31750ae8 Merge branch 'phy-listing-link_topology-tracking')
Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device)
Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (e00fc2700a3f Bluetooth: btusb: Fix triggering coredump implementation for QCA)
01841038e1d2 ("Bluetooth: Fix memory leak in hci_req_sync_complete()")
2151391668d9 ("Bluetooth: ISO: Don't reject BT_ISO_QOS if parameters are unset")
289bfd91fcf2 ("Bluetooth: SCO: Fix not validating setsockopt user input")
35d2c39b23ff ("Bluetooth: hci_sock: Fix not validating setsockopt user input")
5a5010485400 ("Bluetooth: ISO: Fix not validating setsockopt user input")
a95f9d212d1b ("Bluetooth: L2CAP: Fix not validating setsockopt user input")
b191fb7a3075 ("Bluetooth: hci_sync: Fix using the same interval and window for Coded PHY")
e6bb15dbae90 ("Bluetooth: l2cap: Don't double set the HCI_CONN_MGMT_CONNECTED bit")
ee77912bc0bb ("Bluetooth: RFCOMM: Fix not validating setsockopt user input")
Merging wireless-next/for-next (d26a0a66f929 wifi: brcmfmac: Fix spelling mistake "ivalid" -> "invalid")
Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mtd/mtd/next (3ef4600f1226 mtd: maps: sa1100-flash: Prefer struct_size over open coded arithmetic)
Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo)
Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1)
Merging crypto/master (4ad27a8be9db crypto: jitter - Replace http with https)
Merging drm/drm-next (6e1f415e7129 Merge tag 'drm-misc-next-2024-04-10' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next)
Merging drm-exynos/for-linux-next (6633c7d2fd31 drm/exynos: mixer: drop driver owner initialization)
Merging drm-misc/for-linux-next (42118c5f6853 drm/i915: Add SIZE_HINTS property for cursors)
Merging amdgpu/drm-next (526b184e8883 drm/amdgpu: differentiate external rev id for gfx 11.5.0)
029faefb7302 ("drm/amdgpu: implement IRQ_STATE_ENABLE for SDMA v4.4.2")
05e40141685f ("drm/amdgpu: clear set_q_mode_offs when VM changed")
108ab31be9d5 ("drm/amdgpu/umsch: reinitialize write pointer in hw init")
24e9727b39ca ("drm/amd/display: Do not recursively call manual trigger programming")
27e718ac8b81 ("drm/amd/display: fix disable otg wa logic in DCN316")
2dbe9c2b2685 ("drm/amd/display: add DCN 351 version for microcode load")
364b1c1de6de ("drm/amd/display: Adjust dprefclk by down spread percentage.")
4a5b171299e5 ("drm/amd/display: always reset ODM mode in context when adding first plane")
526b184e8883 ("drm/amdgpu: differentiate external rev id for gfx 11.5.0")
7c1d9e10e664 ("drm/amd/pm: fix the high voltage issue after unload")
8966c3167402 ("drm/amdgpu : Increase the mes log buffer size as per new MES FW version")
91bc86011661 ("drm/amdgpu: Fix VCN allocation in CPX partition")
af1c41858da1 ("drm/amd/display: Return max resolution supported by DWB")
cd409dbc6986 ("drm/amdgpu: Refine IB schedule error logging")
cf82a80a1456 ("drm/amd/display: Skip on writeback when it's not applicable")
d045f4ad7700 ("drm/amd/swsmu: Update smu v14.0.0 headers to be 14.0.1 compatible")
d6d6561f936b ("drm/amdgpu: fix incorrect number of active RBs for gfx11")
d7f148764355 ("drm/amdgpu: always force full reset for SOC21")
df3c7dc5c58b ("drm/amdgpu: Reset dGPU if suspend got aborted")
dfb15c4ab586 ("amd/amdkfd: sync all devices to wait all processes being evicted")
e58acb7613aa ("drm/amdgpu : Add mes_log_enable to control mes log feature")
f5a3507c4abf ("drm/amdgpu: add smu 14.0.1 discovery support")
fedb6ae49758 ("drm/amd/pm: fixes a random hang in S4 for SMU v13.0.4/11")
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c
Merging drm-intel/for-linux-next (578ff98403ce drm/i915: Allow bigjoiner for MST)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cdclk.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (9dc23cba0927 drm/msm/adreno: Set highest_bank_bit for A619)
Merging drm-msm-lumag/msm-next-lumag (ab556156cafa drm/msm: drop A6xx header)
Merging drm-xe/drm-xe-next (4209d635a823 drm/xe: Remove devcoredump during driver release)
117de185edf2 ("drm/xe/display: Fix double mutex initialization")
34820967ae7b ("drm/xe/xe_migrate: Cast to output precision before multiplying operands")
883232b47b81 ("drm/xe/hwmon: Cast result to output precision on left shift of operand")
dc30c6e7149b ("drm/xe: Label RING_CONTEXT_CONTROL as masked")
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_bo.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_exec.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c
CONFLICT (content): Merge conflict in include/uapi/drm/xe_drm.h
Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values)
Merging fbdev/for-next (fb3b9c2d217f video: logo: Drop full path of the input filename in generated file)
Merging regmap/for-next (8a8317f92770 regmap: kunit: Add some test cases and a few small)
Merging sound/for-next (a9b16d591874 Merge branch 'topic/emu10k1-fix' into for-next)
Merging ieee1394/for-next (0d4149e5e9b0 firewire: ohci: use pci_irq_vector() to retrieve allocated interrupt line)
Merging sound-asoc/for-next (f8cfa515170f Merge remote-tracking branch 'asoc/for-6.10' into asoc-next)
Merging modules/modules-next (68881525ba29 mm: introduce execmem_alloc() and execmem_free())
CONFLICT (content): Merge conflict in kernel/module/main.c
Merging input/next (8984e0b56923 Input: adafruit-seesaw - only report buttons that changed state)
Merging block/for-next (7ed173281653 Merge branch 'for-6.10/io_uring' into for-next)
CONFLICT (content): Merge conflict in io_uring/io_uring.c
CONFLICT (content): Merge conflict in io_uring/rw.c
Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag"
Merging device-mapper/for-next (44078156fc77 dm: use queue_limits_set)
Merging libata/for-next (dcf2653ac12f dt-bindings: ata: ahci-da850: Convert to dtschema)
Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant)
Merging mmc/next (bce42d6108c9 mmc: Merge branch fixes into next)
Merging mfd/for-mfd-next (fb9d85a9698e mfd: Tidy Kconfig dependency's parentheses)
CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c
Merging backlight/for-backlight-next (9db7677e33b6 backlight: otm3225a: Drop driver owner assignment)
Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop)
Merging regulator/for-next (15f992fa81eb Merge remote-tracking branch 'regulator/for-6.10' into regulator-next)
Merging security/next (4cece7649650 Linux 6.9-rc1)
Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile())
Merging integrity/next-integrity (5e2e4d0ea5c2 evm: Rename is_unsupported_fs to is_unsupported_hmac_fs)
Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next')
Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (6999f8229e59 keys: Fix overwrite of key expiration on instantiation)
Merging watchdog/master (6fe5aabf7fc6 watchdog: intel-mid_wdt: Get platform data via dev_get_platdata())
Merging iommu/next (c404f55c26fc iommu: Validate the PASID in iommu_attach_device_pasid())
Merging audit/next (4cece7649650 Linux 6.9-rc1)
Merging devicetree/for-next (3cef9e08b6f4 dt-bindings: usb: mtk-xhci: add compatible for MT7988)
Merging dt-krzk/for-next (364be3ecd30d Merge branch 'next/dt' into for-next)
Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU)
Merging spi/for-next (637ced031d3c Merge remote-tracking branch 'spi/for-6.10' into spi-next)
Merging tip/master (b4ba814ae4a4 Merge branch into tip/master: 'x86/shstk')
Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization)
Merging edac/edac-for-next (8e95536e9495 Merge branch ras/edac-misc into for-next)
Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused)
Merging rcu/rcu/next (8942ebe9e183 rcutorture: Make rcutorture support srcu double call test)
56544e22cc3a ("fs/proc: remove redundant comments from /proc/bootconfig")
e6f3a323fcfa ("fs/proc: Skip bootloader comment if no embedded kernel parameters")
Merging kvm/next (415efaaf0d97 KVM: SEV: use u64_to_user_ptr throughout)
Applying: fix up for "mm: replace set_pte_at_notify() with just set_pte_at()"
Merging kvm-arm/next (29b0075ed61c KVM: selftests: Fix __GUEST_ASSERT() format warnings in ARM's arch timer test)
Merging kvms390/next (00de073e2420 KVM: s390: selftest: memop: Fix undefined behavior)
Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2)
Merging kvm-riscv/riscv_kvm_next (8e936e98718f RISC-V: KVM: Fix APLIC in_clrip[x] read emulation)
Merging kvm-x86/next (f10f3621ad80 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'svm' and 'vmx')
CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (8a8a4bfdbe85 Merge branch 'for-6.10' into for-next)
Merging drivers-x86/for-next (88c0ef69dd88 platform/x86: asus-wmi: cleanup main struct to avoid some holes)
Merging chrome-platform/for-next (70a5f3005008 platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD))
Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization)
Merging hsi/for-next (4cece7649650 Linux 6.9-rc1)
Merging leds-lj/for-leds-next (de6b3fd4bbc9 leds: trigger: netdev: Remove not needed call to led_set_brightness in deactivate)
da8310b24223 ("video: backlight: Make backlight_class constant")
Merging ipmi/for-next (6b4c04178660 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void)
Merging driver-core/driver-core-next (0bb322be5d38 driver core: Remove unused platform_notify, platform_notify_remove)
Merging usb/usb-next (1a395af9d53c usb: typec: ucsi_glink: drop special handling for CCI_BUSY)
CONFLICT (modify/delete): drivers/usb/misc/onboard_usb_hub.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/misc/onboard_usb_hub.c left in tree.
$ git rm -f drivers/usb/misc/onboard_usb_hub.c
Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev"
Merging thunderbolt/next (9a966517a830 thunderbolt: Enable NVM upgrade support on Intel Maple Ridge)
Merging usb-serial/usb-next (b1a8da9ff139 USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M)
Merging tty/tty-next (fff4a5d5609d serial: ar933x: Remove unneeded static structure)
CONFLICT (content): Merge conflict in drivers/tty/serial/serial_core.c
$ git reset --hard HEAD^
Merging next-20240410 version of tty
Merging char-misc/char-misc-next (fec50db7033e Linux 6.9-rc3)
Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage)
Merging coresight/next (a4f3057d19ff coresight-tpda: Change qcom,dsb-element-size to qcom,dsb-elem-bits)
Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1)
Merging fpga/for-next (5d04660b29fb fpga: ice40-spi: Remove unused of_gpio.h)
$ git reset --hard HEAD^
Merging next-20240411 version of fpga
Merging icc/icc-next (7af14fe58e5e Merge branch 'icc-fixes' into icc-next)
Merging iio/togreg (27eea4778db8 iio: adc: ad7944: simplify adi,spi-mode property parsing)
Merging phy-next/next (0338e1d2f933 MAINTAINERS: Add phy-gs101-ufs file to Tensor GS101.)
Merging soundwire/next (4cd5ea6de156 soundwire: intel_init: resume all devices on exit.)
Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h)
Merging gnss/gnss-next (54be6c6c5ae8 Linux 6.8-rc3)
Merging vfio/next (7447d911af69 vfio/fsl-mc: Block calling interrupt handler without trigger)
Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers)
Merging spmi/spmi-next (897268aef3fa spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe())
Merging staging/staging-next (18f44de63f88 staging: greybus: change strncpy() to strscpy_pad())
Merging counter-next/counter-next (916baadd293a counter: ti-ecap-capture: Utilize COUNTER_COMP_FREQUENCY macro)
Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (4665be0e952f dmaengine: pch_dma: remove unused function chan2parent)
Merging cgroup/for-next (a24e3b7d27c6 docs: cgroup-v1: Fix description for css_online)
Merging scsi/for-next (99033e81ab05 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (8e50d1ee8f4c Merge patch series "convert SCSI to atomic queue limits, part 1 (v3)")
$ git reset --hard HEAD^
Merging next-20240411 version of scsi-mkp
Merging vhost/linux-next (5b9f214d0540 vhost: Merge tag 'vduse-virtio-net' into vhost)
Merging rpmsg/for-next (4d5aabb68439 Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (1685f72a6dcc gpiolib: Do not mention legacy GPIOF_* in the code)
Merging gpio-intel/for-next (d8a26a18d971 gpiolib: acpi: Check for errors first in acpi_find_gpio())
Merging pinctrl/for-next (07bd48cca03b Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3)
Merging pinctrl-renesas/renesas-pinctrl (aa43c15a790c pinctrl: renesas: rzg2l: Execute atomically the interrupt configuration)
Merging pinctrl-samsung/for-next (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants)
Merging pwm/pwm/for-next (858fbbf538a6 pwm: bcm2835: Drop open coded variant of devm_clk_rate_exclusive_get())
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (4f4ade6863ce selftests/clone3: Correct log message for waitpid() failures)
CONFLICT (content): Merge conflict in tools/testing/selftests/timers/valid-adjtimex.c
Merging kunit/test (4cece7649650 Linux 6.9-rc1)
Merging kunit-next/kunit (82b0beff3497 kunit: Add tests for fault)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (8b59a11fb8e6 rtc: nuvoton: Modify part number value)
Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage)
Merging at24/at24/for-next (4cece7649650 Linux 6.9-rc1)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2)
Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation)
Merging nvmem/for-next (ea8f9ec2bbb7 nvmem: core: switch to use device_add_groups())
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator)
Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y)
Merging kgdb/kgdb/for-next (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local())
Merging hmm/hmm (6613476e225e Linux 6.8-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (813e0ae613d6 bus: mhi: host: Add mhi_power_down_keep_dev() API to support system suspend/hibernation)
Merging memblock/for-next (2159bd4e9057 memblock: Return NUMA_NO_NODE instead of -1 to improve code readability)
Merging cxl/next (ed1ff2fba7af Merge branch 'for-6.9/cxl-einj' into for-6.9/cxl)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (bf87a149828e efi: Clear up misconceptions about a maximum variable name size)
Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static)
Merging slab/slab/for-next (5aa5c7b9a09d mm/slub: remove duplicate initialization for early_kmem_cache_node_alloc())
Merging random/master (4cece7649650 Linux 6.9-rc1)
Merging landlock/next (028243655456 fs/ioctl: Add a comment to keep the logic in sync with LSM policies)
Merging rust/rust-next (8db31d3f3bd5 rust: workqueue: add `#[pin_data]` to `Work`)
Merging sysctl/sysctl-next (4f1136a55dc8 scripts: check-sysctl-docs: handle per-namespace sysctls)
Merging execve/for-next/execve (c82389947d90 tracing: Add sched_prepare_exec tracepoint)
Merging bitmap/bitmap-for-next (fd8ed16c2419 bitmap: Step down as a reviewer)
Merging hte/for-next (b85ea95d0864 Linux 6.7-rc1)
Merging kspp/for-next/kspp (9c573cd31343 randomize_kstack: Improve entropy diffusion)
Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
Merging nolibc/nolibc (4cece7649650 Linux 6.9-rc1)
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1)
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Applying: fixup for "mm: swap: introduce swap_free_nr() for batched swap_free()"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [relevance 2%]
Results 1-200 of ~10000 next (older) | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-12-04 20:34 [PATCH AUTOSEL 6.1 01/17] pinctrl: lochnagar: Don't build on MIPS Sasha Levin
2023-12-04 20:35 ` [PATCH AUTOSEL 6.1 15/17] smb: client, common: fix fortify warnings Sasha Levin
2024-04-23 18:57 6% ` Steve French
2024-03-11 16:10 [RFC PATCH net-next 0/5] net: In-kernel QUIC implementation with Userspace handshake Xin Long
2024-03-13 8:56 ` Stefan Metzmacher
2024-03-13 16:03 ` Xin Long
2024-03-13 17:28 ` Stefan Metzmacher
2024-03-13 19:39 ` Xin Long
2024-03-14 9:21 ` Stefan Metzmacher
2024-03-14 16:21 ` Xin Long
2024-04-19 14:07 0% ` Stefan Metzmacher
2024-04-19 18:09 0% ` Xin Long
2024-04-19 18:51 ` Stefan Metzmacher
2024-04-19 19:19 ` Xin Long
2024-04-20 19:32 ` Xin Long
2024-04-21 19:27 ` Stefan Metzmacher
2024-04-25 18:06 5% ` Xin Long
2024-04-29 15:20 0% ` Stefan Metzmacher
2024-05-02 18:08 6% ` Xin Long
2024-03-13 13:07 [PATCH] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Marios Makassikis
2024-04-15 9:00 4% ` Marios Makassikis
2024-04-15 10:51 4% ` Namjae Jeon
2024-04-15 12:36 10% ` Marios Makassikis
2024-04-15 12:55 4% ` Namjae Jeon
2024-04-15 13:12 4% ` [PATCH v2] " Marios Makassikis
2024-04-16 12:40 8% ` Namjae Jeon
2024-04-11 15:35 [PATCH][next] smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings Gustavo A. R. Silva
2024-04-23 18:57 ` Gustavo A. R. Silva
2024-04-23 20:15 4% ` Steve French
2024-04-23 20:47 0% ` Gustavo A. R. Silva
2024-04-23 21:08 0% ` Gustavo A. R. Silva
2024-04-23 21:09 0% ` Steve French
2024-04-12 7:09 2% linux-next: Tree for Apr 12 Stephen Rothwell
2024-04-12 20:49 3% [PATCH 0/6] Add an option for running fstests on CIFS Scott Mayhew
2024-04-12 20:49 2% ` [PATCH 3/6] bringup: add a playbook to bring up an SMB server Scott Mayhew
2024-04-12 20:52 0% ` [PATCH 0/6] Add an option for running fstests on CIFS Chuck Lever III
2024-04-16 21:54 0% ` Scott Mayhew
2024-04-12 21:46 0% ` Luis Chamberlain
2024-04-15 5:56 2% linux-next: Tree for Apr 15 Stephen Rothwell
[not found] <20240415105208.3137874-1-sashal@kernel.org>
2024-04-15 10:49 9% ` [PATCH 4.14-openela 046/190] ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE Sasha Levin
2024-04-15 16:54 10% current ksmbd Steve French
2024-04-16 0:28 4% ` Namjae Jeon
2024-04-16 7:55 2% linux-next: Tree for Apr 16 Stephen Rothwell
2024-04-17 5:38 2% linux-next: Tree for Apr 17 Stephen Rothwell
2024-04-17 21:44 3% [regression 6.1.80+] "CIFS: VFS: directory entry name would overflow frame end of buf" and invisible files under certain conditions and at least with noserverino mount option Salvatore Bonaccorso
2024-04-18 6:47 2% linux-next: Tree for Apr 18 Stephen Rothwell
2024-04-18 8:57 3% [ANNOUNCE] Release v6.1.86-cip19 nobuhiro1.iwamatsu
2024-04-18 9:32 1% WARNING: modpost: "__udelay" [drivers/net/ethernet/adi/adin1110.ko] has no CRC! kernel test robot
2024-04-18 20:21 4% Missing protocol features that could help Linux Steve French
2024-04-19 1:40 0% ` Andrew Bartlett
2024-04-19 16:53 0% ` Ralph Boehme
2024-04-19 16:55 0% ` Jeremy Allison
2024-04-19 6:09 2% linux-next: Tree for Apr 19 Stephen Rothwell
2024-04-20 0:43 4% [PATCH 1/2] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info Namjae Jeon
2024-04-20 0:43 8% ` [PATCH 2/2] ksmbd: add continuous availability share parameter Namjae Jeon
2024-04-22 5:38 2% linux-next: Tree for Apr 22 Stephen Rothwell
2024-04-22 23:20 11% [GIT PULL] ksmbd server fixes Steve French
2024-04-22 23:51 4% ` pr-tracker-bot
2024-04-23 6:52 2% linux-next: Tree for Apr 23 Stephen Rothwell
2024-04-23 21:37 3% [PATCH 6.8 000/158] 6.8.8-rc1 review Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.8 155/158] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.8 156/158] ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.8 157/158] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.8 158/158] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info Greg Kroah-Hartman
2024-04-23 21:37 3% [PATCH 6.6 000/158] 6.6.29-rc1 review Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.6 154/158] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.6 155/158] ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.6 156/158] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Greg Kroah-Hartman
2024-04-23 21:39 4% ` [PATCH 6.6 157/158] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info Greg Kroah-Hartman
2024-04-23 21:37 3% [PATCH 6.1 000/141] 6.1.88-rc1 review Greg Kroah-Hartman
2024-04-23 21:40 4% ` [PATCH 6.1 137/141] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
2024-04-23 21:40 4% ` [PATCH 6.1 138/141] ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
2024-04-23 21:40 4% ` [PATCH 6.1 139/141] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Greg Kroah-Hartman
2024-04-23 21:40 4% ` [PATCH 6.1 140/141] ksmbd: common: use struct_group_attr instead of struct_group for network_open_info Greg Kroah-Hartman
2024-04-23 21:39 5% [PATCH 5.15 00/71] 5.15.157-rc1 review Greg Kroah-Hartman
2024-04-23 21:39 15% ` [PATCH 5.15 01/71] ksmbd: dont send oplock break if rename fails Greg Kroah-Hartman
2024-04-23 21:39 17% ` [PATCH 5.15 02/71] ksmbd: validate payload size in ipc response Greg Kroah-Hartman
2024-04-23 21:39 15% ` [PATCH 5.15 03/71] ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1 Greg Kroah-Hartman
2024-04-24 6:05 6% fs/smb/server/smb2pdu.c:1992 smb2_tree_connect() error: uninitialized symbol 'share' kernel test robot
2024-04-24 6:28 5% Dan Carpenter
2024-04-24 7:21 0% ` Namjae Jeon
2024-04-24 10:21 2% linux-next: Tree for Apr 24 Stephen Rothwell
[not found] <CA+EPQ66bhvV_Wr2PE=bQQwcYbfvXCAn_TyAoHdD9fSfahsgG0Q@mail.gmail.com>
2024-04-25 6:23 4% ` Kernel RIP 0010:cifs_flush_folio Steve French
[not found] ` <CA+EPQ664FHmSU-XW2e63jz1hEYNYVS-RdY6309g7-hvUMdt5Ew@mail.gmail.com>
2024-04-25 16:52 0% ` Shyam Prasad N
2024-04-25 13:57 8% [PATCH] ksmbd: fix uninitialized symbol 'share' in smb2_tree_connect() Namjae Jeon
2024-04-25 21:14 2% fs/smb/client/smb2pdu.c:3639 __SMB2_close() error: __builtin_memcpy() '&rsp->network_open_info' too small (52 vs 56) kernel test robot
2024-04-26 7:18 2% linux-next: Tree for Apr 26 Stephen Rothwell
2024-04-26 11:04 3% [syzbot] [can?] KMSAN: kernel-infoleak in raw_recvmsg syzbot
2024-05-06 3:34 0% ` Oliver Hartkopp
2024-04-26 15:05 1% [PATCH v2 00/35] x86/resctrl: Move the resctrl filesystem code to /fs/resctrl Dave Martin
2024-04-29 23:34 0% ` Peter Newman
2024-04-30 16:29 0% ` Dave Martin
2024-04-27 11:09 2% [syzbot] [kernfs?] possible deadlock in kernfs_seq_start syzbot
2024-04-27 15:54 6% Linux 5.15.157 Greg Kroah-Hartman
2024-04-27 15:54 5% ` Greg Kroah-Hartman
2024-04-27 15:54 3% Linux 6.1.88 Greg Kroah-Hartman
2024-04-27 15:55 3% Linux 6.6.29 Greg Kroah-Hartman
2024-04-27 15:55 3% Linux 6.8.8 Greg Kroah-Hartman
2024-04-28 10:32 [syzbot] [crypto?] KMSAN: uninit-value in aes_encrypt (5) syzbot
2024-05-10 4:02 3% ` syzbot
2024-04-28 19:41 4% Samba ctime still reported incorrectly Steve French
2024-04-29 8:51 0% ` Ralph Boehme
2024-04-29 17:17 0% ` Jeremy Allison
2024-04-29 19:27 0% ` Ralph Boehme
2024-04-28 20:58 4% Linux 6.9-rc6 Linus Torvalds
2024-04-28 23:27 4% query fs info level 0x100 Steve French
2024-04-29 5:31 0% ` Ralph Boehme
2024-04-29 16:13 4% ` Steve French
2024-04-29 16:37 0% ` Stefan Metzmacher
2024-04-29 16:44 0% ` Ralph Boehme
2024-04-29 17:11 0% ` Jeremy Allison
2024-04-30 3:30 0% ` Steve French
2024-04-29 7:20 1% linux-next: Tree for Apr 29 Stephen Rothwell
2024-04-30 7:04 2% linux-next: Tree for Apr 30 Stephen Rothwell
2024-05-01 5:21 8% CVE-2024-26952: ksmbd: fix potencial out-of-bounds when buffer offset is invalid Greg Kroah-Hartman
2024-05-01 5:21 8% CVE-2024-26954: ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16() Greg Kroah-Hartman
2024-05-01 5:30 8% CVE-2024-26936: ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
2024-05-01 5:30 8% CVE-2024-26980: ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
2024-05-01 10:21 2% linux-next: Tree for May 1 Stephen Rothwell
2024-05-02 3:10 2% [kernel-cve-report] New CVE entries this week Masami Ichikawa
2024-05-02 6:47 2% linux-next: Tree for May 2 Stephen Rothwell
2024-05-02 12:14 8% [PATCH 1/4] ksmbd: off ipv6only for both ipv4/ipv6 binding Namjae Jeon
2024-05-02 12:14 8% ` [PATCH 2/4] ksmbd: avoid to send duplicate lease break notifications Namjae Jeon
2024-05-02 12:14 3% ` [PATCH 3/4] ksmbd: use rwsem instead of rwlock for lease break Namjae Jeon
2024-05-02 12:14 9% ` [PATCH 4/4] ksmbd: do not grant v2 lease if parent lease key and epoch are not set Namjae Jeon
2024-05-03 2:40 [PATCH 00/12] linux-yocto: v6.6 updates bruce.ashfield
2024-05-03 2:40 1% ` [PATCH 01/12] linux-yocto/6.6: update to v6.6.24 bruce.ashfield
2024-05-03 2:40 2% ` [PATCH 06/12] linux-yocto/6.6: update to v6.6.27 bruce.ashfield
2024-05-03 2:40 4% ` [PATCH 11/12] linux-yocto/6.6: update to v6.6.29 bruce.ashfield
2024-05-03 2:52 [OE-core][kirkstone 01/12] linux-yocto/5.15: update to v5.15.151 bruce.ashfield
2024-05-03 2:52 1% ` [OE-core][kirkstone 07/12] linux-yocto/5.15: update to v5.15.155 bruce.ashfield
2024-05-03 2:52 3% ` [OE-core][kirkstone 11/12] linux-yocto/5.15: update to v5.15.157 bruce.ashfield
2024-05-03 17:39 0% ` Steve Sakoman
2024-05-03 17:40 0% ` Bruce Ashfield
2024-05-03 3:00 1% [OE-core][nanbield 01/10] linux-yocto/6.1: update to v6.1.79 bruce.ashfield
2024-05-03 3:00 1% ` [OE-core][nanbield 06/10] linux-yocto/6.1: update to v6.1.84 bruce.ashfield
2024-05-03 3:00 3% ` [OE-core][nanbield 07/10] linux-yocto/6.1: update to v6.1.86 bruce.ashfield
2024-05-03 3:00 4% ` [OE-core][nanbield 09/10] linux-yocto/6.1: update to v6.1.89 bruce.ashfield
2024-05-03 4:28 6% backport of missing fs/smb patches not in 6.6.30 stable Steve French
2024-05-06 23:11 0% ` Sasha Levin
2024-05-03 7:17 2% linux-next: Tree for May 3 Stephen Rothwell
2024-05-05 4:10 1% rmmod cifs error Steve French
2024-05-06 3:08 8% Added various xfstests to ksmbd test run Steve French
2024-05-06 6:49 2% linux-next: Tree for May 6 Stephen Rothwell
2024-05-07 7:10 2% linux-next: Tree for May 7 Stephen Rothwell
2024-05-07 12:50 4% [ANNOUNCE] Release v6.1.90-cip20 nobuhiro1.iwamatsu
2024-05-07 18:44 kdevops BoF at LSFMM Luis Chamberlain
2024-05-08 7:45 ` Amir Goldstein
2024-05-08 17:45 3% ` Steve French
2024-05-08 17:54 0% ` Chuck Lever III
2024-05-12 20:20 0% ` Luis Chamberlain
2024-05-08 7:29 2% linux-next: Tree for May 8 Stephen Rothwell
2024-05-08 15:19 11% [GIT PULL] ksmbd fixes Steve French
2024-05-08 17:46 4% ` pr-tracker-bot
2024-05-08 21:24 11% ksmbd stuck open response Steve French
2024-05-09 12:31 4% ` Namjae Jeon
2024-05-09 1:21 4% ❌ FAIL (MISSED 5 of 204): Test report for master (6.9.0-rc7, mainline.kernel.org-clang, 45db3ab7) cki-project
2024-05-09 6:37 3% linux-next: Tree for May 9 Stephen Rothwell
2024-05-09 8:04 [syzbot] [bcachefs?] kernel BUG in __journal_res_get syzbot
2024-05-10 5:08 4% ` syzbot
2024-05-09 12:04 [OE-core][kirkstone 00/23] Patch review Steve Sakoman
2024-05-09 12:04 1% ` [OE-core][kirkstone 14/23] linux-yocto/5.15: update to v5.15.155 Steve Sakoman
2024-05-09 12:04 3% ` [OE-core][kirkstone 18/23] linux-yocto/5.15: update to v5.15.157 Steve Sakoman
2024-05-09 14:25 5% [GIT PULL] keys changes for v6.10-rc1 Jarkko Sakkinen
2024-05-09 15:47 5% [GIT PULL] trusted " Jarkko Sakkinen
2024-05-09 20:04 4% [GIT PULL] TPM DEVICE DRIVER: tpmdd-next-6.10-rc1 Jarkko Sakkinen
2024-05-10 7:28 2% linux-next: Tree for May 10 Stephen Rothwell
2024-05-10 8:45 3% [syzbot] [bcachefs?] KMSAN: uninit-value in bch2_checksum_update syzbot
2024-05-10 13:28 3% [syzbot] [lsm?] WARNING in collect_domain_accesses syzbot
2024-05-11 17:32 9% Lots of testing progress with ksmbd Steve French
2024-05-11 18:05 [RFC PATCH] fs: dcache: Delete the associated dentry when deleting a file Linus Torvalds
2024-05-11 18:26 ` [PATCH] vfs: move dentry shrinking outside the inode lock in 'rmdir()' Linus Torvalds
2024-05-11 18:42 4% ` Linus Torvalds
2024-05-12 1:13 1% commits for stable 2024-05-11 Ronnie Sahlberg
2024-05-12 21:34 5% Linux 6.9 Linus Torvalds
2024-05-13 7:11 2% linux-next: Tree for May 13 Stephen Rothwell
2024-05-13 11:53 2% [syzbot] [ext4?] possible deadlock in ext4_xattr_set_handle (5) syzbot
2024-05-13 15:21 9% FAILED: patch "[PATCH] ksmbd: use rwsem instead of rwlock for lease break" failed to apply to 6.6-stable tree gregkh
2024-05-13 15:21 8% FAILED: patch "[PATCH] ksmbd: use rwsem instead of rwlock for lease break" failed to apply to 6.8-stable tree gregkh
2024-05-13 15:21 9% FAILED: patch "[PATCH] ksmbd: use rwsem instead of rwlock for lease break" failed to apply to 6.1-stable tree gregkh
2024-05-13 15:44 2% [syzbot] [bcachefs?] KASAN: slab-use-after-free Read in evict_inodes syzbot
2024-05-13 18:28 3% [syzbot] [overlayfs?] WARNING in ovl_workdir_create (3) syzbot
2024-05-17 15:40 0% ` Miklos Szeredi
2024-05-17 15:43 0% ` Aleksandr Nogikh
2024-05-14 1:10 3% [syzbot] [bcachefs?] KMSAN: uninit-value in bch2_dirent_invalid syzbot
2024-05-14 5:53 3% [syzbot] [net?] [nfc?] KMSAN: uninit-value in nci_rsp_packet (2) syzbot
2024-05-14 7:22 2% linux-next: Tree for May 14 Stephen Rothwell
2024-05-14 10:13 1% [PATCH 6.8 000/336] 6.8.10-rc1 review Greg Kroah-Hartman
2024-05-14 10:18 8% ` [PATCH 6.8 322/336] ksmbd: off ipv6only for both ipv4/ipv6 binding Greg Kroah-Hartman
2024-05-14 10:18 8% ` [PATCH 6.8 323/336] ksmbd: avoid to send duplicate lease break notifications Greg Kroah-Hartman
2024-05-14 10:18 9% ` [PATCH 6.8 324/336] ksmbd: do not grant v2 lease if parent lease key and epoch are not set Greg Kroah-Hartman
2024-05-14 10:14 2% [PATCH 6.6 000/301] 6.6.31-rc1 review Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.6 287/301] ksmbd: off ipv6only for both ipv4/ipv6 binding Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.6 288/301] ksmbd: avoid to send duplicate lease break notifications Greg Kroah-Hartman
2024-05-14 10:19 9% ` [PATCH 6.6 289/301] ksmbd: do not grant v2 lease if parent lease key and epoch are not set Greg Kroah-Hartman
2024-05-14 10:16 2% [PATCH 6.1 000/236] 6.1.91-rc1 review Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.1 229/236] ksmbd: off ipv6only for both ipv4/ipv6 binding Greg Kroah-Hartman
2024-05-14 10:19 8% ` [PATCH 6.1 230/236] ksmbd: avoid to send duplicate lease break notifications Greg Kroah-Hartman
2024-05-14 10:19 9% ` [PATCH 6.1 231/236] ksmbd: do not grant v2 lease if parent lease key and epoch are not set Greg Kroah-Hartman
2024-05-14 10:18 4% [PATCH 5.15 000/168] 5.15.159-rc1 review Greg Kroah-Hartman
2024-05-14 10:18 14% ` [PATCH 5.15 004/168] ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf Greg Kroah-Hartman
2024-05-14 10:18 15% ` [PATCH 5.15 005/168] ksmbd: validate request buffer size in smb2_allocate_rsp_buf() Greg Kroah-Hartman
2024-05-14 10:18 15% ` [PATCH 5.15 006/168] ksmbd: clear RENAME_NOREPLACE before calling vfs_rename Greg Kroah-Hartman
2024-05-15 6:41 2% linux-next: Tree for May 15 Stephen Rothwell
2024-05-15 8:27 2% [PATCH 6.6 000/309] 6.6.31-rc2 review Greg Kroah-Hartman
2024-05-15 8:27 1% [PATCH 6.8 000/340] 6.8.10-rc2 review Greg Kroah-Hartman
2024-05-15 16:37 3% ` Mark Brown
2024-05-16 12:10 0% ` Greg Kroah-Hartman
2024-05-15 8:27 2% [PATCH 6.1 000/243] 6.1.91-rc2 review Greg Kroah-Hartman
2024-05-15 8:27 4% [PATCH 5.15 000/168] 5.15.159-rc2 review Greg Kroah-Hartman
2024-05-16 5:00 2% linux-next: Tree for May 16 Stephen Rothwell
2024-05-16 9:13 2% [PATCH 6.1 000/244] 6.1.91-rc3 review Greg Kroah-Hartman
2024-05-16 12:14 1% [PATCH 6.8 000/339] 6.8.10-rc3 review Greg Kroah-Hartman
2024-05-16 12:15 2% [PATCH 6.6 000/308] 6.6.31-rc3 review Greg Kroah-Hartman
[not found] <20240517.004903.736683498204817840.syoshida@redhat.com>
2024-05-16 16:24 4% ` [syzbot] [can?] KMSAN: kernel-infoleak in raw_recvmsg syzbot
2024-05-17 3:39 2% linux-next: Tree for May 17 Stephen Rothwell
2024-05-17 11:58 4% Linux 5.15.159 Greg Kroah-Hartman
2024-05-17 11:58 2% ` Greg Kroah-Hartman
2024-05-17 11:58 2% Linux 6.1.91 Greg Kroah-Hartman
2024-05-17 11:58 2% Linux 6.6.31 Greg Kroah-Hartman
2024-05-17 11:58 2% Linux 6.8.10 Greg Kroah-Hartman
2024-05-17 14:01 8% CVE-2023-52666: ksmbd: fix potential circular locking issue in smb2_set_ea() Greg Kroah-Hartman
2024-05-20 3:48 2% linux-next: Tree for May 20 Stephen Rothwell
2024-05-21 2:54 2% linux-next: Tree for May 21 Stephen Rothwell
2024-05-21 7:44 2% [linus:master] [keys] 9578e327b2: stress-ng.key.ops_per_sec -98.9% regression kernel test robot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.