summaryrefslogtreecommitdiff
path: root/Documentation/admin-guide
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2026-03-12 12:53:34 -0700
committerJakub Kicinski <kuba@kernel.org>2026-03-19 14:16:00 -0700
commitedab1ca5ec6fffecbf340e26956ce73e502901d5 (patch)
treed1cec843415f5b36a31d50e4f164d0d9a2a2fadb /Documentation/admin-guide
parent9ac76f3d0bb2940db3a9684d596b9c8f301ef315 (diff)
parenta1d9d8e833781c44ab688708804ce35f20f3cbbd (diff)
downloadlwn-edab1ca5ec6fffecbf340e26956ce73e502901d5.tar.gz
lwn-edab1ca5ec6fffecbf340e26956ce73e502901d5.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-7.0-rc5). net/netfilter/nft_set_rbtree.c 598adea720b97 ("netfilter: revert nft_set_rbtree: validate open interval overlap") 3aea466a43998 ("netfilter: nft_set_rbtree: don't disable bh when acquiring tree lock") https://lore.kernel.org/abgaQBpeGstdN4oq@sirena.org.uk No adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'Documentation/admin-guide')
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 55ffc0f8858a..03a550630644 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -8196,6 +8196,9 @@ Kernel parameters
p = USB_QUIRK_SHORT_SET_ADDRESS_REQ_TIMEOUT
(Reduce timeout of the SET_ADDRESS
request from 5000 ms to 500 ms);
+ q = USB_QUIRK_FORCE_ONE_CONFIG (Device
+ claims zero configurations,
+ forcing to 1);
Example: quirks=0781:5580:bk,0a5c:5834:gij
usbhid.mousepoll=