On 28 Aug 2014, at 17:16, Seán Coffey <sean.cof...@oracle.com> wrote:
> Approved. The conflict does indeed look trivial. Good if Chris can confirm. Ok for me. -Chris. > regards, > Sean. > > On 28/08/2014 15:45, Rob McKenna wrote: >> Hi folks, >> >> Looking to backport this change to 7u. >> >> There is a trivial conflict (namely the addition of the wlen var at the top >> of NetworkInterface.c) so I've posted a webrev of 7 here and cc'd Chris in >> case there is a problem with it: >> >> 7 webrev: http://cr.openjdk.java.net/~robm/7158636/webrev.01/ >> >> Bug: https://bugs.openjdk.java.net/browse/JDK-7158636 >> 8 Changeset: http://hg.openjdk.java.net/jdk8u/jdk8u-dev/jdk/rev/715f50872ae7 >> 8 review: >> http://mail.openjdk.java.net/pipermail/net-dev/2012-April/004275.html >> >> -Rob >> >
