tree 04f9f67e5f5880552da967938889abd2698b59c9
parent bc8f7f4d773c18aeb6f13c5586fa1059922d0838
parent d3c4ae2a3dbb4e7a4625ac4e03da37b05dd37845
author Iliyan Malchev <malchev@google.com> 1418245067 -0800
committer Iliyan Malchev <malchev@google.com> 1418245071 -0800

resolved conflicts for merge of d3c4ae2a to lmp-mr1-dev

bfd5c1b net: ipv6: allow choosing optimistic addresses with use_optimistic
954e7e0 net/ping: handle protocol mismatching scenario
9e6ff30 cgroup: remove synchronize_rcu() from cgroup_attach_{task|proc}()
085ab6c net: ipv6: Add a sysctl to make optimistic addresses useful candidates

This merge occured because I had to rewrite git history of the grouper kernel
in order to make a single change in lmp-dev.  There had been other changes that
had been merged, so I rebased the kernel such that the change in question was
the first, and the other ones were stacked on top of it.  These additional
changes are in this resolution, and address the following issues:

b/18609055 (redacted)
b/18512516 (moto APR) 9 panics at PC=ping_err+0x264/0x338 LR=ping_err+0x23c/0x338
b/18081205 [L/Mako][UI Performance] APP launch speed is slower than KK
b/17769720 Please cherry-pick optimistic addresses kernel change from net-next
b/18180674 Don't use IP address from wrong interface while performing DAD

Change-Id: I9f7eef5f18d137695b91b35be7f194fb8adb0f34
Signed-off-by: Iliyan Malchev <malchev@google.com>