From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Steffen Klassert <steffen.klassert@secunet•com>,
David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>
Cc: Networking <netdev@vger•kernel.org>,
Cosmin Ratiu <cratiu@nvidia•com>,
Jedrzej Jagielski <jedrzej.jagielski@intel•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Przemek Kitszel <przemyslaw.kitszel@intel•com>,
Tony Nguyen <anthony.l.nguyen@intel•com>
Subject: linux-next: manual merge of the ipsec-next tree with the net-next tree
Date: Tue, 22 Apr 2025 14:43:21 +1000 [thread overview]
Message-ID: <20250422144321.3879d891@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2890 bytes --]
Hi all,
Today's linux-next merge of the ipsec-next tree got a conflict in:
drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
between commit:
fd5ef5203ce6 ("ixgbe: wrap netdev_priv() usage")
from the net-next tree and commit:
43eca05b6a3b ("xfrm: Add explicit dev to .xdo_dev_state_{add,delete,free}")
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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
index 648a7c618cd1,796e90d741f0..000000000000
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
@@@ -473,12 -474,13 +474,13 @@@ static int ixgbe_ipsec_parse_proto_keys
/**
* ixgbe_ipsec_check_mgmt_ip - make sure there is no clash with mgmt IP filters
+ * @dev: pointer to net device
* @xs: pointer to transformer state struct
**/
- static int ixgbe_ipsec_check_mgmt_ip(struct xfrm_state *xs)
+ static int ixgbe_ipsec_check_mgmt_ip(struct net_device *dev,
+ struct xfrm_state *xs)
{
- struct net_device *dev = xs->xso.real_dev;
- struct ixgbe_adapter *adapter = netdev_priv(dev);
+ struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
struct ixgbe_hw *hw = &adapter->hw;
u32 mfval, manc, reg;
int num_filters = 4;
@@@ -559,11 -562,11 +562,11 @@@
* @xs: pointer to transformer state struct
* @extack: extack point to fill failure reason
**/
- static int ixgbe_ipsec_add_sa(struct xfrm_state *xs,
+ static int ixgbe_ipsec_add_sa(struct net_device *dev,
+ struct xfrm_state *xs,
struct netlink_ext_ack *extack)
{
- struct net_device *dev = xs->xso.real_dev;
- struct ixgbe_adapter *adapter = netdev_priv(dev);
+ struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
struct ixgbe_ipsec *ipsec = adapter->ipsec;
struct ixgbe_hw *hw = &adapter->hw;
int checked, match, first;
@@@ -752,12 -755,12 +755,12 @@@
/**
* ixgbe_ipsec_del_sa - clear out this specific SA
+ * @dev: pointer to device to program
* @xs: pointer to transformer state struct
**/
- static void ixgbe_ipsec_del_sa(struct xfrm_state *xs)
+ static void ixgbe_ipsec_del_sa(struct net_device *dev, struct xfrm_state *xs)
{
- struct net_device *dev = xs->xso.real_dev;
- struct ixgbe_adapter *adapter = netdev_priv(dev);
+ struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
struct ixgbe_ipsec *ipsec = adapter->ipsec;
struct ixgbe_hw *hw = &adapter->hw;
u32 zerobuf[4] = {0, 0, 0, 0};
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-04-22 4:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-22 4:43 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-09-08 1:59 linux-next: manual merge of the ipsec-next tree with the net-next tree Stephen Rothwell
2020-05-19 3:27 Stephen Rothwell
2019-12-15 23:38 Stephen Rothwell
2018-04-30 0:35 Stephen Rothwell
2017-02-12 23:25 Stephen Rothwell
2014-01-09 2:41 Stephen Rothwell
2013-09-24 2:16 Stephen Rothwell
2013-09-24 10:25 ` Steffen Klassert
2013-09-24 23:59 ` Stephen Rothwell
2013-09-25 5:29 ` Steffen Klassert
2013-09-27 2:01 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250422144321.3879d891@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=anthony.l.nguyen@intel$(echo .)com \
--cc=cratiu@nvidia$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=jedrzej.jagielski@intel$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=przemyslaw.kitszel@intel$(echo .)com \
--cc=steffen.klassert@secunet$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox