Today's linux-next merge of the net-next tree got a conflict in:
include/linux/netdevice.h
caused by commits 3573540 (netif_set_xps_queue: make cpu mask const) and
f629d20 ([networking]device.h: Remove extern from function prototypes).
I fixed it up (see below). Please verify that the resolution looks
correct.
Thanks,
Thierry
---
diff --cc include/linux/netdevice.h
index 25f5d2d,6d77e0f..2e53b44
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -2264,12 -2273,11 +2273,11 @@@ static inline void netif_wake_subqueue(
}
#ifdef CONFIG_XPS
- extern int netif_set_xps_queue(struct net_device *dev,
- const struct cpumask *mask,
- u16 index);
-int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask,
++int netif_set_xps_queue(struct net_device *dev, const struct cpumask *mask,
+ u16 index);
#else
static inline int netif_set_xps_queue(struct net_device *dev,
- struct cpumask *mask,
+ const struct cpumask *mask,
u16 index)
{
return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
