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

  net/core/dev.c

between commit:

  388d31417ce0 ("net: gro: expose GRO init/cleanup to use outside of NAPI")

from the net-next tree and commit:

  fe0b776543e9 ("netdev: Switch to use hrtimer_setup()")

from the tip 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/dev.c
index d6d68a2d2355,03a7f867c7b3..000000000000

--- a/net/core/dev.c
+++ b/net/core/dev.c

@@@ -7169,10 -7013,11 +7169,9 @@@ void netif_napi_add_weight_locked(struc
  
  	INIT_LIST_HEAD(&napi->poll_list);
  	INIT_HLIST_NODE(&napi->napi_hash_node);
- 	hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
- 	napi->timer.function = napi_watchdog;
+ 	hrtimer_setup(&napi->timer, napi_watchdog, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
 -	init_gro_hash(napi);
 +	gro_init(&napi->gro);
  	napi->skb = NULL;
 -	INIT_LIST_HEAD(&napi->rx_list);
 -	napi->rx_count = 0;
  	napi->poll = poll;
  	if (weight > NAPI_POLL_WEIGHT)
  		netdev_err_once(dev, "%s() called with weight %d\n", __func__,