Merge 4.18-rc5 into staging-next

We need the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2026-10-14 05:55:17 +00:00 · 2018-07-16 09:06:57 +02:00 · 2018-07-16 09:06:57 +02:00 · 956f004a04
commit 956f004a04
parent bfd727f3a5 9d3cce1e8b
415 changed files with 3904 additions and 2059 deletions
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
--- a/include/dt-bindings/clock/imx6ul-clock.h
+++ b/include/dt-bindings/clock/imx6ul-clock.h
--- a/include/linux/bpf-cgroup.h
+++ b/include/linux/bpf-cgroup.h
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/include/linux/bpf_lirc.h
+++ b/include/linux/bpf_lirc.h
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
--- a/include/linux/kthread.h
+++ b/include/linux/kthread.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
--- a/include/linux/mlx5/eswitch.h
+++ b/include/linux/mlx5/eswitch.h
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
--- a/include/uapi/linux/rseq.h
+++ b/include/uapi/linux/rseq.h
--- a/include/uapi/linux/types_32_64.h
+++ b/include/uapi/linux/types_32_64.h