Commit 570d58b1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v6.15-rc5' into x86/msr, to pick up fixes and to resolve conflicts 



 Conflicts:
	drivers/cpufreq/intel_pstate.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 502ad6e5 92a09c47

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

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -22738,9 +22738,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 
F:	Documentation/devicetree/bindings/sound/

F:	Documentation/sound/soc/

F:	include/dt-bindings/sound/

F:	include/sound/cs-amp-lib.h

F:	include/sound/cs35l*

F:	include/sound/cs4271.h

F:	include/sound/cs42l*

F:	include/sound/madera-pdata.h

F:	include/sound/soc*

F:	include/sound/sof.h

F:	include/sound/sof/

F:	include/sound/wm*.h

F:	include/trace/events/sof*.h

F:	include/uapi/sound/asoc.h

F:	sound/soc/

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