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-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android11-5.4' into 'android11-5.4-lts'

Browse source 
Sync up with android11-5.4 for the following commits:

ea5b4af68f ANDROID: Update the KMI_GENERATION after KMI changes on October 31
40799f06ce ANDROID: Input: bump SW_MAX up to 0x3f
d1f4f1327d ANDROID: GKI: ABI update for Oct 31 KABI break
95dc566101 ANDROID: GKI: add Android ABI padding to struct nf_conn
0709341102 ANDROID: GKI: add vendor padding variable in struct skb_shared_info
01435b2e91 ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle
0bc7257c7f ANDROID: GKI: add vendor padding variable in struct nf_conn
20dd49792a ANDROID: GKI: net: add vendor hooks for 'struct sock' lifecycle
b3d5bbd878 ANDROID: GKI: add vendor padding variable in struct sock
24ab59f6bb ANDROID: fuse: Add support for d_canonical_path
854f380681 ANDROID: vfs: add d_canonical_path for stacked filesystem support
aa445f97a0 ANDROID: fscrypt: prevent fscrypt_operations from affecting KMI
d2a52d0eaa Revert "ANDROID: GKI: fix ABI breakage in module.h"
a273b843ac ANDROID: ABI: update allowed list for galaxy
6ca1e28c7f FROMLIST: char: misc: increase DYNAMIC_MINORS value

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0fafb78b93dca8fd7b76c5808c89e32ae640a75e
This commit is contained in:
Greg Kroah-Hartman 2020-11-01 12:05:12 +01:00
commit ec9ecb5d11
27 changed files with 4940 additions and 5264 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/module.c
View file

@ -1433,7 +1433,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;
@ -1472,7 +1472,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;