summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2023-05-11 09:06:26 -0700
committerJakub Kicinski <kuba@kernel.org>2023-05-11 09:06:55 -0700
commitbc88ba0cad64a4aa85f9deca79c6f3addcd21795 (patch)
tree66db8412b3f65bf19645611afee4b1dbe14b74a8
parent285b2a46953cecea207c53f7c6a7a76c9bbab303 (diff)
parent6e27831b91a0bc572902eb065b374991c1ef452a (diff)
downloadlinux-bc88ba0cad64a4aa85f9deca79c6f3addcd21795.tar.gz
linux-bc88ba0cad64a4aa85f9deca79c6f3addcd21795.tar.bz2
linux-bc88ba0cad64a4aa85f9deca79c6f3addcd21795.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes. No conflicts. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--.mailmap5
-rw-r--r--Documentation/admin-guide/blockdev/nbd.rst2
-rw-r--r--Documentation/devicetree/bindings/mailbox/mediatek,gce-mailbox.yaml20
-rw-r--r--Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml31
-rw-r--r--Documentation/networking/bonding.rst9
-rw-r--r--Documentation/networking/index.rst2
-rw-r--r--Documentation/networking/x25-iface.rst3
-rw-r--r--Documentation/power/regulator/consumer.rst2
-rw-r--r--Documentation/sound/alsa-configuration.rst13
-rw-r--r--Documentation/sound/kernel-api/writing-an-alsa-driver.rst22
-rw-r--r--MAINTAINERS2234
-rw-r--r--Makefile4
-rw-r--r--block/bdev.c13
-rw-r--r--block/blk-cgroup.c3
-rw-r--r--block/blk-integrity.c175
-rw-r--r--block/blk.h12
-rw-r--r--block/genhd.c19
-rw-r--r--block/partitions/core.c8
-rw-r--r--crypto/acompress.c2
-rw-r--r--crypto/aead.c2
-rw-r--r--crypto/ahash.c2
-rw-r--r--crypto/akcipher.c2
-rw-r--r--crypto/algapi.c3
-rw-r--r--crypto/crypto_engine.c6
-rw-r--r--crypto/kpp.c2
-rw-r--r--crypto/rng.c2
-rw-r--r--crypto/scompress.c2
-rw-r--r--crypto/shash.c2
-rw-r--r--crypto/skcipher.c2
-rw-r--r--drivers/block/brd.c1
-rw-r--r--drivers/block/drbd/drbd_receiver.c2
-rw-r--r--drivers/block/nbd.c7
-rw-r--r--drivers/block/null_blk/main.c1
-rw-r--r--drivers/block/ublk_drv.c71
-rw-r--r--drivers/block/zram/zram_drv.c1
-rw-r--r--drivers/clk/clk-sp7021.c2
-rw-r--r--drivers/clk/imx/clk-composite-8m.c7
-rw-r--r--drivers/clk/starfive/Kconfig5
-rw-r--r--drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c2
-rw-r--r--drivers/mailbox/Kconfig2
-rw-r--r--drivers/mailbox/bcm-pdc-mailbox.c2
-rw-r--r--drivers/mailbox/hi6220-mailbox.c5
-rw-r--r--drivers/mailbox/mailbox-test.c8
-rw-r--r--drivers/mailbox/mailbox.c96
-rw-r--r--drivers/mailbox/omap-mailbox.c25
-rw-r--r--drivers/mailbox/pcc.c84
-rw-r--r--drivers/mailbox/qcom-apcs-ipc-mailbox.c11
-rw-r--r--drivers/mailbox/rockchip-mailbox.c2
-rw-r--r--drivers/md/bcache/super.c1
-rw-r--r--drivers/md/md-bitmap.c6
-rw-r--r--drivers/md/raid5.c45
-rw-r--r--drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c3
-rw-r--r--drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c6
-rw-r--r--drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c41
-rw-r--r--drivers/media/platform/renesas/rcar-vin/rcar-dma.c21
-rw-r--r--drivers/net/bonding/bond_netlink.c7
-rw-r--r--drivers/net/bonding/bond_options.c8
-rw-r--r--drivers/net/ethernet/google/gve/gve_main.c13
-rw-r--r--drivers/net/ethernet/mediatek/mtk_wed.c2
-rw-r--r--drivers/net/ethernet/mscc/vsc7514_regs.c18
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/dwmac4.h1
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c5
-rw-r--r--drivers/net/ipvlan/ipvlan_core.c6
-rw-r--r--drivers/net/mdio/mdio-mvusb.c11
-rw-r--r--drivers/net/pcs/pcs-xpcs.c2
-rw-r--r--drivers/net/phy/bcm-phy-lib.h5
-rw-r--r--drivers/net/phy/bcm7xxx.c2
-rw-r--r--drivers/net/tap.c4
-rw-r--r--drivers/nvme/host/ioctl.c2
-rw-r--r--drivers/platform/mellanox/mlxbf-tmfifo.c11
-rw-r--r--drivers/platform/x86/hp/hp-wmi.c1
-rw-r--r--drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c6
-rw-r--r--drivers/platform/x86/intel_scu_pcidrv.c1
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c24
-rw-r--r--drivers/platform/x86/touchscreen_dmi.c41
-rw-r--r--drivers/scsi/Kconfig3
-rw-r--r--drivers/scsi/ipr.c788
-rw-r--r--drivers/scsi/ipr.h64
-rw-r--r--drivers/scsi/pm8001/pm8001_hwi.c7
-rw-r--r--drivers/scsi/qedi/qedi_main.c3
-rw-r--r--drivers/scsi/scsi_debug.c22
-rw-r--r--drivers/ufs/core/ufs-mcq.c6
-rw-r--r--fs/afs/dir_edit.c7
-rw-r--r--fs/btrfs/block-rsv.c3
-rw-r--r--fs/btrfs/ctree.c38
-rw-r--r--fs/btrfs/file-item.c5
-rw-r--r--fs/btrfs/ioctl.c4
-rw-r--r--fs/btrfs/super.c7
-rw-r--r--fs/btrfs/volumes.c1
-rw-r--r--fs/btrfs/zoned.c6
-rw-r--r--fs/cifs/cifs_debug.c7
-rw-r--r--fs/cifs/cifs_debug.h12
-rw-r--r--fs/cifs/cifsfs.c14
-rw-r--r--fs/cifs/cifsglob.h23
-rw-r--r--fs/cifs/cifsproto.h44
-rw-r--r--fs/cifs/connect.c141
-rw-r--r--fs/cifs/dfs.c137
-rw-r--r--fs/cifs/dfs.h13
-rw-r--r--fs/cifs/dfs_cache.c133
-rw-r--r--fs/cifs/dfs_cache.h9
-rw-r--r--fs/cifs/ioctl.c2
-rw-r--r--fs/cifs/sess.c7
-rw-r--r--fs/cifs/smb2pdu.c21
-rw-r--r--fs/fs-writeback.c2
-rw-r--r--fs/gfs2/super.c8
-rw-r--r--fs/ksmbd/auth.c19
-rw-r--r--fs/ksmbd/connection.c68
-rw-r--r--fs/ksmbd/connection.h58
-rw-r--r--fs/ksmbd/mgmt/tree_connect.c13
-rw-r--r--fs/ksmbd/mgmt/tree_connect.h3
-rw-r--r--fs/ksmbd/mgmt/user_session.c81
-rw-r--r--fs/ksmbd/mgmt/user_session.h1
-rw-r--r--fs/ksmbd/server.c4
-rw-r--r--fs/ksmbd/smb2pdu.c109
-rw-r--r--fs/ksmbd/smb2pdu.h18
-rw-r--r--fs/ksmbd/transport_tcp.c2
-rw-r--r--fs/nfs/dir.c4
-rw-r--r--fs/nilfs2/bmap.c16
-rw-r--r--fs/nilfs2/segment.c5
-rw-r--r--fs/notify/inotify/inotify_fsnotify.c11
-rw-r--r--fs/pipe.c3
-rw-r--r--fs/smbfs_common/smb2pdu.h20
-rw-r--r--fs/splice.c34
-rw-r--r--include/dt-bindings/gce/mediatek,mt6795-gce.h123
-rw-r--r--include/linux/blkdev.h3
-rw-r--r--include/linux/dim.h3
-rw-r--r--include/linux/if_vlan.h17
-rw-r--r--include/linux/io_uring.h7
-rw-r--r--include/linux/mailbox_client.h1
-rw-r--r--include/net/bonding.h2
-rw-r--r--include/net/sock.h2
-rw-r--r--include/uapi/linux/nbd.h25
-rw-r--r--io_uring/io_uring.h10
-rw-r--r--io_uring/opdef.c2
-rw-r--r--io_uring/rsrc.c7
-rw-r--r--io_uring/uring_cmd.c12
-rw-r--r--io_uring/uring_cmd.h8
-rw-r--r--lib/debugobjects.c21
-rw-r--r--lib/dim/dim.c5
-rw-r--r--lib/dim/net_dim.c3
-rw-r--r--lib/dim/rdma_dim.c3