Merge 4.15-rc3 into tty-next

We want the serial/tty fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2026-11-13 07:31:07 +00:00 · 2017-12-11 08:41:08 +01:00 · 2017-12-11 08:41:08 +01:00 · 42e64571d5
commit 42e64571d5
parent b8f3bff057 50c4c4e268
1515 changed files with 13724 additions and 8583 deletions
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
--- a/include/drm/ttm/ttm_page_alloc.h
+++ b/include/drm/ttm/ttm_page_alloc.h
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
--- a/include/linux/iio/timer/stm32-lptim-trigger.h
+++ b/include/linux/iio/timer/stm32-lptim-trigger.h
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
--- a/include/linux/kmemcheck.h
+++ b/include/linux/kmemcheck.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
--- a/include/linux/libgcc.h
+++ b/include/linux/libgcc.h
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/rculist_nulls.h
+++ b/include/linux/rculist_nulls.h
--- a/include/linux/serdev.h
+++ b/include/linux/serdev.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
--- a/include/net/red.h
+++ b/include/net/red.h
--- a/include/net/sctp/checksum.h
+++ b/include/net/sctp/checksum.h
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
--- a/include/net/sctp/stream_sched.h
+++ b/include/net/sctp/stream_sched.h
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/net/tc_act/tc_sample.h
+++ b/include/net/tc_act/tc_sample.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
--- a/include/trace/events/xdp.h
+++ b/include/trace/events/xdp.h
--- a/include/uapi/asm-generic/bpf_perf_event.h
+++ b/include/uapi/asm-generic/bpf_perf_event.h
--- a/include/uapi/linux/bcache.h
+++ b/include/uapi/linux/bcache.h
--- a/include/uapi/linux/bfs_fs.h
+++ b/include/uapi/linux/bfs_fs.h
--- a/include/uapi/linux/bpf_perf_event.h
+++ b/include/uapi/linux/bpf_perf_event.h
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
--- a/include/uapi/linux/rxrpc.h
+++ b/include/uapi/linux/rxrpc.h
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
--- a/include/uapi/linux/vm_sockets_diag.h
+++ b/include/uapi/linux/vm_sockets_diag.h