From patchwork Thu Feb  2 22:44:54 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 13126798
X-Patchwork-Delegate: kuba@kernel.org
Return-Path: <netdev-owner@vger.kernel.org>
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 71BA1C61DA4
	for <netdev@archiver.kernel.org>; Thu,  2 Feb 2023 22:45:06 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S232822AbjBBWpE (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Thu, 2 Feb 2023 17:45:04 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55450 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S231744AbjBBWpD (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 2 Feb 2023 17:45:03 -0500
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00E8069B3B;
        Thu,  2 Feb 2023 14:44:58 -0800 (PST)
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 4P7DPh2x5jz4xGq;
        Fri,  3 Feb 2023 09:44:55 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1675377896;
        bh=6wZYEA3Bc4iGOhxen05MNQBeHSf3sRdVjqTcfmUFB2s=;
        h=Date:From:To:Cc:Subject:From;
        b=lF0qN0f4T5MQfonwxYClmpGhgaDTkty9mI/4V7YIYoZtpx/+SWPXrnSyb/rU577wH
         P6g3iKqOxh5f9CWakZ1VSO2OeHKYHZhCjVwA4x9eiWjqp3Glyo51dt3QrlBcGL6Vop
         0AI7o63oVFJtjFUahuzk9iAjXaFAuMDbKEs8Qw/VUqfDlfgqbfnjA0rD4LukwR0U6J
         wTmd12tKaxNIBK1f9o6iG/Z/VNWb5NukzDiEhAwxGVUCCPwdojHKaigynC/dzPcr+8
         DbzzxmOSWaSZw/5M98asBzwNnGVTv49J/xYUHF5nCIfiuO/gVc4ZBAk5hqa4PUvUJP
         HAx+LDJuza1NQ==
Date: Fri, 3 Feb 2023 09:44:54 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc: Alexander Duyck <alexanderduyck@fb.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Xin Long <lucien.xin@gmail.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20230203094454.5766f160@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/core/gro.c

between commit:

  7d2c89b32587 ("skb: Do mix page pool and page referenced frags in GRO")

from the net tree and commit:

  b1a78b9b9886 ("net: add support for ipv4 big tcp")

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 net/core/gro.c
index 4bac7ea6e025,b15f85546bdd..000000000000
--- a/net/core/gro.c