summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Documentation/pktgen: Clearify how-to use pktgen samplesDmitry Safonov2018-01-241-5/+14
|/
* Merge branch 'cxgb4-fix-build-error'David S. Miller2018-01-245-17/+6
|\
| * cxgb4: properly initialize variablesRahul Lakkireddy2018-01-242-2/+4
| * cxgb4: enable ZLIB_DEFLATE when building cxgb4Rahul Lakkireddy2018-01-243-15/+2
|/
* Merge branch 'net-smc-socket-closing-improvements'David S. Miller2018-01-247-121/+71
|\
| * net/smc: continue waiting if peer signals write_shutdownUrsula Braun2018-01-241-2/+2
| * net/smc: improve state change handling after close waitUrsula Braun2018-01-241-14/+26
| * net/smc: make wait for work request uninterruptibleUrsula Braun2018-01-241-7/+6
| * net/smc: get rid of tx_pend waits in socket closingUrsula Braun2018-01-245-57/+0
| * net/smc: simplify function smc_clcsock_accept()Ursula Braun2018-01-241-9/+2
| * net/smc: use local struct sock variables consistentlyUrsula Braun2018-01-242-34/+37
|/
* cxgb4/cxgb4vf: add support for ndo_set_vf_vlanGanesh Goudar2018-01-249-8/+116
* Merge branch 'bpf-and-netdevsim-test-updates'David S. Miller2018-01-244-38/+216
|\
| * selftests/bpf: validate replace of TC filters is workingJakub Kicinski2018-01-241-5/+50
| * selftests/bpf: check bpf verifier log buffer usage works for HW offloadQuentin Monnet2018-01-242-5/+25
| * netdevsim: don't compile BPF code if syscall not enabledJakub Kicinski2018-01-242-1/+33
| * selftests/bpf: add checks on extack messages for eBPF hw offload testsQuentin Monnet2018-01-241-26/+86
| * netdevsim: add extack support for TC eBPF offloadQuentin Monnet2018-01-241-7/+28
|/
* Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe...David S. Miller2018-01-2418-210/+403
|\
| * i40e: Fix channel addition in reset flowAmritha Nambiar2018-01-231-0/+11
| * i40evf: ignore link up if not runningAlan Brady2018-01-231-12/+23
| * i40e: Delete an error message for a failed memory allocation in i40e_init_int...Markus Elfring2018-01-231-3/+2
| * i40e: Disable iWARP VSI PETCP_ENA flag on netdev down eventsShiraz Saleem2018-01-232-18/+20
| * i40e: simplify pointer dereferencesMitch Williams2018-01-231-10/+8
| * i40e: check for invalid DCB configMitch Williams2018-01-231-1/+33
| * i40e/i40evf: Detect and recover hung queue scenarioSudheer Mogilappagari2018-01-236-99/+115
| * i40e: Fix for blinking activity instead of link LEDsMichal Kuchta2018-01-231-3/+2
| * i40evf: Don't schedule reset_task when device is being removedAvinash Dayanand2018-01-232-1/+9
| * i40evf: remove flush_scheduled_work call in i40evf_removeSudheer Mogilappagari2018-01-231-2/+0
| * i40e: avoid divide by zeroMitch Williams2018-01-231-2/+7
| * i40e/i40evf: Enable NVMUpdate to retrieve AdminQ and add preservation flags f...Pawel Jablonski2018-01-239-59/+173
* | Merge branch 'act_csum-spinlock-remove'David S. Miller2018-01-242-20/+62
|\ \
| * | net/sched: act_csum: don't use spinlock in the fast pathDavide Caratti2018-01-242-15/+59
| * | net/sched: act_csum: use per-core statisticsDavide Caratti2018-01-241-6/+4
|/ /
* | net: link_watch: mark bonding link events urgentRoopa Prabhu2018-01-241-1/+1
* | Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe...David S. Miller2018-01-248-23/+1116
|\ \
| * | ixgbe: register ipsec offload with the xfrm subsystemShannon Nelson2018-01-232-0/+23
| * | ixgbe: ipsec offload statsShannon Nelson2018-01-234-1/+10
| * | ixgbe: process the Tx ipsec offloadShannon Nelson2018-01-235-9/+112
| * | ixgbe: process the Rx ipsec offloadShannon Nelson2018-01-233-2/+115
| * | ixgbe: restore offloaded SAs after a resetShannon Nelson2018-01-233-0/+44
| * | ixgbe: add ipsec offload add and remove SAShannon Nelson2018-01-233-1/+399
| * | ixgbe: add ipsec data structuresShannon Nelson2018-01-232-0/+45
| * | ixgbe: add ipsec engine start and stop routinesShannon Nelson2018-01-231-0/+142
| * | ixgbe: add ipsec register access routinesShannon Nelson2018-01-235-0/+222
| * | ixgbe: clean up ipsec definesShannon Nelson2018-01-231-13/+7
| |/
* | Merge branch 'GEHC-Bx50-Switch-Support'David S. Miller2018-01-248-32/+327
|\ \
| * | ARM: dts: imx6q-b450v3: Add switch port configurationSebastian Reichel2018-01-241-0/+52
| * | ARM: dts: imx6q-b650v3: Add switch port configurationSebastian Reichel2018-01-241-0/+52
| * | ARM: dts: imx6q-b850v3: Add switch port configurationSebastian Reichel2018-01-241-0/+75