The following patch has been reverted from v4.4.70 prior to the merge
since it was already applied to avoid unnecessary conflicts.
a7544fdd1626 staging/android/ion :
fix a race condition in the ion driver
The following patch has been reverted from chromeos-4.4 prior to the merge
since the underlying problem was fixed differently upstream, and we are
picking up the upstream version as part of the merge.
0ebfa4910c78 FROMLIST: fscrypt: use 32 bytes of encrypted filename
Conflicts:
drivers/media/tuners/tuner-xc2028.c (use local version)
Comment 1 by groeck@chromium.org
, May 25 2017Status: Started (was: Untriaged)