Hi Alex,

On 28 March 2016 at 19:53, Alex Shi alex.shi@linaro.org wrote:

pulled and pushed.

I don't see these patches in linux-linaro-lsk-v4.1-android branch[1]. Did I miss anything?

Regards, Amit Pundir

[1] https://git.linaro.org/kernel/linux-linaro-stable.git/shortlog/refs/heads/li...

Thanks Amit!

On 03/28/2016 06:53 PM, Amit Pundir wrote:

...

Hi Alex,

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

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.

Just a heads up that x86/x86_64, allmodconfig + config_of=n, is still broken.

Regards, Amit Pundir

The following changes since commit 3e492f24e3c5a76d99dfd65a8a1fd2282101d313:

Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-android (2016-03-22 14:51:35 +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 efb9cd23d1de2f3a51157e92a30e79de5dcd0216:

ANDROID: dm: Mounting root as linear device when verity disabled (2016-03-28 15:51:27 +0530)

---

Badhri Jagan Sridharan (6): 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 ANDROID: usb: gadget: Add support for MTP OS desc ANDROID: dm: Mounting root as linear device when verity disabled

Brian Norris (1): FROMLIST: pstore-ram: fix NULL reference when used with pdata

Daniel Campello (3): Included sdcardfs source code for kernel 3.0 Port of sdcardfs to 4.1 Changed type-casting in packagelist management

Daniel Rosenberg (5): sdcardfs: Bring up to date with Android M permissions: vfs: add d_canonical_path for stacked filesystem support sdcardfs: Add support for d_canonical_path inotify: Fix erroneous update of bit count sdcardfs: remove effectless config option

Dmitry Shmidt (2): Revert "mmc: core: Hold a wake lock accross delayed work + mmc rescan" Revert "mmc: Extend wakelock if bus is dead"

Eliad Peller (1): UPSTREAM: wl18xx: fallback to default conf in case of invalid conf file

Eric Dumazet (2): ipv6: inet6_sk() should use sk_fullsock() net: diag: support v4mapped sockets in inet_diag_find_one_icsk()

Guenter Roeck (1): fs: sdcardfs: Declare LOOKUP_CASE_INSENSITIVE unconditionally

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 Kuo (4): CHROMIUM: usb: gadget: f_mtp: Add SuperSpeed support CHROMIUM: usb: gadget: f_mtp: fix usb_ss_ep_comp_descriptor CHROMIUM: usb: gadget: audio_source: add .free_func callback CHROMIUM: usb: gadget: f_accessory: add .raw_request callback

Mark Salyzyn (1): android: base-cfg: Add CONFIG_IP_MULTICAST

Matthew Moeller (1): ANDROID: usb: u_ether: Add missing rx_work init

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

Thierry Strudel (1): trace: cpufreq: fix typo in min/max cpufreq

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=

dcashman (2): FROMLIST: drivers: char: random: add get_random_long() FROMLIST: mm: ASLR: use get_random_long()

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/arm/mm/mmap.c | 2 +- arch/arm64/kernel/debug-monitors.c | 2 +- arch/arm64/kernel/hw_breakpoint.c | 2 +- arch/arm64/mm/mmap.c | 4 +- arch/mips/mm/mmap.c | 4 +- arch/powerpc/kernel/process.c | 4 +- arch/powerpc/mm/mmap.c | 4 +- arch/sparc/kernel/sys_sparc_64.c | 2 +- arch/x86/mm/mmap.c | 6 +- drivers/char/random.c | 22 +++ drivers/md/Kconfig | 28 ++++ drivers/md/Makefile | 9 ++ drivers/md/dm-android-verity.c | 858 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/md/dm-android-verity.h | 95 +++++++++++ drivers/md/dm-crypt.c | 14 +- drivers/md/dm-ioctl.c | 39 +++++ drivers/md/dm-linear.c | 2 +- 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 +-- drivers/net/wireless/ti/wl18xx/main.c | 45 +++--- drivers/usb/gadget/function/f_accessory.c | 7 + drivers/usb/gadget/function/f_audio_source.c | 6 + drivers/usb/gadget/function/f_mtp.c | 103 +++++++++++- drivers/usb/gadget/function/u_ether.c | 1 + fs/Kconfig | 1 + fs/Makefile | 5 +- fs/binfmt_elf.c | 2 +- fs/notify/inotify/inotify_user.c | 15 +- fs/pstore/ram.c | 3 +- fs/sdcardfs/Kconfig | 13 ++ fs/sdcardfs/Makefile | 7 + fs/sdcardfs/dentry.c | 182 +++++++++++++++++++++ fs/sdcardfs/derived_perm.c | 265 ++++++++++++++++++++++++++++++ fs/sdcardfs/file.c | 356 +++++++++++++++++++++++++++++++++++++++++ fs/sdcardfs/inode.c | 804 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/sdcardfs/lookup.c | 384 ++++++++++++++++++++++++++++++++++++++++++++ fs/sdcardfs/main.c | 404 ++++++++++++++++++++++++++++++++++++++++++++++ fs/sdcardfs/mmap.c | 81 ++++++++++ fs/sdcardfs/multiuser.h | 37 +++++ fs/sdcardfs/packagelist.c | 440 ++++++++++++++++++++++++++++++++++++++++++++++++++ fs/sdcardfs/sdcardfs.h | 530 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/sdcardfs/super.c | 222 ++++++++++++++++++++++++++ include/linux/dcache.h | 1 + include/linux/device-mapper.h | 6 + include/linux/inet_diag.h | 9 ++ include/linux/ipv6.h | 4 +- include/linux/namei.h | 2 + include/linux/random.h | 1 + include/linux/sock_diag.h | 2 + include/linux/string.h | 1 + include/net/sock.h | 1 + include/net/tcp.h | 2 + include/trace/events/power.h | 2 +- include/uapi/linux/magic.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 + 77 files changed, 7168 insertions(+), 366 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 fs/sdcardfs/Kconfig create mode 100644 fs/sdcardfs/Makefile create mode 100644 fs/sdcardfs/dentry.c create mode 100644 fs/sdcardfs/derived_perm.c create mode 100644 fs/sdcardfs/file.c create mode 100644 fs/sdcardfs/inode.c create mode 100644 fs/sdcardfs/lookup.c create mode 100644 fs/sdcardfs/main.c create mode 100644 fs/sdcardfs/mmap.c create mode 100644 fs/sdcardfs/multiuser.h create mode 100644 fs/sdcardfs/packagelist.c create mode 100644 fs/sdcardfs/sdcardfs.h create mode 100644 fs/sdcardfs/super.c create mode 100644 init/do_mounts_dm.c