Commit 7672135d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.15-rc6' of... 

Merge tag 'asoc-fix-v6.15-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.15

A collection of driver specific fixes that built up over the past few
weeks, plus one core patch which fixes handling of topology files where
some DAI names are substrings of others.
parents 5ad8a4dd 7dd7f39f

Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ Description: RO. Package current voltage in millivolt. 


What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/temp2_input

Date:		March 2025

KernelVersion:	6.14

KernelVersion:	6.15

Contact:	intel-xe@lists.freedesktop.org

Description:	RO. Package temperature in millidegree Celsius.
@@ -119,7 +119,7 @@ Description: RO. Package temperature in millidegree Celsius. 


What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/temp3_input

Date:		March 2025

KernelVersion:	6.14

KernelVersion:	6.15

Contact:	intel-xe@lists.freedesktop.org

Description:	RO. VRAM temperature in millidegree Celsius.

Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml

+7 −12
Original line number Diff line number Diff line
@@ -56,19 +56,18 @@ properties: 
        enum:

          - snps,dw-apb-ssi

          - snps,dwc-ssi-1.01a

      - description: Microsemi Ocelot/Jaguar2 SoC SPI Controller

        items:

          - enum:

              - mscc,ocelot-spi

              - mscc,jaguar2-spi

          - const: snps,dw-apb-ssi

      - description: Microchip Sparx5 SoC SPI Controller

        const: microchip,sparx5-spi

      - description: Amazon Alpine SPI Controller

        const: amazon,alpine-dw-apb-ssi

      - description: Renesas RZ/N1 SPI Controller

      - description: Vendor controllers which use snps,dw-apb-ssi as fallback

        items:

          - const: renesas,rzn1-spi

          - enum:

              - mscc,ocelot-spi

              - mscc,jaguar2-spi

              - renesas,rzn1-spi

              - sophgo,sg2042-spi

              - thead,th1520-spi

          - const: snps,dw-apb-ssi

      - description: Intel Keem Bay SPI Controller

        const: intel,keembay-ssi
@@ -88,10 +87,6 @@ properties: 
              - renesas,r9a06g032-spi # RZ/N1D

              - renesas,r9a06g033-spi # RZ/N1S

          - const: renesas,rzn1-spi   # RZ/N1

      - description: T-HEAD TH1520 SoC SPI Controller

        items:

          - const: thead,th1520-spi

          - const: snps,dw-apb-ssi



  reg:

    minItems: 1

Documentation/netlink/specs/ethtool.yaml

+3 −1
Original line number Diff line number Diff line
@@ -89,8 +89,10 @@ definitions: 
          doc: Group of short_detected states

  -

    name: phy-upstream-type

    enum-name:

    enum-name: phy-upstream

    header: linux/ethtool.h

    type: enum

    name-prefix: phy-upstream

    entries: [ mac, phy ]

  -

    name: tcp-data-split

Makefile

+1 −8
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 6

PATCHLEVEL = 15

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Baby Opossum Posse



# *DOCUMENTATION*
@@ -1052,13 +1052,6 @@ NOSTDINC_FLAGS += -nostdinc 
# perform bounds checking.

KBUILD_CFLAGS += $(call cc-option, -fstrict-flex-arrays=3)



#Currently, disable -Wstringop-overflow for GCC 11, globally.

KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-disable-warning, stringop-overflow)

KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow)



#Currently, disable -Wunterminated-string-initialization as broken

KBUILD_CFLAGS += $(call cc-disable-warning, unterminated-string-initialization)



# disable invalid "can't wrap" optimizations for signed / pointers

KBUILD_CFLAGS	+= -fno-strict-overflow

arch/arm64/kernel/proton-pack.c

+2 −0
Original line number Diff line number Diff line
@@ -879,10 +879,12 @@ static u8 spectre_bhb_loop_affected(void) 
	static const struct midr_range spectre_bhb_k132_list[] = {

		MIDR_ALL_VERSIONS(MIDR_CORTEX_X3),

		MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2),

		{},

	};

	static const struct midr_range spectre_bhb_k38_list[] = {

		MIDR_ALL_VERSIONS(MIDR_CORTEX_A715),

		MIDR_ALL_VERSIONS(MIDR_CORTEX_A720),

		{},

	};

	static const struct midr_range spectre_bhb_k32_list[] = {

		MIDR_ALL_VERSIONS(MIDR_CORTEX_A78),