From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 26 Mar 2009 17:29:40 +0000 (+0100)
Subject: Merge commit 'v2.6.29' into core/header-fixes
X-Git-Tag: v2.6.30-rc1~655^2~1
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=5a54bd1307471c1cd0521402fe65e2057edcab2f

Merge commit 'v2.6.29' into core/header-fixes
---

5a54bd1307471c1cd0521402fe65e2057edcab2f
diff --cc arch/ia64/include/asm/kvm.h
index 116761ca462d,bfa86b6af7cd..2b0a38e84705
--- a/arch/ia64/include/asm/kvm.h
+++ b/arch/ia64/include/asm/kvm.h
@@@ -21,9 -21,14 +21,13 @@@
   *
   */
  
 -#include <asm/types.h>
 -
 +#include <linux/types.h>
  #include <linux/ioctl.h>
  
+ /* Select x86 specific features in <linux/kvm.h> */
+ #define __KVM_HAVE_IOAPIC
+ #define __KVM_HAVE_DEVICE_ASSIGNMENT
+ 
  /* Architectural interrupt line count. */
  #define KVM_NR_INTERRUPTS 256
  
diff --cc include/linux/netfilter/xt_NFLOG.h
index eaac7b5226e9,4b36aeb46a10..87b58311ce6b
--- a/include/linux/netfilter/xt_NFLOG.h
+++ b/include/linux/netfilter/xt_NFLOG.h
@@@ -1,10 -1,8 +1,10 @@@
  #ifndef _XT_NFLOG_TARGET
  #define _XT_NFLOG_TARGET
  
 +#include <linux/types.h>
 +
  #define XT_NFLOG_DEFAULT_GROUP		0x1
- #define XT_NFLOG_DEFAULT_THRESHOLD	1
+ #define XT_NFLOG_DEFAULT_THRESHOLD	0
  
  #define XT_NFLOG_MASK			0x0