From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C517ECAAD2 for ; Thu, 1 Sep 2022 20:00:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234747AbiIAT75 (ORCPT ); Thu, 1 Sep 2022 15:59:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234761AbiIAT7y (ORCPT ); Thu, 1 Sep 2022 15:59:54 -0400 Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5485D62F4 for ; Thu, 1 Sep 2022 12:59:51 -0700 (PDT) Received: by mail-il1-x12a.google.com with SMTP id s11so38202ilt.7 for ; Thu, 01 Sep 2022 12:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=ekynf+/BSh/SSLKbRbwHtlCTZ6yGYWXyonn9Bv5B8Bc=; b=SkX7tOUcaATU7cJVXxyr9eimSNbrsSgQAivI4QMSQOiXuRj0XvDIl716g23uG0rDBK Tot2KOcKVaz1Vmkf7Hc+ulgsBCzQAMBZGsOtL4BeJnulNeN3CPqgwNKhR8tqsN/cS2DM Gdf2rNbG+qQ8jgS0bMS8rXzrp9Sxryg8iog8jquadAF9DwPm8RByST8m/5Ul7r20LYSF nZHXj8ufx6beh6I0LRKXT8IqeD9m2kEmqA2LUC9a0i64fHo31b2zGDnHE+p12smhriLi A6ZzOgIUwbSnX1iiWZ7LuUV/9bRKXEuZQ6uj7ZBs8XLkY5d4WLeVeTRlMrRrBI5ahNsR Egpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=ekynf+/BSh/SSLKbRbwHtlCTZ6yGYWXyonn9Bv5B8Bc=; b=Cr/DnpqZhEZebupdIfKhXfAgDgmSIBZXFR9CgggvmVqQfj53s5N0Vg1fx/zCDB4nal prw1u8PCAy7L/gpZ6N7Ue7wjKte2LpeC6YYpCuQb4kD9J4CiT6kZKDmdHx0bmTyQk7Nv U4xcqNLdWQqW92Y2AtR2SFBu0QAq5lkki9nJWXq9HWDs/ndD+WGPk+FpnZhmBzMCgvUc b9wayygH4d1wgHTjMQlwzKWa8cl+iqHFr2Y3CmpUwyEprpt+0zk6K4e/NT/ouVcq8d2z qUOLS3nRbS0xgqnyCKCmOKcAk5d3Dwr78zhudrkWhZvvRfw09LAXT9wkPh/GJ0Y+m5G3 Ad4Q== X-Gm-Message-State: ACgBeo3dbihk76SDtlbVL8ACNmi9jlizDTEXGyD8YNfpFEOYyBHNyf6C y7sU0alc6Jx+n7nFni1rpGJY6m1pnTeCasxvHqCyK7OWUoRizA== X-Google-Smtp-Source: AA6agR49NPfEJI4FfVSTP4h6PGe2YxY4wjxg6NOvPXrQ5XwPJyXndWzskiAsxBlViqFWenXpXCk7Z0ld77R3caQiLEQ= X-Received: by 2002:a92:da0d:0:b0:2eb:3361:c58c with SMTP id z13-20020a92da0d000000b002eb3361c58cmr8430258ilm.247.1662062390589; Thu, 01 Sep 2022 12:59:50 -0700 (PDT) MIME-Version: 1.0 References: <20220901105512.177ed27d@canb.auug.org.au> In-Reply-To: <20220901105512.177ed27d@canb.auug.org.au> From: Axel Rasmussen Date: Thu, 1 Sep 2022 12:59:14 -0700 Message-ID: Subject: Re: linux-next: manual merge of the net-next tree with the net tree To: Stephen Rothwell Cc: David Miller , Networking , Jakub Kicinski , Joanne Koong , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 31, 2022 at 5:55 PM Stephen Rothwell 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@google.com/ > > -- > 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