kernel: drm/vc4: Notify firmware when use of simple framebuffer is co…

…mplete See: raspberrypi/linux#4421 kernel: Fix CPU hang when using CEC while HDMI output is disabled See: raspberrypi/linux#4418 kernel: drm/vc4: hdmi: Add missing clk_disable_unprepare on error path See: raspberrypi/linux#4426 kernel: staging: vc04_services: isp: Set the YUV420/YVU420 format stride to 64 bytes See: raspberrypi/linux#4419 kernel: media: i2c: imx477: Add support for imx378 as a compatible sensor See: raspberrypi/linux#4420
Hexxeh · Jul 2, 2021 · f29ab05 · f29ab05
1 parent 48aef33
commit f29ab05
Show file tree

Hide file tree

Showing 74 changed files with 56 additions and 6 deletions.
diff --git a/Module8.symvers b/Module8.symvers
@@ -10564,6 +10564,7 @@
 0x96deea0d	rt2800_watchdog	drivers/net/wireless/ralink/rt2x00/rt2800lib	EXPORT_SYMBOL_GPL	
 0x526e04c1	drm_gem_dmabuf_vmap	drivers/gpu/drm/drm	EXPORT_SYMBOL	
 0x3fb4d161	snd_seq_kernel_client_dispatch	sound/core/seq/snd-seq	EXPORT_SYMBOL	
+0x3130503d	tap_destroy_cdev	drivers/net/tap	EXPORT_SYMBOL_GPL	
 0x182bbff9	drm_gem_cma_mmap	drivers/gpu/drm/drm	EXPORT_SYMBOL_GPL	
 0x94e481cf	ZSTD_adjustCParams	lib/zstd/zstd_compress	EXPORT_SYMBOL	
 0x5b606b63	drm_object_property_get_value	drivers/gpu/drm/drm	EXPORT_SYMBOL	
@@ -10839,6 +10840,7 @@
 0x5d287fa9	__media_remove_intf_link	drivers/media/mc/mc	EXPORT_SYMBOL_GPL	
 0x55198793	dib7000p_attach	drivers/media/dvb-frontends/dib7000p	EXPORT_SYMBOL	
 0xf72d18bb	dib7000m_attach	drivers/media/dvb-frontends/dib7000m	EXPORT_SYMBOL	
+0xbfebaea7	tap_create_cdev	drivers/net/tap	EXPORT_SYMBOL_GPL	
 0x82e134f7	mt76x02_eeprom_parse_hw_cap	drivers/net/wireless/mediatek/mt76/mt76x02-lib	EXPORT_SYMBOL_GPL	
 0xfd5cf08c	drm_gem_dmabuf_export	drivers/gpu/drm/drm	EXPORT_SYMBOL	
 0x079ec30b	l2cap_chan_del	net/bluetooth/bluetooth	EXPORT_SYMBOL_GPL	
@@ -11892,6 +11894,7 @@
 0x454f7dad	snd_rawmidi_set_ops	sound/core/snd-rawmidi	EXPORT_SYMBOL	
 0xd53fa4d7	_snd_pcm_stream_lock_irqsave	sound/core/snd-pcm	EXPORT_SYMBOL_GPL	
 0xb930f84c	fbtft_init_display	drivers/staging/fbtft/fbtft	EXPORT_SYMBOL	
+0xc5b9bb5d	tap_get_ptr_ring	drivers/net/tap	EXPORT_SYMBOL_GPL	
 0x3bb3caad	rtl92c_phy_set_bw_mode	drivers/net/wireless/realtek/rtlwifi/rtl8192c/rtl8192c-common	EXPORT_SYMBOL	
 0x0281f28e	crypto_sha256_finup	crypto/sha256_generic	EXPORT_SYMBOL	
 0x80aa39ae	pingv6_prot	net/ipv6/ipv6	EXPORT_SYMBOL_GPL	
@@ -12190,6 +12193,7 @@
 0xb75bc9fd	wimax_state_get	net/wimax/wimax	EXPORT_SYMBOL_GPL	
 0x9274119d	snd_pcm_fill_iec958_consumer	sound/core/snd-pcm	EXPORT_SYMBOL	
 0xd1975e13	vhost_dev_init	drivers/vhost/vhost	EXPORT_SYMBOL_GPL	
+0xbc46df5e	tap_handle_frame	drivers/net/tap	EXPORT_SYMBOL_GPL	
 0x8b22342a	ath9k_hw_gettsf32	drivers/net/wireless/ath/ath9k/ath9k_hw	EXPORT_SYMBOL	
 0xdc512134	backlight_register_notifier	drivers/video/backlight/backlight	EXPORT_SYMBOL	
 0x39f4e182	asoc_simple_canonicalize_platform	sound/soc/generic/snd-soc-simple-card-utils	EXPORT_SYMBOL_GPL	
@@ -12225,6 +12229,7 @@
 0xaf0847f0	nf_conntrack_locks	net/netfilter/nf_conntrack	EXPORT_SYMBOL_GPL	
 0xc8d30799	iio_read_channel_offset	drivers/iio/industrialio	EXPORT_SYMBOL_GPL	
 0x6bfe26fd	ad714x_enable	drivers/input/misc/ad714x	EXPORT_SYMBOL	
+0xcf0b586f	tap_get_socket	drivers/net/tap	EXPORT_SYMBOL_GPL	
 0x7f16cd1e	ath_hw_setbssidmask	drivers/net/wireless/ath/ath	EXPORT_SYMBOL	
 0x85430a76	nft_validate_register_load	net/netfilter/nf_tables	EXPORT_SYMBOL_GPL	
 0xeece0ffe	btintel_set_debug_features	drivers/bluetooth/btintel	EXPORT_SYMBOL_GPL	
@@ -12461,6 +12466,7 @@
 0xd1e246a2	xt_compat_unlock	net/netfilter/x_tables	EXPORT_SYMBOL_GPL	
 0xbe64d789	usb_wwan_tiocmset	drivers/usb/serial/usb_wwan	EXPORT_SYMBOL	
 0x3c12f700	usb_wwan_tiocmget	drivers/usb/serial/usb_wwan	EXPORT_SYMBOL	
+0x10611576	tap_free_minor	drivers/net/tap	EXPORT_SYMBOL_GPL	
 0xa130e9c6	iscsi_eh_device_reset	drivers/scsi/libiscsi	EXPORT_SYMBOL_GPL	
 0xa03d962e	__drm_atomic_helper_bridge_reset	drivers/gpu/drm/drm_kms_helper	EXPORT_SYMBOL	
 0xd9e0f005	drm_dp_vsc_sdp_log	drivers/gpu/drm/drm_kms_helper	EXPORT_SYMBOL	
@@ -12621,6 +12627,7 @@
 0x1ce2497f	reg_query_regdb_wmm	net/wireless/cfg80211	EXPORT_SYMBOL	
 0xf5fc6e76	fbtft_write_spi	drivers/staging/fbtft/fbtft	EXPORT_SYMBOL	
 0xc7b45aa4	__SCK__tp_func_vb2_buf_done	drivers/media/common/videobuf2/videobuf2-common	EXPORT_SYMBOL_GPL	
+0x31aa1033	tap_get_minor	drivers/net/tap	EXPORT_SYMBOL_GPL	
 0x48a43801	bt_debugfs	net/bluetooth/bluetooth	EXPORT_SYMBOL_GPL	
 0x5e986cba	wm_adsp_compr_trigger	sound/soc/codecs/snd-soc-wm-adsp	EXPORT_SYMBOL_GPL	
 0x1e0f0980	ata_bmdma_irq_clear	drivers/ata/libata	EXPORT_SYMBOL_GPL	
@@ -12759,6 +12766,7 @@
 0x44fbc9a3	nf_ct_gre_keymap_add	net/netfilter/nf_conntrack	EXPORT_SYMBOL_GPL	
 0xec93b1ce	tm6000_init_digital_mode	drivers/media/usb/tm6000/tm6000	EXPORT_SYMBOL	
 0x86399e09	vb2_request_validate	drivers/media/common/videobuf2/videobuf2-v4l2	EXPORT_SYMBOL_GPL	
+0x5b65f8d7	tap_del_queues	drivers/net/tap	EXPORT_SYMBOL_GPL	
 0xbd3fda1e	xt_check_target	net/netfilter/x_tables	EXPORT_SYMBOL_GPL	
 0xe071a60e	ascot2e_attach	drivers/media/dvb-frontends/ascot2e	EXPORT_SYMBOL	
 0xad29e512	rt2x00queue_pause_queue	drivers/net/wireless/ralink/rt2x00/rt2x00lib	EXPORT_SYMBOL_GPL	
@@ -15453,6 +15461,7 @@
 0xa8e7c8b7	ath9k_hw_disable	drivers/net/wireless/ath/ath9k/ath9k_hw	EXPORT_SYMBOL	
 0x5cf0d0bb	dm_tm_create_with_sm	drivers/md/persistent-data/dm-persistent-data	EXPORT_SYMBOL_GPL	
 0x861834d2	v4l2_event_unsubscribe_all	drivers/media/v4l2-core/videodev	EXPORT_SYMBOL_GPL	
+0x28d141c6	tap_queue_resize	drivers/net/tap	EXPORT_SYMBOL_GPL	
 0x97b49a55	ath9k_hw_resettxqueue	drivers/net/wireless/ath/ath9k/ath9k_hw	EXPORT_SYMBOL	
 0xf09de93a	iscsi_session_failure	drivers/scsi/libiscsi	EXPORT_SYMBOL_GPL	
 0x595f551b	drm_gem_shmem_create	drivers/gpu/drm/drm	EXPORT_SYMBOL_GPL	

diff --git a/bcm2708-rpi-b-plus.dtb b/bcm2708-rpi-b-plus.dtb
diff --git a/bcm2708-rpi-b-rev1.dtb b/bcm2708-rpi-b-rev1.dtb
diff --git a/bcm2708-rpi-b.dtb b/bcm2708-rpi-b.dtb
diff --git a/bcm2708-rpi-cm.dtb b/bcm2708-rpi-cm.dtb
diff --git a/bcm2708-rpi-zero-w.dtb b/bcm2708-rpi-zero-w.dtb
diff --git a/bcm2708-rpi-zero.dtb b/bcm2708-rpi-zero.dtb
diff --git a/bcm2709-rpi-2-b.dtb b/bcm2709-rpi-2-b.dtb
diff --git a/bcm2710-rpi-2-b.dtb b/bcm2710-rpi-2-b.dtb
diff --git a/bcm2710-rpi-3-b-plus.dtb b/bcm2710-rpi-3-b-plus.dtb
diff --git a/bcm2710-rpi-3-b.dtb b/bcm2710-rpi-3-b.dtb
diff --git a/bcm2710-rpi-cm3.dtb b/bcm2710-rpi-cm3.dtb
diff --git a/bcm2711-rpi-4-b.dtb b/bcm2711-rpi-4-b.dtb
diff --git a/bcm2711-rpi-400.dtb b/bcm2711-rpi-400.dtb
diff --git a/bcm2711-rpi-cm4.dtb b/bcm2711-rpi-cm4.dtb
diff --git a/git_hash b/git_hash
@@ -1 +1 @@
-9b672c5441497337f286686122a6f17fd7985cc2
+4afd064509b23882268922824edc5b391a1ea55d
diff --git a/kernel.img b/kernel.img
diff --git a/kernel7.img b/kernel7.img
diff --git a/kernel7l.img b/kernel7l.img
diff --git a/kernel8.img b/kernel8.img
diff --git a/modules/5.10.46+/kernel/drivers/gpu/drm/vc4/vc4.ko b/modules/5.10.46+/kernel/drivers/gpu/drm/vc4/vc4.ko
diff --git a/modules/5.10.46+/kernel/drivers/hwmon/raspberrypi-hwmon.ko b/modules/5.10.46+/kernel/drivers/hwmon/raspberrypi-hwmon.ko
diff --git a/modules/5.10.46+/kernel/drivers/hwmon/rpi-poe-fan.ko b/modules/5.10.46+/kernel/drivers/hwmon/rpi-poe-fan.ko
diff --git a/modules/5.10.46+/kernel/drivers/media/i2c/imx477.ko b/modules/5.10.46+/kernel/drivers/media/i2c/imx477.ko
diff --git a/modules/5.10.46+/kernel/drivers/perf/raspberrypi_axi_monitor.ko b/modules/5.10.46+/kernel/drivers/perf/raspberrypi_axi_monitor.ko
diff --git a/modules/5.10.46+/kernel/drivers/staging/vc04_services/bcm2835-audio/snd-bcm2835.ko b/modules/5.10.46+/kernel/drivers/staging/vc04_services/bcm2835-audio/snd-bcm2835.ko
diff --git a/modules/5.10.46+/kernel/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp.ko b/modules/5.10.46+/kernel/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp.ko
diff --git a/modules/5.10.46+/modules.alias b/modules/5.10.46+/modules.alias
@@ -7255,6 +7255,8 @@ alias of:N*T*Csony,imx290-monoC* imx290
 alias of:N*T*Csony,imx290-mono imx290
 alias of:N*T*Csony,imx290C* imx290
 alias of:N*T*Csony,imx290 imx290
+alias of:N*T*Csony,imx378C* imx477
+alias of:N*T*Csony,imx378 imx477
 alias of:N*T*Csony,imx477C* imx477
 alias of:N*T*Csony,imx477 imx477
 alias spi:msi001 msi001

diff --git a/modules/5.10.46+/modules.alias.bin b/modules/5.10.46+/modules.alias.bin
diff --git a/modules/5.10.46-v7+/kernel/drivers/gpu/drm/vc4/vc4.ko b/modules/5.10.46-v7+/kernel/drivers/gpu/drm/vc4/vc4.ko
diff --git a/modules/5.10.46-v7+/kernel/drivers/hwmon/raspberrypi-hwmon.ko b/modules/5.10.46-v7+/kernel/drivers/hwmon/raspberrypi-hwmon.ko
diff --git a/modules/5.10.46-v7+/kernel/drivers/hwmon/rpi-poe-fan.ko b/modules/5.10.46-v7+/kernel/drivers/hwmon/rpi-poe-fan.ko
diff --git a/modules/5.10.46-v7+/kernel/drivers/media/i2c/imx477.ko b/modules/5.10.46-v7+/kernel/drivers/media/i2c/imx477.ko
diff --git a/modules/5.10.46-v7+/kernel/drivers/perf/raspberrypi_axi_monitor.ko b/modules/5.10.46-v7+/kernel/drivers/perf/raspberrypi_axi_monitor.ko
diff --git a/modules/5.10.46-v7+/kernel/drivers/staging/vc04_services/bcm2835-audio/snd-bcm2835.ko b/modules/5.10.46-v7+/kernel/drivers/staging/vc04_services/bcm2835-audio/snd-bcm2835.ko
diff --git a/modules/5.10.46-v7+/kernel/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp.ko b/modules/5.10.46-v7+/kernel/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp.ko
diff --git a/modules/5.10.46-v7+/modules.alias b/modules/5.10.46-v7+/modules.alias
@@ -7246,6 +7246,8 @@ alias of:N*T*Csony,imx290-monoC* imx290
 alias of:N*T*Csony,imx290-mono imx290
 alias of:N*T*Csony,imx290C* imx290
 alias of:N*T*Csony,imx290 imx290
+alias of:N*T*Csony,imx378C* imx477
+alias of:N*T*Csony,imx378 imx477
 alias of:N*T*Csony,imx477C* imx477
 alias of:N*T*Csony,imx477 imx477
 alias spi:msi001 msi001

diff --git a/modules/5.10.46-v7+/modules.alias.bin b/modules/5.10.46-v7+/modules.alias.bin
diff --git a/modules/5.10.46-v7l+/kernel/drivers/gpu/drm/vc4/vc4.ko b/modules/5.10.46-v7l+/kernel/drivers/gpu/drm/vc4/vc4.ko
diff --git a/modules/5.10.46-v7l+/kernel/drivers/hwmon/raspberrypi-hwmon.ko b/modules/5.10.46-v7l+/kernel/drivers/hwmon/raspberrypi-hwmon.ko
diff --git a/modules/5.10.46-v7l+/kernel/drivers/hwmon/rpi-poe-fan.ko b/modules/5.10.46-v7l+/kernel/drivers/hwmon/rpi-poe-fan.ko
diff --git a/modules/5.10.46-v7l+/kernel/drivers/media/i2c/imx477.ko b/modules/5.10.46-v7l+/kernel/drivers/media/i2c/imx477.ko
diff --git a/modules/5.10.46-v7l+/kernel/drivers/perf/raspberrypi_axi_monitor.ko b/modules/5.10.46-v7l+/kernel/drivers/perf/raspberrypi_axi_monitor.ko
diff --git a/modules/5.10.46-v7l+/kernel/drivers/staging/vc04_services/bcm2835-audio/snd-bcm2835.ko b/modules/5.10.46-v7l+/kernel/drivers/staging/vc04_services/bcm2835-audio/snd-bcm2835.ko
diff --git a/modules/5.10.46-v7l+/kernel/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp.ko b/modules/5.10.46-v7l+/kernel/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp.ko
diff --git a/modules/5.10.46-v7l+/modules.alias b/modules/5.10.46-v7l+/modules.alias
@@ -7335,6 +7335,8 @@ alias of:N*T*Csony,imx290-monoC* imx290
 alias of:N*T*Csony,imx290-mono imx290
 alias of:N*T*Csony,imx290C* imx290
 alias of:N*T*Csony,imx290 imx290
+alias of:N*T*Csony,imx378C* imx477
+alias of:N*T*Csony,imx378 imx477
 alias of:N*T*Csony,imx477C* imx477
 alias of:N*T*Csony,imx477 imx477
 alias spi:msi001 msi001

diff --git a/modules/5.10.46-v7l+/modules.alias.bin b/modules/5.10.46-v7l+/modules.alias.bin
diff --git a/modules/5.10.46-v8+/kernel/drivers/gpu/drm/vc4/vc4.ko b/modules/5.10.46-v8+/kernel/drivers/gpu/drm/vc4/vc4.ko
diff --git a/modules/5.10.46-v8+/kernel/drivers/hwmon/raspberrypi-hwmon.ko b/modules/5.10.46-v8+/kernel/drivers/hwmon/raspberrypi-hwmon.ko
diff --git a/modules/5.10.46-v8+/kernel/drivers/hwmon/rpi-poe-fan.ko b/modules/5.10.46-v8+/kernel/drivers/hwmon/rpi-poe-fan.ko
diff --git a/modules/5.10.46-v8+/kernel/drivers/media/i2c/imx477.ko b/modules/5.10.46-v8+/kernel/drivers/media/i2c/imx477.ko
diff --git a/modules/5.10.46-v8+/kernel/drivers/net/macvtap.ko b/modules/5.10.46-v8+/kernel/drivers/net/macvtap.ko
diff --git a/modules/5.10.46-v8+/kernel/drivers/net/tap.ko b/modules/5.10.46-v8+/kernel/drivers/net/tap.ko
diff --git a/modules/5.10.46-v8+/kernel/drivers/perf/raspberrypi_axi_monitor.ko b/modules/5.10.46-v8+/kernel/drivers/perf/raspberrypi_axi_monitor.ko
diff --git a/modules/5.10.46-v8+/kernel/drivers/staging/vc04_services/bcm2835-audio/snd-bcm2835.ko b/modules/5.10.46-v8+/kernel/drivers/staging/vc04_services/bcm2835-audio/snd-bcm2835.ko
diff --git a/modules/5.10.46-v8+/kernel/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp.ko b/modules/5.10.46-v8+/kernel/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp.ko
diff --git a/modules/5.10.46-v8+/kernel/drivers/vhost/vhost_net.ko b/modules/5.10.46-v8+/kernel/drivers/vhost/vhost_net.ko
diff --git a/modules/5.10.46-v8+/kernel/kernel/configs.ko b/modules/5.10.46-v8+/kernel/kernel/configs.ko
diff --git a/modules/5.10.46-v8+/modules.alias b/modules/5.10.46-v8+/modules.alias
@@ -2900,6 +2900,7 @@ alias net-pf-16-proto-16-family-wireguard wireguard
 alias rtnl-link-wireguard wireguard
 alias rtnl-link-ifb ifb
 alias rtnl-link-macvlan macvlan
+alias rtnl-link-macvtap macvtap
 alias devname:net/tun tun
 alias char-major-10-200 tun
 alias rtnl-link-veth veth
@@ -7330,6 +7331,8 @@ alias of:N*T*Csony,imx290-monoC* imx290
 alias of:N*T*Csony,imx290-mono imx290
 alias of:N*T*Csony,imx290C* imx290
 alias of:N*T*Csony,imx290 imx290
+alias of:N*T*Csony,imx378C* imx477
+alias of:N*T*Csony,imx378 imx477
 alias of:N*T*Csony,imx477C* imx477
 alias of:N*T*Csony,imx477 imx477
 alias spi:msi001 msi001

diff --git a/modules/5.10.46-v8+/modules.alias.bin b/modules/5.10.46-v8+/modules.alias.bin
diff --git a/modules/5.10.46-v8+/modules.dep b/modules/5.10.46-v8+/modules.dep
@@ -326,8 +326,10 @@ kernel/drivers/net/dummy.ko:
 kernel/drivers/net/wireguard/wireguard.ko: kernel/lib/crypto/libchacha20poly1305.ko kernel/arch/arm64/crypto/chacha-neon.ko kernel/arch/arm64/crypto/poly1305-neon.ko kernel/net/ipv6/ip6_udp_tunnel.ko kernel/net/ipv4/udp_tunnel.ko kernel/lib/crypto/libcurve25519-generic.ko kernel/lib/crypto/libblake2s.ko kernel/lib/crypto/libblake2s-generic.ko kernel/net/ipv6/ipv6.ko kernel/lib/crypto/libchacha.ko
 kernel/drivers/net/ifb.ko:
 kernel/drivers/net/macvlan.ko:
+kernel/drivers/net/macvtap.ko: kernel/drivers/net/macvlan.ko kernel/drivers/net/tap.ko
 kernel/drivers/net/netconsole.ko:
 kernel/drivers/net/tun.ko:
+kernel/drivers/net/tap.ko:
 kernel/drivers/net/veth.ko:
 kernel/drivers/net/vxlan.ko: kernel/net/ipv6/ip6_udp_tunnel.ko kernel/net/ipv4/udp_tunnel.ko
 kernel/drivers/net/vrf.ko: kernel/net/ipv6/ipv6.ko
@@ -1152,7 +1154,7 @@ kernel/drivers/bluetooth/btbcm.ko: kernel/net/bluetooth/bluetooth.ko kernel/cryp
 kernel/drivers/bluetooth/btrtl.ko: kernel/net/bluetooth/bluetooth.ko kernel/crypto/ecdh_generic.ko kernel/crypto/ecc.ko kernel/net/rfkill/rfkill.ko
 kernel/drivers/ssb/ssb.ko:
 kernel/drivers/bcma/bcma.ko:
-kernel/drivers/vhost/vhost_net.ko: kernel/drivers/net/tun.ko kernel/drivers/vhost/vhost.ko kernel/drivers/vhost/vhost_iotlb.ko
+kernel/drivers/vhost/vhost_net.ko: kernel/drivers/net/tun.ko kernel/drivers/vhost/vhost.ko kernel/drivers/vhost/vhost_iotlb.ko kernel/drivers/net/tap.ko
 kernel/drivers/vhost/vhost.ko: kernel/drivers/vhost/vhost_iotlb.ko
 kernel/drivers/vhost/vhost_iotlb.ko:
 kernel/drivers/iio/adc/mcp320x.ko: kernel/drivers/iio/industrialio.ko

diff --git a/modules/5.10.46-v8+/modules.dep.bin b/modules/5.10.46-v8+/modules.dep.bin
diff --git a/modules/5.10.46-v8+/modules.order b/modules/5.10.46-v8+/modules.order
@@ -326,8 +326,10 @@ kernel/drivers/net/dummy.ko
 kernel/drivers/net/wireguard/wireguard.ko
 kernel/drivers/net/ifb.ko
 kernel/drivers/net/macvlan.ko
+kernel/drivers/net/macvtap.ko
 kernel/drivers/net/netconsole.ko
 kernel/drivers/net/tun.ko
+kernel/drivers/net/tap.ko
 kernel/drivers/net/veth.ko
 kernel/drivers/net/vxlan.ko
 kernel/drivers/net/vrf.ko

diff --git a/modules/5.10.46-v8+/modules.symbols b/modules/5.10.46-v8+/modules.symbols
@@ -617,6 +617,7 @@ alias symbol:efuse_shadow_read rtlwifi
 alias symbol:hostap_80211_rx hostap
 alias symbol:lg2160_attach lg2160
 alias symbol:snd_dmaengine_pcm_pointer_no_residue snd_pcm_dmaengine
+alias symbol:tap_del_queues tap
 alias symbol:drm_client_buffer_vunmap drm
 alias symbol:mlog_not_bits ocfs2_nodemanager
 alias symbol:snd_soc_dapm_del_routes snd_soc_core
@@ -878,6 +879,7 @@ alias symbol:inet6_csk_xmit ipv6
 alias symbol:iscsi_pool_free libiscsi
 alias symbol:md_bitmap_end_sync md_mod
 alias symbol:snd_dmaengine_pcm_pointer snd_pcm_dmaengine
+alias symbol:tap_free_minor tap
 alias symbol:md_done_sync md_mod
 alias symbol:drm_atomic_helper_connector_duplicate_state drm_kms_helper
 alias symbol:snd_pcm_new snd_pcm
@@ -1002,6 +1004,7 @@ alias symbol:channel5g_80m rtlwifi
 alias symbol:nf_nat_snmp_hook nf_conntrack_snmp
 alias symbol:register_atmdevice_notifier atm
 alias symbol:rtl_init_core rtlwifi
+alias symbol:tap_get_minor tap
 alias symbol:btracker_complete dm_cache
 alias symbol:inet6_release ipv6
 alias symbol:snd_timer_global_new snd_timer
@@ -2254,6 +2257,7 @@ alias symbol:p54_free_common p54common
 alias symbol:cast_s4 cast_common
 alias symbol:cfg80211_iftype_allowed cfg80211
 alias symbol:iio_update_buffers industrialio
+alias symbol:tap_handle_frame tap
 alias symbol:ata_sas_port_stop libata
 alias symbol:rfkill_set_sw_state rfkill
 alias symbol:LZ4_compress_fast lz4_compress
@@ -2988,6 +2992,7 @@ alias symbol:drm_panel_add drm
 alias symbol:em28xx_tuner_callback em28xx
 alias symbol:mipi_dbi_command_buf drm_mipi_dbi
 alias symbol:nfnl_acct_overquota nfnetlink_acct
+alias symbol:tap_destroy_cdev tap
 alias symbol:aarp_send_ddp appletalk
 alias symbol:fbtft_init_display fbtft
 alias symbol:v4l2_ctrl_new_custom videodev
@@ -4037,6 +4042,7 @@ alias symbol:snd_soc_component_async_complete snd_soc_core
 alias symbol:xt_tee_enabled x_tables
 alias symbol:v4l2_async_unregister_subdev videodev
 alias symbol:snd_major snd
+alias symbol:tap_queue_resize tap
 alias symbol:iio_device_release_direct_mode industrialio
 alias symbol:mt76x2_eeprom_init mt76x2_common
 alias symbol:v4l2_event_dequeue videodev
@@ -4165,6 +4171,7 @@ alias symbol:drm_property_create_blob drm
 alias symbol:media_remove_intf_link mc
 alias symbol:xt_check_match x_tables
 alias symbol:ip_tunnel_encap_add_ops ip_tunnel
+alias symbol:tap_get_socket tap
 alias symbol:ieee80211_nan_func_match mac80211
 alias symbol:cx24113_agc_callback cx24113
 alias symbol:rt2x00queue_flush_queue rt2x00lib
@@ -5263,6 +5270,7 @@ alias symbol:o2net_register_handler ocfs2_nodemanager
 alias symbol:nft_meta_get_init nf_tables
 alias symbol:snd_soc_component_exit_regmap snd_soc_core
 alias symbol:vhost_add_used_n vhost
+alias symbol:tap_create_cdev tap
 alias symbol:drm_gem_shmem_free_object drm
 alias symbol:hci_mgmt_chan_register bluetooth
 alias symbol:put_mtd_device mtd
@@ -5498,6 +5506,7 @@ alias symbol:rt2x00mac_tx rt2x00lib
 alias symbol:rtl92c_phy_sw_chnl_callback rtl8192c_common
 alias symbol:dm_block_data dm_persistent_data
 alias symbol:iio_read_channel_offset industrialio
+alias symbol:tap_get_ptr_ring tap
 alias symbol:tpg_init v4l2_tpg
 alias symbol:ata_sas_port_start libata
 alias symbol:bcma_chipco_gpio_outen bcma

diff --git a/modules/5.10.46-v8+/modules.symbols.bin b/modules/5.10.46-v8+/modules.symbols.bin
diff --git a/overlays/README b/overlays/README
@@ -1445,6 +1445,8 @@ Params: abx80x                  Select one of the ABx80x family:
 
         ds1339                  Select the DS1339 device
 
+        ds1340                  Select the DS1340 device
+
         ds3231                  Select the DS3231 device
 
         m41t62                  Select the M41T62 device
@@ -1457,14 +1459,22 @@ Params: abx80x                  Select one of the ABx80x family:
 
         pcf2129                 Select the PCF2129 device
 
+        pcf85063                Select the PCF85063 device
+
+        pcf85063a               Select the PCF85063A device
+
         pcf8523                 Select the PCF8523 device
 
+        pcf85363                Select the PCF85363 device
+
         pcf8563                 Select the PCF8563 device
 
         rv1805                  Select the Micro Crystal RV1805 device
 
         rv3028                  Select the Micro Crystal RV3028 device
 
+        sd3078                  Select the ZXW Shenzhen whwave SD3078 device
+
         addr                    Sets the address for the RTC. Note that the
                                 device must be configured to use the specified
                                 address.
@@ -1674,6 +1684,15 @@ Params: 4lane                   Enable 4 CSI2 lanes. This requires a Compute
         mono                    Denote that the module is a mono sensor.
 
 
+Name:   imx378
+Info:   Sony IMX378 camera module.
+        Uses Unicam 1, which is the standard camera connector on most Pi
+        variants.
+Load:   dtoverlay=imx378,<param>=<val>
+Params: rotation                Mounting rotation of the camera sensor (0 or
+                                180, default 180)
+
+
 Name:   imx477
 Info:   Sony IMX477 camera module.
         Uses Unicam 1, which is the standard camera connector on most Pi

diff --git a/overlays/i2c-rtc-gpio.dtbo b/overlays/i2c-rtc-gpio.dtbo
diff --git a/overlays/i2c-rtc.dtbo b/overlays/i2c-rtc.dtbo
diff --git a/overlays/imx378.dtbo b/overlays/imx378.dtbo
diff --git a/overlays/imx477.dtbo b/overlays/imx477.dtbo
diff --git a/uname_string b/uname_string
@@ -1 +1 @@
-Linux version 5.10.46+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1430 Mon Jun 28 17:09:37 BST 2021
+Linux version 5.10.46+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1432 Fri Jul 2 21:15:57 BST 2021
diff --git a/uname_string7 b/uname_string7
@@ -1 +1 @@
-Linux version 5.10.46-v7+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1430 SMP Mon Jun 28 17:12:04 BST 2021
+Linux version 5.10.46-v7+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1432 SMP Fri Jul 2 21:16:37 BST 2021
diff --git a/uname_string7l b/uname_string7l
@@ -1 +1 @@
-Linux version 5.10.46-v7l+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1430 SMP Mon Jun 28 17:14:36 BST 2021
+Linux version 5.10.46-v7l+ (dom@buildbot) (arm-linux-gnueabihf-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1432 SMP Fri Jul 2 21:17:20 BST 2021
diff --git a/uname_string8 b/uname_string8
@@ -1 +1 @@
-Linux version 5.10.46-v8+ (dom@buildbot) (aarch64-linux-gnu-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1430 SMP PREEMPT Mon Jun 28 17:17:17 BST 2021
+Linux version 5.10.46-v8+ (dom@buildbot) (aarch64-linux-gnu-gcc-8 (Ubuntu/Linaro 8.4.0-3ubuntu1) 8.4.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #1432 SMP PREEMPT Fri Jul 2 21:18:07 BST 2021