summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: axienet: Fix return value check in axienet_probe()Wei Yongjun2016-07-201-2/+2
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2016-07-2011-11/+76
|\
| * Bluetooth: btmrvl: reset is_suspending flag in failure pathAmitkumar Karwar2016-07-181-0/+1
| * Bluetooth: bpa10x: Add support for hci_set_fw_infoMarcel Holtmann2016-07-181-0/+2
| * Bluetooth: Add debugfs fields for hardware and firmware infoMarcel Holtmann2016-07-183-0/+63
| * Bluetooth: Move hci_recv_frame and hci_recv_diag prototypesMarcel Holtmann2016-07-181-3/+2
| * Bluetooth: Fix l2cap_sock_setsockopt() with optname BT_RCVMTUAmadeusz Sławiński2016-07-171-1/+1
| * drivers: misc: ti-st: Use int instead of fuzzy char for callback statusGeert Uytterhoeven2016-07-175-7/+7
* | bpf, elf: add official ELF machine define for eBPFDaniel Borkmann2016-07-201-0/+1
* | bpf: fix implicit declaration of bpf_prog_addBrenden Blanco2016-07-201-0/+4
* | Merge branch 'xdp'David S. Miller2016-07-2022-96/+1206
|\ \
| * | bpf: add sample for xdp forwarding and rewriteBrenden Blanco2016-07-202-0/+119
| * | bpf: enable direct packet data write for xdp progsBrenden Blanco2016-07-201-1/+16
| * | net/mlx4_en: add xdp forwarding and data write supportBrenden Blanco2016-07-205-8/+211
| * | net/mlx4_en: break out tx_desc write into separate functionBrenden Blanco2016-07-203-71/+92
| * | bpf: add XDP_TX xdp_action for direct forwardingBrenden Blanco2016-07-201-0/+1
| * | net/mlx4_en: add page recycle to prepare rx ring for tx supportBrenden Blanco2016-07-203-10/+109
| * | Add sample for adding simple drop program to linkBrenden Blanco2016-07-204-0/+286
| * | net/mlx4_en: add support for fast rx drop bpf programBrenden Blanco2016-07-203-4/+102
| * | rtnl: add option for setting link xdp progBrenden Blanco2016-07-202-0/+76
| * | net: add ndo to setup/query xdp prog in adapter rxBrenden Blanco2016-07-202-0/+67
| * | bpf: add XDP prog type for early driver filterBrenden Blanco2016-07-204-0/+118
| * | bpf: add bpf_prog_add api for bulk prog refcntBrenden Blanco2016-07-202-3/+10
|/ /
* | Merge branch 'ncsi'David S. Miller2016-07-2013-63/+3825
|\ \
| * | net/faraday: Mask PHY interrupt with NCSI modeGavin Shan2016-07-201-12/+15
| * | net/faraday: Match driver according to compatible propertyGavin Shan2016-07-201-5/+11
| * | net/faraday: Support NCSI modeGavin Shan2016-07-201-10/+75
| * | net/faraday: Read MAC address from chipGavin Shan2016-07-201-7/+62
| * | net/faraday: Helper functions to create or destroy MDIO interfaceGavin Shan2016-07-201-35/+60
| * | net/ncsi: NCSI AEN packet handlerGavin Shan2016-07-205-2/+236
| * | net/ncsi: Package and channel managementGavin Shan2016-07-204-0/+834
| * | net/ncsi: NCSI response packet handlerGavin Shan2016-07-204-1/+1227
| * | net/ncsi: NCSI command packet handlerGavin Shan2016-07-205-1/+559
| * | net/ncsi: Resource managementGavin Shan2016-07-207-0/+756
|/ /
* | Merge branch 'dsa-mv88e6xxx-g2-cleanup-stp'David S. Miller2016-07-204-235/+472
|\ \
| * | net: dsa: mv88e6xxx: add support for DSA ageing timeVivien Didelot2016-07-201-0/+14
| * | net: dsa: mv88e6xxx: add G1 helper for ageing timeVivien Didelot2016-07-202-5/+54
| * | net: dsa: support switchdev ageing time attrVivien Didelot2016-07-202-0/+43
| * | net: dsa: mv88e6xxx: add cap for IRLVivien Didelot2016-07-202-20/+53
| * | net: dsa: mv88e6xxx: add cap for Priority OverrideVivien Didelot2016-07-202-10/+33
| * | net: dsa: mv88e6xxx: add cap for PVTVivien Didelot2016-07-202-13/+31
| * | net: dsa: mv88e6xxx: rework Switch MAC setterVivien Didelot2016-07-202-75/+64
| * | net: dsa: mv88e6xxx: add cap for MGMT Enables bitsVivien Didelot2016-07-202-18/+41
| * | net: dsa: mv88e6xxx: extract trunk mappingVivien Didelot2016-07-202-21/+48
| * | net: dsa: mv88e6xxx: extract device mappingVivien Didelot2016-07-201-15/+60
| * | net: dsa: mv88e6xxx: split setup of Global 1 and 2Vivien Didelot2016-07-202-32/+62
| * | net: dsa: mv88e6xxx: remove basic function flagsVivien Didelot2016-07-202-63/+6
|/ /
* | kernel/trace/bpf_trace.c: work around gcc-4.4.4 anon union initialization bugAndrew Morton2016-07-201-1/+3
* | virtio-net: Remove more stack DMAAndy Lutomirski2016-07-201-5/+8
* | bnxt_en: Remove locking around txr->dev_stateFlorian Fainelli2016-07-201-2/+0