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

Merge 5.15-rc4 into char-misc-next 



We need the char-misc fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 20ac422c 9e1ff307

Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml

+42 −4
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ properties: 


  clocks:

    minItems: 1

    maxItems: 3

    maxItems: 7



  clock-names:

    minItems: 1

    maxItems: 3

    maxItems: 7



required:

  - compatible
@@ -72,6 +72,32 @@ allOf: 
          contains:

            enum:

              - qcom,sdm660-a2noc

    then:

      properties:

        clocks:

          items:

            - description: Bus Clock.

            - description: Bus A Clock.

            - description: IPA Clock.

            - description: UFS AXI Clock.

            - description: Aggregate2 UFS AXI Clock.

            - description: Aggregate2 USB3 AXI Clock.

            - description: Config NoC USB2 AXI Clock.

        clock-names:

          items:

            - const: bus

            - const: bus_a

            - const: ipa

            - const: ufs_axi

            - const: aggre2_ufs_axi

            - const: aggre2_usb3_axi

            - const: cfg_noc_usb2_axi



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sdm660-bimc

              - qcom,sdm660-cnoc

              - qcom,sdm660-gnoc
@@ -91,6 +117,7 @@ examples: 
  - |

      #include <dt-bindings/clock/qcom,rpmcc.h>

      #include <dt-bindings/clock/qcom,mmcc-sdm660.h>

      #include <dt-bindings/clock/qcom,gcc-sdm660.h>



      bimc: interconnect@1008000 {

              compatible = "qcom,sdm660-bimc";
@@ -123,9 +150,20 @@ examples: 
              compatible = "qcom,sdm660-a2noc";

              reg = <0x01704000 0xc100>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clock-names = "bus",

                            "bus_a",

                            "ipa",

                            "ufs_axi",

                            "aggre2_ufs_axi",

                            "aggre2_usb3_axi",

                            "cfg_noc_usb2_axi";

              clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>,

                       <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>;

                       <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>,

                       <&rpmcc RPM_SMD_IPA_CLK>,

                       <&gcc GCC_UFS_AXI_CLK>,

                       <&gcc GCC_AGGRE2_UFS_AXI_CLK>,

                       <&gcc GCC_AGGRE2_USB3_AXI_CLK>,

                       <&gcc GCC_CFG_NOC_USB2_AXI_CLK>;

      };



      mnoc: interconnect@1745000 {

Documentation/hwmon/k10temp.rst

+0 −17
Original line number Diff line number Diff line
@@ -132,20 +132,3 @@ On Family 17h and Family 18h CPUs, additional temperature sensors may report 
Core Complex Die (CCD) temperatures. Up to 8 such temperatures are reported

as temp{3..10}_input, labeled Tccd{1..8}. Actual support depends on the CPU

variant.
 


Various Family 17h and 18h CPUs report voltage and current telemetry

information. The following attributes may be reported.



Attribute	Label	Description

===============	=======	================

in0_input	Vcore	Core voltage

in1_input	Vsoc	SoC voltage

curr1_input	Icore	Core current

curr2_input	Isoc	SoC current

===============	=======	================



Current values are raw (unscaled) as reported by the CPU. Core current is

reported as multiples of 1A / LSB. SoC is reported as multiples of 0.25A

/ LSB. The real current is board specific. Reported currents should be seen

as rough guidance, and should be scaled using sensors3.conf as appropriate

for a given board.

MAINTAINERS

+16 −12
Original line number Diff line number Diff line
@@ -414,7 +414,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 
F:	drivers/acpi/pmic/









ACPI THERMAL DRIVER









M:	Zhang Rui <rui.zhang@intel.com>









M:	Rafael J. Wysocki <rafael@kernel.org>









R:	Zhang Rui <rui.zhang@intel.com>









L:	linux-acpi@vger.kernel.org









S:	Supported









W:	https://01.org/linux-acpi








@@ -810,7 +811,7 @@ F:	Documentation/devicetree/bindings/dma/altr,msgdma.yaml







F:	drivers/dma/altera-msgdma.c

















ALTERA PIO DRIVER









M:	Joyce Ooi <joyce.ooi@intel.com>









M:	Mun Yew Tham <mun.yew.tham@intel.com>









L:	linux-gpio@vger.kernel.org









S:	Maintained









F:	drivers/gpio/gpio-altera.c








@@ -2961,7 +2962,7 @@ F:	crypto/async_tx/







F:	include/linux/async_tx.h

















AT24 EEPROM DRIVER









M:	Bartosz Golaszewski <bgolaszewski@baylibre.com>









M:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-i2c@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git








@@ -3384,9 +3385,11 @@ F:	Documentation/networking/filter.rst







F:	Documentation/userspace-api/ebpf/









F:	arch/*/net/*









F:	include/linux/bpf*









F:	include/linux/btf*









F:	include/linux/filter.h









F:	include/trace/events/xdp.h









F:	include/uapi/linux/bpf*









F:	include/uapi/linux/btf*









F:	include/uapi/linux/filter.h









F:	kernel/bpf/









F:	kernel/trace/bpf_trace.c








@@ -3820,7 +3823,6 @@ F:	drivers/scsi/mpi3mr/















BROADCOM NETXTREME-E ROCE DRIVER









M:	Selvin Xavier <selvin.xavier@broadcom.com>









M:	Naresh Kumar PBS <nareshkumar.pbs@broadcom.com>









L:	linux-rdma@vger.kernel.org









S:	Supported









W:	http://www.broadcom.com








@@ -4655,7 +4657,7 @@ W:	http://linux-cifs.samba.org/







T:	git git://git.samba.org/sfrench/cifs-2.6.git









F:	Documentation/admin-guide/cifs/









F:	fs/cifs/









F:	fs/cifs_common/









F:	fs/smbfs_common/

















COMPACTPCI HOTPLUG CORE









M:	Scott Murray <scott@spiteful.org>








@@ -7985,7 +7987,7 @@ F:	include/linux/gpio/regmap.h















GPIO SUBSYSTEM









M:	Linus Walleij <linus.walleij@linaro.org>









M:	Bartosz Golaszewski <bgolaszewski@baylibre.com>









M:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-gpio@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git








@@ -10193,8 +10195,8 @@ M:	Hyunchul Lee <hyc.lee@gmail.com>







L:	linux-cifs@vger.kernel.org









S:	Maintained









T:	git git://git.samba.org/ksmbd.git









F:	fs/cifs_common/









F:	fs/ksmbd/









F:	fs/smbfs_common/

















KERNEL UNIT TESTING FRAMEWORK (KUnit)









M:	Brendan Higgins <brendanhiggins@google.com>








@@ -11366,7 +11368,7 @@ F:	Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml







F:	drivers/iio/proximity/mb1232.c

















MAXIM MAX77650 PMIC MFD DRIVER









M:	Bartosz Golaszewski <bgolaszewski@baylibre.com>









M:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/*/*max77650.yaml








@@ -17883,7 +17885,8 @@ M:	Olivier Moysan <olivier.moysan@foss.st.com>







M:	Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Maintained









F:	Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml









F:	Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml









F:	Documentation/devicetree/bindings/sound/st,stm32-*.yaml









F:	sound/soc/stm/

















STM32 TIMER/LPTIMER DRIVERS








@@ -18547,13 +18550,14 @@ T:	git git://linuxtv.org/media_tree.git







F:	drivers/media/radio/radio-raremono.c

















THERMAL









M:	Zhang Rui <rui.zhang@intel.com>









M:	Rafael J. Wysocki <rafael@kernel.org>









M:	Daniel Lezcano <daniel.lezcano@linaro.org>









R:	Amit Kucheria <amitk@kernel.org>









R:	Zhang Rui <rui.zhang@intel.com>









L:	linux-pm@vger.kernel.org









S:	Supported









Q:	https://patchwork.kernel.org/project/linux-pm/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git thermal









F:	Documentation/devicetree/bindings/thermal/









F:	drivers/thermal/









F:	include/linux/cpu_cooling.h








@@ -18682,7 +18686,7 @@ F:	include/linux/clk/ti.h















TI DAVINCI MACHINE SUPPORT









M:	Sekhar Nori <nsekhar@ti.com>









R:	Bartosz Golaszewski <bgolaszewski@baylibre.com>









R:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







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







VERSION = 5









PATCHLEVEL = 15









SUBLEVEL = 0









EXTRAVERSION = -rc3









EXTRAVERSION = -rc4









NAME = Opossums on Parade



















# *DOCUMENTATION*
































arch/arm64/kvm/hyp/nvhe/Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -54,7 +54,7 @@ $(obj)/kvm_nvhe.tmp.o: $(obj)/hyp.lds $(addprefix $(obj)/,$(hyp-obj)) FORCE







#    runtime. Because the hypervisor is part of the kernel binary, relocations









#    produce a kernel VA. We enumerate relocations targeting hyp at build time









#    and convert the kernel VAs at those positions to hyp VAs.









$(obj)/hyp-reloc.S: $(obj)/kvm_nvhe.tmp.o $(obj)/gen-hyprel









$(obj)/hyp-reloc.S: $(obj)/kvm_nvhe.tmp.o $(obj)/gen-hyprel FORCE









	$(call if_changed,hyprel)



















# 5) Compile hyp-reloc.S and link it into the existing partially linked object.