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 AFF94C433FE for ; Thu, 10 Nov 2022 07:28:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232631AbiKJH2j (ORCPT ); Thu, 10 Nov 2022 02:28:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232638AbiKJH2h (ORCPT ); Thu, 10 Nov 2022 02:28:37 -0500 Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.216]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2C5E13D3A; Wed, 9 Nov 2022 23:28:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1668065306; s=strato-dkim-0002; d=hartkopp.net; h=In-Reply-To:From:References:Cc:To:Subject:Date:Message-ID:Cc:Date: From:Subject:Sender; bh=53kn45NV5vY6ZWYmWvYdin3V1VeMulhMote1E7SCfzQ=; b=iYJBnHw3MqkXuXr9h0MSplYpRIgCGr4n5rWv9Ch51ZyomIlsjdOyYH2yh8T/wnkeYO MGCqD9U4OzkPzLCLq93N1JpqBT45IaIlbupHok7jQgEF6mpoyPNE6eP7d5dsLcBa2QCj ls/kl0xpn2gdyjx/EDULD/fV26G8+LI/vTXpEqoxLYrHveTfWlB33XAiuGgttAdKm7ps 6Vmak3WE+1jD7cuc6kJQcfGz+NI+XZbdnmnkU65+kwaxqqBpCtPA+gp9vOML01lL10Nl YkT/r2x6hReudom+NvJP25lwbRgmxDsT5IlGqXosoJAUGxOwXjbbz6vRv5gytdc2ey/2 MvFg== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":P2MHfkW8eP4Mre39l357AZT/I7AY/7nT2yrDxb8mjG14FZxedJy6qgO1qCHSa1GLptZHusx3hdIrpKytJSr6hfz3Vg==" X-RZG-CLASS-ID: mo00 Received: from [IPV6:2a00:6020:1cfd:d100::923] by smtp.strato.de (RZmta 48.2.1 AUTH) with ESMTPSA id Dde783yAA7SQeDY (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Thu, 10 Nov 2022 08:28:26 +0100 (CET) Message-ID: <54c92bbe-33fa-35ba-dd7f-14a28dcf758a@hartkopp.net> Date: Thu, 10 Nov 2022 08:28:21 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.0 Subject: Re: linux-next: manual merge of the net-next tree with the net tree To: Stephen Rothwell , David Miller , Networking Cc: Linux Kernel Mailing List , Linux Next Mailing List , Marc Kleine-Budde References: <20221110102509.1f7d63cc@canb.auug.org.au> Content-Language: en-US From: Oliver Hartkopp In-Reply-To: <20221110102509.1f7d63cc@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hello Stephen, On 10.11.22 00:25, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/can/pch_can.c > > between commit: > > ae64438be192 ("can: dev: fix skb drop check") > > from the net tree and commit: > > 1dd1b521be85 ("can: remove obsolete PCH CAN driver") > > from the net-next tree. > > I fixed it up (I just removed the file) 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. > Yes, this is known. The removal of the PCH CAN driver missed the last net-next phase for Linux 6.1 by some hours and therefore showed up relatively early in the net-next for 6.2. Maybe we should generally try to commit "complete removals" of drivers preferably at the end of a -next phase which would have omitted this conflict. Thanks for your work! Best regards, Oliver