diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-08-29 18:57:22 -0700 | 
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-08-29 18:57:23 -0700 | 
| commit | c407beb5b883b8b89c9372e588bad5634a30927a (patch) | |
| tree | c45295665e1ebc8723fe136c1db7575ed9b58e55 /net/lapb/lapb_subr.c | |
| parent | d6a367ec6c96fc8e61b4d67e69df03565ec69fb7 (diff) | |
| parent | 54416fd76770bd04fc3c501810e8d673550bab26 (diff) | |
Merge tag 'nf-25-08-27' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
Florian Westphal says:
====================
netfilter updates for net
1) Remove bogus WARN_ON in br_netfilter that came in 6.8.
   This is now more prominent due to
   commit 2d72afb34065 ("netfilter: nf_conntrack: fix crash due to
   removal of uninitialised entry"). From Wang Liang.
2) Better error reporting when a helper module clashes with
   an existing helper name: -EEXIST makes modprobe believe that
   the module is already loaded, so error message is elided.
   From Phil Sutter.
* tag 'nf-25-08-27' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  netfilter: conntrack: helper: Replace -EEXIST by -EBUSY
  netfilter: br_netfilter: do not check confirmed bit in br_nf_local_in() after confirm
====================
Link: https://patch.msgid.link/20250827133900.16552-1-fw@strlen.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions
