Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2026-11-13 07:31:07 +00:00 · 2017-10-09 09:02:35 +02:00 · 2017-10-09 09:02:35 +02:00 · 1236d6bb6e
commit 1236d6bb6e
parent 750b1a6894 8a5776a5f4
968 changed files with 13000 additions and 6533 deletions
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/asm-generic/percpu.h
+++ b/include/asm-generic/percpu.h
--- a/include/dt-bindings/reset/snps,hsdk-reset.h
+++ b/include/dt-bindings/reset/snps,hsdk-reset.h
--- a/include/dt-bindings/reset/snps,hsdk-v1-reset.h
+++ b/include/dt-bindings/reset/snps,hsdk-v1-reset.h
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
--- a/include/linux/bitfield.h
+++ b/include/linux/bitfield.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/iio/adc/ad_sigma_delta.h
+++ b/include/linux/iio/adc/ad_sigma_delta.h
--- a/include/linux/input.h
+++ b/include/linux/input.h
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
--- a/include/linux/key.h
+++ b/include/linux/key.h
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
--- a/include/linux/mmu_notifier.h
+++ b/include/linux/mmu_notifier.h
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
--- a/include/linux/nvme-fc-driver.h
+++ b/include/linux/nvme-fc-driver.h
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/sched/mm.h
+++ b/include/linux/sched/mm.h
--- a/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
--- a/include/linux/smpboot.h
+++ b/include/linux/smpboot.h
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
--- a/include/net/dst.h
+++ b/include/net/dst.h
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
--- a/include/net/route.h
+++ b/include/net/route.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/include/net/udp.h
+++ b/include/net/udp.h
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
--- a/include/scsi/scsi_devinfo.h
+++ b/include/scsi/scsi_devinfo.h
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
--- a/include/sound/hda_verbs.h
+++ b/include/sound/hda_verbs.h
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
--- a/include/uapi/linux/dm-ioctl.h
+++ b/include/uapi/linux/dm-ioctl.h
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
--- a/include/uapi/linux/seccomp.h
+++ b/include/uapi/linux/seccomp.h
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
--- a/include/xen/arm/page.h
+++ b/include/xen/arm/page.h