Revert incorrect TM Branching Stage 4 merges am: df9b86f15b am: 9954c73afc

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/17920100

Change-Id: Ic4a4ddc5060932526da82798a90902350e2eaa4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/ac97_bus.ko b/ac97_bus.ko
index 0f9d941..fb443b2 100644
--- a/ac97_bus.ko
+++ b/ac97_bus.ko
Binary files differ
diff --git a/deferred-free-helper.ko b/deferred-free-helper.ko
index df966aa..8fbcea9 100644
--- a/deferred-free-helper.ko
+++ b/deferred-free-helper.ko
Binary files differ
diff --git a/dummy-cpufreq.ko b/dummy-cpufreq.ko
index 7de5a6b..eae19cd 100644
--- a/dummy-cpufreq.ko
+++ b/dummy-cpufreq.ko
Binary files differ
diff --git a/failover.ko b/failover.ko
index c710e9f..0ded2b0 100644
--- a/failover.ko
+++ b/failover.ko
Binary files differ
diff --git a/gnss-cmdline.ko b/gnss-cmdline.ko
index e765673..30944ff 100644
--- a/gnss-cmdline.ko
+++ b/gnss-cmdline.ko
Binary files differ
diff --git a/gnss-serial.ko b/gnss-serial.ko
index dde44ee..e86f2b7 100644
--- a/gnss-serial.ko
+++ b/gnss-serial.ko
Binary files differ
diff --git a/goldfish_address_space.ko b/goldfish_address_space.ko
index 237027d..edfdc1c 100644
--- a/goldfish_address_space.ko
+++ b/goldfish_address_space.ko
Binary files differ
diff --git a/goldfish_battery.ko b/goldfish_battery.ko
index 62f5be7..d8b8505 100644
--- a/goldfish_battery.ko
+++ b/goldfish_battery.ko
Binary files differ
diff --git a/goldfish_pipe.ko b/goldfish_pipe.ko
index 12de4af..ab81d88 100644
--- a/goldfish_pipe.ko
+++ b/goldfish_pipe.ko
Binary files differ
diff --git a/goldfish_sync.ko b/goldfish_sync.ko
index 448d786..291bdf9 100644
--- a/goldfish_sync.ko
+++ b/goldfish_sync.ko
Binary files differ
diff --git a/hci_vhci.ko b/hci_vhci.ko
index ddabcf0..106e9da 100644
--- a/hci_vhci.ko
+++ b/hci_vhci.ko
Binary files differ
diff --git a/initramfs.img b/initramfs.img
index 66b0480..a41e783 100644
--- a/initramfs.img
+++ b/initramfs.img
Binary files differ
diff --git a/lzo-rle.ko b/lzo-rle.ko
index f75d6ac..7851ef9 100644
--- a/lzo-rle.ko
+++ b/lzo-rle.ko
Binary files differ
diff --git a/lzo.ko b/lzo.ko
index 80bf298..b9ba269 100644
--- a/lzo.ko
+++ b/lzo.ko
Binary files differ
diff --git a/mac80211_hwsim.ko b/mac80211_hwsim.ko
index 118d008..021d8b2 100644
--- a/mac80211_hwsim.ko
+++ b/mac80211_hwsim.ko
Binary files differ
diff --git a/md-mod.ko b/md-mod.ko
index 51bbf86..fb12082 100644
--- a/md-mod.ko
+++ b/md-mod.ko
Binary files differ
diff --git a/nd_virtio.ko b/nd_virtio.ko
index f3770a6..ea040d6 100644
--- a/nd_virtio.ko
+++ b/nd_virtio.ko
Binary files differ
diff --git a/net_failover.ko b/net_failover.ko
index 55adaca..4588525 100644
--- a/net_failover.ko
+++ b/net_failover.ko
Binary files differ
diff --git a/page_pool.ko b/page_pool.ko
index 25bcb37..48ed00e 100644
--- a/page_pool.ko
+++ b/page_pool.ko
Binary files differ
diff --git a/pulse8-cec.ko b/pulse8-cec.ko
index aab28b3..084ccef 100644
--- a/pulse8-cec.ko
+++ b/pulse8-cec.ko
Binary files differ
diff --git a/rtc-test.ko b/rtc-test.ko
index 1824ca6..a5dad32 100644
--- a/rtc-test.ko
+++ b/rtc-test.ko
Binary files differ
diff --git a/snd-ac97-codec.ko b/snd-ac97-codec.ko
index 1556232..4e429f6 100644
--- a/snd-ac97-codec.ko
+++ b/snd-ac97-codec.ko
Binary files differ
diff --git a/snd-hda-codec-generic.ko b/snd-hda-codec-generic.ko
index 6966227..e2bed68 100644
--- a/snd-hda-codec-generic.ko
+++ b/snd-hda-codec-generic.ko
Binary files differ
diff --git a/snd-hda-codec-realtek.ko b/snd-hda-codec-realtek.ko
index 678d7df..6fedb64 100644
--- a/snd-hda-codec-realtek.ko
+++ b/snd-hda-codec-realtek.ko
Binary files differ
diff --git a/snd-hda-codec.ko b/snd-hda-codec.ko
index 82c5ccb..d087be5 100644
--- a/snd-hda-codec.ko
+++ b/snd-hda-codec.ko
Binary files differ
diff --git a/snd-hda-core.ko b/snd-hda-core.ko
index c040528..fdbc01e 100644
--- a/snd-hda-core.ko
+++ b/snd-hda-core.ko
Binary files differ
diff --git a/snd-hda-intel.ko b/snd-hda-intel.ko
index 12af020..b8e226c 100644
--- a/snd-hda-intel.ko
+++ b/snd-hda-intel.ko
Binary files differ
diff --git a/snd-intel8x0.ko b/snd-intel8x0.ko
index 11085a8..4f8a0ff 100644
--- a/snd-intel8x0.ko
+++ b/snd-intel8x0.ko
Binary files differ
diff --git a/system_heap.ko b/system_heap.ko
index e9b8a07..0b93049 100644
--- a/system_heap.ko
+++ b/system_heap.ko
Binary files differ
diff --git a/test_meminit.ko b/test_meminit.ko
index d156263..07e9669 100644
--- a/test_meminit.ko
+++ b/test_meminit.ko
Binary files differ
diff --git a/test_stackinit.ko b/test_stackinit.ko
index 43a2483..6ef0071 100644
--- a/test_stackinit.ko
+++ b/test_stackinit.ko
Binary files differ
diff --git a/tpm.ko b/tpm.ko
index 3db03ce..026db71 100644
--- a/tpm.ko
+++ b/tpm.ko
Binary files differ
diff --git a/tpm_vtpm_proxy.ko b/tpm_vtpm_proxy.ko
index 78e7453..b66041b 100644
--- a/tpm_vtpm_proxy.ko
+++ b/tpm_vtpm_proxy.ko
Binary files differ
diff --git a/virt_wifi.ko b/virt_wifi.ko
index cd4274a..93777a1 100644
--- a/virt_wifi.ko
+++ b/virt_wifi.ko
Binary files differ
diff --git a/virt_wifi_sim.ko b/virt_wifi_sim.ko
index 0965ca1..4bab2df 100644
--- a/virt_wifi_sim.ko
+++ b/virt_wifi_sim.ko
Binary files differ
diff --git a/virtio-gpu.ko b/virtio-gpu.ko
index 3a844d3..14b8690 100644
--- a/virtio-gpu.ko
+++ b/virtio-gpu.ko
Binary files differ
diff --git a/virtio-rng.ko b/virtio-rng.ko
index 880d899..f5f5dd2 100644
--- a/virtio-rng.ko
+++ b/virtio-rng.ko
Binary files differ
diff --git a/virtio_balloon.ko b/virtio_balloon.ko
index b08b1b4..c8ed8a4 100644
--- a/virtio_balloon.ko
+++ b/virtio_balloon.ko
Binary files differ
diff --git a/virtio_blk.ko b/virtio_blk.ko
index d3700f0..6c1b3a5 100644
--- a/virtio_blk.ko
+++ b/virtio_blk.ko
Binary files differ
diff --git a/virtio_console.ko b/virtio_console.ko
index c31b3a9..aa4fb57 100644
--- a/virtio_console.ko
+++ b/virtio_console.ko
Binary files differ
diff --git a/virtio_input.ko b/virtio_input.ko
index 70dcbb7..ddfe629 100644
--- a/virtio_input.ko
+++ b/virtio_input.ko
Binary files differ
diff --git a/virtio_mmio.ko b/virtio_mmio.ko
index 653cb23..997b1a4 100644
--- a/virtio_mmio.ko
+++ b/virtio_mmio.ko
Binary files differ
diff --git a/virtio_net.ko b/virtio_net.ko
index 24c473b..1375349 100644
--- a/virtio_net.ko
+++ b/virtio_net.ko
Binary files differ
diff --git a/virtio_pci.ko b/virtio_pci.ko
index 2d9773c..d725d19 100644
--- a/virtio_pci.ko
+++ b/virtio_pci.ko
Binary files differ
diff --git a/virtio_pmem.ko b/virtio_pmem.ko
index a569d7f..e74b6ce 100644
--- a/virtio_pmem.ko
+++ b/virtio_pmem.ko
Binary files differ
diff --git a/vmw_vsock_virtio_transport.ko b/vmw_vsock_virtio_transport.ko
index 0c3c2b1..c77a89e 100644
--- a/vmw_vsock_virtio_transport.ko
+++ b/vmw_vsock_virtio_transport.ko
Binary files differ
diff --git a/zram.ko b/zram.ko
index 1fa524e..3c9af58 100644
--- a/zram.ko
+++ b/zram.ko
Binary files differ
diff --git a/zsmalloc.ko b/zsmalloc.ko
index 4c6ac09..19ac4e4 100644
--- a/zsmalloc.ko
+++ b/zsmalloc.ko
Binary files differ