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

Merge 6.11-rc6 into usb-next 



We need the USB fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents fc88bb11 431c1646

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -354,6 +354,8 @@ Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org> 
Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>

Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>
@@ -614,6 +616,7 @@ Simon Kelley <simon@thekelleys.org.uk> 
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>

Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>

Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>

Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>

Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>

Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Documentation/core-api/workqueue.rst

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ Some users depend on strict execution ordering where only one work item 
is in flight at any given time and the work items are processed in

queueing order. While the combination of ``@max_active`` of 1 and

``WQ_UNBOUND`` used to achieve this behavior, this is no longer the

case. Use ``alloc_ordered_queue()`` instead.

case. Use alloc_ordered_workqueue() instead.





Example Execution Scenarios

Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ properties: 
      - focaltech,ft5426

      - focaltech,ft5452

      - focaltech,ft6236

      - focaltech,ft8201

      - focaltech,ft8719



  reg:

Documentation/devicetree/bindings/usb/microchip,usb2514.yaml

+8 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ maintainers: 
  - Fabio Estevam <festevam@gmail.com>



allOf:

  - $ref: usb-hcd.yaml#

  - $ref: usb-device.yaml#



properties:

  compatible:
@@ -36,6 +36,13 @@ required: 
  - compatible

  - reg



patternProperties:

  "^.*@[0-9a-f]{1,2}$":

    description: The hard wired USB devices

    type: object

    $ref: /schemas/usb/usb-device.yaml

    additionalProperties: true



unevaluatedProperties: false



examples:

Documentation/filesystems/erofs.rst

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ Here are the main features of EROFS: 


 - Support merging tail-end data into a special inode as fragments.



 - Support large folios for uncompressed files.

 - Support large folios to make use of THPs (Transparent Hugepages);



 - Support direct I/O on uncompressed files to avoid double caching for loop

   devices;