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

Merge 6.11-rc7 into usb-next 



We need the USB fixes in here as well, and this also resolves the merge
conflict in:
	drivers/usb/typec/ucsi/ucsi.c

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 9c0c11bb da3ea350

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ Amit Nischal <quic_anischal@quicinc.com> <anischal@codeaurora.org> 
Andi Kleen <ak@linux.intel.com> <ak@suse.de>

Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>

Andreas Herrmann <aherrman@de.ibm.com>

Andreas Hindborg <a.hindborg@kernel.org> <a.hindborg@samsung.com>

Andrej Shadura <andrew.shadura@collabora.co.uk>

Andrej Shadura <andrew@shadura.me> <andrew@beldisplaytech.com>

Andrew Morton <akpm@linux-foundation.org>
@@ -269,6 +270,7 @@ James Ketrenos <jketreno@io.(none)> 
Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>

Jan Kuliga <jtkuliga.kdev@gmail.com> <jankul@alatek.krakow.pl>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>

Documentation/ABI/testing/sysfs-timecard

+18 −13
Original line number Diff line number Diff line
@@ -258,24 +258,29 @@ Description: (RW) When retrieving the PHC with the PTP SYS_OFFSET_EXTENDED 
		the estimated point where the FPGA latches the PHC time.  This

		value may be changed by writing an unsigned integer.



What:		/sys/class/timecard/ocpN/ttyGNSS

What:		/sys/class/timecard/ocpN/ttyGNSS2

Date:		September 2021

What:		/sys/class/timecard/ocpN/tty

Date:		August 2024

Contact:	Vadim Fedorenko <vadim.fedorenko@linux.dev>

Description:	(RO) Directory containing the sysfs nodes for TTY attributes



What:		/sys/class/timecard/ocpN/tty/ttyGNSS

What:		/sys/class/timecard/ocpN/tty/ttyGNSS2

Date:		August 2024

Contact:	Jonathan Lemon <jonathan.lemon@gmail.com>

Description:	These optional attributes link to the TTY serial ports

		associated with the GNSS devices.

Description:	(RO) These optional attributes contain names of the TTY serial

		ports associated with the GNSS devices.



What:		/sys/class/timecard/ocpN/ttyMAC

Date:		September 2021

What:		/sys/class/timecard/ocpN/tty/ttyMAC

Date:		August 2024

Contact:	Jonathan Lemon <jonathan.lemon@gmail.com>

Description:	This optional attribute links to the TTY serial port

		associated with the Miniature Atomic Clock.

Description:	(RO) This optional attribute contains name of the TTY serial

		port associated with the Miniature Atomic Clock.



What:		/sys/class/timecard/ocpN/ttyNMEA

Date:		September 2021

What:		/sys/class/timecard/ocpN/tty/ttyNMEA

Date:		August 2024

Contact:	Jonathan Lemon <jonathan.lemon@gmail.com>

Description:	This optional attribute links to the TTY serial port

		which outputs the PHC time in NMEA ZDA format.

Description:	(RO) This optional attribute contains name of the TTY serial

		port which outputs the PHC time in NMEA ZDA format.



What:		/sys/class/timecard/ocpN/utc_tai_offset

Date:		September 2021

Documentation/admin-guide/cgroup-v2.rst

+4 −3
Original line number Diff line number Diff line
@@ -1717,9 +1717,10 @@ The following nested keys are defined. 
	entries fault back in or are written out to disk.



  memory.zswap.writeback

	A read-write single value file. The default value is "1". The

	initial value of the root cgroup is 1, and when a new cgroup is

	created, it inherits the current value of its parent.

	A read-write single value file. The default value is "1".

	Note that this setting is hierarchical, i.e. the writeback would be

	implicitly disabled for child cgroups if the upper hierarchy

	does so.



	When this is set to 0, all swapping attempts to swapping devices

	are disabled. This included both zswap writebacks, and swapping due

Documentation/arch/riscv/vm-layout.rst

+0 −16
Original line number Diff line number Diff line
@@ -134,19 +134,3 @@ RISC-V Linux Kernel SV57 
   ffffffff00000000 |  -4     GB | ffffffff7fffffff |    2 GB | modules, BPF

   ffffffff80000000 |  -2     GB | ffffffffffffffff |    2 GB | kernel

  __________________|____________|__________________|_________|____________________________________________________________
 




Userspace VAs

--------------------

To maintain compatibility with software that relies on the VA space with a

maximum of 48 bits the kernel will, by default, return virtual addresses to

userspace from a 48-bit range (sv48). This default behavior is achieved by

passing 0 into the hint address parameter of mmap. On CPUs with an address space

smaller than sv48, the CPU maximum supported address space will be the default.



Software can "opt-in" to receiving VAs from another VA space by providing

a hint address to mmap. When a hint address is passed to mmap, the returned

address will never use more bits than the hint address. For example, if a hint

address of `1 << 40` is passed to mmap, a valid returned address will never use

bits 41 through 63. If no mappable addresses are available in that range, mmap

will return `MAP_FAILED`.

Documentation/devicetree/bindings/display/panel/wl-355608-a8.yaml→Documentation/devicetree/bindings/display/panel/anbernic,rg35xx-plus-panel.yaml

+11 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/panel/wl-355608-a8.yaml#

$id: http://devicetree.org/schemas/display/panel/anbernic,rg35xx-plus-panel.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: WL-355608-A8 3.5" (640x480 pixels) 24-bit IPS LCD panel

title: Anbernic RG35XX series (WL-355608-A8) 3.5" 640x480 24-bit IPS LCD panel



maintainers:

  - Ryan Walklin <ryan@testtoast.com>
@@ -15,7 +15,14 @@ allOf: 


properties:

  compatible:

    const: wl-355608-a8

    oneOf:

      - const: anbernic,rg35xx-plus-panel

      - items:

          - enum:

              - anbernic,rg35xx-2024-panel

              - anbernic,rg35xx-h-panel

              - anbernic,rg35xx-sp-panel

          - const: anbernic,rg35xx-plus-panel



  reg:

    maxItems: 1
@@ -40,7 +47,7 @@ examples: 
        #size-cells = <0>;



        panel@0 {

            compatible = "wl-355608-a8";

            compatible = "anbernic,rg35xx-plus-panel";

            reg = <0>;



            spi-3wire;