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 2E81EC54EE9 for ; Thu, 22 Sep 2022 20:00:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232740AbiIVUAc (ORCPT ); Thu, 22 Sep 2022 16:00:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232777AbiIVUAC (ORCPT ); Thu, 22 Sep 2022 16:00:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C963410D65D; Thu, 22 Sep 2022 12:59:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0562D6115C; Thu, 22 Sep 2022 19:59:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D93D5C433D6; Thu, 22 Sep 2022 19:59:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663876750; bh=8JkOYZR01lEo18px3jH97GFzQcOf/gCjHG8IRSVX1fU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=XqD4FqSFIjqiAe81OoGf1PfmzuoB+cr3bVp1YYPbi5L7/NcHt9anCQ67kDQQCCJ0O ryrAXvo7W1bx18KmSkfb49iKDOjlxsUJ2MKc2l/see7ALYK2Oikc7CNnrZyUdcIpQr eu5wEeYyzJ9PquSp/IiVSpHz4za5WmoKO1q4Zd2adv8bA2kv9+hqHLOaXp5EeHSMMR BQFAgqM8xIv7SXj6A8Ff/aTfCCYLpqbBnRhFRPsBXU0H8GARpX9yraG3KX9mDd6YEy 15V9wdyQCzgn70Hg+aD8dg88ZYT/R18FrRnh/wh1eAxJ388FbYhffAck14JVroy3gT kqy3+K9synnAg== Date: Thu, 22 Sep 2022 12:59:08 -0700 From: Jakub Kicinski To: Matthieu Baerts Cc: Stephen Rothwell , David Miller , Networking , Benjamin Poirier , Hangbin Liu , Linux Kernel Mailing List , Linux Next Mailing List , MPTCP Upstream Subject: Re: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20220922125908.28efd4b4@kernel.org> In-Reply-To: <2b4722a2-04cd-5e8f-ee09-c01c55aee7a7@tessares.net> References: <20220921110437.5b7dbd82@canb.auug.org.au> <2b4722a2-04cd-5e8f-ee09-c01c55aee7a7@tessares.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, 21 Sep 2022 11:18:17 +0200 Matthieu Baerts wrote: > Hi Stephen, > > On 21/09/2022 03:04, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the net-next tree got a conflict in: > > > > tools/testing/selftests/drivers/net/bonding/Makefile > > > > between commit: > > > > bbb774d921e2 ("net: Add tests for bonding and team address list management") > > > > from the net tree and commit: > > > > 152e8ec77640 ("selftests/bonding: add a test for bonding lladdr target") > > > > from the net-next tree. > > > > I fixed it up (see below) and can carry the fix as necessary. > Thank you for sharing this fix (and all the others!). > > I also had this conflict on my side[1] and I resolved it differently, > more like what is done in the -net tree I think, please see the patch > attached to this email. > > I guess I should probably use your version. It is just I saw it after > having resolved the conflict on my side :) > I will check later how the network maintainers will resolve this > conflict and update my tree if needed. I took this opportunity to sort 'em: - TEST_PROGS := bond-break-lacpdu-tx.sh - TEST_PROGS += bond-lladdr-target.sh -TEST_PROGS := bond-break-lacpdu-tx.sh \ - dev_addr_lists.sh \ - bond-arp-interval-causes-panic.sh ++TEST_PROGS := \ ++ bond-arp-interval-causes-panic.sh \ ++ bond-break-lacpdu-tx.sh \ ++ dev_addr_lists.sh + + TEST_FILES := lag_lib.sh Here's to hoping there are no more bond selftests before final..