Unverified Commit 2bfb20b6 authored by Mark Brown's avatar Mark Brown
Browse files

spi: rpc-if: Add resume support for RZ/G3E 

Merge series from Biju Das <biju.das.jz@bp.renesas.com>:

On RZ/G3E using PSCI, s2ram powers down the SoC. After resume,
reinitialize the hardware for SPI operations.

Also Replace the macro SIMPLE_DEV_PM_OPS->DEFINE_SIMPLE_DEV_PM_OPS macro
and use pm_sleep_ptr(). This lets us drop the check for CONFIG_PM_SLEEP
and __maybe_unused attribute from PM functions.
parents 089558a9 ad472874

Documentation/netlink/specs/conntrack.yaml

+4 −5
Original line number Diff line number Diff line
@@ -575,8 +575,8 @@ operations: 
            - nat-dst

            - timeout

            - mark

            - counter-orig

            - counter-reply

            - counters-orig

            - counters-reply

            - use

            - id

            - nat-dst
@@ -591,7 +591,6 @@ operations: 
        request:

          value: 0x101

          attributes:

            - nfgen-family

            - mark

            - filter

            - status
@@ -608,8 +607,8 @@ operations: 
            - nat-dst

            - timeout

            - mark

            - counter-orig

            - counter-reply

            - counters-orig

            - counters-reply

            - use

            - id

            - nat-dst

Documentation/netlink/specs/mptcp_pm.yaml

+2 −2
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ definitions: 
          traffic-patterns it can take a long time until the

          MPTCP_EVENT_ESTABLISHED is sent.

          Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, sport,

          dport, server-side.

          dport, server-side, [flags].

      -

        name: established

        doc: >-

          A MPTCP connection is established (can start new subflows).

          Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, sport,

          dport, server-side.

          dport, server-side, [flags].

      -

        name: closed

        doc: >-

Documentation/sound/alsa-configuration.rst

+1 −1
Original line number Diff line number Diff line
@@ -2293,7 +2293,7 @@ delayed_register 
    notice the need.

skip_validation

    Skip unit descriptor validation (default: no).

    The option is used to ignores the validation errors with the hexdump

    The option is used to ignore the validation errors with the hexdump

    of the unit descriptor instead of a driver probe error, so that we

    can check its details.

quirk_flags

MAINTAINERS

+5 −2
Original line number Diff line number Diff line
@@ -7440,7 +7440,7 @@ S: Supported 
F:	Documentation/devicetree/bindings/dpll/dpll-device.yaml

F:	Documentation/devicetree/bindings/dpll/dpll-pin.yaml

F:	Documentation/driver-api/dpll.rst

F:	drivers/dpll/*

F:	drivers/dpll/

F:	include/linux/dpll.h

F:	include/uapi/linux/dpll.h








@@ -16206,6 +16206,7 @@ R:	Rik van Riel <riel@surriel.com>







R:	Liam R. Howlett <Liam.Howlett@oracle.com>









R:	Vlastimil Babka <vbabka@suse.cz>









R:	Harry Yoo <harry.yoo@oracle.com>









R:	Jann Horn <jannh@google.com>









L:	linux-mm@kvack.org









S:	Maintained









F:	include/linux/rmap.h








@@ -16250,6 +16251,7 @@ R:	Nico Pache <npache@redhat.com>







R:	Ryan Roberts <ryan.roberts@arm.com>









R:	Dev Jain <dev.jain@arm.com>









R:	Barry Song <baohua@kernel.org>









R:	Lance Yang <lance.yang@linux.dev>









L:	linux-mm@kvack.org









S:	Maintained









W:	http://www.linux-mm.org








@@ -22060,6 +22062,7 @@ F:	drivers/infiniband/ulp/rtrs/















RUNTIME VERIFICATION (RV)









M:	Steven Rostedt <rostedt@goodmis.org>









M:	Gabriele Monaco <gmonaco@redhat.com>









L:	linux-trace-kernel@vger.kernel.org









S:	Maintained









F:	Documentation/trace/rv/








@@ -24267,7 +24270,7 @@ F:	Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml







F:	drivers/input/keyboard/sun4i-lradc-keys.c

















SUNDANCE NETWORK DRIVER









M:	Denis Kirjanov <dkirjanov@suse.de>









M:	Denis Kirjanov <kirjanov@gmail.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/ethernet/dlink/sundance.c

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 6









PATCHLEVEL = 17









SUBLEVEL = 0









EXTRAVERSION = -rc6









EXTRAVERSION = -rc7









NAME = Baby Opossum Posse



















# *DOCUMENTATION*