Greg Kroah-Hartman
bfb2ce3eb1
ANDROID: GKI: rework the ANDROID_KABI_USE() macro to not use __UNIQUE() ...
The __UNIQUE_ID() macro causes problems as it turns out to not be
deterministic across different compiler runs as it relies on the
__COUNTER__ macro which could have been used on other .h files previous
to this .h file being included.
This shows up specifically when building with "LTO=thin" vs. "LTO=full"
as different build paths seem to be triggered.
As the structure name isn't really needed at all here, we were just
including it for older compilers that could not handle anonymous
structures in a union, just drop the whole thing which resolves the abi
naming issue.
Bug: 210255585
Reported-by: Giuliano Procida <gprocida@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6b9449fa9d26ffc5d66b2f0f3b41e2d5f3003f68
2021-11-09 18:38:36 +01:00
Revert "net: introduce CAN specific pointer in the struct net_device"
2021-04-08 13:35:24 +02:00
iio: cros_ec_sensors: Fix alignment of buffer in iio_push_to_buffers_with_timestamp()
2021-07-14 16:53:39 +02:00
Input: elan_i2c - add more hardware ID for Lenovo laptops
2020-07-22 09:33:13 +02:00
Merge 5.4.139 into android11-5.4-lts
2021-08-11 10:16:17 +02:00
RDMA/mlx4: Do not map the core_clock page to user space unless enabled
2021-06-16 11:59:44 +02:00
net/mlx5e: Fix page reclaim for dead peer hairpin
2021-06-23 14:41:24 +02:00
ANDROID: GKI: restore a part of "struct mmc_host"
2021-05-12 08:30:50 +02:00
mtd: lpddr: Fix bad logic in print_drs_error
2020-11-01 12:01:05 +01:00
This is the 5.4.109 stable release
2021-03-30 16:56:49 +02:00
netfilter: arp_tables: add pre_exit hook for table unregister
2021-04-21 12:56:16 +02:00
netfilter: bridge: add pre_exit hooks for ebtable unregistration
2021-04-21 12:56:16 +02:00
gpio: omap: Save and restore sysconfig
2021-04-28 13:19:14 +02:00
This is the 5.4.146 stable release
2021-09-15 14:01:16 +02:00
net: qed: Disable aRFS for NPAR and 100G
2020-10-01 13:18:18 +02:00
This is the 5.4.134 stable release
2021-07-20 16:30:12 +02:00
Revert "spi: Fix use-after-free with devm_spi_alloc_*"
2021-05-14 15:25:16 +02:00
SUNRPC: Move simple_get_bytes and simple_get_netobj into private header
2021-02-13 13:52:56 +01:00
This is the 5.4.140 stable release
2021-08-12 14:00:44 +02:00
ACPI: tables: x86: Reserve memory occupied by ACPI tables
2021-05-07 10:51:36 +02:00
ANDROID: GKI: rework the ANDROID_KABI_USE() macro to not use __UNIQUE()
2021-11-09 18:38:36 +01:00
ANDROID: add macros to create OEM data fields
2021-01-27 09:43:29 +00:00
KVM: arm64: ARM_SMCCC_ARCH_WORKAROUND_1 doesn't return SMCCC_RET_NOT_REQUIRED
2020-11-18 19:20:21 +01:00
Revert "exec: Add exec_update_mutex to replace cred_guard_mutex"
2021-01-11 14:35:30 +01:00
This is the 5.4.132 stable release
2021-07-14 17:12:58 +02:00
bitfield.h: don't compile-time validate _val in FIELD_FIT
2020-08-19 08:16:28 +02:00
This is the 5.4.53 stable release
2020-07-23 12:36:54 +02:00
This is the 5.4.109 stable release
2021-03-30 16:56:49 +02:00
bpf: Fix pointer arithmetic mask tightening under state pruning
2021-09-15 09:47:39 +02:00
kbuild: avoid static_assert for genksyms
2020-12-16 10:56:58 +01:00
block: allow for_each_bvec to support zero len bvec
2020-09-09 19:12:34 +02:00
ANDROID: GKI: preserve ABI for struct sock_cgroup_data
2020-07-23 12:40:32 +02:00
cgroup: fix cgroup_sk_alloc() for sk_clone_lock()
2020-07-22 09:32:49 +02:00
This is the 5.4.84 stable release
2020-12-16 11:33:19 +01:00
compiler.h: Raise minimum version of GCC to 5.1 for arm64
2021-01-23 15:57:55 +01:00
vmlinux.lds.h: Create section for protection against instrumentation
2021-02-17 10:35:16 +01:00
This is the 5.4.99 stable release
2021-02-17 11:45:30 +01:00
vt: Fix character height handling with VT_RESIZEX
2021-05-26 12:05:20 +02:00
Revert "clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940"
2021-06-23 19:06:25 +02:00
BACKPORT: FROMLIST: cpuidle: change enter_s2idle() prototype
2020-07-29 14:37:49 +00:00
Revert "crypto - shash: reduce minimum alignment of shash_desc structure"
2021-03-09 13:52:50 +01:00
dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX
2020-09-23 12:40:47 +02:00
ANDROID: vfs: add d_canonical_path for stacked filesystem support
2020-10-30 10:02:25 +01:00
debugfs: Fix !DEBUG_FS debugfs_create_automount
2020-10-01 13:17:21 +02:00
This is the 5.4.102 stable release
2021-03-04 10:44:50 +01:00
Revert "PCI/MSI: Protect msi_desc::masked for multi-MSI"
2021-08-27 16:29:28 +02:00
dm integrity: fix flush with external metadata device
2021-01-19 18:26:13 +01:00
This is the 5.4.54 stable release
2020-07-29 13:27:01 +02:00
misc: eeprom_93xx46: Add quirk to support Microchip 93LC46B eeprom
2021-03-11 14:06:50 +01:00
efi: use 32-bit alignment for efi_guid_t literals
2021-03-24 11:26:45 +01:00
ANDROID: GKI: genksyms fixup for efed9a3337e3 ("kyber: fix out of bounds access when * preempted")
2021-05-20 10:57:18 +02:00
elfcore: fix building with clang
2021-01-23 15:57:55 +01:00
PM: EM: Increase energy calculation precision
2021-09-15 09:47:33 +02:00
This is the 5.4.110 stable release
2021-04-07 15:05:05 +02:00
fbmem: pull fbcon_update_vcs() out of fb_set_var()
2020-09-03 11:27:09 +02:00
This is the 5.4.146 stable release
2021-09-15 14:01:16 +02:00
Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts
2020-10-14 10:32:56 +02:00
writeback: Drop I_DIRTY_TIME_EXPIRE
2021-01-30 13:54:11 +01:00
cgroup1: fix leaked context root causing sporadic NULL deref in LTP
2021-07-31 08:19:37 +02:00
This is the 5.4.145 stable release
2021-09-12 09:54:40 +02:00
ANDROID: vfs: add d_canonical_path for stacked filesystem support
2020-10-30 10:02:25 +01:00
ANDROID: GKI: add some padding to some driver core structures
2020-08-13 09:08:01 +02:00
This is the 5.4.70 stable release
2020-10-07 08:50:29 +02:00
FROMLIST: HID: Support Microsoft SPI touch digitizer driver
2021-09-14 15:46:30 -07:00
hil/parisc: Disable HIL driver when it gets stuck
2020-11-05 11:43:36 +01:00
This is the 5.4.146 stable release
2021-09-15 14:01:16 +02:00
Linux 5.4.129
2021-06-30 19:19:07 +02:00
mm, futex: fix shared futex pgoff on shmem huge page
2021-06-30 08:47:55 -04:00
Drivers: hv: vmbus: Ignore CHANNELMSG_TL_CONNECT_RESULT(23)
2020-08-11 15:33:38 +02:00
i2c: algo: pca: Reapply i2c bus settings after reset
2020-09-23 12:40:38 +02:00
i2c: Add I2C_AQ_NO_REP_START adapter quirk
2021-05-19 10:08:22 +02:00
ANDROID: GKI: bring back icmpv6_send
2021-03-05 06:50:46 +01:00
BACKPORT: ieee80211: add HE ext EIDs and 6 GHz capability defines
2020-08-11 12:53:27 +02:00
macvlan: macvlan_count_rx() needs to be aware of preemption
2021-03-30 14:35:25 +02:00
vlan: consolidate VLAN parsing code and limit max parsing depth
2020-07-22 09:32:49 +02:00
Revert "net: igmp: increase size of mr_ifc_count"
2021-08-27 17:58:47 +02:00
iommu/vt-d: Don't dereference iommu_device if IOMMU_API is not built
2021-02-03 23:26:01 +01:00
io-mapping: indicate mapping failure
2020-07-29 10:18:44 +02:00
BACKPORT: FROMLIST: iommu/io-pgtable-arm-v7s: Extend PA34 for MediaTek
2020-10-22 19:44:19 +00:00
This is the 5.4.120 stable release
2021-05-19 10:41:47 +02:00
ANDROID: staging: android: ion: Expose total heap and pool sizes via sysfs
2020-07-08 21:27:13 +02:00
UPSTREAM: net: icmp: pass zeroed opts from icmp{,v6}_ndo_send before sending
2021-03-05 06:50:46 +01:00
This is the 5.4.142 stable release
2021-08-27 16:27:13 +02:00
ANDROID: GKI: bring back irq_create_mapping()
2020-12-12 13:59:12 +01:00
ANDROID: kallsyms: increase KSYM_NAME_LEN
2020-08-04 19:33:41 +00:00
UPSTREAM: kbuild: ensure full rebuild when the compiler is updated
2020-09-24 10:02:38 +00:00
kdev_t: always inline major/minor helper functions
2021-01-09 13:44:54 +01:00
ima: Free IMA measurement buffer after kexec syscall
2021-03-04 10:26:25 +01:00
certs: Fix blacklist flag type confusion
2021-03-04 10:26:29 +01:00
mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged
2020-10-14 10:33:05 +02:00
tracing/kprobe: Fix to support kretprobe events on unloaded modules
2021-02-13 13:52:54 +01:00
kthread: Extract KTHREAD_IS_PER_CPU
2021-02-07 15:35:49 +01:00
kvm: fix previous commit for 32-bit builds
2021-06-16 11:59:45 +02:00
ata: make qc_prep return ata_completion_errors
2020-10-01 13:18:26 +02:00
linkage: Introduce new macros for assembler symbols
2020-11-10 12:37:24 +01:00
include/linux/log2.h: add missing () around n in roundup_pow_of_two()
2020-09-09 19:12:29 +02:00
net: phy: marvell: fix detection of PHY on Topaz switches
2021-04-21 12:56:18 +02:00
Linux 5.4.143
2021-08-27 22:38:57 +02:00
memstick: Skip allocating card when removing host
2020-10-07 08:01:25 +02:00
Linux 5.4.129
2021-06-30 19:19:07 +02:00
Revert "mm: fix struct page layout on 32-bit systems"
2021-05-20 10:55:38 +02:00
mm: add VM_WARN_ON_ONCE_PAGE() macro
2021-06-30 08:47:51 -04:00
Merge branch 'android11-5.4' into 'android11-5.4-lts'
2020-10-16 08:10:38 +02:00
ANDROID: Input: bump SW_MAX up to 0x3f
2020-10-31 12:21:18 +01:00
modules: inherit TAINT_PROPRIETARY_MODULE
2021-05-11 14:04:04 +02:00
Revert "PCI/MSI: Protect msi_desc::masked for multi-MSI"
2021-08-27 16:29:28 +02:00
locking/mutex: Fix non debug version of mutex_lock_io_nested()
2021-03-30 14:35:29 +02:00
This is the 5.4.71 stable release
2020-10-14 17:07:42 +02:00
Merge 5.4.133 into android11-5.4-lts
2021-07-20 11:32:58 +02:00
This is the 5.4.144 stable release
2021-09-03 10:17:46 +02:00
netfilter: clear skb->next in NF_HOOK_LIST()
2020-12-02 08:49:44 +01:00
netfilter: use actual socket sk rather than skb sk when routing harder
2020-11-18 19:20:17 +01:00
netfilter: use actual socket sk rather than skb sk when routing harder
2020-11-18 19:20:17 +01:00
NFS: nfs_find_open_context() may only select open files
2021-07-20 16:10:48 +02:00
NFS: Fix races nfs_page_group_destroy() vs nfs_destroy_unlinked_subrequests()
2020-10-01 13:17:52 +02:00
mm: don't rely on system state to detect hot-plug operations
2020-10-07 08:01:30 +02:00
of: fix linker-section match-table corruption
2021-01-06 14:48:37 +01:00
Revert "once: Fix panic when module unload"
2021-09-07 14:06:59 +02:00
mm, oom: make the calculation of oom badness more accurate
2021-09-03 10:08:12 +02:00
overflow: Include header file with SIZE_MAX declaration
2020-10-29 09:57:51 +01:00
ANDROID: Add OWNERS files referring to the respective android-mainline OWNERS
2021-04-01 13:45:14 +00:00
mm/page_owner: change split_page_owner to take a count
2020-10-29 09:57:52 +01:00
mm, futex: fix shared futex pgoff on shmem huge page
2021-06-30 08:47:55 -04:00
Revert "PCI/IOV: Mark VFs as not implementing PCI_COMMAND_MEMORY"
2020-10-29 17:29:55 +01:00
Revert "PM: runtime: Fix unpaired parent child_count for force_resume"
2021-05-20 10:56:16 +02:00
PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter
2020-12-30 11:50:53 +01:00
FROMLIST: power: supply: core: property to control reverse charge
2020-09-01 17:57:03 +00:00
random32: Fix implicit truncation warning in prandom_seed_state()
2021-07-14 16:53:17 +02:00
i40e: optimise prefetch page refcount
2020-12-30 11:50:55 +01:00
proc: fix lookup in /proc/net subdirectories after setns(2)
2021-01-12 20:16:10 +01:00
ptp: improve max_adj check against unreasonable values
2021-06-23 14:41:26 +02:00
serial: qcom_geni_serial: To correct QUP Version detection logic
2020-11-01 12:01:06 +01:00
This is the 5.4.57 stable release
2020-08-07 10:07:58 +02:00
rcu/nocb: Perform deferred wake up before last idle's need_resched() check
2021-03-04 10:26:47 +01:00
rhashtable: Fix unprotected RCU dereference in __rht_ptr
2020-08-05 09:59:47 +02:00
mm/thp: try_to_unmap() use TTU_SYNC for safe splitting
2021-06-30 08:47:52 -04:00
FROMLIST: rpmsg: core: Add signal API support
2020-07-17 00:08:34 +00:00
Revert "rwsem: Implement down_read_killable_nested"
2021-01-11 14:47:10 +01:00
ANDROID: vendor_hooks: Extend the vendor data array in task_struct
2020-10-15 17:21:03 +02:00
ANDROID: scs: use vmapped shadow stacks by default
2020-10-26 19:41:02 +00:00
This is the 5.4.86 stable release
2020-12-30 12:31:14 +01:00
Revert "seq_buf: Avoid type mismatch for seq_buf_init"
2020-12-30 15:25:34 +01:00
seqlock: Require WRITE_ONCE surrounding raw_seqcount_barrier
2020-10-01 13:17:25 +02:00
This is the 5.4.92 stable release
2021-01-23 16:15:43 +01:00
bpf, sockmap: Fix sk->prot unhash op reset
2021-04-14 08:24:12 +02:00
Revert "smp: Fix smp_call_function_single_async prototype"
2021-05-14 15:29:26 +02:00
net: make get_net_ns return error if NET_NS is disabled
2021-06-23 14:41:25 +02:00
stop_machine: mark helpers __always_inline
2021-03-17 17:03:56 +01:00
swap: fix swapfile read/write offset
2021-03-07 12:20:49 +01:00
swiotlb: using SIZE_MAX needs limits.h included
2020-11-24 13:29:04 +01:00
sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output
2021-03-07 12:20:48 +01:00
tcp: allow at most one TLP probe per flight
2020-07-31 18:39:31 +02:00
tee: Correct inappropriate usage of TEE_SHM_DMA_BUF flag
2021-08-15 13:08:02 +02:00
kernel, fs: Introduce and use set_restart_fn() and arch_set_restart_data()
2021-03-24 11:26:44 +01:00
This is the 5.4.147 stable release
2021-09-16 15:57:48 +02:00
tpm: Unify the mismatching TPM space buffer sizes
2020-08-19 08:16:27 +02:00
tpm: Require that all digests are present in TCG_PCR_EVENT2 structures
2020-08-19 08:15:57 +02:00
Revert "seq_buf: Avoid type mismatch for seq_buf_init"
2020-12-30 15:25:34 +01:00
tracepoint: Add tracepoint_probe_register_may_exist() for BPF tracing
2021-07-14 16:53:08 +02:00
tty: Fix ->session locking
2020-12-11 13:23:28 +01:00
tty: fix return value for unsupported ioctls
2021-05-14 09:44:22 +02:00
u64_stats,lockdep: Fix u64_stats_init() vs lockdep
2021-03-30 14:35:22 +02:00
UPSTREAM: udp: never accept GSO_FRAGLIST packets
2021-10-01 11:32:55 -07:00
udp: fix skb_copy_and_csum_datagram with odd segment sizes
2021-02-17 10:35:19 +01:00
usb-storage: Add quirk to defeat Kindle's automatic unload
2021-03-24 11:26:40 +01:00
Revert "virtio: Protect vqs list access"
2021-08-27 22:40:33 +02:00
virtio_net: Do not pull payload in skb->head
2021-05-22 11:38:28 +02:00
ANDROID: Make vsock virtio packet buff size configurable
2021-03-25 19:12:07 +00:00
ANDROID: GKI: add fields required to enable CONFIG_TRANSPARENT_HUGEPAGE
2020-10-15 17:21:03 +02:00
rq-qos: fix missed wake-ups in rq_qos_throttle try two
2021-07-19 08:53:16 +02:00
XArray: add xas_split
2021-06-10 13:37:14 +02:00
This is the 5.4.58 stable release
2020-08-11 18:37:58 +02:00
zsmalloc: account the number of compacted pages correctly
2021-03-07 12:20:49 +01:00
