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

Conflicts solution:
	keep 'KBUILD_CFLAGS += -fno-pic'
	in arch/arm64/Makefile

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm64/Makefile
index a5c84594f6adb38390b95271e0a48419d0199765,b6c90e5006e45ae01654c3b5867c3a49910dc54e..285b32fa41c11a4e81ea1663f69946b8486bd881
--- 1/arch/arm64/Makefile
--- 2/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -27,7 -27,7 +27,8 @@@ $(warning LSE atomics not supported by 
  endif
  
  KBUILD_CFLAGS += -mgeneral-regs-only $(lseinstr)
 +KBUILD_CFLAGS += -fno-pic
+ KBUILD_CFLAGS += $(call cc-option, -mpc-relative-literal-loads)
  KBUILD_AFLAGS += $(lseinstr)
  
  ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)

diff --cc arch/arm64/mm/init.c
Simple merge

diff --cc drivers/android/binder.c
Simple merge

diff --cc drivers/mmc/core/sd.c
Simple merge

diff --cc drivers/mmc/core/sdio.c
Simple merge

diff --cc fs/fs-writeback.c
Simple merge

diff --cc fs/super.c
Simple merge

diff --cc include/linux/cgroup-defs.h
Simple merge

diff --cc include/net/ip6_route.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc net/ipv4/devinet.c
Simple merge

diff --cc net/ipv4/inet_connection_sock.c
Simple merge

diff --cc net/ipv4/ping.c
Simple merge

diff --cc net/ipv4/raw.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/datagram.c
index 0743a5f4c53356784e665fcecc7d5780b5bc696e,428162155280ca2af782ea9fd9fa26e0d1666d89..183ff87dacf33f2f95f80fc043c939d217d36b68
--- 1/net/ipv6/datagram.c
--- 2/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@@ -161,8 -161,10 +161,11 @@@ ipv4_connected
        fl6.flowi6_mark = sk->sk_mark;
        fl6.fl6_dport = inet->inet_dport;
        fl6.fl6_sport = inet->inet_sport;
 +      fl6.flowi6_uid = sock_i_uid(sk);
  
+       if (!fl6.flowi6_oif)
+               fl6.flowi6_oif = np->sticky_pktinfo.ipi6_ifindex;
+ 
        if (!fl6.flowi6_oif && (addr_type&IPV6_ADDR_MULTICAST))
                fl6.flowi6_oif = np->mcast_oif;
  

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/rfkill/core.c
Simple merge