projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a93bdb5 07818b5)
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android
authorKevin Hilman <khilman@linaro.org>
Fri, 14 Aug 2015 16:45:22 +0000 (09:45 -0700)
committerKevin Hilman <khilman@linaro.org>
Fri, 14 Aug 2015 16:55:00 +0000 (09:55 -0700)
commit4dddf720534a9a14fa9b048e7930dcc55b1b1e40
tree6dead0bf02a9c08038d3238b1599823a25d9e881tree | snapshot
parenta93bdb5f55d343fb51892050ed49da9d476da18acommit | diff
parent07818b5b1ba0f494a7255ab634bad2dd2b908ed0commit | diff
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

 Conflicts:
fs/exec.c

 Resolution summary:

    Conflict between upstream/LTS commit 9eae8ac6ab40 (fs: take
    i_mutex during prepare_binprm for set[ug]id executables) and
    android commit 9d0ff694bc22 (sched: move no_new_privs into new
    atomic flags).  Resolution: move task_no_new_privs() usage into
    new function created by upstream/LTS comit.
18 files changed:
arch/arm64/mm/init.c diff1 | diff2 | blob | history
block/genhd.c diff1 | diff2 | blob | history
drivers/base/firmware_class.c diff1 | diff2 | blob | history
drivers/cpuidle/governors/menu.c diff1 | diff2 | blob | history
drivers/mmc/card/block.c diff1 | diff2 | blob | history
fs/btrfs/super.c diff1 | diff2 | blob | history
fs/exec.c diff1 | diff2 | blob | history
fs/ext4/mballoc.c diff1 | diff2 | blob | history
fs/ext4/super.c diff1 | diff2 | blob | history
fs/fuse/inode.c diff1 | diff2 | blob | history
fs/hpfs/super.c diff1 | diff2 | blob | history
include/linux/fs.h diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
kernel/trace/trace.h diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/ipv6/udp.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.