| /linux/drivers/net/ethernet/aquantia/atlantic/ |
| H A D | aq_macsec.h | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/drivers/net/phy/mscc/ |
| H A D | mscc_macsec.h | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| H A D | mscc_macsec.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/include/net/ |
| H A D | macsec.h | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| H A D | xsk_buff_pool.h | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/net/can/j1939/ |
| H A D | main.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| H A D | socket.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/net/ipv4/ |
| H A D | udp_bpf.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/drivers/net/ethernet/sfc/ |
| H A D | ef10_sriov.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/net/netfilter/ |
| H A D | nft_tproxy.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| H A D | nft_osf.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| H A D | nf_tables_offload.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| H A D | nft_exthdr.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/drivers/net/ethernet/broadcom/ |
| H A D | bcm4908_enet.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/drivers/net/ieee802154/ |
| H A D | mac802154_hwsim.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/drivers/net/can/peak_canfd/ |
| H A D | peak_canfd.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/drivers/net/ethernet/ezchip/ |
| H A D | nps_enet.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/net/sctp/ |
| H A D | bind_addr.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/tools/bpf/resolve_btfids/ |
| H A D | main.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/tools/testing/selftests/bpf/prog_tests/ |
| H A D | sockmap_listen.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/drivers/atm/ |
| H A D | nicstar.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/drivers/net/ethernet/microsoft/mana/ |
| H A D | mana_en.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/net/can/ |
| H A D | gw.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| H A D | isotp.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
| /linux/drivers/net/ethernet/aeroflex/ |
| H A D | greth.c | diff b6df00789e2831fff7a2c65aa7164b2a4dcbe599 Wed Jun 30 00:45:27 CEST 2021 Jakub Kicinski <kuba@kernel.org> Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Trivial conflict in net/netfilter/nf_tables_api.c.
Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.
skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|