Merge branch 'linus' into locking/core, to fix up conflicts

Conflicts: mm/page_alloc.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-11-13 07:31:07 +00:00 · 2017-09-04 11:01:18 +02:00 · 2017-09-04 11:01:18 +02:00 · edc2988c54
commit edc2988c54
parent d82fed7529 81a84ad3cb
1536 changed files with 48802 additions and 53893 deletions
--- a/include/asm-generic/topology.h
+++ b/include/asm-generic/topology.h
--- a/include/drm/bridge/dw_mipi_dsi.h
+++ b/include/drm/bridge/dw_mipi_dsi.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
--- a/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
--- a/include/drm/drm_bridge.h
+++ b/include/drm/drm_bridge.h
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
--- a/include/drm/drm_device.h
+++ b/include/drm/drm_device.h
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
--- a/include/drm/drm_fb_cma_helper.h
+++ b/include/drm/drm_fb_cma_helper.h
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
--- a/include/drm/drm_framebuffer.h
+++ b/include/drm/drm_framebuffer.h
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
--- a/include/drm/drm_gem_cma_helper.h
+++ b/include/drm/drm_gem_cma_helper.h
--- a/include/drm/drm_gem_framebuffer_helper.h
+++ b/include/drm/drm_gem_framebuffer_helper.h
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
--- a/include/drm/drm_pci.h
+++ b/include/drm/drm_pci.h
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
--- a/include/drm/drm_property.h
+++ b/include/drm/drm_property.h
--- a/include/drm/drm_scdc_helper.h
+++ b/include/drm/drm_scdc_helper.h
--- a/include/drm/drm_simple_kms_helper.h
+++ b/include/drm/drm_simple_kms_helper.h
--- a/include/drm/drm_syncobj.h
+++ b/include/drm/drm_syncobj.h
--- a/include/drm/drm_vblank.h
+++ b/include/drm/drm_vblank.h
--- a/include/drm/tinydrm/mipi-dbi.h
+++ b/include/drm/tinydrm/mipi-dbi.h
--- a/include/drm/tinydrm/tinydrm-helpers.h
+++ b/include/drm/tinydrm/tinydrm-helpers.h
--- a/include/drm/tinydrm/tinydrm.h
+++ b/include/drm/tinydrm/tinydrm.h
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
--- a/include/linux/blk-mq-rdma.h
+++ b/include/linux/blk-mq-rdma.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/bsg-lib.h
+++ b/include/linux/bsg-lib.h
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
--- a/include/linux/dma-fence.h
+++ b/include/linux/dma-fence.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/genalloc.h
+++ b/include/linux/genalloc.h
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
--- a/include/linux/iio/trigger.h
+++ b/include/linux/iio/trigger.h
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
--- a/include/linux/mfd/da9052/da9052.h
+++ b/include/linux/mfd/da9052/da9052.h
--- a/include/linux/mfd/da9052/reg.h
+++ b/include/linux/mfd/da9052/reg.h
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.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/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
--- a/include/linux/mlx5/srq.h
+++ b/include/linux/mlx5/srq.h
--- a/include/linux/mlx5/vport.h
+++ b/include/linux/mlx5/vport.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mmu_notifier.h
+++ b/include/linux/mmu_notifier.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/platform_data/omap_drm.h
+++ b/include/linux/platform_data/omap_drm.h
--- a/include/linux/reservation.h
+++ b/include/linux/reservation.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
--- a/include/media/vsp1.h
+++ b/include/media/vsp1.h
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.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_addr.h
+++ b/include/rdma/ib_addr.h
--- a/include/rdma/ib_hdrs.h
+++ b/include/rdma/ib_hdrs.h
--- a/include/rdma/ib_marshall.h
+++ b/include/rdma/ib_marshall.h
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
--- a/include/rdma/opa_addr.h
+++ b/include/rdma/opa_addr.h
--- a/include/rdma/opa_vnic.h
+++ b/include/rdma/opa_vnic.h
--- a/include/rdma/rdma_netlink.h
+++ b/include/rdma/rdma_netlink.h
--- a/include/rdma/rdma_vt.h
+++ b/include/rdma/rdma_vt.h
--- a/include/rdma/rdmavt_mr.h
+++ b/include/rdma/rdmavt_mr.h
--- a/include/rdma/rdmavt_qp.h
+++ b/include/rdma/rdmavt_qp.h
--- a/include/rdma/uverbs_ioctl.h
+++ b/include/rdma/uverbs_ioctl.h
--- a/include/rdma/uverbs_std_types.h
+++ b/include/rdma/uverbs_std_types.h
--- a/include/rdma/uverbs_types.h
+++ b/include/rdma/uverbs_types.h
--- a/include/sound/omap-hdmi-audio.h
+++ b/include/sound/omap-hdmi-audio.h
--- a/include/uapi/drm/armada_drm.h
+++ b/include/uapi/drm/armada_drm.h
--- a/include/uapi/drm/drm.h
+++ b/include/uapi/drm/drm.h
--- a/include/uapi/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
--- a/include/uapi/drm/qxl_drm.h
+++ b/include/uapi/drm/qxl_drm.h
--- a/include/uapi/drm/vc4_drm.h
+++ b/include/uapi/drm/vc4_drm.h
--- a/include/uapi/drm/vmwgfx_drm.h
+++ b/include/uapi/drm/vmwgfx_drm.h
--- a/include/uapi/linux/aio_abi.h
+++ b/include/uapi/linux/aio_abi.h
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
--- a/include/uapi/linux/loop.h
+++ b/include/uapi/linux/loop.h
--- a/include/uapi/linux/ndctl.h
+++ b/include/uapi/linux/ndctl.h
--- a/include/uapi/rdma/ib_user_ioctl_verbs.h
+++ b/include/uapi/rdma/ib_user_ioctl_verbs.h
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
--- a/Show more
+++ b/Show more