tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Linus Torvalds d70aa5e4 4570cd6a

+2
unified split
+2
net/ipv6/addrconf.c
··· 985 } 986 987 /* Rule 4: Prefer home address -- not implemented yet */ 988 989 /* Rule 5: Prefer outgoing interface */ 990 if (hiscore.rule < 5) {
··· 985 } 986 987 /* Rule 4: Prefer home address -- not implemented yet */ 988 + if (hiscore.rule < 4) 989 + hiscore.rule++; 990 991 /* Rule 5: Prefer outgoing interface */ 992 if (hiscore.rule < 5) {