Jason Gunthorpe 89982f7cce Merge tag 'v4.18' into rdma.git for-next ...

Resolve merge conflicts from the -rc cycle against the rdma.git tree:

Conflicts:
 drivers/infiniband/core/uverbs_cmd.c
  - New ifs added to ib_uverbs_ex_create_flow in -rc and for-next
  - Merge removal of file->ucontext in for-next with new code in -rc
 drivers/infiniband/core/uverbs_main.c
  - for-next removed code from ib_uverbs_write() that was modified
    in for-rc

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

2018-08-16 13:12:00 -06:00

..

6lowpan

…

9p

Merge tag 'v4.18' into rdma.git for-next

2018-08-16 13:12:00 -06:00

802

…

8021q

net: fix use-after-free in GRO with ESP

2018-07-02 20:34:04 +09:00

appletalk

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

atm

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

ax25

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

batman-adv

batman-adv: Fix multicast TT issues with bogus ROAM flags

2018-06-23 10:29:33 +02:00

bluetooth

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

bpf

bpf: fix panic due to oob in bpf_prog_test_run_skb

2018-07-11 16:10:57 -07:00

bpfilter

bpfilter: include bpfilter_umh in assembly instead of using objcopy

2018-06-28 21:39:16 +09:00

bridge

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-06-16 07:39:34 +09:00

caif

net: caif: Add a missing rcu_read_unlock() in caif_flow_cb

2018-07-21 16:14:39 -07:00

can

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

ceph

Merge tag 'ceph-for-4.18-rc1' of git://github.com/ceph/ceph-client

2018-06-15 07:24:58 +09:00

core

Merge tag 'v4.18' into rdma.git for-next

2018-08-16 13:12:00 -06:00

dcb

treewide: kmalloc() -> kmalloc_array()

2018-06-12 16:19:22 -07:00

dccp

dccp: fix undefined behavior with 'cwnd' shift in ccid2_cwnd_restart()

2018-08-07 15:34:44 -07:00

decnet

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

dns_resolver

KEYS: DNS: fix parsing multiple options

2018-07-16 11:22:14 -07:00

dsa

dsa: slave: eee: Allow ports to use phylink

2018-08-08 19:19:03 -07:00

ethernet

…

hsr

…

ieee802154

ieee802154: 6lowpan: set IFLA_LINK

2018-07-05 11:13:17 +02:00

ife

…

ipv4

ipv4: frags: handle possible skb truesize change

2018-07-31 14:41:29 -07:00

ipv6

ip6_tunnel: use the right value for ipv4 min mtu check in ip6_tnl_xmit

2018-08-05 17:35:02 -07:00

iucv

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

kcm

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

key

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

l2tp

l2tp: fix missing refcount drop in pppol2tp_tunnel_ioctl()

2018-08-03 12:39:01 -07:00

l3mdev

…

lapb

…

llc

llc: use refcount_inc_not_zero() for llc_sap_find()

2018-08-07 15:54:00 -07:00

mac80211

nl80211/mac80211: allow non-linear skb in rx_control_port

2018-07-06 14:34:42 +02:00

mac802154

…

mpls

…

ncsi

net/ncsi: Use netdev_dbg for debug messages

2018-06-20 07:26:58 +09:00

netfilter

netfilter: nf_tables: move dumper state allocation into ->start

2018-07-24 00:36:33 +02:00

netlabel

…

netlink

netlink: Don't shift on 64 for ngroups

2018-08-04 17:52:51 -07:00

netrom

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

nfc

net/nfc: Avoid stalls when nfc_alloc_send_skb() returned NULL.

2018-07-18 10:51:45 -07:00

nsh

nsh: set mac len based on inner packet

2018-07-12 16:55:29 -07:00

openvswitch

openvswitch: meter: Fix setting meter id for new entries

2018-07-29 13:20:54 -07:00

packet

packet: refine ring v3 block size test to hold one frame

2018-08-06 13:48:33 -07:00

phonet

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

psample

…

qrtr

net: qrtr: Reset the node and port ID of broadcast messages

2018-07-05 20:20:03 +09:00

rds

Merge tag 'v4.18' into rdma.git for-next

2018-08-16 13:12:00 -06:00

rfkill

…

rose

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

rxrpc

rxrpc: Fix the keepalive generator [ver #2]

2018-08-08 19:10:26 -07:00

sched

net: sched: Using NULL instead of plain integer

2018-07-18 13:44:07 -07:00

sctp

sctp: fix the issue that pathmtu may be set lower than MINSEGMENT

2018-07-04 21:36:34 +09:00

smc

Merge tag 'v4.18' into rdma.git for-next

2018-08-16 13:12:00 -06:00

strparser

strparser: Remove early eaten to fix full tcp receive buffer stall

2018-06-28 21:37:26 +09:00

sunrpc

Merge tag 'v4.18' into rdma.git for-next

2018-08-16 13:12:00 -06:00

switchdev

…

tipc

tipc: fix an interrupt unsafe locking scenario

2018-08-07 13:15:35 -07:00

tls

tls: check RCV_SHUTDOWN in tls_wait_data

2018-07-20 14:38:14 -07:00

unix

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

vmw_vsock

vsock: split dwork to avoid reinitializations

2018-08-07 12:39:13 -07:00

wimax

…

wireless

cfg80211: never ignore user regulatory hint

2018-07-24 09:11:31 +02:00

x25

Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL

2018-06-28 10:40:47 -07:00

xdp

net: xsk: don't return frames via the allocator on error

2018-07-31 02:03:19 +02:00

xfrm

xfrm: free skb if nlsk pointer is NULL

2018-06-25 16:43:36 +02:00

compat.c

…

Kconfig

…

Makefile

bpfilter: check compiler capability in Kconfig

2018-06-28 13:36:39 +09:00

socket.c

net: socket: Fix potential spectre v1 gadget in sock_is_registered

2018-07-28 22:43:30 -07:00

sysctl_net.c

…