aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/git-resolve.sh
diff options
context:
space:
mode:
authorJakub Kicinski <[email protected]>2025-06-05 14:59:31 +0000
committerJakub Kicinski <[email protected]>2025-06-05 14:59:31 +0000
commit4bbe2e570f454ca1765d4e45b9b8266c4e65c581 (patch)
tree1ffe4ed8d863398f1258cb1d2be223af995a7eb0 /scripts/git-resolve.sh
parentwireguard: device: enable threaded NAPI (diff)
parentiavf: get rid of the crit lock (diff)
downloadkernel-4bbe2e570f454ca1765d4e45b9b8266c4e65c581.tar.gz
kernel-4bbe2e570f454ca1765d4e45b9b8266c4e65c581.zip
Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
Tony Nguyen says: ==================== iavf: get rid of the crit lock Przemek Kitszel says: Fix some deadlocks in iavf, and make it less error prone for the future. Patch 1 is simple and independent from the rest. Patches 2, 3, 4 are strictly a refactor, but it enables the last patch to be much smaller. (Technically Jake given his RB tags not knowing I will send it to -net). Patch 5 just adds annotations, this also helps prove last patch to be correct. Patch 6 removes the crit lock, with its unusual try_lock()s. I have more refactoring for scheduling done for -next, to be sent soon. There is a simple test: add VF; decrease number of queueus; remove VF that was way too hard to pass without this series :) * '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue: iavf: get rid of the crit lock iavf: sprinkle netdev_assert_locked() annotations iavf: extract iavf_watchdog_step() out of iavf_watchdog_task() iavf: simplify watchdog_task in terms of adminq task scheduling iavf: centralize watchdog requeueing itself iavf: iavf_suspend(): take RTNL before netdev_lock() ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'scripts/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions