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

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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/sfc/tc.c
  fa165e19 ("sfc: don't unregister flow_indr if it was never registered")
  3bf969e8 ("sfc: add MAE table machinery for conntrack table")
https://lore.kernel.org/all/20230818112159.7430e9b4@canb.auug.org.au/



No adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c2e5f4fd 0e8860d2

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -538,6 +538,8 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com> 
Sibi Sankar <quic_sibis@quicinc.com> <sibis@codeaurora.org>

Sid Manning <quic_sidneym@quicinc.com> <sidneym@codeaurora.org>

Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>

Simon Horman <horms@kernel.org> <simon.horman@corigine.com>

Simon Horman <horms@kernel.org> <simon.horman@netronome.com>

Simon Kelley <simon@thekelleys.org.uk>

Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>

Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>

Documentation/devicetree/bindings/iio/addac/adi,ad74115.yaml

+0 −3
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ properties: 
    description: Whether to enable burnout current for EXT1.



  adi,ext1-burnout-current-nanoamp:

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

    description:

      Burnout current in nanoamps to be applied to EXT1.

    enum: [0, 50, 500, 1000, 10000]
@@ -233,7 +232,6 @@ properties: 
    description: Whether to enable burnout current for EXT2.



  adi,ext2-burnout-current-nanoamp:

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

    description: Burnout current in nanoamps to be applied to EXT2.

    enum: [0, 50, 500, 1000, 10000]

    default: 0
@@ -249,7 +247,6 @@ properties: 
    description: Whether to enable burnout current for VIOUT.



  adi,viout-burnout-current-nanoamp:

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

    description: Burnout current in nanoamps to be applied to VIOUT.

    enum: [0, 1000, 10000]

    default: 0

Documentation/networking/nf_conntrack-sysctl.rst

+2 −2
Original line number Diff line number Diff line
@@ -178,10 +178,10 @@ nf_conntrack_sctp_timeout_established - INTEGER (seconds) 
	Default is set to (hb_interval * path_max_retrans + rto_max)



nf_conntrack_sctp_timeout_shutdown_sent - INTEGER (seconds)

	default 0.3

	default 3



nf_conntrack_sctp_timeout_shutdown_recd - INTEGER (seconds)

	default 0.3

	default 3



nf_conntrack_sctp_timeout_shutdown_ack_sent - INTEGER (seconds)

	default 3

MAINTAINERS

+12 −2
Original line number Diff line number Diff line
@@ -9394,7 +9394,6 @@ F: drivers/crypto/hisilicon/sgl.c 
F:	include/linux/hisi_acc_qm.h









HISILICON ROCE DRIVER









M:	Haoyue Xu <xuhaoyue1@hisilicon.com>









M:	Junxian Huang <huangjunxian6@hisilicon.com>









L:	linux-rdma@vger.kernel.org









S:	Maintained








@@ -12499,6 +12498,7 @@ F:	net/mctp/















MAPLE TREE









M:	Liam R. Howlett <Liam.Howlett@oracle.com>









L:	maple-tree@lists.infradead.org









L:	linux-mm@kvack.org









S:	Supported









F:	Documentation/core-api/maple_tree.rst








@@ -16312,6 +16312,7 @@ F:	drivers/pci/controller/dwc/pci-exynos.c







PCI DRIVER FOR SYNOPSYS DESIGNWARE









M:	Jingoo Han <jingoohan1@gmail.com>









M:	Gustavo Pimentel <gustavo.pimentel@synopsys.com>









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









L:	linux-pci@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml








@@ -22499,7 +22500,6 @@ L:	virtualization@lists.linux-foundation.org







S:	Maintained









F:	drivers/block/virtio_blk.c









F:	drivers/scsi/virtio_scsi.c









F:	drivers/vhost/scsi.c









F:	include/uapi/linux/virtio_blk.h









F:	include/uapi/linux/virtio_scsi.h
















@@ -22598,6 +22598,16 @@ F:	include/linux/vhost_iotlb.h







F:	include/uapi/linux/vhost.h









F:	kernel/vhost_task.c

















VIRTIO HOST (VHOST-SCSI)









M:	"Michael S. Tsirkin" <mst@redhat.com>









M:	Jason Wang <jasowang@redhat.com>









M:	Mike Christie <michael.christie@oracle.com>









R:	Paolo Bonzini <pbonzini@redhat.com>









R:	Stefan Hajnoczi <stefanha@redhat.com>









L:	virtualization@lists.linux-foundation.org









S:	Maintained









F:	drivers/vhost/scsi.c

















VIRTIO I2C DRIVER









M:	Conghui Chen <conghui.chen@intel.com>









M:	Viresh Kumar <viresh.kumar@linaro.org>

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







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







VERSION = 6









PATCHLEVEL = 5









SUBLEVEL = 0









EXTRAVERSION = -rc5









EXTRAVERSION = -rc6









NAME = Hurr durr I'ma ninja sloth



















# *DOCUMENTATION*