From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 1 Sep 2022 19:58:02 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=60ad1100d525699bce83690757ff3077c6ab83ab;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

tools/testing/selftests/net/.gitignore
  sort the net-next version and use it

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

60ad1100d525699bce83690757ff3077c6ab83ab
diff --cc tools/testing/selftests/net/.gitignore
index bec5cf96984c1,de7d5cc15f857..3d7adee7a3e6f
--- a/tools/testing/selftests/net/.gitignore
+++ b/tools/testing/selftests/net/.gitignore
@@@ -1,7 -1,15 +1,16 @@@
  # SPDX-License-Identifier: GPL-2.0-only
++bind_bhash
+ cmsg_sender
+ fin_ack_lat
+ gro
+ hwtstamp_config
+ ioam6_parser
+ ip_defrag
  ipsec
+ ipv6_flowlabel
+ ipv6_flowlabel_mgr
  msg_zerocopy
- socket
+ nettest
  psock_fanout
  psock_snd
  psock_tpacket
@@@ -11,35 -20,23 +21,25 @@@ reuseport_bp
  reuseport_bpf_cpu
  reuseport_bpf_numa
  reuseport_dualstack
- reuseaddr_conflict
- tcp_mmap
- udpgso
- udpgso_bench_rx
- udpgso_bench_tx
- tcp_inq
- tls
- txring_overwrite
- ip_defrag
- ipv6_flowlabel
- ipv6_flowlabel_mgr
- so_txtime
- tcp_fastopen_backup_key
- nettest
- fin_ack_lat
- reuseaddr_ports_exhausted
- hwtstamp_config
  rxtimestamp
- timestamping
- txtimestamp
++sk_bind_sendto_listen
++sk_connect_zero_addr
+ socket
  so_netns_cookie
+ so_txtime
+ stress_reuseport_listen
+ tap
+ tcp_fastopen_backup_key
+ tcp_inq
+ tcp_mmap
  test_unix_oob
- gro
- ioam6_parser
+ timestamping
+ tls
  toeplitz
  tun
- cmsg_sender
+ txring_overwrite
+ txtimestamp
+ udpgso
+ udpgso_bench_rx
+ udpgso_bench_tx
  unix_connect
- tap
- bind_bhash
- sk_bind_sendto_listen
- sk_connect_zero_addr