From patchwork Fri May 5 14:05:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 90462 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp456906vqo; Fri, 5 May 2023 07:40:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7/KX5ouYPJ9xpqFEUl+a+IpvHCNbP5574TCV7vDAEwm7vYeyEPzIqoIr1Gtc+INem6u6wG X-Received: by 2002:a05:6a21:348b:b0:f2:e4c1:af7a with SMTP id yo11-20020a056a21348b00b000f2e4c1af7amr1891776pzb.7.1683297601446; Fri, 05 May 2023 07:40:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683297601; cv=none; d=google.com; s=arc-20160816; b=JNsxzOr6Freq2kg1RisjIxI2hCdfIsZhWK2AhIGS/cH0Nox50egUvrPIoLbuWONp2s qPggd4j7nnwrrZxeeFoz+48T2O+mh6/iHRsss0kkCIhEd/F1o+IHsyo+GR39H12F/LU2 0HnaB010lmPgtb5MebDnfpEMR0dumeL+tWvTA6gsmIj5Efax+3z1iApaq+/8g0ho2qmB qw43tFz8eXcqmlErBPnpZlhhsP05S6MADxSguA7ULfOjYTJVJYF1cFNfB0+7vWikOKWN UODHdwpD6QambBHhXeVf6MczcerLkTwxnc6etHm8GEZnHPl83vLIcHlQtz0ZX3CrVzqA X5JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=SgH522LNS8VpogzvkbQdgMyjR4pz9eaSbVwsilwQefE=; b=u3UjUzuOm7kQ652YGiNBTwgBhVE8TfWyGP9JznGzw2/Pk+IypqOu//67OqN7eEbVHB f6G6h8BAbp2qhuhT67cg+RhiSOPaKXNkk/He65fnkQ0eT6wBX5HqyvwbLvUJpep52gsv Ll7wyruum3syp7qIlq3IhnI8O73vWCx8jYnZc+5Qom3EEZLlIrhjJU+sFKWPJXHcMr0P jdBiSQuXE3Cb9mYdXyyqhUATxLr27EEfVbBEx3ZF6dyMzdgNkte6d+A6lve2VWtp5NRc 2bjwRmHRiiVccqwjANHwid9gpPadpm4hiZ1fyKDV02kpfGm2izjpLyyCpZipJE5nNQiY S4VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ij29A2hg; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t22-20020aa79476000000b00639e52424a6si2199063pfq.146.2023.05.05.07.39.49; Fri, 05 May 2023 07:40:01 -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=@kernel.org header.s=k20201202 header.b=ij29A2hg; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232781AbjEEOFs (ORCPT + 99 others); Fri, 5 May 2023 10:05:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232695AbjEEOFr (ORCPT ); Fri, 5 May 2023 10:05:47 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 639B614E5D; Fri, 5 May 2023 07:05:46 -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 09C3D6120E; Fri, 5 May 2023 14:05:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06870C433EF; Fri, 5 May 2023 14:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683295545; bh=C2geJvBn21IBblTJ0IEJ0Dfm+DUTWnIev4wKTeoTUdM=; h=From:To:Cc:Subject:Date:From; b=ij29A2hgwGSdgvcBBZwr7aCJLne6Qx520GWrjgyoYtasTyRBe1z9EVXqF4F8Kgboq 9LcNfshqPnyDH3mvXc+U0O6jHF4Gi3vBtu8ddZPLNTTPP9UpoAAwASP0Q2qLLQAgCo tf1PPgacXyFZPj1u0wAZ6au31CKe3XRhxS0qsAaAy4DXGzrhJxAtn25zWeaXioDWeX Eg7Tpga5FC11GeUx1CIqeuU3JjwjV5eM0OjNMrIxxqlc0pWDAvnBbdCdxPElZasRI4 Gye2ip21A+pBstCs7WoV5jzhvjC/7B7tnhVjOI5ve6UFpwPtyWR/ZlRYWmqFo9n+On r8ErfpClE1kNA== From: Mark Brown To: "Michael S . Tsirkin" Cc: "David S . Miller" , Linux Kernel Mailing List , Linux Next Mailing List , Wenliang Wang Subject: linux-next: manual merge of the vhost tree with the net tree Date: Fri, 5 May 2023 23:05:41 +0900 Message-Id: <20230505140541.220392-1-broonie@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1765065465602744453?= X-GMAIL-MSGID: =?utf-8?q?1765065465602744453?= Hi all, Today's linux-next merge of the vhost tree got a conflict in: drivers/net/virtio_net.c between commit: f8bb510439456 ("virtio_net: suppress cpu stall when free_unused_bufs") from the net and Linus' tree and commit: bc31caabba78f ("virtio_net: suppress cpu stall when free_unused_bufs") from the vhost 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. +++ b/drivers/net/virtio_net.c diff --cc drivers/net/virtio_net.c index a12ae26db0e22,cdb1654e5a435..0000000000000 --- a/drivers/net/virtio_net.c