Merge 4.9.216 branch 'android-4.9-q' into tw10-android-4.9-q
Conflicts:
drivers/scsi/ufs/ufshcd.c Checked out ' 39f4ec1ef6
', similar fix was found in source
drivers/staging/android/ashmem.c
drivers/usb/gadget/function/u_serial.c
fs/ext4/ext4.h
security/selinux/avc.c
This commit is contained in:
commit
fa3b3e9fc6
448 changed files with 3962 additions and 1699 deletions
|
@ -121,7 +121,6 @@ void crypto_alg_tested(const char *name, int err);
|
|||
void crypto_remove_spawns(struct crypto_alg *alg, struct list_head *list,
|
||||
struct crypto_alg *nalg);
|
||||
void crypto_remove_final(struct list_head *list);
|
||||
void crypto_shoot_alg(struct crypto_alg *alg);
|
||||
struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type,
|
||||
u32 mask);
|
||||
void *crypto_create_tfm(struct crypto_alg *alg,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue