Greg Kroah-Hartman e8cd29b774 Merge Linus's staging merge point into staging-next ...

This resolves the merge issue pointed out by Stephen in
drivers/iio/adc/meson_saradc.c.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2017-12-06 15:27:17 +01: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

Merge branch '9p-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-11-22 20:17:54 -10:00

802

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

8021q

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

2017-11-12 09:17:05 +09: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

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

bluetooth

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

bpf

bpf: add meta pointer for direct access

2017-09-26 13:36:44 -07:00

bridge

net: bridge: add vlan_tunnel to bridge port policies

2017-11-14 21:54:55 +09:00

caif

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

can

treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts

2017-11-21 16:35:54 -08:00

ceph

We have a set of file locking improvements from Zheng, rbd rw/ro

2017-11-21 05:38:32 -10:00

core

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-11-25 08:37:16 -10:00

dcb

rtnetlink: make rtnl_register accept a flags parameter

2017-08-09 16:57:38 -07:00

dccp

tcp/dccp: block bh before arming time_wait timer

2017-12-01 15:07:43 -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: dsa: fix 'increment on 0' warning

2017-11-26 04:23:10 +09:00

ethernet

…

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

tcp: add tcp_v4_fill_cb()/tcp_v4_restore_cb()

2017-12-03 12:39:14 -05:00

ipv6

tcp: add tcp_v4_fill_cb()/tcp_v4_restore_cb()

2017-12-03 12:39:14 -05:00

iucv

iucv: Convert sk_wmem_alloc accesses to refcount_t.

2017-07-03 02:31:22 -07:00

kcm

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

2017-11-04 09:26:51 +09:00

key

af_key: replace BUG_ON on WARN_ON in net_exit hook

2017-11-14 15:45:52 +09: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: tear down RX aggregations first

2017-11-27 11:24:59 +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

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

netlabel

net/netlabel: Add list_next_rcu() in rcu_dereference().

2017-11-18 10:32:41 +09:00

netlink

netlink: remove unnecessary forward declaration

2017-11-14 21:51:14 +09: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

openvswitch: fix the incorrect flow action alloc size

2017-11-26 18:34:59 -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 branch 'akpm' (patches from Andrew)

2017-11-15 19:42:40 -08:00

rfkill

…

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

act_sample: get rid of tcf_sample_cleanup_rcu()

2017-11-30 10:19:17 -05:00

sctp

sctp: do not abandon the other frags in unsent outq if one msg has outstanding frags

2017-12-01 15:06:24 -05:00

smc

net/smc: Fix preinitialization of buf_desc in __smc_buf_create()

2017-11-24 01:33:34 +09:00

strparser

strparser: Use delayed work instead of timer for msg timeout

2017-10-25 10:37:11 +09:00

sunrpc

NFS client fixes for Linux 4.15-rc2

2017-12-01 20:04:20 -05:00

switchdev

net: bridge: Add/del switchdev object on host join/leave

2017-11-10 13:41:40 +09:00

tipc

tipc: call tipc_rcv() only if bearer is up in tipc_udp_recv()

2017-12-01 15:14:22 -05:00

tls

tls: don't override sk_write_space if tls_set_sw_offload fails.

2017-11-14 16:26:35 +09: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: Don't set sk_state to TCP_CLOSE before testing it

2017-11-28 16:01:50 -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

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

2017-11-29 13:10:25 -08:00

x25

treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts

2017-11-21 16:35:54 -08:00

xfrm

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

compat.c

net: compat: assert the size of cmsg copied in is as expected

2017-09-20 15:36:18 -07:00

Kconfig

ipx: move Novell IPX protocol support into staging

2017-11-28 13:55:00 +01:00

Makefile

ipx: move Novell IPX protocol support into staging

2017-11-28 13:55:00 +01:00

socket.c

kmemcheck: remove annotations

2017-11-15 18:21:04 -08:00

sysctl_net.c

…