Commit 5603effb authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes 



We were stuck on rc2, should at least attempt to track drm-fixes
slightly.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parents b89ce117 09a9639e

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ modules.order 
# RPM spec file (make rpm-pkg)

#

/*.spec

/rpmbuild/



#

# Debian directory (make deb-pkg)

.mailmap

+19 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru> 
Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>

Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>

Alexandre Ghiti <alex@ghiti.fr> <alexandre.ghiti@canonical.com>

Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>

Alexei Starovoitov <ast@kernel.org> <ast@fb.com>

Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
@@ -121,7 +122,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com> 
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

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

<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>

Dikshita Agarwal <dikshita@qti.qualcomm.com> <dikshita@codeaurora.org>

Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>

Dmitry Baryshkov <dbaryshkov@gmail.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
@@ -132,6 +133,8 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com> 
Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>

Ed L. Cashin <ecashin@coraid.com>

Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>

Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>
@@ -194,6 +197,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com> 
Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -213,6 +217,9 @@ Jens Axboe <axboe@suse.de> 
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>

Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>

Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>

Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>

Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>

Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -258,7 +265,9 @@ 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>

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>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Leon Romanovsky <leon@kernel.org> <leon@leon.nu>

Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
@@ -374,6 +383,7 @@ Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com> 
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -382,6 +392,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com> 
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>

Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>

Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>

Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>

Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>

Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
@@ -392,6 +405,7 @@ Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com> 
Rudolf Marek <R.Marek@sh.cvut.cz>

Rui Saraiva <rmps@joel.ist.utl.pt>

Sachin P Sant <ssant@in.ibm.com>

Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>

Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>

Sam Ravnborg <sam@mars.ravnborg.org>

Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
@@ -432,6 +446,10 @@ Thomas Graf <tgraf@suug.ch> 
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>

Thomas Pedersen <twp@codeaurora.org>

Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>

Tobias Klauser <tklauser@distanz.ch> <tobias.klauser@gmail.com>

Tobias Klauser <tklauser@distanz.ch> <klto@zhaw.ch>

Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>

Tobias Klauser <tklauser@distanz.ch> <tklauser@xenon.tklauser.home>

Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>

Tony Luck <tony.luck@intel.com>

TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

Documentation/admin-guide/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ problems and bugs in particular. 


   reporting-issues

   reporting-regressions

   security-bugs

   bug-hunting

   bug-bisect

   tainted-kernels

Documentation/admin-guide/reporting-issues.rst

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ might want to be aware of; it for example explains how to add your issue to the 
list of tracked regressions, to ensure it won't fall through the cracks.



What qualifies as security issue is left to your judgment. Consider reading

Documentation/admin-guide/security-bugs.rst before proceeding, as it

Documentation/process/security-bugs.rst before proceeding, as it

provides additional details how to best handle security issues.



An issue is a 'really severe problem' when something totally unacceptably bad
@@ -1269,7 +1269,7 @@ them when sending the report by mail. If you filed it in a bug tracker, forward 
the report's text to these addresses; but on top of it put a small note where

you mention that you filed it with a link to the ticket.



See Documentation/admin-guide/security-bugs.rst for more information.

See Documentation/process/security-bugs.rst for more information.





Duties after the report went out

Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml

+7 −0
Original line number Diff line number Diff line
@@ -76,6 +76,13 @@ properties: 
      If "broken-flash-reset" is present then having this property does not

      make any difference.



  spi-cpol: true

  spi-cpha: true



dependencies:

  spi-cpol: [ spi-cpha ]

  spi-cpha: [ spi-cpol ]



unevaluatedProperties: false



examples: