Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts

Conflicts: arch/x86/kernel/head64.c arch/x86/mm/mmap.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-11-13 07:31:07 +00:00 · 2017-08-26 09:19:13 +02:00 · 2017-08-26 09:19:13 +02:00 · 413d63d71b
commit 413d63d71b
parent d6c8103b02 90a6cd5039
1493 changed files with 27316 additions and 23647 deletions
--- a/include/acpi/acpi_numa.h
+++ b/include/acpi/acpi_numa.h
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/kvm/arm_pmu.h
+++ b/include/kvm/arm_pmu.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
--- a/include/linux/bpf-cgroup.h
+++ b/include/linux/bpf-cgroup.h
--- a/include/linux/bpf_verifier.h
+++ b/include/linux/bpf_verifier.h
--- a/include/linux/cdev.h
+++ b/include/linux/cdev.h
--- a/include/linux/ceph/ceph_features.h
+++ b/include/linux/ceph/ceph_features.h
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
--- a/include/linux/ceph/rados.h
+++ b/include/linux/ceph/rados.h
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
--- a/include/linux/crush/crush.h
+++ b/include/linux/crush/crush.h
--- a/include/linux/dax.h
+++ b/include/linux/dax.h
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/devpts_fs.h
+++ b/include/linux/devpts_fs.h
--- a/include/linux/dma-fence.h
+++ b/include/linux/dma-fence.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/fs_struct.h
+++ b/include/linux/fs_struct.h
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
--- a/include/linux/ipc.h
+++ b/include/linux/ipc.h
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
--- a/include/linux/jhash.h
+++ b/include/linux/jhash.h
--- a/include/linux/key-type.h
+++ b/include/linux/key-type.h
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
--- a/include/linux/kthread.h
+++ b/include/linux/kthread.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
--- a/include/linux/llist.h
+++ b/include/linux/llist.h
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
--- a/include/linux/module.h
+++ b/include/linux/module.h
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
--- a/include/linux/msg.h
+++ b/include/linux/msg.h
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
--- a/include/linux/net.h
+++ b/include/linux/net.h
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.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-fc.h
+++ b/include/linux/nvme-fc.h
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
--- a/include/linux/path.h
+++ b/include/linux/path.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/perf/arm_pmu.h
+++ b/include/linux/perf/arm_pmu.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
--- a/include/linux/pid_namespace.h
+++ b/include/linux/pid_namespace.h
--- a/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
--- a/include/linux/platform_data/hsmmc-omap.h
+++ b/include/linux/platform_data/hsmmc-omap.h
--- a/include/linux/platform_data/st_sensors_pdata.h
+++ b/include/linux/platform_data/st_sensors_pdata.h
--- a/include/linux/proc_ns.h
+++ b/include/linux/proc_ns.h
--- a/include/linux/ptp_clock_kernel.h
+++ b/include/linux/ptp_clock_kernel.h
--- a/include/linux/ptr_ring.h
+++ b/include/linux/ptr_ring.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/sched/signal.h
+++ b/include/linux/sched/signal.h
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
--- a/include/linux/skb_array.h
+++ b/include/linux/skb_array.h
--- a/include/linux/sync_file.h
+++ b/include/linux/sync_file.h
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
--- a/include/linux/usb/audio-v2.h
+++ b/include/linux/usb/audio-v2.h
--- a/include/linux/usb/cdc_ncm.h
+++ b/include/linux/usb/cdc_ncm.h
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
--- a/include/linux/utsname.h
+++ b/include/linux/utsname.h
--- a/include/linux/uuid.h
+++ b/include/linux/uuid.h
--- a/include/linux/vfio.h
+++ b/include/linux/vfio.h
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
--- a/include/media/cec-notifier.h
+++ b/include/media/cec-notifier.h
--- a/include/media/davinci/dm644x_ccdc.h
+++ b/include/media/davinci/dm644x_ccdc.h
--- a/include/media/davinci/vpfe_capture.h
+++ b/include/media/davinci/vpfe_capture.h
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
--- a/include/net/bonding.h
+++ b/include/net/bonding.h
--- a/Show more
+++ b/Show more