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;
}
From: Stephen Rothwell <[email protected]>
Date: Fri, 10 Nov 2017 10:31:00 +1100
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/sched/cls_basic.c
> net/sched/cls_u32.c
>
> between commits:
>
> 0b2a59894b76 ("cls_basic: use tcf_exts_get_net() before call_rcu()")
> 35c55fc156d8 ("cls_u32: use tcf_exts_get_net() before call_rcu()")
>
> from Linus' tree and commit:
>
> 1d8134fea2eb ("net_sched: use idr to allocate basic filter handles")
>
> from the net-next tree.
This should be resolved as I've just merged 'net' into 'net-next'.
From 1583652515193592463@xxx Fri Nov 10 04:38:49 +0000 2017
X-GM-THRID: 1583633222255996540
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread
On Thu, Nov 9, 2017 at 3:31 PM, Stephen Rothwell <[email protected]> wrote:
> I fixed it up (I think - 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.
It looks good to me.
Thanks!
From 1583633222255996540@xxx Thu Nov 09 23:32:10 +0000 2017
X-GM-THRID: 1583633222255996540
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread