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 15B27C71145 for ; Thu, 24 Aug 2023 06:42:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240132AbjHXGlz (ORCPT ); Thu, 24 Aug 2023 02:41:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240155AbjHXGlY (ORCPT ); Thu, 24 Aug 2023 02:41:24 -0400 Received: from 1wt.eu (ded1.1wt.eu [163.172.96.212]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A40F610FD; Wed, 23 Aug 2023 23:41:21 -0700 (PDT) Received: (from willy@localhost) by mail.home.local (8.17.1/8.17.1/Submit) id 37O6eYn8017295; Thu, 24 Aug 2023 08:40:34 +0200 Date: Thu, 24 Aug 2023 08:40:34 +0200 From: Willy Tarreau To: Thomas =?iso-8859-1?Q?Wei=DFschuh?= Cc: Stephen Rothwell , Christian Brauner , Shuah Khan , "Paul E. McKenney" , Linux Kernel Mailing List , Linux Next Mailing List , Zhangjin Wu Subject: Re: linux-next: manual merge of the nolibc tree with the vfs-brauner tree Message-ID: References: <20230824141008.27f7270b@canb.auug.org.au> <3028a552-bd75-4ded-9211-62d10768d9ea@t-8ch.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <3028a552-bd75-4ded-9211-62d10768d9ea@t-8ch.de> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Thu, Aug 24, 2023 at 08:27:21AM +0200, Thomas Weißschuh wrote: > Hi everybody, > > On 2023-08-24 14:10:08+1000, Stephen Rothwell wrote: > > Today's linux-next merge of the nolibc tree got a conflict in: > > > > tools/testing/selftests/nolibc/nolibc-test.c > > > > between commit: > > > > 49319832de90 ("selftests/nolibc: drop test chmod_net") > > > > from the vfs-brauner tree and commit: > > > > 148e9718e2a2 ("selftests/nolibc: add chmod_argv0 test") > > > > from the nolibc 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. > > This is fallout from the recent removal of > "selftests/nolibc: drop test chmod_net" from the nolibc tree. > > Christian: > > You mentioned before that you plan to have this series in > -next for some time. If you only submit it to Linux for 6.7 or later > then you have to, if I understand the process correctly, rebase your > -next branch on Linus' master after 6.6-rc1. > 6.6-rc1 should contain the conflicting nolibc changes, so you would need > to resolve the conflict during rebasing. > The patch is intentionally made to be easy to resolve conflicts for, > just delete the line containing "CASE_TEST(chmod_net)". > > Everyone: > > What is your opinion on that? I think that if Stephen is okay with temporarily carrying the small fix he has (which is correct), it could be the simplest way to resolve it until the branches are merged. Otherwise we can try to adjust again. Cheers, Willy