summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2019-06-26 12:22:54 +0200
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2019-06-26 12:22:54 +0200
commit355a47ae7ebcf9d605aa809b259d380422e81b8d (patch)
treef42b3196986c7de89a335b4f57384d249f5663e9 /include/linux
parentb1622cb3be4557fd086831ca7426eafe5f1acc2e (diff)
parent80d42db02b3a5beb8cffba08207adf5f4c525ee3 (diff)
downloadlinux-355a47ae7ebcf9d605aa809b259d380422e81b8d.tar.gz
linux-355a47ae7ebcf9d605aa809b259d380422e81b8d.tar.bz2
linux-355a47ae7ebcf9d605aa809b259d380422e81b8d.zip
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixes
Some fixes have been accidentally pushed to this, so I cannot fost-forward. Required to pull in the remove-fbcon-notifiers fixes. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/acpi.h30
-rw-r--r--include/linux/acpi_iort.h22
-rw-r--r--include/linux/ahci_platform.h6
-rw-r--r--include/linux/alcor_pci.h2
-rw-r--r--include/linux/amba/clcd.h31
-rw-r--r--include/linux/amba/kmi.h16
-rw-r--r--include/linux/amba/pl022.h11
-rw-r--r--include/linux/amba/serial.h15
-rw-r--r--include/linux/amd-iommu.h14
-rw-r--r--include/linux/apm-emulation.h3
-rw-r--r--include/linux/apm_bios.h11
-rw-r--r--include/linux/arm-cci.h15
-rw-r--r--include/linux/arm-smccc.h11
-rw-r--r--include/linux/armada-37xx-rwtm-mailbox.h23
-rw-r--r--include/linux/asn1.h6
-rw-r--r--include/linux/asn1_ber_bytecode.h6
-rw-r--r--include/linux/asn1_decoder.h6
-rw-r--r--include/linux/assoc_array.h6
-rw-r--r--include/linux/assoc_array_priv.h6
-rw-r--r--include/linux/async.h6
-rw-r--r--include/linux/async_tx.h15
-rw-r--r--include/linux/ata.h18
-rw-r--r--include/linux/atmel_pdc.h6
-rw-r--r--include/linux/atmel_tc.h270
-rw-r--r--include/linux/attribute_container.h3
-rw-r--r--include/linux/audit.h91
-rw-r--r--include/linux/auto_dev-ioctl.h5
-rw-r--r--include/linux/auto_fs.h5
-rw-r--r--include/linux/avf/virtchnl.h16
-rw-r--r--include/linux/balloon_compaction.h15
-rw-r--r--include/linux/bch.h14
-rw-r--r--include/linux/bcm47xx_nvram.h5
-rw-r--r--include/linux/bcm47xx_sprom.h5
-rw-r--r--include/linux/binfmts.h3
-rw-r--r--include/linux/bio.h22
-rw-r--r--include/linux/bitfield.h10
-rw-r--r--include/linux/bitops.h16
-rw-r--r--include/linux/blk-mq-rdma.h1
-rw-r--r--include/linux/blk-mq.h2
-rw-r--r--include/linux/blk_types.h36
-rw-r--r--include/linux/blkdev.h50
-rw-r--r--include/linux/bma150.h15
-rw-r--r--include/linux/bpf-cgroup.h21
-rw-r--r--include/linux/bpf.h92
-rw-r--r--include/linux/bpf_types.h3
-rw-r--r--include/linux/bpf_verifier.h37
-rw-r--r--include/linux/bsg-lib.h16
-rw-r--r--include/linux/btf.h1
-rw-r--r--include/linux/bvec.h37
-rw-r--r--include/linux/can/dev/peak_canfd.h10
-rw-r--r--include/linux/ceph/ceph_fs.h6
-rw-r--r--include/linux/ceph/messenger.h3
-rw-r--r--include/linux/ceph/osdmap.h13
-rw-r--r--include/linux/cgroup-defs.h39
-rw-r--r--include/linux/cgroup.h57
-rw-r--r--include/linux/clk-provider.h113
-rw-r--r--include/linux/clk.h16
-rw-r--r--include/linux/clk/analogbits-wrpll-cln28hpc.h79
-rw-r--r--include/linux/clk/at91_pmc.h19
-rw-r--r--include/linux/clk/sunxi-ng.h10
-rw-r--r--include/linux/clk/tegra.h13
-rw-r--r--include/linux/clk/ti.h2
-rw-r--r--include/linux/clk/zynq.h15
-rw-r--r--include/linux/clock_cooling.h10
-rw-r--r--include/linux/compiler.h35
-rw-r--r--include/linux/compiler_types.h3
-rw-r--r--include/linux/configfs.h16
-rw-r--r--include/linux/connector.h15
-rw-r--r--include/linux/console.h7
-rw-r--r--include/linux/console_struct.h5
-rw-r--r--include/linux/coresight-pmu.h2
-rw-r--r--include/linux/coresight.h7
-rw-r--r--include/linux/count_zeros.h6
-rw-r--r--include/linux/counter.h510
-rw-r--r--include/linux/counter_enum.h45
-rw-r--r--include/linux/cper.h350
-rw-r--r--include/linux/cpu.h50
-rw-r--r--include/linux/cpu_cooling.h13
-rw-r--r--include/linux/cpu_pm.h11
-rw-r--r--include/linux/cpufreq.h28
-rw-r--r--include/linux/cpuhotplug.h3
-rw-r--r--include/linux/cpuidle.h1
-rw-r--r--include/linux/cpumask.h3
-rw-r--r--include/linux/cred.h8
-rw-r--r--include/linux/crypto.h7
-rw-r--r--include/linux/cs5535.h5
-rw-r--r--include/linux/dax.h26
-rw-r--r--include/linux/dca.h18
-rw-r--r--include/linux/dcache.h7
-rw-r--r--include/linux/delayacct.h12
-rw-r--r--include/linux/devcoredump.h17
-rw-r--r--include/linux/device-mapper.h3
-rw-r--r--include/linux/device.h19
-rw-r--r--include/linux/devpts_fs.h5
-rw-r--r--include/linux/digsig.h6
-rw-r--r--include/linux/dlm.h4
-rw-r--r--include/linux/dlm_plock.h5
-rw-r--r--include/linux/dma-buf.h52
-rw-r--r--include/linux/dma-contiguous.h6
-rw-r--r--include/linux/dma-debug.h14
-rw-r--r--include/linux/dma-fence-array.h10
-rw-r--r--include/linux/dma-fence-chain.h10
-rw-r--r--include/linux/dma-fence.h10
-rw-r--r--include/linux/dma-iommu.h24
-rw-r--r--include/linux/dma-mapping.h6
-rw-r--r--include/linux/dma-noncoherent.h6
-rw-r--r--include/linux/dma/idma64.h14
-rw-r--r--include/linux/dma/qcom_bam_dma.h10
-rw-r--r--include/linux/dma/xilinx_dma.h6
-rw-r--r--include/linux/dmaengine.h14
-rw-r--r--include/linux/dmar.h14
-rw-r--r--include/linux/dmi.h8
-rw-r--r--include/linux/dns_resolver.h3
-rw-r--r--include/linux/drbd.h14
-rw-r--r--include/linux/dsa/8021q.h76
-rw-r--r--include/linux/dsa/sja1105.h28
-rw-r--r--include/linux/dynamic_debug.h11
-rw-r--r--include/linux/edd.h11
-rw-r--r--include/linux/eeprom_93cx6.h15
-rw-r--r--include/linux/efi.h7
-rw-r--r--include/linux/elevator.h1
-rw-r--r--include/linux/elf-fdpic.h6
-rw-r--r--include/linux/enclosure.h13
-rw-r--r--include/linux/etherdevice.h21
-rw-r--r--include/linux/ethtool.h9
-rw-r--r--include/linux/eventpoll.h7
-rw-r--r--include/linux/extcon-provider.h10
-rw-r--r--include/linux/extcon.h10
-rw-r--r--include/linux/f2fs_fs.h11
-rw-r--r--include/linux/fb.h45
-rw-r--r--include/linux/fbcon.h30
-rw-r--r--include/linux/fcdevice.h7
-rw-r--r--include/linux/fddidevice.h6
-rw-r--r--include/linux/filter.h34
-rw-r--r--include/linux/firmware-map.h11
-rw-r--r--include/linux/firmware/imx/sci.h5
-rw-r--r--include/linux/firmware/intel/stratix10-smc.h19
-rw-r--r--include/linux/firmware/meson/meson_sm.h8