mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-12 11:14:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
ca85bb1ca9948899682fe7170636e465599ea8e7
linux/net
History
Jason Gunthorpe e7996a9a77 Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 
To resolve conflicts in:
 drivers/infiniband/hw/mlx5/main.c
 drivers/infiniband/hw/mlx5/qp.c

From patches merged into the -rc cycle. The conflict resolution matches
what linux-next has been carrying.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
2018-01-30 09:30:00 -07:00
..
6lowpan
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
9p
9p: add missing module license for xen transport
2018-01-15 13:13:53 -05:00
802
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
8021q
8021q: fix a memory leak for VLAN 0 device
2018-01-10 15:31:07 -05:00
appletalk
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
atm
treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts
2017-11-21 16:35:54 -08:00
ax25
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
batman-adv
batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq
2017-12-04 11:47:33 +01:00
bluetooth
Bluetooth: Prevent stack info leak from the EFS element.
2018-01-04 17:01:01 +01:00
bpf
bpf: add meta pointer for direct access
2017-09-26 13:36:44 -07:00
bridge
net: bridge: fix early call to br_stp_change_bridge_id and plug newlink leaks
2017-12-18 13:29:01 -05:00
caif
caif_usb: use strlcpy() instead of strncpy()
2018-01-10 15:06:14 -05:00
can
can: af_can: canfd_rcv(): replace WARN_ONCE by pr_warn_once
2018-01-18 09:32:54 +01:00
ceph
Merge tag 'ceph-for-4.15-rc1' of git://github.com/ceph/ceph-client
2017-11-21 05:38:32 -10:00
core
net: qdisc_pkt_len_init() should be more robust
2018-01-22 16:00:05 -05:00
dcb
rtnetlink: make rtnl_register accept a flags parameter
2017-08-09 16:57:38 -07:00
dccp
dccp: don't restart ccid2_hc_tx_rto_expire() if sk in closed state
2018-01-26 11:15:00 -05:00
decnet
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
dns_resolver
KEYS: Fix race between updating and finding a negative key
2017-10-18 09:12:40 +01:00
dsa
net: remove duplicate includes
2017-12-13 13:18:46 -05:00
ethernet
networking: make skb_push & __skb_push return void pointers
2017-06-16 11:48:40 -04:00
hsr
net: hsr: Convert timers to use timer_setup()
2017-10-25 13:00:27 +09:00
ieee802154
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
ife
MAINTAINERS: Update Yotam's E-mail
2017-11-01 12:19:03 +09:00
ipv4
net: don't call update_pmtu unconditionally
2018-01-25 16:27:34 -05:00
ipv6
net: don't call update_pmtu unconditionally
2018-01-25 16:27:34 -05:00
ipx
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
iucv
iucv: Convert sk_wmem_alloc accesses to refcount_t.
2017-07-03 02:31:22 -07:00
kcm
kcm: Check if sk_user_data already set in kcm_attach
2018-01-24 15:54:30 -05:00
key
af_key: Fix memory leak in key_notify_policy.
2018-01-10 09:45:11 +01:00
l2tp
l2tp: exit_net cleanup check added
2017-11-14 15:45:53 +09:00
l3mdev
…
lapb
treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts
2017-11-21 16:35:54 -08:00
llc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2017-11-15 11:56:19 -08:00
mac80211
mac80211: mesh: drop frames appearing to be from us
2018-01-04 15:51:53 +01:00
mac802154
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
mpls
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
ncsi
treewide: setup_timer() -> timer_setup() (2 field)
2017-11-21 15:57:09 -08:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-01-08 20:21:39 -08:00
netlabel
net/netlabel: Add list_next_rcu() in rcu_dereference().
2017-11-18 10:32:41 +09:00
netlink
netlink: reset extack earlier in netlink_rcv_skb
2018-01-18 15:14:51 -05:00
netrom
treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts
2017-11-21 16:35:54 -08:00
nfc
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
nsh
openvswitch: enable NSH support
2017-11-08 16:12:33 +09:00
openvswitch
Revert "openvswitch: Add erspan tunnel support."
2018-01-15 14:33:16 -05:00
packet
net/packet: fix a race in packet_bind() and packet_notifier()
2017-11-28 11:13:30 -05:00
phonet
phonet: exit_net cleanup check added
2017-11-14 15:45:53 +09:00
psample
MAINTAINERS: Update Yotam's E-mail
2017-11-01 12:19:03 +09:00
qrtr
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-10 10:00:18 +09:00
rds
Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
2018-01-30 09:30:00 -07:00
rfkill
net: rfkill: gpio: Switch to devm_acpi_dev_add_driver_gpios()
2017-06-13 11:07:51 +02:00
rose
treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts
2017-11-21 16:35:54 -08:00
rxrpc
rxrpc: Use correct netns source in rxrpc_release_sock()
2017-12-03 10:05:20 -05:00
sched
net: sched: em_nbyte: don't add the data offset twice
2018-01-24 14:52:40 -05:00
sctp
gso: validate gso_type in GSO handlers
2018-01-22 16:01:30 -05:00
smc
net/smc: Fix preinitialization of buf_desc in __smc_buf_create()
2017-11-24 01:33:34 +09:00
strparser
strparser: Call sock_owned_by_user_nocheck
2017-12-28 14:28:22 -05:00
sunrpc
Merge tag 'nfs-for-4.15-3' of git://git.linux-nfs.org/projects/anna/linux-nfs
2017-12-16 13:12:53 -08:00
switchdev
net: bridge: Add/del switchdev object on host join/leave
2017-11-10 13:41:40 +09:00
tipc
tipc: fix a memory leak in tipc_nl_node_get_link()
2018-01-15 13:45:50 -05:00
tls
tls: Correct length of scatterlist in tls_sw_sendpage
2018-01-22 16:25:21 -05:00
unix
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
vmw_vsock
VSOCK: set POLLOUT | POLLWRNORM for TCP_CLOSING
2018-01-26 11:16:27 -05:00
wimax
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
wireless
cfg80211: fix station info handling bugs
2018-01-18 15:36:18 -05:00
x25
treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts
2017-11-21 16:35:54 -08:00
xfrm
xfrm: fix boolean assignment in xfrm_get_type_offload
2018-01-23 10:56:36 +01:00
compat.c
net: compat: assert the size of cmsg copied in is as expected
2017-09-20 15:36:18 -07:00
Kconfig
net: Remove CONFIG_NETFILTER_DEBUG and _ASSERT() macros.
2017-09-04 13:25:20 +02:00
Makefile
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
socket.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-01-10 17:55:42 -08:00
sysctl_net.c
sysctl: Remove dead register_sysctl_root
2017-04-16 23:42:49 -05:00