Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common
* android-3.18: (28 commits)
lowmemorykiller: trace kill events.
selinux: do not check open perm on ftruncate call
Revert "HACK: usb: gadget: Fix enumeration on boot"
ipv6: sysctl to restrict candidate source addresses
ipv6: Remove unused arguments for __ipv6_dev_get_saddr().
ipv6: Fix finding best source address in ipv6_dev_get_saddr().
ipv6: Do not iterate over all interfaces when finding source address on specific interface.
net: ipv6: allow explicitly choosing optimistic addresses
net: ipv6: Add a sysctl to make optimistic addresses useful candidates
Revert "net: ipv6: Add a sysctl to make optimistic addresses useful candidates"
Revert "net: ipv6: allow choosing optimistic addresses with use_optimistic"
net: ping: Return EAFNOSUPPORT when appropriate.
net: core: fix UID-based routing build
android: configs: base: enable IPV6
Handle 'sk' being NULL in UID-based routing.
UPSTREAM: ARM: 8425/1: kgdb: Don't try to stop the machine when setting breakpoints
UPSTREAM: ARM: mm: allow text and rodata sections to be read-only
BACKPORT: ARM: mm: allow non-text sections to be non-executable
UPSTREAM: arm: kgdb: Handle read-only text / modules
UPSTREAM: ARM: kexec: Make .text R/W in machine_kexec
...
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Conflicts:
Documentation/device-mapper/verity.txt
drivers/md/dm-verity.c
==> Pick changes from mainline commit 65ff5b7ddf05 "dm verity:
add error handling modes for corrupted blocks" instead of
changes from aosp commit e25690abc0b1 "dm-verity: Add modes
and emit uevent on corrupted blocks".
arch/arm/crypto/Makefile
arch/arm/crypto/sha256_glue.c
arch/arm/crypto/sha256_glue.h
arch/arm/crypto/sha256_neon_glue.c
crypto/Kconfig
==> Pick changes from mainline commit f2f770d74a8d "crypto:
arm/sha256 - Add optimized SHA-256/224" instead of changes
from aosp commit 06435950571f "crypto: arm/sha256 - Add
optimized SHA-256/224"
arch/arm/include/asm/cacheflush.h
==> Pick changes from mainline commit 80d6b0c2eed2 "ARM: mm:
allow text and rodata sections to be read-only" instead
of changes from aosp commit 229aabdcbd25 "UPSTREAM: ARM:
mm: allow text and rodata sections to be read-only".
arch/arm/include/asm/fixmap.h
==> Pick changes from mainline commit a5f4c561b3b1 "ARM: 8415/1:
early fixmap support for earlycon" over aosp changes.
arch/arm/kernel/kgdb.c
==> Add changes from mainline commit fca08f326ae0 "ARM: probes:
move all probe code to dedicate directory".
arch/arm/kernel/patch.h
==> Pick mainline changes for patch.h i.e. delete it.
arch/arm/kernel/vmlinux.lds.S
==> Pick changes from mainline commit commit 1e6b48116a95 "ARM:
mm: allow non-text sections to be non-executable" instead of
aosp commit 229aabdcbd25 "UPSTREAM: ARM: mm: allow text and
rodata sections to be read-only".
arch/arm/mm/Kconfig
==> Add changes from mainline commit fba289054f24 "ARM: 8298/1:
ARM_KERNMEM_PERMS only works with MMU enabled".
arch/arm/mm/init.c
==> Add changes from mainline commit 1e3479225acb "ARM: 8275/1:
mm: fix PMD_SECT_RDONLY undeclared compile error".
drivers/net/ppp/pppopns.c
include/linux/if_pppox.h
==> Discard changes from aosp commit b17194022686 "net: PPPoPNS:
Remove length argument from data_ready" since we no longer
carry broken aosp pppopns and pppolac drivers. See commit
4bacec07a089 "net: temporarily drop broken PPPoLAC and PPPoPNS drivers".
drivers/staging/android/lowmemorykiller.c
==> Pick changes from mainline commits 49550b605587 "oom: add
helpers for setting and clearing TIF_MEMDIE", e1099a69a624
"android, lmk: avoid setting TIF_MEMDIE if process has already
exited", and 16e951966f05 "mm: oom_kill: clean up victim marking
and exiting interfaces" as well as changes from aosp commit
fbc83982bfd5 "lowmemorykiller: trace kill events.".
drivers/usb/gadget/udc/udc-core.c
==> Add changes from aosp commit e8205bb08bb7 "Revert "HACK:
usb: gadget: Fix enumeration on boot"" and remove previous
workarounds as well.
include/linux/ipv6.h
include/uapi/linux/ipv6.h
net/ipv6/addrconf.c
==> Pick changes from mainline including 3985e8a3611a "ipv6:
sysctl to restrict candidate source addresses" instead of
aosp backport dbd204200c68 "ipv6: sysctl to restrict
candidate source addresses".
include/net/route.h
==> Add changes from aosp commit 83511cc43b56 "net: core: fix
UID-based routing build" instead of equivalent linaro-android
fix in llct.