/* * ICMPv6 tracking. * * 21 Apl 2004: Yasuyuki Kozakai @USAGI * - separated from nf_conntrack_icmp.h * * Derived from include/linux/netfiter_ipv4/ip_conntrack_icmp.h */ #ifndef _NF_CONNTRACK_ICMPV6_H #define _NF_CONNTRACK_ICMPV6_H #ifndef ICMPV6_NI_QUERY #define ICMPV6_NI_QUERY 139 #endif #ifndef ICMPV6_NI_REPLY #define ICMPV6_NI_REPLY 140 #endif #endif /* _NF_CONNTRACK_ICMPV6_H */ ink rel='vcs-git' href='http:///git.distanz.ch/cgit.cgi/linux/net-next.git' title='net-next.git Git repository'/>
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-09-26 15:48:33 -0400
committerThomas Gleixner <tglx@linutronix.de>2016-09-26 15:51:22 -0400
commiteb6296dec19f304199ae389e6863ecc1fc74b7c7 (patch)
tree9c14dca3c3c8a6f9db63b1d9c13020225dd1a2ed
parent1e1b37273cf719545da50b76f214f983a710aaf4 (diff)
x86/apic: Fix silent & fatal merge conflict in __generic_processor_info()
Fix up the silent merge conflict between commit c291b0151585 in x86/urgent and commit f7c28833c2520 in x86/apic which both remove num_processors++ from the original location and then add it at two different locations. As a result num_processors is incremented twice which can cut the number of available cpus in half. Remove the one which is added by commit c291b0151585. In hindsight I should have merged x86/urgent into x86/apic _before_ adding the nodeid bits, but in hindsight we are always smarter. Reported-and-tested-by: Borislav Petkov <bp@alien8.de> Reported-by: Mike Galbraith <umgwanakikbuti@gmail.com> Fixes: 1e1b37273cf7 ("Merge branch 'x86/urgent' into x86/apic") Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1609261350090.5483@nanos Cc: Dou Liyang <douly.fnst@cn.fujitsu.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat