Hi Mark, Alex,
Please consider following linaro-android pull request for "linux-linaro-lsk-v4.1-android" LSK branch for 16.03.
This pull request contain patches cherry-picked from android-4.1 branch of https://android.googlesource.com/kernel/common. aosp/android-4.1 test merge into lsk-v4.1-android branch had quiet a few complicated merge conflicts and it was easier to just cherry-pick the AOSP only changes for this pull request and skip the upstream or backported patches from AOSP which are already pulled by LTS.
Regards, Amit Pundir
The following changes since commit 26cdd04dff45c47e537a53687eb0b301ec0439ad:
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-android (2016-03-02 08:57:30 +0800)
are available in the git repository at:
git://android.git.linaro.org/kernel/linaro-android.git lsk-v4.1-android
for you to fetch changes up to d2c10e7b4c4253d362053463ac24a68e1d678858:
ANDROID: dm-crypt: run in a WQ_HIGHPRI workqueue (2016-03-10 15:34:28 +0700)
---------------------------------------------------------------- Badhri Jagan Sridharan (4): ANDROID: dm: Add android verity target ANDROID: dm-android-verity: Rebase on top of 4.1 ANDROID: dm: Rebase on top of 4.1 ANDROID: recommended.cfg: Setup verity root for A/B
Dmitry Shmidt (2): Revert "mmc: core: Hold a wake lock accross delayed work + mmc rescan" Revert "mmc: Extend wakelock if bus is dead"
Eric Dumazet (2): ipv6: inet6_sk() should use sk_fullsock() net: diag: support v4mapped sockets in inet_diag_find_one_icsk()
Lorenzo Colitti (5): net: diag: split inet_diag_dump_one_icsk into two net: diag: Add the ability to destroy a socket. net: diag: Support SOCK_DESTROY for inet sockets. net: diag: Support destroying TCP sockets. net: tcp: deal with listen sockets properly in tcp_abort.
Mark Salyzyn (1): android: base-cfg: Add CONFIG_IP_MULTICAST
Rasmus Villemoes (1): UPSTREAM: lib/string.c: introduce strreplace()
Sami Tolvanen (7): UPSTREAM: dm verity: clean up duplicate hashing code UPSTREAM: dm verity: separate function for parsing opt args UPSTREAM: dm verity: move dm-verity.c to dm-verity-target.c BACKPORT: dm verity: factor out structures and functions useful to separate object UPSTREAM: dm verity: factor out verity_for_bv_block() BACKPORT: dm verity: add support for forward error correction UPSTREAM: dm verity: add ignore_zero_blocks feature
Tim Murray (2): ANDROID: mmc: move to a SCHED_FIFO thread ANDROID: dm-crypt: run in a WQ_HIGHPRI workqueue
Will Deacon (1): UPSTREAM: arm64: cpu hotplug: ensure we mask out CPU_TASKS_FROZEN in notifiers
Will Drewry (1): CHROMIUM: dm: boot time specification of dm=
Documentation/device-mapper/boot.txt | 42 +++++ Documentation/device-mapper/verity.txt | 40 ++++- Documentation/kernel-parameters.txt | 6 + android/configs/android-base.cfg | 1 + android/configs/android-recommended.cfg | 7 + arch/arm64/kernel/debug-monitors.c | 2 +- arch/arm64/kernel/hw_breakpoint.c | 2 +- drivers/md/Kconfig | 28 ++++ drivers/md/Makefile | 9 ++ drivers/md/dm-android-verity.c | 771 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/md/dm-android-verity.h | 92 +++++++++++ drivers/md/dm-crypt.c | 14 +- drivers/md/dm-ioctl.c | 39 +++++ drivers/md/dm-table.c | 1 + drivers/md/dm-verity-fec.c | 818 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/md/dm-verity-fec.h | 152 +++++++++++++++++++ drivers/md/{dm-verity.c => dm-verity-target.c} | 616 +++++++++++++++++++++++++++++++++++++++++++------------------------------- drivers/md/dm-verity.h | 144 ++++++++++++++++++ drivers/mmc/card/queue.c | 6 + drivers/mmc/core/core.c | 23 +-- include/linux/device-mapper.h | 6 + include/linux/inet_diag.h | 9 ++ include/linux/ipv6.h | 4 +- include/linux/sock_diag.h | 2 + include/linux/string.h | 1 + include/net/sock.h | 1 + include/net/tcp.h | 2 + include/uapi/linux/sock_diag.h | 1 + init/Makefile | 1 + init/do_mounts.c | 1 + init/do_mounts.h | 10 ++ init/do_mounts_dm.c | 425 +++++++++++++++++++++++++++++++++++++++++++++++++++ lib/string.c | 17 +++ net/core/sock_diag.c | 23 ++- net/ipv4/Kconfig | 13 ++ net/ipv4/inet_diag.c | 86 +++++++---- net/ipv4/tcp.c | 37 +++++ net/ipv4/tcp_diag.c | 19 +++ net/ipv4/tcp_ipv4.c | 1 + net/ipv6/tcp_ipv6.c | 1 + 40 files changed, 3151 insertions(+), 322 deletions(-) create mode 100644 Documentation/device-mapper/boot.txt create mode 100644 drivers/md/dm-android-verity.c create mode 100644 drivers/md/dm-android-verity.h create mode 100644 drivers/md/dm-verity-fec.c create mode 100644 drivers/md/dm-verity-fec.h rename drivers/md/{dm-verity.c => dm-verity-target.c} (68%) create mode 100644 drivers/md/dm-verity.h create mode 100644 init/do_mounts_dm.c