Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95d002e0 authored by Zhenyu Wang's avatar Zhenyu Wang
Browse files

Merge tag 'drm-intel-next-2019-04-04' into gvt-next 



Merge back drm-intel-next for engine name definition refinement
and 54939ea0 ("drm/i915: Switch to use HWS indices rather than addresses")
that would need gvt fixes to depend on.

Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parents d57b39e3 28d618e9

.clang-format

+44 −2
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ ForEachMacros: 
  - 'apei_estatus_for_each_section'

  - 'ata_for_each_dev'

  - 'ata_for_each_link'

  - '__ata_qc_for_each'

  - 'ata_qc_for_each'

  - 'ata_qc_for_each_raw'

  - 'ata_qc_for_each_with_internal'

  - 'ax25_for_each'

  - 'ax25_uid_for_each'

  - 'bio_for_each_integrity_vec'
@@ -85,6 +89,7 @@ ForEachMacros: 
  - 'blk_queue_for_each_rl'

  - 'bond_for_each_slave'

  - 'bond_for_each_slave_rcu'

  - 'bpf_for_each_spilled_reg'

  - 'btree_for_each_safe128'

  - 'btree_for_each_safe32'

  - 'btree_for_each_safe64'
@@ -103,6 +108,8 @@ ForEachMacros: 
  - 'drm_atomic_crtc_for_each_plane'

  - 'drm_atomic_crtc_state_for_each_plane'

  - 'drm_atomic_crtc_state_for_each_plane_state'

  - 'drm_atomic_for_each_plane_damage'

  - 'drm_connector_for_each_possible_encoder'

  - 'drm_for_each_connector_iter'

  - 'drm_for_each_crtc'

  - 'drm_for_each_encoder'
@@ -121,11 +128,21 @@ ForEachMacros: 
  - 'for_each_bio'

  - 'for_each_board_func_rsrc'

  - 'for_each_bvec'

  - 'for_each_card_components'

  - 'for_each_card_links'

  - 'for_each_card_links_safe'

  - 'for_each_card_prelinks'

  - 'for_each_card_rtds'

  - 'for_each_card_rtds_safe'

  - 'for_each_cgroup_storage_type'

  - 'for_each_child_of_node'

  - 'for_each_clear_bit'

  - 'for_each_clear_bit_from'

  - 'for_each_cmsghdr'

  - 'for_each_compatible_node'

  - 'for_each_component_dais'

  - 'for_each_component_dais_safe'

  - 'for_each_comp_order'

  - 'for_each_console'

  - 'for_each_cpu'

  - 'for_each_cpu_and'
@@ -133,6 +150,10 @@ ForEachMacros: 
  - 'for_each_cpu_wrap'

  - 'for_each_dev_addr'

  - 'for_each_dma_cap_mask'

  - 'for_each_dpcm_be'

  - 'for_each_dpcm_be_rollback'

  - 'for_each_dpcm_be_safe'

  - 'for_each_dpcm_fe'

  - 'for_each_drhd_unit'

  - 'for_each_dss_dev'

  - 'for_each_efi_memory_desc'
@@ -149,6 +170,7 @@ ForEachMacros: 
  - 'for_each_iommu'

  - 'for_each_ip_tunnel_rcu'

  - 'for_each_irq_nr'

  - 'for_each_link_codecs'

  - 'for_each_lru'

  - 'for_each_matching_node'

  - 'for_each_matching_node_and_match'
@@ -160,6 +182,7 @@ ForEachMacros: 
  - 'for_each_mem_range_rev'

  - 'for_each_migratetype_order'

  - 'for_each_msi_entry'

  - 'for_each_msi_entry_safe'

  - 'for_each_net'

  - 'for_each_netdev'

  - 'for_each_netdev_continue'
@@ -183,12 +206,14 @@ ForEachMacros: 
  - 'for_each_node_with_property'

  - 'for_each_of_allnodes'

  - 'for_each_of_allnodes_from'

  - 'for_each_of_cpu_node'

  - 'for_each_of_pci_range'

  - 'for_each_old_connector_in_state'

  - 'for_each_old_crtc_in_state'

  - 'for_each_oldnew_connector_in_state'

  - 'for_each_oldnew_crtc_in_state'

  - 'for_each_oldnew_plane_in_state'

  - 'for_each_oldnew_plane_in_state_reverse'

  - 'for_each_oldnew_private_obj_in_state'

  - 'for_each_old_plane_in_state'

  - 'for_each_old_private_obj_in_state'
@@ -206,14 +231,18 @@ ForEachMacros: 
  - 'for_each_process'

  - 'for_each_process_thread'

  - 'for_each_property_of_node'

  - 'for_each_registered_fb'

  - 'for_each_reserved_mem_region'

  - 'for_each_resv_unavail_range'

  - 'for_each_rtd_codec_dai'

  - 'for_each_rtd_codec_dai_rollback'

  - 'for_each_rtdcom'

  - 'for_each_rtdcom_safe'

  - 'for_each_set_bit'

  - 'for_each_set_bit_from'

  - 'for_each_sg'

  - 'for_each_sg_dma_page'

  - 'for_each_sg_page'

  - 'for_each_sibling_event'

  - '__for_each_thread'

  - 'for_each_thread'

  - 'for_each_zone'
@@ -251,6 +280,8 @@ ForEachMacros: 
  - 'hlist_nulls_for_each_entry_from'

  - 'hlist_nulls_for_each_entry_rcu'

  - 'hlist_nulls_for_each_entry_safe'

  - 'i3c_bus_for_each_i2cdev'

  - 'i3c_bus_for_each_i3cdev'

  - 'ide_host_for_each_port'

  - 'ide_port_for_each_dev'

  - 'ide_port_for_each_present_dev'
@@ -259,7 +290,6 @@ ForEachMacros: 
  - 'idr_for_each_entry_ul'

  - 'inet_bind_bucket_for_each'

  - 'inet_lhash2_for_each_icsk_rcu'

  - 'iov_for_each'

  - 'key_for_each'

  - 'key_for_each_safe'

  - 'klp_for_each_func'
@@ -267,11 +297,14 @@ ForEachMacros: 
  - 'kvm_for_each_memslot'

  - 'kvm_for_each_vcpu'

  - 'list_for_each'

  - 'list_for_each_codec'

  - 'list_for_each_codec_safe'

  - 'list_for_each_entry'

  - 'list_for_each_entry_continue'

  - 'list_for_each_entry_continue_rcu'

  - 'list_for_each_entry_continue_reverse'

  - 'list_for_each_entry_from'

  - 'list_for_each_entry_from_rcu'

  - 'list_for_each_entry_from_reverse'

  - 'list_for_each_entry_lockless'

  - 'list_for_each_entry_rcu'
@@ -291,6 +324,7 @@ ForEachMacros: 
  - 'media_device_for_each_intf'

  - 'media_device_for_each_link'

  - 'media_device_for_each_pad'

  - 'nanddev_io_for_each_page'

  - 'netdev_for_each_lower_dev'

  - 'netdev_for_each_lower_private'

  - 'netdev_for_each_lower_private_rcu'
@@ -326,6 +360,7 @@ ForEachMacros: 
  - 'radix_tree_for_each_slot'

  - 'radix_tree_for_each_tagged'

  - 'rbtree_postorder_for_each_entry_safe'

  - 'rdma_for_each_port'

  - 'resource_list_for_each_entry'

  - 'resource_list_for_each_entry_safe'

  - 'rhl_for_each_entry_rcu'
@@ -357,12 +392,14 @@ ForEachMacros: 
  - 'sk_nulls_for_each'

  - 'sk_nulls_for_each_from'

  - 'sk_nulls_for_each_rcu'

  - 'snd_array_for_each'

  - 'snd_pcm_group_for_each_entry'

  - 'snd_soc_dapm_widget_for_each_path'

  - 'snd_soc_dapm_widget_for_each_path_safe'

  - 'snd_soc_dapm_widget_for_each_sink_path'

  - 'snd_soc_dapm_widget_for_each_source_path'

  - 'tb_property_for_each'

  - 'tcf_exts_for_each_action'

  - 'udp_portaddr_for_each_entry'

  - 'udp_portaddr_for_each_entry_rcu'

  - 'usb_hub_for_each_child'
@@ -371,6 +408,11 @@ ForEachMacros: 
  - 'v4l2_m2m_for_each_dst_buf_safe'

  - 'v4l2_m2m_for_each_src_buf'

  - 'v4l2_m2m_for_each_src_buf_safe'

  - 'virtio_device_for_each_vq'

  - 'xa_for_each'

  - 'xas_for_each'

  - 'xas_for_each_conflict'

  - 'xas_for_each_marked'

  - 'zorro_for_each_dev'



#IncludeBlocks: Preserve # Unknown to clang-format-5.0

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
*.bin

*.bz2

*.c.[012]*.*

*.dt.yaml

*.dtb

*.dtb.S

*.dwo

.mailmap

+9 −4
Original line number Diff line number Diff line
@@ -36,9 +36,10 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com> 
Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@free-electrons.com>

Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon.dev@gmail.com>

Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon@overkiz.com>

Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>

Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>

Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>

Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>

Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Christoph Hellwig <hch@lst.de>
@@ -47,7 +48,10 @@ Corey Minyard <minyard@acm.org> 
Damian Hobson-Garcia <dhobsong@igel.co.jp>

David Brownell <david-b@pacbell.net>

David Woodhouse <dwmw2@shinybook.infradead.org>

Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>
@@ -119,6 +123,7 @@ Mark Brown <broonie@sirena.org.uk> 
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>

Mathieu Othacehe <m.othacehe@gmail.com>

Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>

Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>

Matthew Wilcox <willy@infradead.org> <mawilcox@linuxonhyperv.com>

CREDITS

+28 −12
Original line number Diff line number Diff line
@@ -842,10 +842,9 @@ D: ax25-utils maintainer. 


N: Helge Deller

E: deller@gmx.de

E: hdeller@redhat.de

D: PA-RISC Linux hacker, LASI-, ASP-, WAX-, LCD/LED-driver

S: Schimmelsrain 1

S: D-69231 Rauenberg

W: http://www.parisc-linux.org/

D: PA-RISC Linux architecture maintainer

D: LASI-, ASP-, WAX-, LCD/LED-driver

S: Germany



N: Jean Delvare
@@ -1222,7 +1221,7 @@ S: Brazil 


N: Oded Gabbay

E: oded.gabbay@gmail.com

D: AMD KFD maintainer

D: HabanaLabs and AMD KFD maintainer

S: 12 Shraga Raphaeli

S: Petah-Tikva, 4906418

S: Israel
@@ -1361,7 +1360,7 @@ S: Stellenbosch, Western Cape 
S: South Africa



N: Grant Grundler

E: grundler@parisc-linux.org

E: grantgrundler@gmail.com

W: http://obmouse.sourceforge.net/

W: http://www.parisc-linux.org/

D: obmouse - rewrote Olivier Florent's Omnibook 600 "pop-up" mouse driver
@@ -2204,6 +2203,16 @@ S: Post Office Box 371 
S: North Little Rock, Arkansas 72115

S: USA



N: Christopher Li

E: sparse@chrisli.org

D: Sparse maintainer 2009 - 2018



N: Shaohua Li

D: Worked on many parts of the kernel, from core x86, ACPI, PCI, KVM, MM,

D: and much more. He was the maintainer of MD from 2016 to 2018. Shaohua

D: passed away late 2018, he will be greatly missed.

W: https://www.spinics.net/lists/raid/msg61993.html



N: Stephan Linz

E: linz@mazet.de

E: Stephan.Linz@gmx.de
@@ -2482,7 +2491,7 @@ S: Syracuse, New York 13206 
S: USA



N: Kyle McMartin

E: kyle@parisc-linux.org

E: kyle@mcmartin.ca

D: Linux/PARISC hacker

D: AD1889 sound driver

S: Ottawa, Canada
@@ -2537,6 +2546,10 @@ S: Ormond 
S: Victoria 3163

S: Australia



N: Eric Miao

E: eric.y.miao@gmail.com

D: MMP support



N: Pauline Middelink

E: middelin@polyware.nl

D: General low-level bug fixes, /proc fixes, identd support
@@ -3766,14 +3779,13 @@ S: 21513 Conradia Ct 
S: Cupertino, CA 95014

S: USA



N: Thibaut Varene

E: T-Bone@parisc-linux.org

W: http://www.parisc-linux.org/~varenet/

P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C  FA2F 1E32 C3DA B7D2 F063

N: Thibaut Varène

E: hacks+kernel@slashdirt.org

W: http://hacks.slashdirt.org/

D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits

D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there

D: AD1889 sound driver

S: Paris, France

S: France



N: Heikki Vatiainen

E: hessu@cs.tut.fi
@@ -4111,6 +4123,10 @@ S: 1507 145th Place SE #B5 
S: Bellevue, Washington 98007

S: USA



N: Haojian Zhuang

E: haojian.zhuang@gmail.com

D: MMP support



N: Richard Zidlicky

E: rz@linux-m68k.org, rdzidlic@geocities.com

W: http://www.geocities.com/rdzidlic

Documentation/ABI/obsolete/sysfs-class-dax

0 → 100644
+22 −0
Original line number Diff line number Diff line 
What:           /sys/class/dax/

Date:           May, 2016

KernelVersion:  v4.7

Contact:        linux-nvdimm@lists.01.org

Description:	Device DAX is the device-centric analogue of Filesystem

		DAX (CONFIG_FS_DAX).  It allows memory ranges to be

		allocated and mapped without need of an intervening file

		system.  Device DAX is strict, precise and predictable.

		Specifically this interface:



		1/ Guarantees fault granularity with respect to a given

		page size (pte, pmd, or pud) set at configuration time.



		2/ Enforces deterministic behavior by being strict about

		what fault scenarios are supported.



		The /sys/class/dax/ interface enumerates all the

		device-dax instances in the system. The ABI is

		deprecated and will be removed after 2020. It is

		replaced with the DAX bus interface /sys/bus/dax/ where

		device-dax instances can be found under

		/sys/bus/dax/devices/