Blagovest Kolenichev
98c101df75
Merge android11-5.4.61+ ( dc2d5a0) into msm-5.4 ...
* refs/heads/tmp-dc2d5a0:
ANDROID: ABI: Update allowed list for QCOM
ANDROID: ABI: Update allowed list for QCOM
ANDROID: modules: cfi cleanup for module load failure
ANDROID: Temporarily disable XFRM_USER_COMPAT filtering
ANDROID: ABI: Update allowed list for QCOM
ANDROID: ABI: update allowed list for QCOM
ANDROID: fix kernelci build-break due to stop_ipi hook
BACKPORT: rcu/tree: Export rcu_idle_{enter,exit} to modules
ANDROID: GKI: Add some symbols to symbol list
ANDROID: arm64: smp: fix Lockdep warning: RCU used illegally from idle CPU.
ANDROID: Fix build-break caused by android_rvh_nf_conn_alloc hook
ANDROID: GKI: Enable DEBUG_INFO_DWARF4
ANDROID: cfi: ensure RCU is watching in __cfi_slowpath
UPSTREAM: mm/sl[uo]b: export __kmalloc_track(_node)_caller
BACKPORT: xfrm/compat: Translate 32-bit user_policy from sockptr
UPSTREAM: xfrm/compat: Add 32=>64-bit messages translator
UPSTREAM: xfrm/compat: Attach xfrm dumps to 64=>32 bit translator
UPSTREAM: xfrm/compat: Add 64=>32-bit messages translator
BACKPORT: xfrm: Provide API to register translator module
ANDROID: ABI: update allowed list for galaxy
ANDROID: Update the KMI_GENERATION after KMI changes on October 31
ANDROID: Input: bump SW_MAX up to 0x3f
ANDROID: GKI: ABI update for Oct 31 KABI break
ANDROID: GKI: add Android ABI padding to struct nf_conn
ANDROID: GKI: add vendor padding variable in struct skb_shared_info
ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle
ANDROID: GKI: add vendor padding variable in struct nf_conn
ANDROID: GKI: net: add vendor hooks for 'struct sock' lifecycle
ANDROID: GKI: add vendor padding variable in struct sock
ANDROID: fuse: Add support for d_canonical_path
ANDROID: vfs: add d_canonical_path for stacked filesystem support
ANDROID: fscrypt: prevent fscrypt_operations from affecting KMI
Revert "ANDROID: GKI: fix ABI breakage in module.h"
ANDROID: ABI: update allowed list for galaxy
FROMLIST: char: misc: increase DYNAMIC_MINORS value
Conflicts:
net/netfilter/nf_conntrack_core.c
Change-Id: I0687237ba5f07f291a5f3b49ee2057071fcb2717
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2020-11-13 03:55:57 -08:00
This is the 5.4.57 stable release
2020-08-07 10:07:58 +02:00
ANDROID: kernel: cgroup: cpuset: Clear cpus_requested for empty buf
2020-08-27 02:50:39 +05:30
kgdb: Avoid suspicious RCU usage warning
2020-07-09 09:37:51 +02:00
Merge android-5.4-stable.45 ( a9a13ee) into msm-5.4
2020-07-09 17:51:24 -07:00
Merge android11-5.4.61+ ( 0d36496) into msm-5.4
2020-09-02 16:54:52 -07:00
kernel/gcov/fs.c: gcov_seq_next() should increase position index
2020-04-29 16:33:00 +02:00
Merge android11-5.4.60 ( 8ae87ad) into msm-5.4
2020-08-31 13:04:44 -07:00
ANDROID: kallsyms: increase KSYM_NAME_LEN
2020-08-04 19:33:41 +00:00
Merge android11-5.4.60 ( 8ae87ad) into msm-5.4
2020-08-31 13:04:44 -07:00
Merge android11-5.4.61+ ( 0d36496) into msm-5.4
2020-09-02 16:54:52 -07:00
Merge "defconfig: lahaina: remove CONFIG_LEDS_CLASS_FLASH & CONFIG_LEDS_TRIGGER_TIMER"
2020-09-25 13:11:08 -07:00
Merge android11-5.4.61+ ( dc2d5a0) into msm-5.4
2020-11-13 03:55:57 -08:00
Merge "cpufreq: schedutil: Queue sugov irq work on policy online cpu"
2020-11-04 14:57:12 -08:00
Merge android11-5.4.61+ ( d240b69) into msm-5.4
2020-10-09 07:27:04 -07:00
Merge "tracing: Add CONFIG_KPROBES_QGKI config"
2020-10-03 15:19:06 -07:00
audit: fix a net reference leak in audit_list_rules_send()
2020-06-22 09:30:59 +02:00
audit: fix a net reference leak in audit_list_rules_send()
2020-06-22 09:30:59 +02:00
audit_get_nd(): don't unlock parent too early
2019-11-10 11:56:55 -05:00
audit: fix a net reference leak in audit_list_rules_send()
2020-06-22 09:30:59 +02:00
ANDROID: cfi: ensure RCU is watching in __cfi_slowpath
2020-11-02 18:55:52 +00:00
Merge android-5.4-stable.50 ( a200ad5) into msm-5.4
2020-07-20 19:22:16 -07:00
kernel/cpu_pm: Fix uninitted local in cpu_pm
2020-06-22 09:31:22 +02:00
keys: Fix request_key() cache
2020-01-17 19:48:42 +01:00
kernel/elfcore.c: include proper prototypes
2019-09-25 17:51:39 -07:00
Merge android-5.4-stable.50 ( a200ad5) into msm-5.4
2020-07-20 19:22:16 -07:00
extable: Add function to search only kernel exception table
2019-08-21 22:23:48 +10:00
FROMGIT: mm, oom_adj: don't loop through tasks in __set_oom_adj when not necessary
2020-09-16 09:56:55 -07:00
Revert "libata, freezer: avoid block device removal while system is frozen"
2019-10-06 09:11:37 -06:00
ANDROID: futex: Add vendor hook for wait queue
2020-08-20 19:30:35 +00:00
kheaders: substituting --sort in archive creation
2019-10-17 09:08:19 +09:00
hung task: check specific tasks for long uninterruptible sleep state
2020-03-23 15:44:56 -07:00
jump_label: Don't warn on __exit jump entries
2019-08-29 15:10:10 +01:00
ANDROID: kallsyms: ignore ThinLTO+CFI hash suffix in kallsyms_lookup_name()
2020-09-22 20:17:26 +00:00
UPSTREAM: kcov: remote coverage support
2020-01-13 18:54:56 +00:00
kexec: bail out upon SIGKILL when allocating memory.
2019-09-25 17:51:40 -07:00
kexec_elf: support 32 bit ELF files
2019-09-06 23:58:44 +02:00
Merge branch 'next-lockdown' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2019-09-28 08:14:15 -07:00
kmod: make request_module() return an error when autoloading is disabled
2020-04-17 10:50:22 +02:00
Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4"
2020-08-23 13:12:51 +02:00
ANDROID: Disable kthread delayed work fp check in CFI builds
2020-09-29 15:26:34 +00:00
ANDROID: add support for Clang's Control Flow Integrity (CFI)
2019-11-27 12:49:12 -08:00
Merge android11-5.4.61+ ( dc2d5a0) into msm-5.4
2020-11-13 03:55:57 -08:00
x86/mm: split vmalloc_sync_all()
2020-03-25 08:25:58 +01:00
padata: add separate cpuhp node for CPUHP_PADATA_DEAD
2020-06-17 16:40:22 +02:00
panic: ensure preemption is disabled during panic()
2019-10-07 15:47:19 -07:00
Merge android11-5.4.61+ ( d240b69) into msm-5.4
2020-10-09 07:27:04 -07:00
ptrace: reintroduce usage of subjective credentials in ptrace_has_cap()
2020-01-23 08:22:36 +01:00
FROMLIST: reboot: Export reboot_mode
2019-11-25 11:46:31 -08:00
kernel/relay.c: fix memleak on destroy relay channel
2020-08-26 10:40:51 +02:00
/dev/mem: Revoke mappings when a driver claims the region
2020-06-24 17:50:35 +02:00
ANDROID: scs: fix recursive spinlock in scs_check_usage
2020-06-09 23:39:55 -07:00
seccomp: Fix ioctl number for SECCOMP_IOCTL_NOTIF_ID_VALID
2020-08-19 08:15:58 +02:00
Merge android11-5.4.61+ ( d240b69) into msm-5.4
2020-10-09 07:27:04 -07:00
smp: Wake up all idle CPUs when suspending to idle
2020-01-15 14:35:44 -08:00
trace: Add trace points for tasklet entry/exit
2020-02-25 07:37:13 -08:00
stacktrace: Don't skip first entry on noncurrent tasks
2019-11-04 21:19:25 +01:00
stop_machine: Avoid potential race behaviour
2019-10-17 12:47:12 +02:00
Merge Linus's 5.4-rc1-prerelease branch into android-mainline
2019-09-20 16:07:54 -07:00
mm/madvise: introduce process_madvise() syscall: an external memory hinting API
2020-06-18 17:55:54 +05:30
soc/qcom/hyp_core_ctl: Track VPM Group state for VM
2020-10-28 20:58:26 -07:00
taskstats: extended taskstats2 with acct fields
2020-06-22 14:26:19 +05:30
umh: fix memory leak on execve failure
2020-05-20 08:20:13 +02:00
Revert "ANDROID: proc: Add /proc/uid directory"
2020-03-06 20:23:08 +00:00
Merge android-5.4.24 ( ce5de62) into msm-5.4
2020-04-14 08:25:29 -07:00
Merge android11-5.4.61+ ( 8540985) into msm-5.4
2020-10-19 10:50:25 -07:00
98c101df75