David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two trivial overlapping changes conflicts in MPLS and mlx5.

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

2017-01-28 10:33:06 -05:00

..

aes_ccm.c

…

aes_ccm.h

…

aes_cmac.c

…

aes_cmac.h

…

aes_gcm.c

…

aes_gcm.h

…

aes_gmac.c

…

aes_gmac.h

…

agg-rx.c

…

agg-tx.c

…

cfg.c

mac80211: multicast to unicast conversion

2016-12-13 16:05:11 +01:00

chan.c

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

2017-01-17 15:19:37 -05:00

debug.h

…

debugfs_key.c

…

debugfs_key.h

…

debugfs_netdev.c

mac80211: multicast to unicast conversion

2016-12-13 16:05:11 +01:00

debugfs_netdev.h

…

debugfs_sta.c

…

debugfs_sta.h

…

debugfs.c

mac80211: Show pending txqlen in debugfs.

2016-12-13 16:05:12 +01:00

debugfs.h

…

driver-ops.c

…

driver-ops.h

…

ethtool.c

…

fils_aead.c

…

fils_aead.h

…

ht.c

…

ibss.c

…

ieee80211_i.h

For 4.11, we seem to have more than in the past few releases:

2017-01-14 12:02:15 -05:00

iface.c

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

2017-01-17 15:19:37 -05:00

Kconfig

…

key.c

mac80211: don't call drv_set_default_unicast_key() for VLANs

2016-12-13 15:57:59 +01:00

key.h

…

led.c

…

led.h

…

main.c

mac80211: initialize SMPS field in HT capabilities

2017-01-13 11:31:26 +01:00

Makefile

Makefile: drop -D__CHECK_ENDIAN__ from cflags

2016-12-16 00:13:43 +02:00

mesh_hwmp.c

…

mesh_pathtbl.c

…

mesh_plink.c

mac80211: Suppress NEW_PEER_CANDIDATE event if no room

2016-12-13 16:05:11 +01:00

mesh_ps.c

…

mesh_sync.c

mac80211: Use appropriate name for functions and messages

2016-12-13 16:22:27 +01:00

mesh.c

mac80211: Fix addition of mesh configuration element

2017-01-02 11:58:26 +01:00

mesh.h

mac80211: Use appropriate name for functions and messages

2016-12-13 16:22:27 +01:00

michael.c

…

michael.h

…

mlme.c

mac80211: Remove unused 'beaconint_us' variable

2016-12-13 16:05:10 +01:00

ocb.c

…

offchannel.c

…

pm.c

…

rate.c

mac80211: don't try to sleep in rate_control_rate_init()

2017-01-24 16:31:54 +01:00

rate.h

…

rc80211_minstrel_debugfs.c

mac80211: minstrel: store probability variance instead of standard deviation

2016-12-15 11:07:52 +01:00

rc80211_minstrel_ht_debugfs.c

mac80211: minstrel: store probability variance instead of standard deviation

2016-12-15 11:07:52 +01:00

rc80211_minstrel_ht.c

mac80211: minstrel_ht: remove obsolete #if for >= 3 streams

2016-12-15 11:07:53 +01:00

rc80211_minstrel_ht.h

mac80211: minstrel_ht: move supported bitrate mask out of group data

2016-12-15 11:07:52 +01:00

rc80211_minstrel.c

mac80211: minstrel: avoid port control frames for sampling

2016-12-15 11:07:53 +01:00

rc80211_minstrel.h

mac80211: minstrel: make prob_ewma u16 instead of u32

2016-12-15 11:07:53 +01:00

rx.c

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

2017-01-17 15:19:37 -05:00

scan.c

mac80211: Remove unused 'len' variable

2016-12-13 16:05:09 +01:00

spectmgmt.c

…

sta_info.c

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

2017-01-17 15:19:37 -05:00

sta_info.h

…

status.c

mac80211: set wifi_acked[_valid] bits for transmitted SKBs

2017-01-12 10:15:19 +01:00

tdls.c

…

tkip.c

…

tkip.h

…

trace_msg.h

…

trace.c

…

trace.h

…

tx.c

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

2017-01-17 15:19:37 -05:00

util.c

…

vht.c

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

2017-01-17 15:19:37 -05:00

wep.c

mac80211: Add RX flag to indicate ICV stripped

2017-01-12 10:15:18 +01:00

wep.h

…

wme.c

…

wme.h

…

wpa.c

mac80211: Add RX flag to indicate ICV stripped

2017-01-12 10:15:18 +01:00

wpa.h

…