Commit c78d218f authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge tag 'v5.15-rc4' into rdma.get for-next 



Merged due to dependencies in following patches.

Conflict in drivers/infiniband/hw/hfi1/ipoib_tx.c resolved by hand to take
the %p change and txq stats rename together.

Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parents 0994a1bc 9e1ff307

Documentation/core-api/irq/irq-domain.rst

+3 −2
Original line number Diff line number Diff line
@@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that 
case the Linux IRQ numbers cannot be dynamically assigned and the legacy

mapping should be used.



As the name implies, the *_legacy() functions are deprecated and only

As the name implies, the \*_legacy() functions are deprecated and only

exist to ease the support of ancient platforms. No new users should be

added.

added. Same goes for the \*_simple() functions when their use results

in the legacy behaviour.



The legacy map assumes a contiguous range of IRQ numbers has already

been allocated for the controller and that the IRQ number can be

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.

Documentation/networking/device_drivers/ethernet/intel/ice.rst

+1 −1
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ NOTES: 
- 0x88A8 traffic will not be received unless VLAN stripping is disabled with

  the following command::



    # ethool -K <ethX> rxvlan off

    # ethtool -K <ethX> rxvlan off



- 0x88A8/0x8100 double VLANs cannot be used with 0x8100 or 0x8100/0x8100 VLANS

  configured on the same port. 0x88a8/0x8100 traffic will not be received if

MAINTAINERS

+29 −34
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








@@ -977,12 +978,12 @@ L:	platform-driver-x86@vger.kernel.org







S:	Maintained









F:	drivers/platform/x86/amd-pmc.*

















AMD POWERPLAY









AMD POWERPLAY AND SWSMU









M:	Evan Quan <evan.quan@amd.com>









L:	amd-gfx@lists.freedesktop.org









S:	Supported









T:	git https://gitlab.freedesktop.org/agd5f/linux.git









F:	drivers/gpu/drm/amd/pm/powerplay/









F:	drivers/gpu/drm/amd/pm/

















AMD PTDMA DRIVER









M:	Sanjay R Mehta <sanju.mehta@amd.com>








@@ -2804,9 +2805,8 @@ F:	arch/arm/mach-pxa/include/mach/vpac270.h







F:	arch/arm/mach-pxa/vpac270.c

















ARM/VT8500 ARM ARCHITECTURE









M:	Tony Prisk <linux@prisktech.co.nz>









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









S:	Maintained









S:	Orphan









F:	Documentation/devicetree/bindings/i2c/i2c-wmt.txt









F:	arch/arm/mach-vt8500/









F:	drivers/clocksource/timer-vt8500.c








@@ -2962,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








@@ -3385,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








@@ -3821,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








@@ -4656,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>








@@ -7986,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








@@ -10194,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>








@@ -11367,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








@@ -13255,9 +13256,9 @@ F:	Documentation/scsi/NinjaSCSI.rst







F:	drivers/scsi/nsp32*

















NIOS2 ARCHITECTURE









M:	Ley Foon Tan <ley.foon.tan@intel.com>









M:	Dinh Nguyen <dinguyen@kernel.org>









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git









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









F:	arch/nios2/

















NITRO ENCLAVES (NE)








@@ -16651,13 +16652,6 @@ M:	Lubomir Rintel <lkundrak@v3.sk>







S:	Supported









F:	drivers/char/pcmcia/scr24x_cs.c

















SCSI CDROM DRIVER









M:	Jens Axboe <axboe@kernel.dk>









L:	linux-scsi@vger.kernel.org









S:	Maintained









W:	http://www.kernel.dk









F:	drivers/scsi/sr*

















SCSI RDMA PROTOCOL (SRP) INITIATOR









M:	Bart Van Assche <bvanassche@acm.org>









L:	linux-rdma@vger.kernel.org








@@ -16956,7 +16950,6 @@ F:	drivers/misc/sgi-xp/















SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS









M:	Karsten Graul <kgraul@linux.ibm.com>









M:	Guvenc Gulce <guvenc@linux.ibm.com>









L:	linux-s390@vger.kernel.org









S:	Supported









W:	http://www.ibm.com/developerworks/linux/linux390/








@@ -17892,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








@@ -17969,10 +17963,11 @@ F:	Documentation/admin-guide/svga.rst







F:	arch/x86/boot/video*

















SWIOTLB SUBSYSTEM









M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>









M:	Christoph Hellwig <hch@infradead.org>









L:	iommu@lists.linux-foundation.org









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git









W:	http://git.infradead.org/users/hch/dma-mapping.git









T:	git git://git.infradead.org/users/hch/dma-mapping.git









F:	arch/*/kernel/pci-swiotlb.c









F:	include/linux/swiotlb.h









F:	kernel/dma/swiotlb.c








@@ -18555,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








@@ -18690,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








@@ -19289,13 +19285,12 @@ S:	Maintained







F:	drivers/usb/misc/chaoskey.c

















USB CYPRESS C67X00 DRIVER









M:	Peter Korsgaard <jacmet@sunsite.dk>









L:	linux-usb@vger.kernel.org









S:	Maintained









S:	Orphan









F:	drivers/usb/c67x00/

















USB DAVICOM DM9601 DRIVER









M:	Peter Korsgaard <jacmet@sunsite.dk>









M:	Peter Korsgaard <peter@korsgaard.com>









L:	netdev@vger.kernel.org









S:	Maintained









W:	http://www.linux-usb.org/usbnet








@@ -20475,7 +20470,6 @@ F:	samples/bpf/xdpsock*







F:	tools/lib/bpf/xsk*

















XEN BLOCK SUBSYSTEM









M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>









M:	Roger Pau Monné <roger.pau@citrix.com>









L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)









S:	Supported








@@ -20523,7 +20517,7 @@ S:	Supported







F:	drivers/net/xen-netback/*

















XEN PCI SUBSYSTEM









M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>









M:	Juergen Gross <jgross@suse.com>









L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)









S:	Supported









F:	arch/x86/pci/*xen*








@@ -20546,7 +20540,8 @@ S:	Supported







F:	sound/xen/*

















XEN SWIOTLB SUBSYSTEM









M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>









M:	Juergen Gross <jgross@suse.com>









M:	Stefano Stabellini <sstabellini@kernel.org>









L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)









L:	iommu@lists.linux-foundation.org









S:	Supported