Merge 5.4-rc7 into char-misc-next

We need the char/misc driver fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2026-10-16 22:39:48 +00:00 · 2019-11-11 06:24:30 +01:00 · 2019-11-11 06:24:30 +01:00 · 01b59c763f
commit 01b59c763f
parent a61ead03a6 31f4f5b495
691 changed files with 9416 additions and 3228 deletions
--- a/include/asm-generic/vdso/vsyscall.h
+++ b/include/asm-generic/vdso/vsyscall.h
--- a/include/drm/drm_gem_shmem_helper.h
+++ b/include/drm/drm_gem_shmem_helper.h
--- a/include/drm/drm_self_refresh_helper.h
+++ b/include/drm/drm_self_refresh_helper.h
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/platform_data/dma-imx-sdma.h
+++ b/include/linux/platform_data/dma-imx-sdma.h
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
--- a/include/linux/reset-controller.h
+++ b/include/linux/reset-controller.h
--- a/include/linux/reset.h
+++ b/include/linux/reset.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/skmsg.h
+++ b/include/linux/skmsg.h
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
--- a/include/linux/sunrpc/bc_xprt.h
+++ b/include/linux/sunrpc/bc_xprt.h
--- a/include/linux/virtio_vsock.h
+++ b/include/linux/virtio_vsock.h
--- a/include/net/bonding.h
+++ b/include/net/bonding.h
--- a/include/net/busy_poll.h
+++ b/include/net/busy_poll.h
--- a/include/net/flow_dissector.h
+++ b/include/net/flow_dissector.h
--- a/include/net/fq.h
+++ b/include/net/fq.h
--- a/include/net/fq_impl.h
+++ b/include/net/fq_impl.h
--- a/include/net/hwbm.h
+++ b/include/net/hwbm.h
--- a/include/net/ip.h
+++ b/include/net/ip.h
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/net/tls.h
+++ b/include/net/tls.h
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
--- a/include/uapi/linux/can.h
+++ b/include/uapi/linux/can.h
--- a/include/uapi/linux/can/bcm.h
+++ b/include/uapi/linux/can/bcm.h
--- a/include/uapi/linux/can/error.h
+++ b/include/uapi/linux/can/error.h
--- a/include/uapi/linux/can/gw.h
+++ b/include/uapi/linux/can/gw.h
--- a/include/uapi/linux/can/j1939.h
+++ b/include/uapi/linux/can/j1939.h
--- a/include/uapi/linux/can/netlink.h
+++ b/include/uapi/linux/can/netlink.h
--- a/include/uapi/linux/can/raw.h
+++ b/include/uapi/linux/can/raw.h
--- a/include/uapi/linux/can/vxcan.h
+++ b/include/uapi/linux/can/vxcan.h
--- a/include/uapi/linux/fuse.h
+++ b/include/uapi/linux/fuse.h
--- a/include/uapi/linux/nvme_ioctl.h
+++ b/include/uapi/linux/nvme_ioctl.h
--- a/include/uapi/linux/sched.h
+++ b/include/uapi/linux/sched.h