Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 5 insertions, 4 deletions

diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 88618f8b794c..c54c9d9d1ffb 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -22,8 +22,9 @@ menuconfig NET_SCHED
           This code is considered to be experimental.
 
           To administer these schedulers, you'll need the user-level utilities
-          from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>.
-          That package also contains some documentation; for more, check out
+          from the package iproute2+tc at
+          <https://www.kernel.org/pub/linux/utils/net/iproute2/>.  That package
+          also contains some documentation; for more, check out
           <http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2>.
 
           This Quality of Service (QoS) support will enable you to use
@@ -336,7 +337,7 @@ config NET_SCH_PLUG
           of virtual machines by allowing the generated network output to be rolled
           back if needed.
 
-          For more information, please refer to http://wiki.xensource.com/xenwiki/Remus
+          For more information, please refer to <http://wiki.xenproject.org/wiki/Remus>
 
           Say Y here if you are using this kernel for Xen dom0 and
           want to protect Xen guests with Remus.
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
index b9ca32ebc1de..1e52decb7b59 100644
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
@@ -94,7 +94,7 @@ static unsigned int fq_codel_classify(struct sk_buff *skb, struct Qdisc *sch,
             TC_H_MIN(skb->priority) <= q->flows_cnt)
                 return TC_H_MIN(skb->priority);
 
-        filter = rcu_dereference(q->filter_list);
+        filter = rcu_dereference_bh(q->filter_list);
         if (!filter)
                 return fq_codel_hash(q, skb) + 1;