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-08 04:42:04 -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

1
include/uapi/linux/fuse.h
View file

@ -465,6 +465,7 @@ enum fuse_opcode {
FUSE_COPY_FILE_RANGE = 47,
FUSE_SETUPMAPPING = 48,
FUSE_REMOVEMAPPING = 49,
FUSE_CANONICAL_PATH = 2016,
/* CUSE specific operations */
CUSE_INIT = 4096,

2
include/uapi/linux/input-event-codes.h
View file

@ -809,7 +809,7 @@
#define SW_MUTE_DEVICE 0x0e /* set = device disabled */
#define SW_PEN_INSERTED 0x0f /* set = pen inserted */
#define SW_MACHINE_COVER 0x10 /* set = cover closed */
#define SW_MAX 0x10
#define SW_MAX 0x3f
#define SW_CNT (SW_MAX+1)
/*