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
|
@ -1238,7 +1238,7 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode)
|
|||
|
||||
sym_calc_value(csym);
|
||||
if (mode == def_random)
|
||||
has_changed = randomize_choice_values(csym);
|
||||
has_changed |= randomize_choice_values(csym);
|
||||
else {
|
||||
set_all_choice_values(csym);
|
||||
has_changed = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue