Scratch this pull request out. I didn't see one patch and its revert got pushed into this pull request. I'll remove both of them and send a new pull request.

Regards, Amit Pundir

On 23 August 2016 at 16:24, Amit Pundir amit.pundir@linaro.org wrote:

Hi Alex, Mark,

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

Regards, Amit Pundir

The following changes since commit d8697678badc1e5228890c9dd4a46882622f953b:

Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-android (2016-08-23 12:32:00 +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 d25cc2ef6aea53ce1854dd899ee8c14f74f0d81f:

UPSTREAM: Bluetooth: Fix potential NULL dereference in RFCOMM bind callback (2016-08-23 13:29:59 +0530)

---

Al Viro (1): UPSTREAM: ecryptfs: fix handling of directory opening

Amit Pundir (2): ANDROID: net: fib: remove duplicate assignment ANDROID: net: core: fix UID-based routing

Andrew Bresticker (1): CHROMIUM: android: binder: Fix potential scheduling-while-atomic

Anson Jacob (1): usb: gadget: f_accessory: remove duplicate endpoint alloc

Badhri Jagan Sridharan (1): ANDROID: dm: android-verity: Verify header before fetching table

David Howells (2): UPSTREAM: ASN.1: Fix non-match detection failure on data overrun UPSTREAM: KEYS: Fix ASN.1 indefinite length object parsing

Dmitry Shmidt (1): cpuset: Fix allow_attach hook for cpusets on android.

Eric Dumazet (1): UPSTREAM: tcp: make challenge acks less predictable

Jaganath Kanakkassery (1): UPSTREAM: Bluetooth: Fix potential NULL dereference in RFCOMM bind callback

James Carr (1): Implement memory_state_time, used by qcom,cpubw

Jann Horn (2): UPSTREAM: ecryptfs: forbid opening files without mmap handler UPSTREAM: sched: panic on corrupted stack end

Jeff Mahoney (1): UPSTREAM: Revert "ecryptfs: forbid opening files without mmap handler"

Jeff Vander Stoep (1): android-recommended.cfg: enable fstack-protector-strong

Julia Lawall (1): ANDROID: sdcardfs: fix itnull.cocci warnings

Mark Salyzyn (1): Revert "CHROMIUM: android: binder: Fix potential scheduling-while-atomic"

Riley Andrews (1): cpuset: Add allow_attach hook for cpusets on android.

WANG Cong (1): UPSTREAM: ppp: defer netns reference release for ppp channel

Winter Wang (1): UPSTREAM: usb: gadget: configfs: add mutex lock before unregister gadget

Documentation/devicetree/bindings/misc/memory-state-time.txt | 8 ++ android/configs/android-recommended.cfg | 2 + drivers/md/dm-android-verity.c | 140 +++++++++++++++--------------- drivers/misc/Kconfig | 6 ++ drivers/misc/Makefile | 1 + drivers/misc/memory_state_time.c | 454 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/ppp/ppp_generic.c | 5 +- drivers/usb/gadget/configfs.c | 2 + drivers/usb/gadget/function/f_accessory.c | 9 -- fs/ecryptfs/file.c | 71 ++++++++++++---- fs/sdcardfs/derived_perm.c | 2 +- include/linux/memory-state-time.h | 42 +++++++++ include/net/fib_rules.h | 1 - include/uapi/linux/rtnetlink.h | 2 +- kernel/cpuset.c | 18 ++++ kernel/sched/core.c | 3 +- lib/asn1_decoder.c | 21 ++--- net/bluetooth/rfcomm/sock.c | 20 +++-- net/ipv4/tcp_input.c | 15 ++-- 19 files changed, 699 insertions(+), 123 deletions(-) create mode 100644 Documentation/devicetree/bindings/misc/memory-state-time.txt create mode 100644 drivers/misc/memory_state_time.c create mode 100644 include/linux/memory-state-time.h