diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2026-10-08 22:20:04 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-10-08 22:21:56 -0700 |
| commit | d8674294aefef02266c4d47ad10131f1bffbe534 (patch) | |
| tree | 549fb0ed04e13a643d3ccd96fda2bc5e767cdd3d /include/linux/platform_data | |
| parent | 758fe10f83a655bed0f7b98fcfacdfc3556fb9a1 (diff) | |
| parent | af32da41b0327b9c6a37856ba82b6760d6c8d10e (diff) | |
| download | linux-next-d8674294aefef02266c4d47ad10131f1bffbe534.tar.gz linux-next-d8674294aefef02266c4d47ad10131f1bffbe534.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-7.3-rc7).
Conflicts:
include/net/strparser.h
0984ebc631792 ("strparser: make sure __strp_recv isn't running before tearing down the parser")
02fd0a2111374 ("net: strparser: removed the aborted bit and aborts counter")
https://lore.kernel.org/asYfmLsfy-SCxXjr@sirena.co.uk
Adjacent changes:
Documentation/networking/strparser.rst
5f193cdabf25 ("docs: networking: strparser: remove general mode")
0984ebc63179 ("strparser: make sure __strp_recv isn't running before tearing down the parser")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux/platform_data')
0 files changed, 0 insertions, 0 deletions