linux-next: manual merge of the net-next tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  drivers/net/ethernet/intel/iavf/iavf_ethtool.c

between commit:

  3a0b5a2929fd ("iavf: Introduce new state machines for flow director")

from Linus' tree and commit:

  95260816b489 ("iavf: use iavf_schedule_aq_request() helper")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/intel/iavf/iavf_ethtool.c
index dc499fe7734e,f147743792fb..000000000000
--- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
@@@ -1436,16 -1435,11 +1435,16 @@@ static int iavf_add_fdir_ethtool(struc
  	spin_lock_bh(&adapter->fdir_fltr_lock);
  	iavf_fdir_list_add_fltr(adapter, fltr);
  	adapter->fdir_active_fltr++;
 -	fltr->state = IAVF_FDIR_FLTR_ADD_REQUEST;
 +	if (adapter->link_up) {
 +		fltr->state = IAVF_FDIR_FLTR_ADD_REQUEST;
- 		adapter->aq_required |= IAVF_FLAG_AQ_ADD_FDIR_FILTER;
 +	} else {
 +		fltr->state = IAVF_FDIR_FLTR_INACTIVE;
 +	}
  	spin_unlock_bh(&adapter->fdir_fltr_lock);
  
 -	iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_FDIR_FILTER);
 +	if (adapter->link_up)
- 		mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);
++		iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_FDIR_FILTER);
+ 
  ret:
  	if (err && fltr)
  		kfree(fltr);
@@@ -1475,12 -1469,6 +1474,11 @@@ static int iavf_del_fdir_ethtool(struc
  	if (fltr) {
  		if (fltr->state == IAVF_FDIR_FLTR_ACTIVE) {
  			fltr->state = IAVF_FDIR_FLTR_DEL_REQUEST;
- 			adapter->aq_required |= IAVF_FLAG_AQ_DEL_FDIR_FILTER;
 +		} else if (fltr->state == IAVF_FDIR_FLTR_INACTIVE) {
 +			list_del(&fltr->list);
 +			kfree(fltr);
 +			adapter->fdir_active_fltr--;
 +			fltr = NULL;
  		} else {
  			err = -EBUSY;
  		}

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