summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-01-2431-123/+274
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-01-2419-49/+90
| |\
| | * net/ibm/emac: wrong bit is used for STA control register writeIvan Mikhaylov2018-01-241-1/+1
| | * net/ibm/emac: add 8192 rx/tx fifo sizeIvan Mikhaylov2018-01-242-0/+8
| | * vhost: do not try to access device IOTLB when not initializedJason Wang2018-01-241-0/+4
| | * vhost: use mutex_lock_nested() in vhost_dev_lock_vqs()Jason Wang2018-01-241-1/+1
| | * i40e: flower: check if TC offload is enabled on a netdevJakub Kicinski2018-01-241-0/+2
| | * Merge branch 'qed-rdma-bug-fixes'David S. Miller2018-01-241-14/+17
| | |\
| | | * qed: Free reserved MR tidMichal Kalderon2018-01-241-11/+17
| | | * qed: Remove reserveration of dpi for kernelMichal Kalderon2018-01-241-3/+0
| | |/
| | * Merge branch 'kcm-fix-two-syzcaller-issues'David S. Miller2018-01-241-4/+21
| | |\
| | | * kcm: Check if sk_user_data already set in kcm_attachTom Herbert2018-01-241-2/+14
| | | * kcm: Only allow TCP sockets to be attached to a KCM muxTom Herbert2018-01-241-2/+7
| | |/
| | * net: sched: fix TCF_LAYER_LINK case in tcf_get_base_ptrWolfgang Bumiller2018-01-241-1/+1
| | * net: sched: em_nbyte: don't add the data offset twiceWolfgang Bumiller2018-01-241-1/+1
| | * mlxsw: spectrum_router: Don't log an error on missing neighborYuval Mintz2018-01-241-8/+2
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2018-01-245-11/+22
| | |\
| | | * xfrm: fix boolean assignment in xfrm_get_type_offloadGustavo A. R. Silva2018-01-231-1/+1
| | | * xfrm: Fix eth_hdr(skb)->h_proto to reflect inner IP versionYossi Kuperman2018-01-232-0/+2
| | | * xfrm: fix error flow in case of add state failsAviad Yehezkel2018-01-191-0/+1
| | | * xfrm: Add SA to hardware at the end of xfrm_state_construct()Yossi Kuperman2018-01-182-10/+18
| | * | vmxnet3: repair memory leakNeil Horman2018-01-231-1/+1
| | * | ipv6: Fix getsockopt() for sockets with default IPV6_AUTOFLOWLABELBen Hutchings2018-01-233-2/+3
| | * | pppoe: take ->needed_headroom of lower device into account on xmitGuillaume Nault2018-01-231-5/+6
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparcLinus Torvalds2018-01-241-1/+1
| |\ \ \
| | * | | sparc64: fix typo in CONFIG_CRYPTO_DES_SPARC64 => CONFIG_CRYPTO_CAMELLIA_SPARC64Corentin Labbe2018-01-241-1/+1
| * | | | MAINTAINERS: update email address for James MorrisJames Morris2018-01-251-1/+1
| * | | | Merge tag 'trace-v4.15-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2018-01-248-52/+152
| |\ \ \ \
| | * | | | tracing: Update stack trace skipping for ORC unwinderSteven Rostedt (VMware)2018-01-233-29/+67
| | * | | | ftrace, orc, x86: Handle ftrace dynamically allocated trampolinesSteven Rostedt (VMware)2018-01-233-13/+66
| | * | | | x86/ftrace: Fix ORC unwinding from ftrace handlersJosh Poimboeuf2018-01-232-10/+19
| * | | | | MAINTAINERS: clarify that only verified bugs should be submitted to security@Willy Tarreau2018-01-241-1/+9
| * | | | | Revert "module: Add retpoline tag to VERMAGIC"Greg Kroah-Hartman2018-01-241-7/+1
| * | | | | Merge tag 'pci-v4.15-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2018-01-231-12/+20
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | x86/PCI: Enable AMD 64-bit window on resume=?UTF-8?q?Christian=20K=C3=B6nig?=2018-01-161-12/+20
* | | | | | Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2018-01-243-17/+43
|\ \ \ \ \ \
| * | | | | | fm10k: clarify action when updating the VLAN tableNgai-Mint Kwan2018-01-241-1/+3
| * | | | | | fm10k: correct typo in fm10k_pf.cNgai-Mint Kwan2018-01-241-1/+1
| * | | | | | fm10k: don't assume VLAN 1 is enabledJacob Keller2018-01-241-5/+3
| * | | | | | fm10k: stop adding VLAN 0 to the VLAN tableJacob Keller2018-01-241-3/+0
| * | | | | | fm10k: fix "failed to kill vid" message for VFNgai-Mint Kwan2018-01-241-2/+12
| * | | | | | fm10k: cleanup unnecessary parenthesis in fm10k_iov.cJacob Keller2018-01-241-2/+2
| * | | | | | fm10k: Fix configuration for macvlan offloadAlexander Duyck2018-01-241-3/+22
* | | | | | | cxgb4: make symbol pedits staticWei Yongjun2018-01-241-1/+1
* | | | | | | net: erspan: fix use-after-freeWilliam Tu2018-01-241-2/+2
* | | | | | | net: qcom/emac: extend DMA mask to 46bitsWang Dongsheng2018-01-242-3/+7
* | | | | | | ip_tunnel: Use mark in skb by defaultThomas Winter2018-01-241-3/+10
* | | | | | | net: stmmac: do not use a bitwise AND operator with a bool operandNiklas Cassel2018-01-242-3/+3
* | | | | | | Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher...David S. Miller2018-01-245-48/+70
|\ \ \ \ \ \ \
| * | | | | | | igb: Clear TXSTMP when ptp_tx_work() is timeoutDaniel Hua2018-01-241-0/+9