On Wed, Aug 31, 2022 at 5:55 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> tools/testing/selftests/net/.gitignore
>
> between commit:
>
> 5a3a59981027 ("selftests: net: sort .gitignore file")
>
> from the net tree and commits:
>
> c35ecb95c448 ("selftests/net: Add test for timing a bind request to a port with a populated bhash entry")
> 1be9ac87a75a ("selftests/net: Add sk_bind_sendto_listen and sk_connect_zero_addr")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Thanks Stephen, and sorry for the trouble.
For what it's worth, I talked about the potential for conflicts with
Jakub in this thread [1]. For next time, is calling it out in the
commit message explicitly the right thing to do?
[1]: https://patchwork.kernel.org/project/netdevbpf/patch/20220819190558.477166-1-axelrasmussen@xxxxxxxxxx/
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc tools/testing/selftests/net/.gitignore
> index de7d5cc15f85,bec5cf96984c..000000000000
> --- a/tools/testing/selftests/net/.gitignore
> +++ b/tools/testing/selftests/net/.gitignore
> @@@ -1,15 -1,7 +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
> @@@ -20,23 -11,35 +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
> - socket
> -timestamping
> -txtimestamp
> ++sk_bind_sendto_listen
> ++sk_connect_zero_addr
> so_netns_cookie
> +so_txtime
> ++socket
> +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
