summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Yepishev <ryepishev@google.com>2022-04-27 07:16:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-27 07:16:39 +0000
commitd39645e2b8d40133c4955a02e115ac660ff5b9ff (patch)
treef8f053e5b264206a3c594e765e6d33aee61b6a14
parent448efcf43ffbe7ebfcd0b21c96d4d761eb38812d (diff)
parent16bea78725745f751483d26656c6258aed325fd8 (diff)
downloadx86-64-d39645e2b8d40133c4955a02e115ac660ff5b9ff.tar.gz
Revert incorrect TM Branching Stage 4 merges am: cb3f6044c1 am: 98d15b15a7 am: 1fca88c97b am: 16bea78725
Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/x86-64/+/17919929 Change-Id: Ied9e7f40ef619440f8bbd8b2b2abd641ea51b076 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--ac97_bus.kobin216552 -> 216480 bytes
-rw-r--r--deferred-free-helper.kobin270344 -> 270344 bytes
-rw-r--r--dummy-cpufreq.kobin125752 -> 125752 bytes
-rw-r--r--failover.kobin341944 -> 340832 bytes
-rw-r--r--gnss-cmdline.kobin193872 -> 193872 bytes
-rw-r--r--gnss-serial.kobin213328 -> 213328 bytes
-rw-r--r--goldfish_address_space.kobin307064 -> 306776 bytes
-rw-r--r--goldfish_battery.kobin216000 -> 216000 bytes
-rw-r--r--goldfish_pipe.kobin590112 -> 590112 bytes
-rw-r--r--goldfish_sync.kobin317920 -> 317920 bytes
-rw-r--r--hci_vhci.kobin446960 -> 445848 bytes
-rw-r--r--initramfs.imgbin940985 -> 940726 bytes
-rw-r--r--lzo-rle.kobin183552 -> 183552 bytes
-rw-r--r--lzo.kobin183416 -> 183416 bytes
-rw-r--r--mac80211_hwsim.kobin937032 -> 935912 bytes
-rw-r--r--md-mod.kobin1560512 -> 1560512 bytes
-rw-r--r--nd_virtio.kobin246056 -> 246056 bytes
-rw-r--r--net_failover.kobin399488 -> 398376 bytes
-rw-r--r--page_pool.kobin293936 -> 293936 bytes
-rw-r--r--pulse8-cec.kobin279952 -> 279952 bytes
-rw-r--r--rtc-test.kobin200120 -> 200120 bytes
-rw-r--r--snd-ac97-codec.kobin1968424 -> 1967912 bytes
-rw-r--r--snd-hda-codec-generic.kobin818576 -> 818496 bytes
-rw-r--r--snd-hda-codec-realtek.kobin919648 -> 919288 bytes
-rw-r--r--snd-hda-codec.kobin2195344 -> 2195120 bytes
-rw-r--r--snd-hda-core.kobin2100024 -> 2099616 bytes
-rw-r--r--snd-hda-intel.kobin493680 -> 493312 bytes
-rw-r--r--snd-intel-nhlt.kobin198544 -> 198544 bytes
-rw-r--r--snd-intel8x0.kobin409744 -> 409376 bytes
-rw-r--r--system_heap.kobin271696 -> 271840 bytes
-rw-r--r--test_meminit.kobin195192 -> 195192 bytes
-rw-r--r--test_stackinit.kobin251736 -> 251736 bytes
-rw-r--r--tpm.kobin2989408 -> 2989408 bytes
-rw-r--r--tpm_vtpm_proxy.kobin238032 -> 238032 bytes
-rw-r--r--virt_wifi.kobin449512 -> 448400 bytes
-rw-r--r--virt_wifi_sim.kobin695848 -> 693680 bytes
-rw-r--r--virtio-gpu.kobin3671296 -> 3671008 bytes
-rw-r--r--virtio-rng.kobin203208 -> 203208 bytes
-rw-r--r--virtio_balloon.kobin370672 -> 370672 bytes
-rw-r--r--virtio_blk.kobin329168 -> 329168 bytes
-rw-r--r--virtio_console.kobin417768 -> 417768 bytes
-rw-r--r--virtio_input.kobin245128 -> 245128 bytes
-rw-r--r--virtio_mmio.kobin256144 -> 256144 bytes
-rw-r--r--virtio_net.kobin865344 -> 864208 bytes
-rw-r--r--virtio_pci.kobin658808 -> 657000 bytes
-rw-r--r--virtio_pmem.kobin229960 -> 229960 bytes
-rw-r--r--vmw_vsock_virtio_transport.kobin484848 -> 483728 bytes
-rw-r--r--zram.kobin469936 -> 469936 bytes
-rw-r--r--zsmalloc.kobin434008 -> 434008 bytes
49 files changed, 0 insertions, 0 deletions
diff --git a/ac97_bus.ko b/ac97_bus.ko
index bf8fe9d..911ee7e 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 2e6ef2a..61f99ec 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 595d0af..03b69f2 100644
--- a/dummy-cpufreq.ko
+++ b/dummy-cpufreq.ko
Binary files differ
diff --git a/failover.ko b/failover.ko
index f78ac31..8ab0327 100644
--- a/failover.ko
+++ b/failover.ko
Binary files differ
diff --git a/gnss-cmdline.ko b/gnss-cmdline.ko
index 1baa37f..ed42c28 100644
--- a/gnss-cmdline.ko
+++ b/gnss-cmdline.ko
Binary files differ
diff --git a/gnss-serial.ko b/gnss-serial.ko
index aaf9705..13cc0ac 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 2447c39..5a5ad96 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 7692f96..5e7ab0e 100644
--- a/goldfish_battery.ko
+++ b/goldfish_battery.ko
Binary files differ
diff --git a/goldfish_pipe.ko b/goldfish_pipe.ko
index b2ea7e7..17e8a93 100644
--- a/goldfish_pipe.ko
+++ b/goldfish_pipe.ko
Binary files differ
diff --git a/goldfish_sync.ko b/goldfish_sync.ko
index abd204c..4101514 100644
--- a/goldfish_sync.ko
+++ b/goldfish_sync.ko
Binary files differ
diff --git a/hci_vhci.ko b/hci_vhci.ko
index 101466c..0069baa 100644
--- a/hci_vhci.ko
+++ b/hci_vhci.ko
Binary files differ
diff --git a/initramfs.img b/initramfs.img
index 1d945ca..c1383d6 100644
--- a/initramfs.img
+++ b/initramfs.img
Binary files differ
diff --git a/lzo-rle.ko b/lzo-rle.ko
index bc956c7..3bd9986 100644
--- a/lzo-rle.ko
+++ b/lzo-rle.ko
Binary files differ
diff --git a/lzo.ko b/lzo.ko
index ce677f3..e4d06b6 100644
--- a/lzo.ko
+++ b/lzo.ko
Binary files differ
diff --git a/mac80211_hwsim.ko b/mac80211_hwsim.ko
index b345ba5..0798e15 100644
--- a/mac80211_hwsim.ko
+++ b/mac80211_hwsim.ko
Binary files differ
diff --git a/md-mod.ko b/md-mod.ko
index d635996..653e317 100644
--- a/md-mod.ko
+++ b/md-mod.ko
Binary files differ
diff --git a/nd_virtio.ko b/nd_virtio.ko
index 6ae46fa..bc1dccd 100644
--- a/nd_virtio.ko
+++ b/nd_virtio.ko
Binary files differ
diff --git a/net_failover.ko b/net_failover.ko
index d792a4c..0526602 100644
--- a/net_failover.ko
+++ b/net_failover.ko
Binary files differ
diff --git a/page_pool.ko b/page_pool.ko
index cda00ce..65a6e50 100644
--- a/page_pool.ko
+++ b/page_pool.ko
Binary files differ
diff --git a/pulse8-cec.ko b/pulse8-cec.ko
index f826c94..1165365 100644
--- a/pulse8-cec.ko
+++ b/pulse8-cec.ko
Binary files differ
diff --git a/rtc-test.ko b/rtc-test.ko
index 9154fdd..a66cd62 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 36de88e..f2500e5 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 3f85ea7..185e54a 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 b9dd591..abeff5e 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 7ebcbb0..de0d539 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 d83926f..6dc58f4 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 23af982..028193d 100644
--- a/snd-hda-intel.ko
+++ b/snd-hda-intel.ko
Binary files differ
diff --git a/snd-intel-nhlt.ko b/snd-intel-nhlt.ko
index e725cb9..a249005 100644
--- a/snd-intel-nhlt.ko
+++ b/snd-intel-nhlt.ko
Binary files differ
diff --git a/snd-intel8x0.ko b/snd-intel8x0.ko
index a81fd0e..d31aa48 100644
--- a/snd-intel8x0.ko
+++ b/snd-intel8x0.ko
Binary files differ
diff --git a/system_heap.ko b/system_heap.ko
index 59b5f40..deb48e5 100644
--- a/system_heap.ko
+++ b/system_heap.ko
Binary files differ
diff --git a/test_meminit.ko b/test_meminit.ko
index bc6ab13..6e4703a 100644
--- a/test_meminit.ko
+++ b/test_meminit.ko
Binary files differ
diff --git a/test_stackinit.ko b/test_stackinit.ko
index dde692d..fd6289f 100644
--- a/test_stackinit.ko
+++ b/test_stackinit.ko
Binary files differ
diff --git a/tpm.ko b/tpm.ko
index d1eb896..d58b0d6 100644
--- a/tpm.ko
+++ b/tpm.ko
Binary files differ
diff --git a/tpm_vtpm_proxy.ko b/tpm_vtpm_proxy.ko
index 697ed91..523bf1b 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 83a50d6..b7f7849 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 7c80e4e..9e14227 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 bff29ce..052e60f 100644
--- a/virtio-gpu.ko
+++ b/virtio-gpu.ko
Binary files differ
diff --git a/virtio-rng.ko b/virtio-rng.ko
index 5a6433a..3e0d14a 100644
--- a/virtio-rng.ko
+++ b/virtio-rng.ko
Binary files differ
diff --git a/virtio_balloon.ko b/virtio_balloon.ko
index b9e9ae4..a3db64e 100644
--- a/virtio_balloon.ko
+++ b/virtio_balloon.ko
Binary files differ
diff --git a/virtio_blk.ko b/virtio_blk.ko
index 30a1363..d714b1f 100644
--- a/virtio_blk.ko
+++ b/virtio_blk.ko
Binary files differ
diff --git a/virtio_console.ko b/virtio_console.ko
index 18050d3..4f6adf7 100644
--- a/virtio_console.ko
+++ b/virtio_console.ko
Binary files differ
diff --git a/virtio_input.ko b/virtio_input.ko
index a166a84..e15d8d3 100644
--- a/virtio_input.ko
+++ b/virtio_input.ko
Binary files differ
diff --git a/virtio_mmio.ko b/virtio_mmio.ko
index 488bbad..50bd65a 100644
--- a/virtio_mmio.ko
+++ b/virtio_mmio.ko
Binary files differ
diff --git a/virtio_net.ko b/virtio_net.ko
index fc1cdc1..ab69d9b 100644
--- a/virtio_net.ko
+++ b/virtio_net.ko
Binary files differ
diff --git a/virtio_pci.ko b/virtio_pci.ko
index 08b35bf..e82e1b8 100644
--- a/virtio_pci.ko
+++ b/virtio_pci.ko
Binary files differ
diff --git a/virtio_pmem.ko b/virtio_pmem.ko
index 3424639..0ed8b60 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 8225d0d..0717e32 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 7b6e287..205cb7a 100644
--- a/zram.ko
+++ b/zram.ko
Binary files differ
diff --git a/zsmalloc.ko b/zsmalloc.ko
index aee04de..fc0c967 100644
--- a/zsmalloc.ko
+++ b/zsmalloc.ko
Binary files differ