Commit b84bc948 authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge v6.9-rc6 into drm-next 



Thomas needs the defio fixes, Maíra needs the vkms fixes and Joonas
has some fun with i915-gem conflicts.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 2236a61b e67572cd

.mailmap

+12 −0
Original line number Diff line number Diff line
@@ -38,6 +38,16 @@ 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>

Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>

Alex Elder <elder@kernel.org>

Alex Elder <elder@kernel.org> <aelder@sgi.com>

Alex Elder <elder@kernel.org> <alex.elder@linaro.org>

Alex Elder <elder@kernel.org> <alex.elder@linary.org>

Alex Elder <elder@kernel.org> <elder@dreamhost.com>

Alex Elder <elder@kernel.org> <elder@dreawmhost.com>

Alex Elder <elder@kernel.org> <elder@ieee.org>

Alex Elder <elder@kernel.org> <elder@inktank.com>

Alex Elder <elder@kernel.org> <elder@linaro.org>

Alex Elder <elder@kernel.org> <elder@newdream.net>

Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>

Alex Shi <alexs@kernel.org> <alex.shi@intel.com>

Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
@@ -98,6 +108,8 @@ Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net> 
Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>

Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>

Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>

Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>

Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>

Documentation/admin-guide/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -3423,6 +3423,9 @@ 
			arch-independent options, each of which is an

			aggregation of existing arch-specific options.



			Note, "mitigations" is supported if and only if the

			kernel was built with CPU_MITIGATIONS=y.



			off

				Disable all optional CPU mitigations.  This

				improves system performance, but it may also

Documentation/admin-guide/verify-bugs-and-bisect-regressions.rst

+417 −180

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/devicetree/bindings/eeprom/at24.yaml

+1 −4
Original line number Diff line number Diff line
@@ -68,14 +68,10 @@ properties: 
                  pattern: cs16$

              - items:

                  pattern: c32$

              - items:

                  pattern: c32d-wl$

              - items:

                  pattern: cs32$

              - items:

                  pattern: c64$

              - items:

                  pattern: c64d-wl$

              - items:

                  pattern: cs64$

              - items:
@@ -136,6 +132,7 @@ properties: 
              - renesas,r1ex24128

              - samsung,s524ad0xd1

          - const: atmel,24c128

      - pattern: '^atmel,24c(32|64)d-wl$' # Actual vendor is st



  label:

    description: Descriptive name of the EEPROM.

Documentation/devicetree/bindings/soc/rockchip/grf.yaml

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ allOf: 
          unevaluatedProperties: false



        pcie-phy:

          type: object

          description:

            Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt