Commit dbae2736 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'zynqmp-soc-fixes-for-v5.10-rc6' of https://github.com/Xilinx/linux-xlnx into arm/fixes 

arm64: soc: ZynqMP SoC fixes for v5.10-rc6

- Fix SD dll reset issue by using proper macro
- Fix PM feature checking for Xilinx Versal SoC

* tag 'zynqmp-soc-fixes-for-v5.10-rc6' of https://github.com/Xilinx/linux-xlnx: (337 commits)
  firmware: xilinx: Use hash-table for api feature check
  firmware: xilinx: Fix SD DLL node reset issue
  Linux 5.10-rc4
  kvm: mmu: fix is_tdp_mmu_check when the TDP MMU is not in use
  afs: Fix afs_write_end() when called with copied == 0 [ver #3]
  ocfs2: initialize ip_next_orphan
  panic: don't dump stack twice on warn
  hugetlbfs: fix anon huge page migration race
  mm: memcontrol: fix missing wakeup polling thread
  kernel/watchdog: fix watchdog_allowed_mask not used warning
  reboot: fix overflow parsing reboot cpu number
  Revert "kernel/reboot.c: convert simple_strtoul to kstrtoint"
  compiler.h: fix barrier_data() on clang
  mm/gup: use unpin_user_pages() in __gup_longterm_locked()
  mm/slub: fix panic in slab_alloc_node()
  mailmap: fix entry for Dmitry Baryshkov/Eremin-Solenikov
  mm/vmscan: fix NR_ISOLATED_FILE corruption on 64-bit
  mm/compaction: stop isolation if too many pages are isolated and we have pages to migrate
  mm/compaction: count pages and stop correctly during page isolation
  drm/nouveau/kms/nv50-: Use atomic encoder callbacks everywhere
  ...

Link: https://lore.kernel.org/r/fd5ab967-f3cf-95fb-7947-5477ff85f97e@monstr.eu


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4765df4d acfdd185

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -82,7 +82,10 @@ 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>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Dmitry Baryshkov <dbaryshkov@gmail.com>

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

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_eremin@mentor.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>

Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>

Documentation/devicetree/bindings/clock/imx5-clock.yaml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ examples: 
    };



    can@53fc8000 {

        compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";

        compatible = "fsl,imx53-flexcan", "fsl,imx25-flexcan";

        reg = <0x53fc8000 0x4000>;

        interrupts = <82>;

        clocks = <&clks IMX5_CLK_CAN1_IPG_GATE>, <&clks IMX5_CLK_CAN1_SERIAL_GATE>;

Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml

+11 −7
Original line number Diff line number Diff line
@@ -20,14 +20,17 @@ properties: 
          - fsl,imx8qm-flexcan

          - fsl,imx8mp-flexcan

          - fsl,imx6q-flexcan

          - fsl,imx53-flexcan

          - fsl,imx35-flexcan

          - fsl,imx28-flexcan

          - fsl,imx25-flexcan

          - fsl,p1010-flexcan

          - fsl,vf610-flexcan

          - fsl,ls1021ar2-flexcan

          - fsl,lx2160ar1-flexcan

      - items:

          - enum:

              - fsl,imx53-flexcan

              - fsl,imx35-flexcan

          - const: fsl,imx25-flexcan

      - items:

          - enum:

              - fsl,imx7d-flexcan
@@ -80,6 +83,7 @@ properties: 
      req_gpr is the gpr register offset of CAN stop request.

      req_bit is the bit offset of CAN stop request.

    $ref: /schemas/types.yaml#/definitions/phandle-array

    items:

      items:

        - description: The 'gpr' is the phandle to general purpose register node.

        - description: The 'req_gpr' is the gpr register offset of CAN stop request.

Documentation/filesystems/ext4/journal.rst

+6 −0
Original line number Diff line number Diff line
@@ -256,6 +256,10 @@ which is 1024 bytes long: 
     - s\_padding2

     -

   * - 0x54

     - \_\_be32

     - s\_num\_fc\_blocks

     - Number of fast commit blocks in the journal.

   * - 0x58

     - \_\_u32

     - s\_padding[42]

     -
@@ -310,6 +314,8 @@ The journal incompat features are any combination of the following: 
     - This journal uses v3 of the checksum on-disk format. This is the same as

       v2, but the journal block tag size is fixed regardless of the size of

       block numbers. (JBD2\_FEATURE\_INCOMPAT\_CSUM\_V3)

   * - 0x20

     - Journal has fast commit blocks. (JBD2\_FEATURE\_INCOMPAT\_FAST\_COMMIT)



.. _jbd2_checksum_type:

Documentation/filesystems/ext4/super.rst

+7 −0
Original line number Diff line number Diff line
@@ -596,6 +596,13 @@ following: 
     - Sparse Super Block, v2. If this flag is set, the SB field s\_backup\_bgs

       points to the two block groups that contain backup superblocks

       (COMPAT\_SPARSE\_SUPER2).

   * - 0x400

     - Fast commits supported. Although fast commits blocks are

       backward incompatible, fast commit blocks are not always

       present in the journal. If fast commit blocks are present in

       the journal, JBD2 incompat feature

       (JBD2\_FEATURE\_INCOMPAT\_FAST\_COMMIT) gets

       set (COMPAT\_FAST\_COMMIT).



.. _super_incompat:

CRA Git | Maintained and supported by SUSTech CRA and CCSE