Commit adeab5bf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 6.9-rc7 into usb-next 



We want the USB fixes in here as well, and resolve a merge conflict in
drivers/usb/dwc3/core.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents a2cf936e dd5a440a

.mailmap

+13 −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>
@@ -500,6 +512,7 @@ Praveen BP <praveenbp@ti.com> 
Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> <pradeepc@codeaurora.org>

Prasad Sodagudi <quic_psodagud@quicinc.com> <psodagud@codeaurora.org>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Puranjay Mohan <puranjay@kernel.org> <puranjay12@gmail.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>

Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.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/core-api/workqueue.rst

+3 −3
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ configuration, worker pools and how workqueues map to the pools: :: 
  events_unbound           unbound  9  9 10 10  8

  events_freezable         percpu   0  2  4  6

  events_power_efficient   percpu   0  2  4  6

  events_freezable_power_  percpu   0  2  4  6

  events_freezable_pwr_ef  percpu   0  2  4  6

  rcu_gp                   percpu   0  2  4  6

  rcu_par_gp               percpu   0  2  4  6

  slub_flushwq             percpu   0  2  4  6
@@ -694,7 +694,7 @@ Use tools/workqueue/wq_monitor.py to monitor workqueue operations: :: 
  events_unbound              38306     0      0.1       -       7       -       -

  events_freezable                0     0      0.0       0       0       -       -

  events_power_efficient      29598     0      0.2       0       0       -       -

  events_freezable_power_        10     0      0.0       0       0       -       -

  events_freezable_pwr_ef        10     0      0.0       0       0       -       -

  sock_diag_events                0     0      0.0       0       0       -       -



                              total  infl  CPUtime  CPUhog CMW/RPR  mayday rescued
@@ -704,7 +704,7 @@ Use tools/workqueue/wq_monitor.py to monitor workqueue operations: :: 
  events_unbound              38322     0      0.1       -       7       -       -

  events_freezable                0     0      0.0       0       0       -       -

  events_power_efficient      29603     0      0.2       0       0       -       -

  events_freezable_power_        10     0      0.0       0       0       -       -

  events_freezable_pwr_ef        10     0      0.0       0       0       -       -

  sock_diag_events                0     0      0.0       0       0       -       -



  ...

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.