From patchwork Fri Jun 23 03:04:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 111892 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5504226vqr; Thu, 22 Jun 2023 20:44:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5YM9EeXotOE3ht2L6X44C5fe/o5Wd+WrJIy4QPjTJfZwkO18cXwBmtLAwtkxB/NMAJlbhf X-Received: by 2002:a17:903:1103:b0:1b5:91:4693 with SMTP id n3-20020a170903110300b001b500914693mr25353869plh.1.1687491872600; Thu, 22 Jun 2023 20:44:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687491872; cv=none; d=google.com; s=arc-20160816; b=ot0796NAvkrqE6hchruB8c8PH5IFWNtmzxPu3ecoLTcmCiwCBK/2wsKF53efmhcDTR Gh2N6F0Pr3syn630yMnhj2+AjUvCSgK9T3hT8YBxULHDBZB2sPz5x46uz7c0VDSWB5DG ueeEI3rj4IWuI0e7ZYVzWCU640W0J83tnFFM1bP7Rhp6bgyuOduAsWn2dZeSqHkuQ6Fu NwvvEIJlix+iZ32l2uPsym/fV87/mpMZwOqKF2khIZI8Db/wbDiqqObGZkvNV83FbP/t EMejUWCwRo0YyY5DcwbEQiANWfICiBPPFCRz+I8OZsJuh+lsg0+rKfibtFlXlP9SOF0K cMEQ== 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=r2ZwcIFT4HlwJjAj+VisO/XGPwfJvpYrACK4BtmNfhY=; b=KMmomQgSGhuEfBXawPs8CwasD3/Ba8ezs9PYuS5e5NB/t2Tri+2KIrUtfYnqnSKudT 5zfxXgG2dD0SC6xu0VG/Rzen9wvMa/aVhJRxIfi15TpjQtUxiBgDUAERF7gDrPy6mtTh BlyMyNFyWHSFVjuX/bbACRNjAxlLH8YFiwERkuxKOROeUFsjV4eeZZvXmX3TsV3o3yZN d7Nl+jUbJXCQKdGK9wu12TtelgLSlmhgixChYwRy5OQloj8TJfEcdDQBfNEq1o/Z3FxR SlkhVWlbDhEzyLolpAI3DZO/637pdeoo0uBWiKe1QawKbwL+KkBmMALEvfC5E19Xc3yD 2fgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="TJd1L/eQ"; 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=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kw5-20020a170902f90500b001b3c66afaaesi7545195plb.185.2023.06.22.20.44.16; Thu, 22 Jun 2023 20:44:32 -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="TJd1L/eQ"; 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=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231490AbjFWDFA (ORCPT + 99 others); Thu, 22 Jun 2023 23:05:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230235AbjFWDEx (ORCPT ); Thu, 22 Jun 2023 23:04:53 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2646C2135; Thu, 22 Jun 2023 20:04:49 -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 4QnMXs5dMSz4wjB; Fri, 23 Jun 2023 13:04:45 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687489487; bh=r2ZwcIFT4HlwJjAj+VisO/XGPwfJvpYrACK4BtmNfhY=; h=Date:From:To:Cc:Subject:From; b=TJd1L/eQg1XgkXP9LOYB6VQ2T1YqBm0OuFJM0pc/r4TCOFy4DClv7TmUylR4Af+GR xjxKvyYZ6dtjKZolUQhLZtwGLJQanHtHBq8WDW+o8upCyX6P7bO/jv+ZpzkWRWbRVm aCg1IDamyE+dD7/4oe7ufWjPmQ2BdthmYLBf8MTihF4QANBdR7AjV+66ghIHJbVH4T Zb3TjwLNfM7WJtEwva4NANAeWTAw4NL7iwlYHPdgrWy3wc4RiOaxkNQ+UVi/iwQpgS JYMVT8delOY3IjxF9hyYeqrUA36kVXJYKRnXElqibS/RjT1/G4x1YkM+t8Tx5q2r8e UOXjU9KfzyqIA== Date: Fri, 23 Jun 2023 13:04:43 +1000 From: Stephen Rothwell To: "Michael S. Tsirkin" , David Miller Cc: Jakub Kicinski , Networking , Linux Kernel Mailing List , Linux Next Mailing List , Xuan Zhuo Subject: linux-next: manual merge of the vhost tree with the net-next tree Message-ID: <20230623130443.6c9a481e@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,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED 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?1769463477650969002?= X-GMAIL-MSGID: =?utf-8?q?1769463477650969002?= Hi all, Today's linux-next merge of the vhost tree got a conflict in: drivers/net/virtio_net.c between commit: 80f50f918c6e ("virtio_net: separate the logic of freeing the rest mergeable buf") from the net-next tree and commit: 21081476b808 ("virtio_net: support dma premapped") 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. diff --cc drivers/net/virtio_net.c index 0db14f6b87d3,d67b36fdba0d..000000000000 --- a/drivers/net/virtio_net.c