summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* afs: Move UUID struct to linux/uuid.hDavid Howells2017-02-104-51/+53
* Merge branch 'openvswitch-Conntrack-integration-improvements'David S. Miller2017-02-098-113/+420
|\
| * openvswitch: Pack struct sw_flow_key.Jarno Rajahalme2017-02-094-34/+39
| * openvswitch: Add force commit.Jarno Rajahalme2017-02-092-2/+29
| * openvswitch: Add original direction conntrack tuple to sw_flow_key.Jarno Rajahalme2017-02-098-47/+246
| * openvswitch: Inherit master's labels.Jarno Rajahalme2017-02-091-14/+31
| * openvswitch: Refactor labels initialization.Jarno Rajahalme2017-02-091-42/+62
| * openvswitch: Simplify labels length logic.Jarno Rajahalme2017-02-091-11/+9
| * openvswitch: Unionize ovs_key_ct_label with a u32 array.Jarno Rajahalme2017-02-092-9/+14
| * openvswitch: Do not trigger events for unconfirmed connections.Jarno Rajahalme2017-02-091-6/+22
| * openvswitch: Use inverted tuple in ovs_ct_find_existing() if NATted.Jarno Rajahalme2017-02-091-2/+22
| * openvswitch: Fix comments for skb->_nfctJarno Rajahalme2017-02-091-7/+7
|/
* Merge branch 'ena-bug-fixes'David S. Miller2017-02-096-83/+172
|\
| * net/ena: update driver version to 1.1.2Netanel Belgazal2017-02-091-1/+1
| * net/ena: change condition for host attribute configurationNetanel Belgazal2017-02-092-7/+6
| * net/ena: change driver's default timeoutsNetanel Belgazal2017-02-092-5/+5
| * net/ena: reduce the severity of ena printoutsNetanel Belgazal2017-02-092-13/+28
| * net/ena: use READ_ONCE to access completion descriptorsNetanel Belgazal2017-02-092-4/+5
| * net/ena: use napi_complete_done() return valueNetanel Belgazal2017-02-091-15/+29
| * net/ena: fix potential access to freed memory during device resetNetanel Belgazal2017-02-091-13/+43
| * net/ena: refactor ena_get_stats64 to be atomic context safeNetanel Belgazal2017-02-093-15/+42
| * net/ena: fix NULL dereference when removing the driver after device reset failedNetanel Belgazal2017-02-091-1/+5
| * net/ena: fix RSS default hash configurationNetanel Belgazal2017-02-091-1/+1
| * net/ena: fix ethtool RSS flow configurationNetanel Belgazal2017-02-091-6/+6
| * net/ena: fix queues number calculationNetanel Belgazal2017-02-091-1/+1
| * net/ena: remove ntuple filter support from device feature listNetanel Belgazal2017-02-091-1/+0
|/
* Merge branch 'enic-vxlan-offload'David S. Miller2017-02-096-15/+364
|\
| * enic: add vxlan offload on tx pathGovindarajulu Varadarajan2017-02-091-12/+114
| * enic: add udp_tunnel ndo for vxlan offloadGovindarajulu Varadarajan2017-02-092-3/+159
| * enic: add devcmds for vxlan offloadGovindarajulu Varadarajan2017-02-094-0/+91
|/
* net: dsa: mv88e6xxx: Move forward declaration to where it is neededAndrew Lunn2017-02-091-2/+2
* net: dsa: Fix duplicate object ruleFlorian Fainelli2017-02-091-1/+0
* Merge branch 'qcom-emac-more-ethtool'David S. Miller2017-02-093-81/+143
|\
| * net: qcom/emac: add ethtool support for setting ring parametersTimur Tabi2017-02-091-0/+24
| * net: qcom/emac: add ethtool support for reading hardware registersTimur Tabi2017-02-093-81/+119
|/
* ARM: orion: remove unused wnr854t_switch_plat_dataArnd Bergmann2017-02-091-5/+0
* Merge branch 'sctp-sender-stream-reconf-reset-add-streams'David S. Miller2017-02-097-4/+297
|\
| * sctp: implement sender-side procedures for Add Incoming/Outgoing Streams Requ...Xin Long2017-02-094-0/+115
| * sctp: add support for generating stream reconf add incoming/outgoing streams ...Xin Long2017-02-093-0/+56
| * sctp: implement sender-side procedures for SSN/TSN Reset Request ParameterXin Long2017-02-094-0/+71
| * sctp: add support for generating stream reconf ssn/tsn reset request chunkXin Long2017-02-093-0/+36
| * sctp: streams should be recovered when it fails to send request.Xin Long2017-02-091-2/+17
| * sctp: drop unnecessary __packed from some stream reconf structuresXin Long2017-02-091-3/+3
|/
* Merge branch 'sfc-more-encap-offloads'David S. Miller2017-02-0911-58/+640
|\
| * sfc: configure UDP tunnel offload portsJon Cooper2017-02-097-1/+397
| * sfc: update mcdi_pcol definitions for MC_CMD_SET_TUNNEL_ENCAP_UDP_PORTSMatthew Slattery2017-02-091-0/+21
| * sfc: call mcdi_reboot_detected() when MC reboots during an MCDI commandJon Cooper2017-02-091-2/+5
| * sfc: harden driver against MC resets during initial probeJon Cooper2017-02-091-35/+64
| * sfc: set csum_level for encapsulated packetsJon Cooper2017-02-093-4/+25
| * sfc: process RX event inner checksum flagsJon Cooper2017-02-094-19/+131
|/