Merge 4.13-rc5 into char-misc-next

We want the firmware, and other changes, in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2026-11-13 07:31:07 +00:00 · 2017-08-14 13:29:31 -07:00 · 2017-08-14 13:29:31 -07:00 · d985524680
commit d985524680
parent 2007eafd9d ef954844c7
875 changed files with 14251 additions and 18282 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/kvm/arm_pmu.h
+++ b/include/kvm/arm_pmu.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.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/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.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/device.h
+++ b/include/linux/device.h
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.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/ipv6.h
+++ b/include/linux/ipv6.h
--- a/include/linux/irq.h
+++ b/include/linux/irq.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/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/mtd/nand.h
+++ b/include/linux/mtd/nand.h
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.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/pagemap.h
+++ b/include/linux/pagemap.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/phy.h
+++ b/include/linux/phy.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/ptp_clock_kernel.h
+++ b/include/linux/ptp_clock_kernel.h
--- a/include/linux/sync_file.h
+++ b/include/linux/sync_file.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/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/include/net/udp.h
+++ b/include/net/udp.h
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
--- a/include/target/iscsi/iscsi_target_core.h
+++ b/include/target/iscsi/iscsi_target_core.h
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
--- a/include/uapi/drm/msm_drm.h
+++ b/include/uapi/drm/msm_drm.h