diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2022-10-03 17:44:18 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-10-03 17:44:18 -0700 |
| commit | e52f7c1ddf3e47243c330923ea764e7ccfbe99f7 (patch) | |
| tree | b7caf07ec39e08cb10e6441966dc1ba5b6cfde15 /arch/nds32/lib/git:/git.zx2c4.com/ssh:/git@git.zx2c4.com | |
| parent | once: rename _SLOW to _SLEEPABLE (diff) | |
| parent | net: mvpp2: fix mvpp2 debugfs leak (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in the left-over fixes before the net-next pull-request.
Conflicts:
drivers/net/ethernet/mediatek/mtk_ppe.c
ae3ed15da588 ("net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear")
9d8cb4c096ab ("net: ethernet: mtk_eth_soc: add foe_entry_size to mtk_eth_soc")
https://lore.kernel.org/all/6cb6893b-4921-a068-4c30-1109795110bb@tessares.net/
kernel/bpf/helpers.c
8addbfc7b308 ("bpf: Gate dynptr API behind CAP_BPF")
5679ff2f138f ("bpf: Move bpf_loop and bpf_for_each_map_elem under CAP_BPF")
8a67f2de9b1d ("bpf: expose bpf_strtol and bpf_strtoul to all program types")
https://lore.kernel.org/all/20221003201957.13149-1-daniel@iogearbox.net/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/nds32/lib/git:/git.zx2c4.com/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions