Commit 2612e3bb authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

Merge drm/drm-next into drm-intel-next 



Catching-up with drm-next and drm-intel-gt-next.
It will unblock a code refactor around the platform
definitions (names vs acronyms).

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parents 0701760e d9aa1da9

.clang-format

+1 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ ForEachMacros: 
  - 'for_each_free_mem_range'

  - 'for_each_free_mem_range_reverse'

  - 'for_each_func_rsrc'

  - 'for_each_group_device'

  - 'for_each_group_evsel'

  - 'for_each_group_member'

  - 'for_each_hstate'

.gitattributes

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ 
*.[ch] diff=cpp

*.dts diff=dts

*.dts[io] diff=dts

*.rs diff=rust

.gitignore

+0 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
*.bin

*.bz2

*.c.[012]*.*

*.cover

*.dt.yaml

*.dtb

*.dtbo
@@ -34,7 +33,6 @@ 
*.lz4

*.lzma

*.lzo

*.mbx

*.mod

*.mod.c

*.o
@@ -51,7 +49,6 @@ 
*.symversions

*.tab.[ch]

*.tar

*.usyms

*.xz

*.zst

Module.symvers
@@ -112,7 +109,6 @@ modules.order 
#

/include/config/

/include/generated/

/include/ksym/

/arch/*/include/generated/



# stgit generated dirs

.mailmap

+21 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
# same person appearing not to be so or badly displayed. Also allows for

# old email addresses to map to new email addresses.

#

# For format details, see "MAPPING AUTHORS" in "man git-shortlog".

# For format details, see "man gitmailmap" or "MAPPING AUTHORS" in

# "man git-shortlog" on older systems.

#

# Please keep this list dictionary sorted.

#
@@ -70,6 +71,8 @@ Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com> 
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>

Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>

Ben Gardner <bgardner@wabtec.com>

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

Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
@@ -175,12 +178,17 @@ Gustavo Padovan <padovan@profusion.mobi> 
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>

Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>

Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@bqreaders.com>

Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@theobroma-systems.com>

Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@vrull.eu>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>

Herbert Xu <herbert@gondor.apana.org.au>

Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>

Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>

J. Bruce Fields <bfields@fieldses.org> <bfields@redhat.com>

J. Bruce Fields <bfields@fieldses.org> <bfields@citi.umich.edu>

Jacob Shin <Jacob.Shin@amd.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
@@ -233,10 +241,12 @@ Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com> 
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Keeping <john@keeping.me.uk> <john@metanate.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>

<jon.toppins+linux@gmail.com> <jtoppins@redhat.com>

Jonas Gorski <jonas.gorski@gmail.com> <jogo@openwrt.org>

Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>

<josh@joshtriplett.org> <josh@freedesktop.org>

<josh@joshtriplett.org> <josh@kernel.org>
@@ -270,6 +280,10 @@ Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com> 
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>

Lee Jones <lee@kernel.org> <joneslee@google.com>

Lee Jones <lee@kernel.org> <lee.jones@canonical.com>

Lee Jones <lee@kernel.org> <lee.jones@linaro.org>

Lee Jones <lee@kernel.org> <lee@ubuntu.com>

Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>

Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>

Leonard Göhrs <l.goehrs@pengutronix.de>
@@ -296,6 +310,7 @@ Marek Behún <kabel@kernel.org> <marek.behun@nic.cz> 
Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>

Mark Brown <broonie@sirena.org.uk>

Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>

Markus Schneider-Pargmann <msp@baylibre.com> <mpa@pengutronix.de>

Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>

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

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
@@ -365,6 +380,11 @@ Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org> 
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>

Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>

Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>

Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

CREDITS

+10 −0
Original line number Diff line number Diff line
@@ -383,6 +383,12 @@ E: tomas@nocrew.org 
W: http://tomas.nocrew.org/

D: dsp56k device driver



N: Srivatsa S. Bhat

E: srivatsa@csail.mit.edu

D: Maintainer of Generic Paravirt-Ops subsystem

D: Maintainer of VMware hypervisor interface

D: Maintainer of VMware virtual PTP clock driver (ptp_vmw)



N: Ross Biro

E: ross.biro@gmail.com

D: Original author of the Linux networking code
@@ -1706,6 +1712,10 @@ S: Panoramastrasse 18 
S: D-69126 Heidelberg

S: Germany



N: Neil Horman

M: nhorman@tuxdriver.com

D: SCTP protocol maintainer.



N: Simon Horman

M: horms@verge.net.au

D: Renesas ARM/ARM64 SoC maintainer