Merge tag 'topic/i915-hda-componentized-2015-01-12' into drm-intel-next-queued

Conflicts: drivers/gpu/drm/i915/intel_runtime_pm.c Separate branch so that Takashi can also pull just this refactoring into sound-next. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2026-11-10 20:48:12 +00:00 · 2015-01-12 23:07:46 +01:00 · 2015-01-12 23:07:46 +01:00 · 0a87a2db48
commit 0a87a2db48
parent 7226572d8e fcf3aac5fc
10079 changed files with 426291 additions and 325453 deletions
--- a/include/uapi/asm-generic/fcntl.h
+++ b/include/uapi/asm-generic/fcntl.h
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
--- a/include/uapi/asm-generic/socket.h
+++ b/include/uapi/asm-generic/socket.h
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
--- a/include/uapi/linux/android/Kbuild
+++ b/include/uapi/linux/android/Kbuild
--- a/include/uapi/linux/android/binder.h
+++ b/include/uapi/linux/android/binder.h
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
--- a/include/uapi/linux/can/error.h
+++ b/include/uapi/linux/can/error.h
--- a/include/uapi/linux/dlmconstants.h
+++ b/include/uapi/linux/dlmconstants.h
--- a/include/uapi/linux/dm-ioctl.h
+++ b/include/uapi/linux/dm-ioctl.h
--- a/include/uapi/linux/elf-em.h
+++ b/include/uapi/linux/elf-em.h
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
--- a/include/uapi/linux/hyperv.h
+++ b/include/uapi/linux/hyperv.h
--- a/include/uapi/linux/if_alg.h
+++ b/include/uapi/linux/if_alg.h
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
--- a/include/uapi/linux/if_tun.h
+++ b/include/uapi/linux/if_tun.h
--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
--- a/include/uapi/linux/in6.h
+++ b/include/uapi/linux/in6.h
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
--- a/include/uapi/linux/kcmp.h
+++ b/include/uapi/linux/kcmp.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/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
--- a/include/uapi/linux/msg.h
+++ b/include/uapi/linux/msg.h
--- a/include/uapi/linux/neighbour.h
+++ b/include/uapi/linux/neighbour.h
--- a/include/uapi/linux/net_tstamp.h
+++ b/include/uapi/linux/net_tstamp.h
--- a/include/uapi/linux/netfilter/ipset/ip_set.h
+++ b/include/uapi/linux/netfilter/ipset/ip_set.h
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
--- a/include/uapi/linux/netfilter/xt_set.h
+++ b/include/uapi/linux/netfilter/xt_set.h
--- a/include/uapi/linux/nfc.h
+++ b/include/uapi/linux/nfc.h
--- a/include/uapi/linux/nfsd/debug.h
+++ b/include/uapi/linux/nfsd/debug.h
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
--- a/include/uapi/linux/nvme.h
+++ b/include/uapi/linux/nvme.h
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
--- a/include/uapi/linux/prctl.h
+++ b/include/uapi/linux/prctl.h
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
--- a/include/uapi/linux/sched.h
+++ b/include/uapi/linux/sched.h
--- a/include/uapi/linux/sem.h
+++ b/include/uapi/linux/sem.h
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
--- a/include/uapi/linux/serial_reg.h
+++ b/include/uapi/linux/serial_reg.h
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
--- a/include/uapi/linux/sysctl.h
+++ b/include/uapi/linux/sysctl.h
--- a/include/uapi/linux/target_core_user.h
+++ b/include/uapi/linux/target_core_user.h
--- a/include/uapi/linux/tc_act/Kbuild
+++ b/include/uapi/linux/tc_act/Kbuild
--- a/include/uapi/linux/tc_act/tc_vlan.h
+++ b/include/uapi/linux/tc_act/tc_vlan.h
--- a/include/uapi/linux/thermal.h
+++ b/include/uapi/linux/thermal.h
--- a/include/uapi/linux/tipc_netlink.h
+++ b/include/uapi/linux/tipc_netlink.h
--- a/include/uapi/linux/tty_flags.h
+++ b/include/uapi/linux/tty_flags.h
--- a/include/uapi/linux/v4l2-common.h
+++ b/include/uapi/linux/v4l2-common.h
--- a/include/uapi/linux/v4l2-mediabus.h
+++ b/include/uapi/linux/v4l2-mediabus.h
--- a/include/uapi/linux/v4l2-subdev.h
+++ b/include/uapi/linux/v4l2-subdev.h
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
--- a/include/uapi/linux/virtio_balloon.h
+++ b/include/uapi/linux/virtio_balloon.h
--- a/include/uapi/linux/virtio_blk.h
+++ b/include/uapi/linux/virtio_blk.h
--- a/include/uapi/linux/virtio_config.h
+++ b/include/uapi/linux/virtio_config.h
--- a/include/uapi/linux/virtio_console.h
+++ b/include/uapi/linux/virtio_console.h
--- a/include/uapi/linux/virtio_net.h
+++ b/include/uapi/linux/virtio_net.h
--- a/include/uapi/linux/virtio_pci.h
+++ b/include/uapi/linux/virtio_pci.h
--- a/include/uapi/linux/virtio_ring.h
+++ b/include/uapi/linux/virtio_ring.h
--- a/include/uapi/linux/virtio_scsi.h
+++ b/include/uapi/linux/virtio_scsi.h
--- a/include/uapi/linux/virtio_types.h
+++ b/include/uapi/linux/virtio_types.h
--- a/include/uapi/linux/vt.h
+++ b/include/uapi/linux/vt.h
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
--- a/include/uapi/sound/asound.h
+++ b/include/uapi/sound/asound.h
--- a/include/uapi/sound/compress_offload.h
+++ b/include/uapi/sound/compress_offload.h
--- a/include/uapi/sound/firewire.h
+++ b/include/uapi/sound/firewire.h
--- a/include/uapi/sound/hdspm.h
+++ b/include/uapi/sound/hdspm.h