public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Borkmann <daniel@iogearbox•net>,
	Alexei Starovoitov <ast@kernel•org>,
	Networking <netdev@vger•kernel.org>
Cc: "Linux-Next Mailing List" <linux-next@vger•kernel.org>,
	"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
	"Björn Töpel" <bjorn.topel@intel•com>,
	"David Miller" <davem@davemloft•net>,
	"Jacob Keller" <jacob.e.keller@intel•com>,
	"Jeff Kirsher" <jeffrey.t.kirsher@intel•com>,
	"Andrew Bowers" <andrewx.bowers@intel•com>
Subject: linux-next: manual merge of the bpf-next tree with a previous revert
Date: Fri, 7 Sep 2018 10:12:25 +1000	[thread overview]
Message-ID: <20180907101225.05a12d00@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2054 bytes --]

Hi all,

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

  drivers/net/ethernet/intel/i40e/i40e_ethtool.c

between commit:

  39b042e0b347 ("Merge remote-tracking branch 'net-next/master'")
(this is really my revert of
  8fd75c58a09a ("i40e: move ethtool stats boiler plate code to i40e_ethtool_stats.h")
due to a build failure
)

and commit:

  b5061a9e8785 ("i40e: disallow changing the number of descriptors when AF_XDP is on")

from the bpf-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/i40e/i40e_ethtool.c
index 235012b3bd42,3cd2c88c72f8..000000000000
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@@ -5,26 -5,9 +5,27 @@@
  
  #include "i40e.h"
  #include "i40e_diag.h"
+ #include "i40e_txrx_common.h"
 -#include "i40e_ethtool_stats.h"
  
 +struct i40e_stats {
 +	/* The stat_string is expected to be a format string formatted using
 +	 * vsnprintf by i40e_add_stat_strings. Every member of a stats array
 +	 * should use the same format specifiers as they will be formatted
 +	 * using the same variadic arguments.
 +	 */
 +	char stat_string[ETH_GSTRING_LEN];
 +	int sizeof_stat;
 +	int stat_offset;
 +};
 +
 +#define I40E_STAT(_type, _name, _stat) { \
 +	.stat_string = _name, \
 +	.sizeof_stat = FIELD_SIZEOF(_type, _stat), \
 +	.stat_offset = offsetof(_type, _stat) \
 +}
 +
 +#define I40E_NETDEV_STAT(_net_stat) \
 +	I40E_STAT(struct rtnl_link_stats64, #_net_stat, _net_stat)
  #define I40E_PF_STAT(_name, _stat) \
  	I40E_STAT(struct i40e_pf, _name, _stat)
  #define I40E_VSI_STAT(_name, _stat) \

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

                 reply	other threads:[~2018-09-07  0:12 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20180907101225.05a12d00@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=andrewx.bowers@intel$(echo .)com \
    --cc=ast@kernel$(echo .)org \
    --cc=bjorn.topel@intel$(echo .)com \
    --cc=daniel@iogearbox$(echo .)net \
    --cc=davem@davemloft$(echo .)net \
    --cc=jacob.e.keller@intel$(echo .)com \
    --cc=jeffrey.t.kirsher@intel$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=netdev@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox