diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-10-13 01:17:46 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-10-13 02:07:34 +0200 |
| commit | 0e6bb5b7f4c8e6665e76bdafce37ad4a8daf83c5 (patch) | |
| tree | 6f71fc5628f01bcf9d2dc6eceb3000ee4e73c79a /drivers/cdrom | |
| parent | net: gso_test: fix build with gcc-12 and earlier (diff) | |
| parent | Merge tag 'net-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-0e6bb5b7f4c8e6665e76bdafce37ad4a8daf83c5.tar.xz linux-0e6bb5b7f4c8e6665e76bdafce37ad4a8daf83c5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
kernel/bpf/verifier.c
829955981c55 ("bpf: Fix verifier log for async callback return values")
a923819fb2c5 ("bpf: Treat first argument as return value for bpf_throw")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/cdrom')
0 files changed, 0 insertions, 0 deletions