From patchwork Thu Sep  8 01:59:14 2022
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: 12969573
Return-Path: <netdev-owner@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 B1DA5C6FA83
	for <netdev@archiver.kernel.org>; Thu,  8 Sep 2022 01:59:29 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230098AbiIHB72 (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Wed, 7 Sep 2022 21:59:28 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37810 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229492AbiIHB71 (ORCPT
        <rfc822;netdev@vger.kernel.org>); Wed, 7 Sep 2022 21:59:27 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0851CB18;
        Wed,  7 Sep 2022 18:59:22 -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 4MNMkD69YTz4xD3;
        Thu,  8 Sep 2022 11:59:16 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1662602358;
        bh=WQMypIQOXO6oFTr6CtsUzHPJrofSi4/VF3WEKPql46Y=;
        h=Date:From:To:Cc:Subject:From;
        b=oSh+TKlbIv9LRKLxRquA2TzOo4W3OdzwUNPL5uv7b+piKZ4Bpj5FcuoXuM88VQ7EZ
         7/71PyQfM2W5RKMvl9yrjIL8Qa05PiwcPmRDqiQrcy0iGmY8tFHZUPxJcnoUleil1R
         cf6qS86ego8ocxZDKlKm/Ih2230trTafvt1yl7tcb1AnxspqGSAt3Djk/DKu7dU//3
         0zQntMYD8BJayloVZk0WYuDuJrp453fX1IoS6LpCzBT5MEa6ju+HBr/QFc13+oi6dm
         rcdN0+fFGWbNpWOLFGg4pff6xzFgg6l/hzMQ9T0s9fQMpLZxz0QC7efZk2mppFdNm/
         nYxzk/TGvW3Jg==
Date: Thu, 8 Sep 2022 11:59:14 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steffen Klassert <steffen.klassert@secunet.com>,
        David Miller <davem@davemloft.net>
Cc: Networking <netdev@vger.kernel.org>,
        Eyal Birger <eyal.birger@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lior Nahmanson <liorna@nvidia.com>,
        Saeed Mahameed <saeedm@nvidia.com>
Subject: linux-next: manual merge of the ipsec-next tree with the net-next
 tree
Message-ID: <20220908115914.69ed4771@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 ipsec-next tree got a conflict in:

  include/net/dst_metadata.h

between commit:

  0a28bfd4971f ("net/macsec: Add MACsec skb_metadata_dst Tx Data path support")

from the net-next tree and commit:

  5182a5d48c3d ("net: allow storing xfrm interface metadata in metadata_dst")

from the ipsec-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 include/net/dst_metadata.h
index 22a6924bf6da,57f75960fa28..000000000000
--- a/include/net/dst_metadata.h