From: Alex Shi <alex.shi@linaro.org>
Date: Mon, 14 Mar 2016 07:32:21 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
X-Git-Tag: firefly_0821_release~176^2~473^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fa6e6c7406806f9d4119703e4c3ad661c25b99ee;p=firefly-linux-kernel-4.4.55.git

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
---

fa6e6c7406806f9d4119703e4c3ad661c25b99ee
diff --cc arch/arm64/Makefile
index a5c84594f6ad,b6c90e5006e4..285b32fa41c1
--- a/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 net/ipv6/datagram.c
index 0743a5f4c533,428162155280..183ff87dacf3
--- a/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;