From 14fbfc9c0e849406dfb70118faa35d11bcb9645b Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Fri, 21 May 2021 10:03:11 -0700 Subject: [PATCH] ANDROID: GKI: 5/21 KMI update Set KMI_GENERATION=5 for 5/21 KMI update Leaf changes summary: 3222 artifacts changed Changed leaf types summary: 28 leaf types changed Removed/Changed/Added functions summary: 2 Removed, 3129 Changed, 1 Added function Removed/Changed/Added variables summary: 1 Removed, 60 Changed, 1 Added variable 2 Removed functions: [D] 'function int __traceiter_android_vh_gic_v3_set_affinity(void*, irq_data*, const cpumask*, u64*, bool, void*)' [D] 'function ssize_t kernel_read(file*, void*, size_t, loff_t*)' 1 Added function: [A] 'function int __traceiter_android_rvh_gic_v3_set_affinity(void*, irq_data*, const cpumask*, u64*, bool, void*)' 3129 functions with some sub-type change: [C] 'function void* PDE_DATA(const inode*)' at generic.c:799:1 has some sub-type changes: CRC (modversions) changed from 0x27c5b1f0 to 0xff685e4c [C] 'function void __ClearPageMovable(page*)' at compaction.c:138:1 has some sub-type changes: CRC (modversions) changed from 0x22571ed2 to 0xa8507b44 [C] 'function void __SetPageMovable(page*, address_space*)' at compaction.c:130:1 has some sub-type changes: CRC (modversions) changed from 0x5f77584f to 0x3bb27a69 ... 3126 omitted; 3129 symbols have only CRC changes 1 Removed variable: [D] 'tracepoint __tracepoint_android_vh_gic_v3_set_affinity' 1 Added variable: [A] 'tracepoint __tracepoint_android_rvh_gic_v3_set_affinity' 60 Changed variables: [C] 'pglist_data contig_page_data' was changed at memblock.c:96:1: size of symbol changed from 7296 to 5696 CRC (modversions) changed from 0x4532035d to 0x173fa7a5 type of variable changed: type size changed from 58368 to 45568 (in bits) there are data member changes: type 'zone[4]' of 'pglist_data::node_zones' changed: type name changed from 'zone[4]' to 'zone[3]' array type size changed from 51200 to 38400 array type subrange 1 changed length from 4 to 3 array element type 'struct zone' changed: type size hasn't changed there are data member changes: type 'long int[4]' of 'zone::lowmem_reserve' changed: type name changed from 'long int[4]' to 'long int[3]' array type size changed from 256 to 192 array type subrange 1 changed length from 4 to 3 11 ('pglist_data* zone_pgdat' .. 'int initialized') offsets changed (by -64 bits) 3470 impacted interfaces 'zonelist node_zonelists[1]' offset changed (by -128 bits) 11 ('int nr_zones' .. 'int kswapd_order') offsets changed (by -12928 bits) type 'enum zone_type' of 'pglist_data::kswapd_highest_zoneidx' changed: type size hasn't changed 1 enumerator deletion: 'zone_type::ZONE_DMA' value '0' 4 enumerator changes: 'zone_type::ZONE_DMA32' from value '1' to '0' at mmzone.h:350:1 'zone_type::ZONE_NORMAL' from value '2' to '1' at mmzone.h:350:1 'zone_type::ZONE_MOVABLE' from value '3' to '2' at mmzone.h:350:1 'zone_type::__MAX_NR_ZONES' from value '4' to '3' at mmzone.h:350:1 3471 impacted interfaces and offset changed from 53664 to 40736 (in bits) (by -12928 bits) 2 ('int kswapd_failures' .. 'int kcompactd_max_order') offsets changed (by -12928 bits) type 'enum zone_type' of 'pglist_data::kcompactd_highest_zoneidx' changed, as reported earlier and offset changed from 53760 to 40832 (in bits) (by -12928 bits) 3 ('wait_queue_head_t kcompactd_wait' .. 'unsigned long int totalreserve_pages') offsets changed (by -12928 bits) 8 ('zone_padding _pad1_' .. 'atomic_long_t vm_stat[38]') offsets changed (by -12800 bits) 3470 impacted interfaces [C] 'task_struct init_task' was changed at init_task.c:64:1: CRC (modversions) changed from 0xff3c49af to 0x62435c95 type of variable changed: type size hasn't changed 1 data member deletion: 'kunit* kunit_test', at offset 21184 (in bits) at sched.h:1255:1 there are data member changes: 19 ('unsigned long int trace' .. 'u64 android_kabi_reserved8') offsets changed (by -64 bits) type 'struct thread_struct' of 'task_struct::thread' changed: type size hasn't changed 1 data member deletion: 'u64 sctlr_tcf0', at offset 8576 (in bits) at processor.h:159:1 1 data member insertion: 'u64 sctlr_user', at offset 8640 (in bits) at processor.h:161:1 there are data member changes: 'u64 gcr_user_excl' offset changed (by -64 bits) 3470 impacted interfaces and offset changed from 26880 to 26752 (in bits) (by -128 bits) 3470 impacted interfaces [C] 'kmem_cache* kmalloc_caches[3][14]' was changed to 'kmem_cache* kmalloc_caches[2][14]' at slab_common.c:593:1: size of symbol changed from 336 to 224 CRC (modversions) changed from 0x409fadd6 to 0x7eb5b122 type of variable changed: type name changed from 'kmem_cache*[3][14]' to 'kmem_cache*[2][14]' array type size changed from 2688 to 1792 array type subrange 1 changed length from 3 to 2 [C] 'rq runqueues' was changed at core.c:49:1: size of symbol changed from 4160 to 4416 CRC (modversions) changed from 0xa1b6d508 to 0xe2c232cf type of variable changed: type size changed from 33280 to 35328 (in bits) there are data member changes: 'uclamp_rq uclamp[2]' size changed from 768 to 2688 (in bits) (by +1920 bits) 'unsigned int uclamp_flags' offset changed (by +1920 bits) 61 ('cfs_rq cfs' .. 'u64 android_kabi_reserved4') offsets changed (by +2048 bits) 3470 impacted interfaces [C] 'static_key sched_feat_keys[22]' was changed to 'static_key sched_feat_keys[24]' at debug.c:80:1: size of symbol changed from 352 to 384 CRC (modversions) changed from 0xcaebe5d2 to 0xef80ba0e type of variable changed: type name changed from 'static_key[22]' to 'static_key[24]' array type size changed from 2816 to 3072 array type subrange 1 changed length from 22 to 24 [C] 'const char* const sched_feat_names[22]' was changed to 'const char* const sched_feat_names[24]' at debug.c:51:1: size of symbol changed from 176 to 192 CRC (modversions) changed from 0xaba74316 to 0x8ecc1cca type of variable changed: type name changed from 'const char* const[22]' to 'const char* const[24]' array type size changed from 1408 to 1536 array type subrange 1 changed length from 22 to 24 [C] 'vm_event_state vm_event_states' was changed at vmstat.c:108:1: size of symbol changed from 728 to 704 CRC (modversions) changed from 0x62cac127 to 0xbe72514d type of variable changed: type size changed from 5824 to 5632 (in bits) there are data member changes: type 'unsigned long int[91]' of 'vm_event_state::event' changed: type name changed from 'unsigned long int[91]' to 'unsigned long int[88]' array type size changed from 5824 to 5632 array type subrange 1 changed length from 91 to 88 one impacted interface [C] 'bus_type amba_bustype' was changed at bus.c:215:1: CRC (modversions) changed from 0xabc9cec3 to 0x7ee45a16 [C] 'neigh_table arp_tbl' was changed at arp.c:152:1: CRC (modversions) changed from 0xa28f8668 to 0xcf671bfd [C] 'const address_space_operations balloon_aops' was changed at balloon_compaction.c:253:1: CRC (modversions) changed from 0xb8eca1a2 to 0xab8331f2 ... 50 omitted; 53 symbols have only CRC changes 'enum zone_type at mmzone.h:350:1' changed: enum type 'enum zone_type' changed at mmzone.h:350:1, as reported earlier 'struct amba_device at bus.h:64:1' changed (indirectly): type size hasn't changed there are data member changes: type 'struct device_dma_parameters' of 'amba_device::dma_parms' changed: type size hasn't changed 1 data member insertion: 'unsigned int min_align_mask', at offset 32 (in bits) at device.h:294:1 3470 impacted interfaces 4 impacted interfaces 'struct blk_mq_tags at blk-mq-tag.h:8:1' changed: type size changed from 1536 to 1600 (in bits) 1 data member insertion: 'spinlock_t lock', at offset 1536 (in bits) at blk-mq-tag.h:28:1 3470 impacted interfaces 'struct device_dma_parameters at device.h:288:1' changed: details were reported earlier 'struct dma_async_tx_descriptor at dmaengine.h:603:1' changed: type size changed from 704 to 896 (in bits) 3 data member insertions: 'dma_async_tx_descriptor* next', at offset 704 (in bits) at dmaengine.h:617:1 'dma_async_tx_descriptor* parent', at offset 768 (in bits) at dmaengine.h:618:1 'spinlock_t lock', at offset 832 (in bits) at dmaengine.h:619:1 32 impacted interfaces 'struct mmc_bus_ops at core.h:20:1' changed: type size changed from 704 to 768 (in bits) 1 data member insertion: 'typedef bool (mmc_host*)* cache_enabled', at offset 704 (in bits) at core.h:32:1 83 impacted interfaces 'struct mmc_host at host.h:276:1' changed: type size hasn't changed 1 data member deletion: 'notifier_block pm_notify', at offset 6784 (in bits) at host.h:291:1 1 data member insertion: 'u64 android_oem_data1', at offset 13184 (in bits) at host.h:488:1 there are data member changes: 31 ('wakeup_source* ws' .. 'int detect_change') offsets changed (by -192 bits) type 'struct mmc_slot' of 'mmc_host::slot' changed: type size changed from 128 to 256 (in bits) 1 data member insertion: 'u64 android_oem_data1[2]', at offset 64 (in bits) at host.h:249:1 there are data member changes: 'void* handler_priv' offset changed (by +128 bits) 83 impacted interfaces and offset changed from 9728 to 9536 (in bits) (by -192 bits) 24 ('const mmc_bus_ops* bus_ops' .. 'bool hsq_enabled') offsets changed (by -64 bits) 83 impacted interfaces 'struct mmc_slot at host.h:244:1' changed: details were reported earlier 'struct pci_dev at pci.h:310:1' changed (indirectly): type size hasn't changed there are data member changes: type 'struct device_dma_parameters' of 'pci_dev::dma_parms' changed, as reported earlier 417 impacted interfaces 'struct pglist_data at mmzone.h:729:1' changed: details were reported earlier 'struct platform_device at platform_device.h:22:1' changed (indirectly): type size hasn't changed there are data member changes: type 'struct device_dma_parameters' of 'platform_device::dma_parms' changed, as reported earlier 36 impacted interfaces 'struct queue_limits at blkdev.h:318:1' changed: type size changed from 960 to 896 (in bits) 1 data member deletion: 'unsigned int bio_max_bytes', at offset 0 (in bits) at blkdev.h:319:1 there are data member changes: 27 ('unsigned long int bounce_pfn' .. 'blk_zoned_model zoned') offsets changed (by -64 bits) 3471 impacted interfaces 'struct request_queue at blkdev.h:398:1' changed (indirectly): type size changed from 15168 to 15104 (in bits) there are data member changes: type 'struct queue_limits' of 'request_queue::limits' changed, as reported earlier 27 ('unsigned int required_elevator_features' .. 'u64 write_hints[5]') offsets changed (by -64 bits) 3470 impacted interfaces 'struct rq at sched.h:914:1' changed (indirectly): details were reported earlier 'struct task_struct at sched.h:652:1' changed: details were reported earlier 'struct tcpm_port at tcpm.c:297:1' changed: type size changed from 98048 to 98944 (in bits) 2 data member insertions: 'hrtimer send_discover_timer', at offset 5376 (in bits) at tcpm.c:371:1 'kthread_work send_discover_work', at offset 5952 (in bits) at tcpm.c:372:1 there are data member changes: 65 ('bool state_machine_running' .. 'u8* logbuffer[1024]') offsets changed (by +896 bits) 17 impacted interfaces 'struct thread_struct at processor.h:131:1' changed: details were reported earlier 'struct track at slab.h:99:1' changed: type size changed from 1216 to 1280 (in bits) 1 data member insertion: 'u64 android_oem_data1', at offset 1216 (in bits) at slab.h:109:1 one impacted interface 'struct uclamp_rq at sched.h:899:1' changed: type size changed from 384 to 1344 (in bits) there are data member changes: type 'uclamp_bucket[5]' of 'uclamp_rq::bucket' changed: type name changed from 'uclamp_bucket[5]' to 'uclamp_bucket[20]' array type size changed from 320 to 1280 array type subrange 1 changed length from 5 to 20 3470 impacted interfaces 'struct uclamp_se at sched.h:623:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int active' .. 'unsigned int user_defined') offsets changed (by +2 bits) 3470 impacted interfaces 'struct ucsi_connector at ucsi.h:311:1' changed: type size changed from 6592 to 6720 (in bits) there are data member changes: type 'u32[4]' of 'ucsi_connector::src_pdos' changed: type name changed from 'u32[4]' to 'u32[7]' array type size changed from 128 to 224 array type subrange 1 changed length from 4 to 7 'int num_pdos' offset changed (by +96 bits) 'usb_role_switch* usb_role_sw' offset changed (by +128 bits) 7 impacted interfaces 'struct user_namespace at user_namespace.h:57:1' changed: type size changed from 4416 to 4480 (in bits) 1 data member insertion: 'bool parent_could_setfcap', at offset 2240 (in bits) at user_namespace.h:70:1 there are data member changes: 10 ('list_head keyring_name_list' .. 'u64 android_kabi_reserved2') offsets changed (by +64 bits) 3470 impacted interfaces 'struct v4l2_ctrl_ref at v4l2-ctrls.h:317:1' changed: type size changed from 512 to 448 (in bits) 1 data member deletion: 'v4l2_ctrl_ref* req', at offset 384 (in bits) at v4l2-ctrls.h:324:1 1 data member insertion: 'bool valid_p_req', at offset 336 (in bits) at v4l2-ctrls.h:326:1 there are data member changes: 'v4l2_ctrl_ptr p_req' offset changed (by -64 bits) 31 impacted interfaces 'struct virt_dma_desc at virt-dma.h:15:1' changed (indirectly): type size changed from 896 to 1088 (in bits) there are data member changes: type 'struct dma_async_tx_descriptor' of 'virt_dma_desc::tx' changed, as reported earlier 2 ('dmaengine_result tx_result' .. 'list_head node') offsets changed (by +192 bits) 3 impacted interfaces 'struct vm_event_state at vmstat.h:54:1' changed: details were reported earlier 'struct vm_struct at vmalloc.h:51:1' changed: type size changed from 512 to 576 (in bits) 1 data member insertion: 'u64 android_oem_data1', at offset 512 (in bits) at vmalloc.h:61:1 3470 impacted interfaces 'struct zone at mmzone.h:431:1' changed: details were reported earlier 'struct zonelist at mmzone.h:704:1' changed: type size changed from 640 to 512 (in bits) there are data member changes: type 'zoneref[5]' of 'zonelist::_zonerefs' changed: type name changed from 'zoneref[5]' to 'zoneref[4]' array type size changed from 640 to 512 array type subrange 1 changed length from 5 to 4 3470 impacted interfaces Bug: 188840887 Signed-off-by: Todd Kjos Change-Id: I734ae5ca74071150e0097dfa22c53296872b8af7 --- android/abi_gki_aarch64.xml | 10899 +++++++++++++++++----------------- build.config.common | 2 +- 2 files changed, 5472 insertions(+), 5429 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index e20b7335c59c..e30a5be6a77b 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -1,16 +1,16 @@ - - - - + + + + - - + + - + @@ -25,60 +25,60 @@ - - - - - - - + + + + + + + - - - - + + + + - - - + + + - - - + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + @@ -88,21 +88,21 @@ - + - + - + - + - - - - - - + + + + + + @@ -111,99 +111,99 @@ - - + + - + - + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + @@ -212,103 +212,103 @@ - - + + - + - - - + + + - + - - - + + + - - - + + + + - - + + - + - + - - + + - - - - - - + + + + + + - + - + - - + + - + - - - - + + + + - - + + - - + + - + - - - + + - - + + - + - + @@ -326,13 +326,13 @@ - + - + - - + + @@ -342,34 +342,34 @@ - - - - - - - + + + + + + + - + - - - + + + - - + + - + - - + + - - + + @@ -377,17 +377,17 @@ - + - - - - - - - - - + + + + + + + + + @@ -414,11 +414,11 @@ - - - - - + + + + + @@ -428,33 +428,33 @@ - + - + - + - - - - + + + + - + - - - - + + + + - - + + @@ -465,40 +465,40 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -508,119 +508,119 @@ - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + @@ -629,145 +629,145 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - + + - + - + - - - - + + + + - - + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - + @@ -777,420 +777,420 @@ - - - - - - - + + + + + + + - - - + + + - + - - + + - - + + - - - + + + - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1208,57 +1208,57 @@ - - - - - - - - - + + + + + + + + + - + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + @@ -1272,491 +1272,491 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - + - - - - - + + + + + - - + + - + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - + - + - + - + - + - - + + - - - - - - - - - - - + + + + + + + + + + + @@ -1773,114 +1773,114 @@ - - - + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - + + - + - - - - - - + + + + + + - - - + + + - + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - - - - + + + + + - + - - - - - + + + + + @@ -1889,78 +1889,78 @@ - - - - - + + + + + - - + + - - + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + @@ -1974,11 +1974,11 @@ - - + + - - + + @@ -1989,278 +1989,277 @@ - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - + + + - + - + - - + + - - - - - + + + + + - - + - + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + @@ -2280,27 +2279,27 @@ - - - - - - + + + + + + - - - - - + + + + + - - + + - - - - + + + + @@ -2316,42 +2315,42 @@ - - - - - - - + + + + + + + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -2379,101 +2378,101 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + @@ -2482,52 +2481,52 @@ - - - - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + @@ -2538,378 +2537,378 @@ - - - - + + + + - + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - - + + - + @@ -2920,50 +2919,50 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - + @@ -3002,45 +3001,45 @@ - + - - - + + + - + - - - - - - + + + + + + - + - + - + - - + + - - + + @@ -3048,95 +3047,95 @@ - - + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - + - - - - + + + + - + - - + + @@ -3147,463 +3146,463 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - + - + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - - - + + + - + - - + + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -3631,7 +3630,7 @@ - + @@ -3653,13 +3652,13 @@ - - - - + + + + - - + + @@ -3669,41 +3668,41 @@ - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - - + + + - + @@ -3714,22 +3713,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3737,219 +3736,219 @@ - - - + + + - - - - - - + + + + + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + - + - - + + - - - - - - - - - - + + + + + + + + + + - + - - - - - + + + + + - - - + + + - + - - - + + + - - + + - + @@ -3961,286 +3960,286 @@ - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - + - + - - - + + + - - + + - - + + - - - + + + @@ -4253,78 +4252,78 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + @@ -4351,6 +4350,7 @@ + @@ -4413,7 +4413,6 @@ - @@ -4481,18 +4480,18 @@ - + - - + + - - - + + + - + @@ -4500,74 +4499,74 @@ - + - - - + + + - + - + - + - - - - - + + + + + - - - + + + - - + + - + - - - + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -4575,19 +4574,19 @@ - + - - - + + + - - + + - - + + @@ -4604,16 +4603,16 @@ - - - + + + - + - - - + + + @@ -6547,135 +6546,135 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -6817,18 +6816,18 @@ - + - + - + - + - + @@ -7548,66 +7547,63 @@ - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -8254,8 +8250,11 @@ + + + - + @@ -8913,10 +8912,10 @@ - + - + @@ -8942,7 +8941,7 @@ - + @@ -8983,7 +8982,6 @@ - @@ -9136,21 +9134,21 @@ - + - + - + - + - + - + @@ -9738,7 +9736,6 @@ - @@ -9920,201 +9917,201 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - + - + - + - - - - - + + - + - - + + - + - - + + - - + + - - + + - - + + + + + - + - - + + - - + + - - + + - - - - - + + - + - - + + - - + + - + - + - + - + - - - - + @@ -10581,10 +10578,10 @@ - + - + @@ -10608,30 +10605,33 @@ - + - + - + - + - + - + - + - + - + + + + @@ -11786,90 +11786,87 @@ - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + + + + + + + - - - - + - - - - - - - - - - - - - + @@ -17267,7 +17264,7 @@ - + @@ -17298,190 +17295,190 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -17544,7 +17541,7 @@ - + @@ -17576,34 +17573,37 @@ - + - - + + - + - - + + - - + + - - + + - + - + - - + + - + + + + @@ -20302,21 +20302,21 @@ - + - + - + - + - + - + @@ -20360,39 +20360,39 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -20832,7 +20832,7 @@ - + @@ -21056,7 +21056,7 @@ - + @@ -21087,6 +21087,9 @@ + + + @@ -23657,12 +23660,12 @@ - + - + @@ -24089,8 +24092,8 @@ - - + + @@ -25246,24 +25249,24 @@ - + - + - + - + - + - + - + @@ -25616,89 +25619,89 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -26759,8 +26762,8 @@ - - + + @@ -27172,51 +27175,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -29342,11 +29345,10 @@ - - - - - + + + + @@ -29627,10 +29629,10 @@ - - + + - + @@ -30770,9 +30772,9 @@ - + - + @@ -32156,8 +32158,8 @@ - - + + @@ -32823,7 +32825,7 @@ - + @@ -35364,135 +35366,135 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -37437,21 +37439,21 @@ - + - + - + - + - + - + @@ -38318,8 +38320,11 @@ + + + - + @@ -39733,7 +39738,7 @@ - + @@ -39764,6 +39769,9 @@ + + + @@ -40177,24 +40185,24 @@ - + - + - + - + - + - + - + @@ -40246,7 +40254,7 @@ - + @@ -40260,7 +40268,7 @@ - + @@ -41197,18 +41205,18 @@ - - + + - - + + - - - - + + + + @@ -41464,14 +41472,14 @@ - - + + - - - - + + + + @@ -41499,9 +41507,9 @@ - - - + + + @@ -41513,26 +41521,26 @@ - - + + - - - + + + - - - + + + - - + + @@ -41540,8 +41548,8 @@ - - + + @@ -41553,8 +41561,8 @@ - - + + @@ -44161,7 +44169,7 @@ - + @@ -44684,7 +44692,7 @@ - + @@ -45295,342 +45303,348 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - + + - - + + - - + + - - + + + + + + + + + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - - - - + - + - - + + - - - - - - - - + + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + @@ -46133,53 +46147,53 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -51283,48 +51297,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -58198,7 +58212,7 @@ - + @@ -58235,6 +58249,15 @@ + + + + + + + + + @@ -58840,14 +58863,14 @@ - + - + - + @@ -80056,32 +80079,32 @@ - - + + - - - + + + - - + + - - - - + + + + - - - + + + - - + + @@ -84633,71 +84656,71 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - - - + + + @@ -84706,42 +84729,42 @@ - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + - - + + - - + + @@ -84963,48 +84986,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -85713,30 +85736,30 @@ - + - + - + - + - + - + - + + + + - - - - + @@ -86846,48 +86869,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -90780,6 +90803,9 @@ + + + @@ -90792,30 +90818,30 @@ - + - + - + - + - + - + - + + + + - - - - + @@ -93522,249 +93548,249 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - + + + + - + - + - + + + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + - + - - + + - - + + - - - - - - - - - - - - - - + + - + + + + + + + - + - - + + - - + + - - - - - - - - + + - + + + + - - - - + - + - - + + + + + - - - - + - + - + - + - - + + - + - + + + + - + - + - - - - + - + - + + + + + + + - + - - - - - - - - + + - + - + @@ -93851,63 +93877,66 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + @@ -93977,7 +94006,7 @@ - + @@ -94011,102 +94040,105 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -94196,6 +94228,7 @@ + @@ -94292,317 +94325,317 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - + + + + - + - + - + + + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + - + - - + + - - + + - - - - - - - - - - - - - - + + - + + + + + + + - + - - + + - - + + - - - - - - - - + + - + + + + - - - - + - + - - + + + + + - - - - + - + - + - + - - + + - + - + + + + - + - + - - - - + - + - + + + + + + + - + - - - - - - - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -94719,39 +94752,39 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -95334,23 +95367,26 @@ - + - + - + - + - + - + + + + - + @@ -95384,42 +95420,45 @@ - - - - - - - + + - + - + - + + + + + + + + + - + - + - + - + - + - + - + @@ -95451,6 +95490,7 @@ + @@ -95605,6 +95645,10 @@ + + + + @@ -95771,8 +95815,8 @@ - - + + @@ -95783,12 +95827,12 @@ - - + + - - + + @@ -95959,35 +96003,35 @@ - - + + - - - - - + + + + + - - - - - - + + + + + + - - + + - - + + - - + + @@ -96763,62 +96807,62 @@ - - + + - - + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - + + - - - + + + - - + + - - + + @@ -121271,342 +121315,348 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - + + - - + + - - + + - - + + + + + + + + + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - - - - + - + - - + + - - - - - - - - + + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + @@ -121855,53 +121905,53 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -121968,45 +122018,45 @@ - - + + - - - - - + + + + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + @@ -122097,171 +122147,168 @@ - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + @@ -122272,35 +122319,35 @@ - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + @@ -125007,6 +125054,9 @@ + + + @@ -125513,13 +125563,6 @@ - - - - - - - @@ -137124,21 +137167,21 @@ - + - + - + - + - + - + @@ -137572,7 +137615,6 @@ - @@ -138149,201 +138191,201 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - + - + - + - - - - - + + - + - - + + - + - - + + - - + + - - + + - - + + + + + - + - - + + - - + + - - + + - - - - - + + - + - - + + - - + + - + - + - + - + - - - - + @@ -138757,21 +138799,21 @@ - + - + - + - + - + - + @@ -138794,7 +138836,7 @@ - + @@ -138826,34 +138868,37 @@ - + - - + + - + - - + + - - + + - - + + - + - + - - + + - + + + + @@ -138930,30 +138975,33 @@ - + - + - + - + - + - + - + - + - + + + + @@ -139633,66 +139681,63 @@ - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -140270,10 +140315,10 @@ - + - + @@ -140897,10 +140942,10 @@ - + - + @@ -141067,7 +141112,6 @@ - @@ -141894,7 +141938,7 @@ - + @@ -143068,51 +143112,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -143729,90 +143773,87 @@ - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + + + + + + + - - - - + - - - - - - - - - - - - - + @@ -144072,7 +144113,7 @@ - + @@ -146693,16 +146734,16 @@ - - + + - + - + @@ -146733,200 +146774,200 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -148272,52 +148313,52 @@ - - + + - - + + - - + + - - + + - - - - - - - - - + - - + + + + + + + + + + - - - - + + + + - - + + - - + + @@ -158443,7 +158484,7 @@ - + @@ -160536,7 +160577,7 @@ - + @@ -160818,31 +160859,31 @@ - - - - - - + + + + + + - - - + + + - - - + + + - - + + - - - + + + @@ -160967,8 +161008,8 @@ - - + + @@ -160982,22 +161023,21 @@ - - + + - + - - + + - - - - - + + + + @@ -161018,39 +161058,39 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -161120,95 +161160,95 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -161316,12 +161356,12 @@ - - + + - - + + @@ -161591,8 +161631,8 @@ - - + + @@ -161640,29 +161680,29 @@ - + - + - + - + - + - + - + - + @@ -161713,58 +161753,61 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + @@ -161773,42 +161816,42 @@ - - - + + + - - + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + @@ -161971,10 +162014,9 @@ - - - - + + + @@ -161987,9 +162029,10 @@ - - - + + + + @@ -162046,76 +162089,76 @@ - - + + - - + + + + + - - - - - + + + - - + + - - - - - - - + + - - + + - - + + - - + + - + - - - - - - - - - + + - - + + + + + + + + + + + + + - - - - + + + + - - + + - - + + @@ -162130,12 +162173,12 @@ - - + + - + - + @@ -163299,12 +163342,6 @@ - - - - - - @@ -163364,164 +163401,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -163791,7 +163670,6 @@ - @@ -163800,8 +163678,6 @@ - - @@ -164293,12 +164169,18 @@ + + + + + + @@ -164345,6 +164227,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -164770,6 +164810,7 @@ + @@ -164779,6 +164820,8 @@ + + @@ -176292,7 +176335,7 @@ - + @@ -181372,6 +181415,17 @@ + + + + + + + + + + + @@ -181848,17 +181902,6 @@ - - - - - - - - - - - diff --git a/build.config.common b/build.config.common index 2cda85335652..2fc5d40a387f 100644 --- a/build.config.common +++ b/build.config.common @@ -1,5 +1,5 @@ BRANCH=android12-5.10 -KMI_GENERATION=4 +KMI_GENERATION=5 LLVM=1 DEPMOD=depmod