Hi Amit,

Pulled & pushed.

Thanks, Mark

On 9 June 2016 at 11:32, Amit Pundir amit.pundir@linaro.org wrote:

Hi Alex,

Please consider following linaro-android pull request for "linux-linaro-lsk-v4.1-android" LSK branch.

Regards, Amit Pundir

The following changes since commit 3ead14acd588093321042ac36e40b52a79e96302:

Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-android (2016-05-31 21:57:22 +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 b92a381c04e44b22cb4d3c384aa04751e4fa873c:

ANDROID: dm verity fec: add missing release from fec_ktype (2016-06-09 15:35:53 +0530)

---

Ard Biesheuvel (2): UPSTREAM: arm64: module: fix relocation of movz instruction with negative immediate UPSTREAM: arm64: module: avoid undefined shift behavior in reloc_data()

Badhri Jagan Sridharan (2): ANDROID: dm: fix signature verification flag ANDROID: dm: use default verity public key

Ben Hutchings (1): BACKPORT: perf tools: Document the perf sysctls

Dmitry Shmidt (1): ARM64: Ignore Image-dtb from git point of view

Haojian Zhuang (1): arm64: add option to build Image-dtb

Jeff Vander Stoep (2): FROMLIST: security,perf: Allow further restriction of perf_event_open ANDROID: restrict access to perf events

Jeremy Compostella (1): ANDROID: dm verity fec: pack the fec_header structure

Sami Tolvanen (2): ANDROID: dm verity fec: limit error correction recursion ANDROID: dm verity fec: add missing release from fec_ktype

Winter Wang (1): ANDROID: usb: gadget: f_midi: set fi->f to NULL when free f_midi function

Documentation/sysctl/kernel.txt | 15 +++++++++++++++ android/configs/android-base.cfg | 1 + arch/arm64/Makefile | 2 +- arch/arm64/boot/.gitignore | 1 + arch/arm64/boot/Makefile | 3 +++ arch/arm64/kernel/module.c | 71 ++++++++++++++++++++++------------------------------------------------- drivers/md/dm-android-verity.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++--------------------- drivers/md/dm-android-verity.h | 21 +++++++++++++++++---- drivers/md/dm-verity-fec.c | 14 ++++++++++++-- drivers/md/dm-verity-fec.h | 4 ++++ drivers/usb/gadget/function/f_midi.c | 1 + include/linux/perf_event.h | 5 +++++ kernel/events/core.c | 8 ++++++++ security/Kconfig | 9 +++++++++ tools/perf/util/evsel.c | 15 +++++++++------ 15 files changed, 156 insertions(+), 83 deletions(-)