| commit | 70e00db9eb8ffc4dcaf5f035ec6a4440ba428794 | [log] [tgz] |
|---|---|---|
| author | Alex Shi <alex.shi@linaro.org> | Fri Mar 18 11:41:51 2016 +0800 |
| committer | Alex Shi <alex.shi@linaro.org> | Fri Mar 18 16:01:49 2016 +0800 |
| tree | ea67e279adedc950c3d4d8e98546b3823a2b3e93 | |
| parent | 34e0913e457f8469667faf5fa600447aa93371cf [diff] | |
| parent | dfbed80c63bb8d965067da3a6dbcc4682edcce0c [diff] |
Merge remote-tracking branch 'lts/linux-3.14.y' into linux-linaro-lsk-v3.14 Conflicts: Most of conflicts are due to efivar_validate() change which introduced a new parameter to check efi guid. I added efi guid for this change in sanity_check()/efivar_create() in drivers/firmware/efi/efivars.c and keep new efivar_validate() in drivers/firmware/efi/vars.c, since it's newer than LSK version. nothing need mentioned in include/linux/efi.h