Amit Pundir 839f249169 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ...

Conflicts due to AOSP's backported commits:
    fs/f2fs/crypto.c
    fs/f2fs/crypto_fname.c
        Deleted by AOSP commit c1286ff41c2f ("f2fs: backport from (4c1fad64 -
        Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)")

    fs/f2fs/crypto_key.c
    fs/f2fs/data.c
    fs/f2fs/file.c
        AOSP commit 13f002354db1 ("f2fs: catch up to v4.14-rc1")
        override most of stable 4.4.y changes.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

2017-11-20 20:53:19 +05:30

..

control.c

…

cuse.c

…

dev.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-02-24 12:03:21 +08:00

dir.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-11-20 20:53:19 +05:30

file.c

fuse: initialize the flock flag in fuse_file on allocation

2017-08-16 13:40:28 -07:00

fuse_i.h

…

inode.c

…

Kconfig

…

Makefile

…