From patchwork Thu Oct 27 23:28:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12006 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp514417wru; Thu, 27 Oct 2022 16:42:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5LPOLY2zJ2rGF/3L6PVDhcjZHYVwkmyxoFHRmLXYlwuHt2Kd/M5g3OIzH4T7Os7cPd++Iq X-Received: by 2002:a05:6402:b2f:b0:461:701e:877a with SMTP id bo15-20020a0564020b2f00b00461701e877amr28476457edb.82.1666914169628; Thu, 27 Oct 2022 16:42:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666914169; cv=none; d=google.com; s=arc-20160816; b=jw7wVrF7pdNT+NY1yCIqxMFzWKkouaUdJXSuuUBXkHyGEybHDfGf7mkkZiY1hPoMkZ RchK0905vyC+fV0iHPWSbYo074X/IxnUegfld3OhLpKjo0EY6Io2XW5wvn2JHcMT/tnl 1OyEqVy60rD9FgzUdIdb3rxjU+4EDF15Jd9obXckAnjjxPcdSvLsBwLVZMXkiH18cPrs oHZIa6z4R5eE4OyKSW+JFlQMr3XAdsoEUF2jQjIUpTWnhBZPejeog3y0BgmdQW+7a34J CYcCZ4i2kZqCvgGUSs2gMjyg8CgwWzSGSpXKyZ+1AKlEKKheFgw7YWR5pitPlt0Y2+H/ inbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=l1mZYQANjUQZxBeBSrpWYKI49wKEgcpLkLLgYPYl7Wo=; b=L2a0OVS8psoXYxOuc7ZNnkkhws2nbdrkPuYqBQI7c1QnbtyJTEI6tVKtv7GejXWPva vd1tRfyWil32GRfYPawHJ4HHeeBQemIXUvnXGq/Z+5DuWpepAU4dto0SMxlxs4Rf0MXV Ul24hCMbSpIEfZRWilNOPq+8NwzExeDn4IKozW+fVc+wBp+uePDoFSd2XKNe6BbeL07D XsJ1HRoOz/B5xCtgnMRoMnfwQTQdDWRol6jpIrRrI1MdiIN8CAj4qvs+Xp7W53MyPS27 QgVR/jBhxFn92hs8ktgQiCZc30OfTQJZVvOkRiYFKwnUNf0xYVl7CXZ05l9iXVFHCzYi 9N1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=dCPyAPs2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hz1-20020a1709072ce100b0078d9b5792a0si2938502ejc.319.2022.10.27.16.42.25; Thu, 27 Oct 2022 16:42:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=dCPyAPs2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235235AbiJ0X2V (ORCPT + 99 others); Thu, 27 Oct 2022 19:28:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229616AbiJ0X2T (ORCPT ); Thu, 27 Oct 2022 19:28:19 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9631921246; Thu, 27 Oct 2022 16:28:16 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Mz20s1K73z4x1G; Fri, 28 Oct 2022 10:28:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1666913294; bh=l1mZYQANjUQZxBeBSrpWYKI49wKEgcpLkLLgYPYl7Wo=; h=Date:From:To:Cc:Subject:From; b=dCPyAPs28vq7MKXTAOO86ymMHNDlajjvwHlKR0rPKEtGrlTwBrkiPN3WNRKS/YjXs zKWFydZ63ZDG4QtFoFyiiw0776SXeoAmMD4tbfRq576+V03Mk+Q5fHFsX0AWa9HSdH 482FfslG+ZsDulxp9TeiYPxPYvSWXKnmU38k9Mpb0gdDXXOvoFNS/HWJvQlLQ63rTV kZQ1y3lpPyAsTW1aGII7J3VNdEQn4H6upxRhmqIvsm0yq2oSm4JHMeOyR1j/BnDv4Y hrLrGWhLhuB1WpIrmMU/ENW9YOYNK/zF1HxQwwf5b8k37XgkR+0eCCIvgjCFhvfEAY N+P6jxn1aprZg== Date: Fri, 28 Oct 2022 10:28:11 +1100 From: Stephen Rothwell To: David Miller , Networking Cc: Anssi Hannula , Jimmy Assarsson , Linux Kernel Mailing List , Linux Next Mailing List , Marc Kleine-Budde Subject: linux-next: manual merge of the net-next tree with Linus' tree Message-ID: <20221028102811.5938f029@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747886192348753666?= X-GMAIL-MSGID: =?utf-8?q?1747886192348753666?= Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c between commit: 2871edb32f46 ("can: kvaser_usb: Fix possible completions during init_completion") from Linus' tree and commit: abb8670938b2 ("can: kvaser_usb_leaf: Ignore stale bus-off after start") 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. diff --cc drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c index 19958037720f,5225e2da6437..000000000000 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c