summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bpf: Always test unprivileged programsMickaël Salaün2017-02-102-6/+64
* bpf: Change the include directory for selftestMickaël Salaün2017-02-101-1/+1
* tools: Sync {,tools/}include/uapi/linux/bpf.hMickaël Salaün2017-02-101-1/+22
* Merge branch 'netronome-NFP4000-and-NFP6000-PF-driver'David S. Miller2017-02-1033-194/+8794
|\
| * nfp: add the PF driverJakub Kicinski2017-02-105-23/+970
| * nfp: allocate irqs in lower driverJakub Kicinski2017-02-103-99/+140
| * nfp: add port layer to debugfs directoriesJakub Kicinski2017-02-103-18/+43
| * nfp: add support for service processor accessJakub Kicinski2017-02-107-0/+799
| * nfp: add rtsym supportJakub Kicinski2017-02-105-0/+353
| * nfp: add MIP reading supportJakub Kicinski2017-02-103-0/+185
| * nfp: add support for reading nffw infoJakub Kicinski2017-02-103-0/+375
| * nfp: add hwinfo supportJakub Kicinski2017-02-105-0/+341
| * nfp: add support for resourcesJakub Kicinski2017-02-104-0/+433
| * nfp: add CPP access coreJakub Kicinski2017-02-1010-0/+4987
| * nfp: rename the driver and add new main fileJakub Kicinski2017-02-108-57/+160
| * bitfield.h: add FIELD_FIT() helperJakub Kicinski2017-02-102-2/+13
|/
* Merge branch 'devlink-small-cleanups'David S. Miller2017-02-102-26/+34
|\
| * devlink: allow to fillup eswitch attrs even if mode_get op does not existJiri Pirko2017-02-101-7/+9
| * devlink: use nla_put_failure goto label instead of outJiri Pirko2017-02-101-6/+6
| * devlink: rename devlink_eswitch_fill to devlink_nl_eswitch_fillJiri Pirko2017-02-101-5/+5
| * devlink: fix the name of eswitch commandsJiri Pirko2017-02-102-11/+17
|/
* Merge tag 'mac80211-next-for-davem-2017-02-09' of git://git.kernel.org/pub/sc...David S. Miller2017-02-1034-843/+559
|\
| * mac80211: fix CSA in IBSS modeKoen Vandeputte2017-02-091-2/+2
| * cfg80211: fix NAN bands definitionLuca Coelho2017-02-097-63/+86
| * cfg80211: Pass new RSSI level in CQM RSSI notificationAndrzej Zaborowski2017-02-087-11/+23
| * mac80211: Pass new RSSI level in CQM RSSI notificationAndrzej Zaborowski2017-02-088-12/+21
| * nl80211: fix validation of scheduled scan info for wowlan netdetectArend Van Spriel2017-02-081-4/+6
| * nl80211: add HT/VHT capabilities to AP parametersJohannes Berg2017-02-083-2/+56
| * cfg80211: make rdev assignment clearer in nl80211_testmode_dump()Luca Coelho2017-02-081-7/+6
| * mac80211: check for allocation failure in debugfs codeDan Carpenter2017-02-081-2/+9
| * mac80211: aes-cmac: switch to shash CMAC driverArd Biesheuvel2017-02-083-107/+32
| * mac80211: fils_aead: Use crypto api CMAC shash rather than bare cipherArd Biesheuvel2017-02-083-45/+34
| * cfg80211 debugfs: Cleanup some checkpatch issuesPichugin Dmitry2017-02-081-5/+5
| * mac80211: add back lost debugfs filesJohannes Berg2017-02-072-0/+2
| * wireless: define cipher/AKM suites using a macroJohannes Berg2017-01-261-22/+24
| * mac80211: use helper function to access ieee802_1d_to_ac[]Amadeusz Sławiński2017-01-263-4/+4
| * wireless: radiotap: rewrite the radiotap header fileJohannes Berg2017-01-251-298/+157
| * rfkill: remove rfkill-regulatorJohannes Berg2017-01-244-214/+0
| * mac80211: fix documentation warningsJohannes Berg2017-01-241-29/+45
| * cfg80211: fix a documentation warningJohannes Berg2017-01-241-16/+47
* | net: ethernet: ti: netcp_core: remove netif_trans_updateIvan Khoronzhuk2017-02-101-2/+0
* | Merge branch 'dsa-phy-include'David S. Miller2017-02-1015-7/+18
|\ \
| * | net: dsa: remove unnecessary phy*.h includesRussell King2017-02-102-2/+4
| * | net: ath5k: fix build errors when linux/phy*.h is removed from net/dsa.hRussell King2017-02-101-1/+1
| * | net: liquidio: fix build errors when linux/phy*.h is removed from net/dsa.hRussell King2017-02-103-0/+3
| * | MIPS: Octeon: Remove unnecessary MODULE_*()Russell King2017-02-101-4/+0
| * | iscsi: fix build errors when linux/phy*.h is removed from net/dsa.hRussell King2017-02-101-0/+1
| * | net: mvneta: fix build errors when linux/phy*.h is removed from net/dsa.hRussell King2017-02-101-0/+1
| * | net: fman: fix build errors when linux/phy*.h is removed from net/dsa.hRussell King2017-02-101-0/+1
| * | net: bgmac: fix build errors when linux/phy*.h is removed from net/dsa.hRussell King2017-02-101-0/+2