From: Jakub Kicinski <kuba@kernel.org>
To: torvalds@linux-foundation.org
Cc: kuba@kernel.org, davem@davemloft.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, pabeni@redhat.com
Subject: [GIT PULL] Networking follow up for 6.7
Date: Tue, 31 Oct 2023 18:18:12 -0700 [thread overview]
Message-ID: <20231101011812.2653409-1-kuba@kernel.org> (raw)
In-Reply-To: <CAHk-=wjTWHVjEA2wfU+eHMXygyuh4Jf_tqXRxv8VnzqAPB4htg@mail.gmail.com>
> Well, I had actually already merged the original pull request, and
> then started a full allmodconfig build.
>
> And because I'm off gallivanting and traveling, that takes 2h on this
> poor little laptop, so I had left to do more fun things than watch
> paint dry.
Eish. Sorry.
> I pushed out my original merge. I'll pull the updates later.
In case it's helpful here's a tag with just the delta described.
Running a risk of another race condition :)
The following changes since commit f1c73396133cb3d913e2075298005644ee8dfade:
net: pcs: xpcs: Add 2500BASE-X case in get state for XPCS drivers (2023-10-27 15:59:44 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git tags/net-next-6.7-followup
for you to fetch changes up to f2fbb908112311423b09cd0d2b4978f174b99585:
net: tcp: remove call to obsolete crypto_ahash_alignmask() (2023-10-31 13:11:51 -0700)
----------------------------------------------------------------
Follow up to networking PR for 6.7
- Support GRO decapsulation for IPsec ESP in UDP.
- Add a handful of MODULE_DESCRIPTION()s.
- Drop questionable alignment check in TCP AO to avoid
build issue after changes in the crypto tree.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
----------------------------------------------------------------
Florian Westphal (4):
xfrm: pass struct net to xfrm_decode_session wrappers
xfrm: move mark and oif flowi decode into common code
xfrm: policy: replace session decode with flow dissector
xfrm: policy: fix layer 4 flowi decoding
Jakub Kicinski (5):
net: fill in MODULE_DESCRIPTION()s in kuba@'s modules
net: fill in MODULE_DESCRIPTION()s under net/core
net: fill in MODULE_DESCRIPTION()s under net/802*
net: fill in MODULE_DESCRIPTION()s under drivers/net/
Merge tag 'ipsec-next-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Kees Cook (1):
xfrm: Annotate struct xfrm_sec_ctx with __counted_by
Steffen Klassert (6):
xfrm: Use the XFRM_GRO to indicate a GRO call on input
xfrm: Support GRO for IPv4 ESP in UDP encapsulation
xfrm: Support GRO for IPv6 ESP in UDP encapsulation
Merge branch 'xfrm: Support GRO decapsulation for ESP in UDP encapsulation'
Merge branch 'xfrm: policy: replace session decode with flow dissector'
xfrm Fix use after free in __xfrm6_udp_encap_rcv.
Stephen Rothwell (1):
net: tcp: remove call to obsolete crypto_ahash_alignmask()
Yue Haibing (1):
xfrm: Remove unused function declarations
drivers/net/amt.c | 1 +
drivers/net/dummy.c | 1 +
drivers/net/eql.c | 1 +
drivers/net/ifb.c | 1 +
drivers/net/macvtap.c | 1 +
drivers/net/netdevsim/netdev.c | 1 +
drivers/net/sungem_phy.c | 1 +
drivers/net/tap.c | 1 +
drivers/net/wireless/mediatek/mt7601u/usb.c | 1 +
include/net/gro.h | 2 +-
include/net/ipv6_stubs.h | 3 +
include/net/xfrm.h | 18 +-
include/uapi/linux/xfrm.h | 3 +-
net/802/fddi.c | 1 +
net/802/garp.c | 1 +
net/802/mrp.c | 1 +
net/802/p8022.c | 1 +
net/802/psnap.c | 1 +
net/802/stp.c | 1 +
net/8021q/vlan.c | 1 +
net/core/dev_addr_lists_test.c | 1 +
net/core/selftests.c | 1 +
net/ipv4/esp4_offload.c | 6 +-
net/ipv4/icmp.c | 2 +-
net/ipv4/ip_vti.c | 4 +-
net/ipv4/netfilter.c | 2 +-
net/ipv4/tcp_ao.c | 6 -
net/ipv4/udp.c | 16 ++
net/ipv4/xfrm4_input.c | 95 +++++++--
net/ipv6/af_inet6.c | 1 +
net/ipv6/esp6_offload.c | 10 +-
net/ipv6/icmp.c | 2 +-
net/ipv6/ip6_vti.c | 4 +-
net/ipv6/netfilter.c | 2 +-
net/ipv6/xfrm6_input.c | 103 ++++++++--
net/netfilter/nf_nat_proto.c | 2 +-
net/xfrm/xfrm_input.c | 6 +-
net/xfrm/xfrm_interface_core.c | 4 +-
net/xfrm/xfrm_policy.c | 301 ++++++++++++----------------
39 files changed, 362 insertions(+), 248 deletions(-)
next prev parent reply other threads:[~2023-11-01 1:18 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-28 1:17 [GIT PULL] Networking for 6.7 Jakub Kicinski
2023-10-30 23:15 ` Jakub Kicinski
2023-10-31 21:09 ` [GIT PULL v2] " Jakub Kicinski
2023-10-31 22:57 ` Linus Torvalds
2023-11-01 1:18 ` Jakub Kicinski [this message]
2023-11-02 2:51 ` pr-tracker-bot
2023-11-09 15:49 ` Kirill A. Shutemov
2023-11-09 16:01 ` Alexei Starovoitov
2023-11-09 16:14 ` Kirill A. Shutemov
2023-11-09 18:09 ` Yonghong Song
2023-11-09 18:18 ` Alexei Starovoitov
2023-11-09 18:41 ` Yonghong Song
2023-11-14 13:30 ` Linux regression tracking #adding (Thorsten Leemhuis)
2023-10-31 23:00 ` [GIT PULL] " pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231101011812.2653409-1-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.