Commit 7df621a3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



include/net/sock.h
  7b50ecfc ("net: Rename ->stream_memory_read to ->sock_is_readable")
  4c1e34c0 ("vsock: Enable y2038 safe timeval for timeout")

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
  0daa55d0 ("octeontx2-af: cn10k: debugfs for dumping LMTST map table")
  e77bcdd1 ("octeontx2-af: Display all enabled PF VF rsrc_alloc entries.")

Adjacent code addition in both cases, keep both.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f2edaa4a 411a44c2

Documentation/devicetree/bindings/mfd/brcm,cru.yaml

+6 −5
Original line number Diff line number Diff line
@@ -32,13 +32,13 @@ properties: 
  "#size-cells":

    const: 1



  pinctrl:

    $ref: ../pinctrl/brcm,ns-pinmux.yaml



patternProperties:

  '^clock-controller@[a-f0-9]+$':

    $ref: ../clock/brcm,iproc-clocks.yaml



  '^pin-controller@[a-f0-9]+$':

    $ref: ../pinctrl/brcm,ns-pinmux.yaml



  '^thermal@[a-f0-9]+$':

    $ref: ../thermal/brcm,ns-thermal.yaml
@@ -73,9 +73,10 @@ examples: 
                                 "iprocfast", "sata1", "sata2";

        };



        pinctrl {

        pin-controller@1c0 {

            compatible = "brcm,bcm4708-pinmux";

            offset = <0x1c0>;

            reg = <0x1c0 0x24>;

            reg-names = "cru_gpio_control";

        };



        thermal@2c0 {

Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml

+14 −19
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ description: 


  A list of pins varies across chipsets so few bindings are available.



  Node of the pinmux must be nested in the CRU (Central Resource Unit) "syscon"

  node.



properties:

  compatible:

    enum:
@@ -27,10 +24,11 @@ properties: 
      - brcm,bcm4709-pinmux

      - brcm,bcm53012-pinmux



  offset:

    description: offset of pin registers in the CRU block

  reg:

    maxItems: 1

    $ref: /schemas/types.yaml#/definitions/uint32-array



  reg-names:

    const: cru_gpio_control



patternProperties:

  '-pins$':
@@ -72,23 +70,20 @@ allOf: 
                        uart1_grp ]



required:

  - offset

  - reg

  - reg-names



additionalProperties: false



examples:

  - |

    cru@1800c100 {

        compatible = "syscon", "simple-mfd";

        reg = <0x1800c100 0x1a4>;



        pinctrl {

    pin-controller@1800c1c0 {

        compatible = "brcm,bcm4708-pinmux";

            offset = <0xc0>;

        reg = <0x1800c1c0 0x24>;

        reg-names = "cru_gpio_control";



        spi-pins {

            function = "spi";

            groups = "spi_grp";

        };

    };
 
    };

Documentation/userspace-api/ioctl/ioctl-number.rst

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ Code Seq# Include File Comments 
'8'   all                                                            SNP8023 advanced NIC card

                                                                     <mailto:mcr@solidum.com>

';'   64-7F  linux/vfio.h

'='   00-3f  uapi/linux/ptp_clock.h                                  <mailto:richardcochran@gmail.com>

'@'   00-0F  linux/radeonfb.h                                        conflict!

'@'   00-0F  drivers/video/aty/aty128fb.c                            conflict!

'A'   00-1F  linux/apm_bios.h                                        conflict!

MAINTAINERS

+14 −1
Original line number Diff line number Diff line
@@ -5464,6 +5464,19 @@ F: include/net/devlink.h 
F:	include/uapi/linux/devlink.h

F:	net/core/devlink.c









DH ELECTRONICS IMX6 DHCOM BOARD SUPPORT









M:	Christoph Niedermaier <cniedermaier@dh-electronics.com>









L:	kernel@dh-electronics.com









S:	Maintained









F:	arch/arm/boot/dts/imx6*-dhcom-*

















DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT









M:	Marek Vasut <marex@denx.de>









L:	kernel@dh-electronics.com









S:	Maintained









F:	arch/arm/boot/dts/stm32mp1*-dhcom-*









F:	arch/arm/boot/dts/stm32mp1*-dhcor-*

















DIALOG SEMICONDUCTOR DRIVERS









M:	Support Opensource <support.opensource@diasemi.com>









S:	Supported








@@ -11284,7 +11297,6 @@ F:	Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst







F:	drivers/net/ethernet/marvell/octeontx2/af/

















MARVELL PRESTERA ETHERNET SWITCH DRIVER









M:	Vadym Kochan <vkochan@marvell.com>









M:	Taras Chornyi <tchornyi@marvell.com>









S:	Supported









W:	https://github.com/Marvell-switching/switchdev-prestera








@@ -20352,6 +20364,7 @@ X86 ARCHITECTURE (32-BIT AND 64-BIT)







M:	Thomas Gleixner <tglx@linutronix.de>









M:	Ingo Molnar <mingo@redhat.com>









M:	Borislav Petkov <bp@alien8.de>









M:	Dave Hansen <dave.hansen@linux.intel.com>









M:	x86@kernel.org









R:	"H. Peter Anvin" <hpa@zytor.com>









L:	linux-kernel@vger.kernel.org

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







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







VERSION = 5









PATCHLEVEL = 15









SUBLEVEL = 0









EXTRAVERSION = -rc6









EXTRAVERSION = -rc7









NAME = Opossums on Parade



















# *DOCUMENTATION*