A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 14:13:01 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge android11-5.4.61+ (dc2d5a0) into msm-5.4

Browse source 
* 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>
This commit is contained in:
Blagovest Kolenichev 2020-11-13 03:55:56 -08:00
commit 98c101df75
45 changed files with 10476 additions and 9846 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/module.c
View file

@ -1432,7 +1432,7 @@ static bool inherit_taint(struct module *mod, struct module *owner)
if (!owner || !test_bit(TAINT_PROPRIETARY_MODULE, &owner->taints))
return true;
if (mod->m1.using_gplonly_symbols) {
if (mod->using_gplonly_symbols) {
pr_err("%s: module using GPL-only symbols uses symbols from proprietary module %s.\n",
mod->name, owner->name);
return false;
@ -1471,7 +1471,7 @@ static const struct kernel_symbol *resolve_symbol(struct module *mod,
goto unlock;
if (license == GPL_ONLY)
mod->m1.using_gplonly_symbols = true;
mod->using_gplonly_symbols = true;
if (!inherit_taint(mod, owner)) {
sym = NULL;
@ -4006,6 +4006,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
mutex_unlock(&module_mutex);
ddebug_cleanup:
/* Clean up CFI for the module. */
cfi_cleanup(mod);
ftrace_release_mod(mod);
dynamic_debug_remove(mod, info->debug);
synchronize_rcu();