import changed kernel options from B3 to B2 kernel config

debian/changelog

@@ -1,3 +1,9 @@
+linux (1:2.6.39.4-12) vincent; urgency=low
+
+  * import changed kernel options from B3 to B2 kernel config
+
+ -- Carl Fürstenberg <carl@excito.com>  Tue, 17 Apr 2012 17:54:21 +0200
+
 linux (1:2.6.39.4-11) vincent; urgency=low
 
   * Add HDIDEV support 

debian/patches/0009-Enable-kernel-options-to-make-iotop-work.patch

@@ -5,8 +5,9 @@ Subject: Enable kernel options to make iotop work
 Enable options CONFIG_TASKSTATS, CONFIG_TASK_DELAY_ACCT, and
 CONFIG_TASK_IO_ACCOUNTING
 ---
- arch/arm/configs/bubba3_defconfig |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ arch/arm/configs/bubba3_defconfig       |    5 +++++
+ arch/powerpc/configs/bubbatwo_defconfig |    4 ++++
+ 2 files changed, 9 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/configs/bubba3_defconfig b/arch/arm/configs/bubba3_defconfig
 index 141f381..a85a07b 100644
@@ -31,4 +32,19 @@ index 141f381..a85a07b 100644
  CONFIG_ATH5K=m
  CONFIG_ATH9K=m
  CONFIG_ATH9K_HTC=m
+diff --git a/arch/powerpc/configs/bubbatwo_defconfig b/arch/powerpc/configs/bubbatwo_defconfig
+index e5e3218..2bd71cf 100644
+--- a/arch/powerpc/configs/bubbatwo_defconfig
++++ b/arch/powerpc/configs/bubbatwo_defconfig
+@@ -1,6 +1,10 @@
+ CONFIG_EXPERIMENTAL=y
+ CONFIG_SYSVIPC=y
+ CONFIG_POSIX_MQUEUE=y
++CONFIG_TASKSTATS=y
++CONFIG_TASK_DELAY_ACCT=y
++CONFIG_TASK_XACCT=y
++CONFIG_TASK_IO_ACCOUNTING=y
+ CONFIG_IKCONFIG=y
+ CONFIG_IKCONFIG_PROC=y
+ CONFIG_LOG_BUF_SHIFT=14
 -- 

debian/patches/0010-Enable-missing-modules-to-make-Strongswan-work.patch

@@ -5,8 +5,9 @@ Subject: Enable missing modules to make Strongswan work
 the modules CONFIG_XFRM_USER and CONFIG_NET_KEY needs to be enabled for
 Strongswan support
 ---
- arch/arm/configs/bubba3_defconfig |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ arch/arm/configs/bubba3_defconfig       |    2 ++
+ arch/powerpc/configs/bubbatwo_defconfig |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/configs/bubba3_defconfig b/arch/arm/configs/bubba3_defconfig
 index a85a07b..f551910 100644
@@ -17,6 +18,19 @@ index a85a07b..f551910 100644
  CONFIG_PACKET=y
  CONFIG_UNIX=y
 +CONFIG_XFRM_USER=y
++CONFIG_NET_KEY=y
+ CONFIG_INET=y
+ CONFIG_IP_MULTICAST=y
+ CONFIG_IP_PNP=y
+diff --git a/arch/powerpc/configs/bubbatwo_defconfig b/arch/powerpc/configs/bubbatwo_defconfig
+index 2bd71cf..46f6778 100644
+--- a/arch/powerpc/configs/bubbatwo_defconfig
++++ b/arch/powerpc/configs/bubbatwo_defconfig
+@@ -31,6 +31,8 @@ CONFIG_PCI=y
+ CONFIG_NET=y
+ CONFIG_PACKET=y
+ CONFIG_UNIX=y
++CONFIG_XFRM_USER=y
 +CONFIG_NET_KEY=y
  CONFIG_INET=y
  CONFIG_IP_MULTICAST=y

debian/patches/0012-Add-ebtables-support.patch

@@ -3,8 +3,9 @@ Date: Fri, 21 Oct 2011 15:39:12 +0200
 Subject: Add ebtables support
 
 ---
- arch/arm/configs/bubba3_defconfig |   21 +++++++++++++++++++++
- 1 files changed, 21 insertions(+), 0 deletions(-)
+ arch/arm/configs/bubba3_defconfig       |   21 +++++++++++++++++++++
+ arch/powerpc/configs/bubbatwo_defconfig |   21 +++++++++++++++++++++
+ 2 files changed, 42 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/configs/bubba3_defconfig b/arch/arm/configs/bubba3_defconfig
 index d53befe..d91141d 100644
@@ -38,4 +39,36 @@ index d53befe..d91141d 100644
  CONFIG_ATM=m
  CONFIG_ATM_CLIP=m
  CONFIG_ATM_BR2684=m
+diff --git a/arch/powerpc/configs/bubbatwo_defconfig b/arch/powerpc/configs/bubbatwo_defconfig
+index 46f6778..97944e2 100644
+--- a/arch/powerpc/configs/bubbatwo_defconfig
++++ b/arch/powerpc/configs/bubbatwo_defconfig
+@@ -148,6 +148,27 @@ CONFIG_IP6_NF_FILTER=m
+ CONFIG_IP6_NF_TARGET_REJECT=m
+ CONFIG_IP6_NF_MANGLE=m
+ CONFIG_IP6_NF_RAW=m
++CONFIG_BRIDGE_NF_EBTABLES=m
++CONFIG_BRIDGE_EBT_BROUTE=m
++CONFIG_BRIDGE_EBT_T_FILTER=m
++CONFIG_BRIDGE_EBT_T_NAT=m
++CONFIG_BRIDGE_EBT_802_3=m
++CONFIG_BRIDGE_EBT_AMONG=m
++CONFIG_BRIDGE_EBT_ARP=m
++CONFIG_BRIDGE_EBT_IP=m
++CONFIG_BRIDGE_EBT_IP6=m
++CONFIG_BRIDGE_EBT_LIMIT=m
++CONFIG_BRIDGE_EBT_MARK=m
++CONFIG_BRIDGE_EBT_PKTTYPE=m
++CONFIG_BRIDGE_EBT_STP=m
++CONFIG_BRIDGE_EBT_VLAN=m
++CONFIG_BRIDGE_EBT_ARPREPLY=m
++CONFIG_BRIDGE_EBT_DNAT=m
++CONFIG_BRIDGE_EBT_MARK_T=m
++CONFIG_BRIDGE_EBT_REDIRECT=m
++CONFIG_BRIDGE_EBT_SNAT=m
++CONFIG_BRIDGE_EBT_LOG=m
++CONFIG_BRIDGE_EBT_NFLOG=m
+ CONFIG_BRIDGE=m
+ CONFIG_VLAN_8021Q=m
+ CONFIG_NET_SCHED=y
 -- 

debian/patches/0015-Add-support-for-NFS41-kernel-client.patch

@@ -3,8 +3,9 @@ Date: Fri, 9 Dec 2011 16:58:33 +0100
 Subject: Add support for NFS41 kernel client
 
 ---
- arch/arm/configs/bubba3_defconfig |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ arch/arm/configs/bubba3_defconfig       |    1 +
+ arch/powerpc/configs/bubbatwo_defconfig |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/configs/bubba3_defconfig b/arch/arm/configs/bubba3_defconfig
 index 0549a86..3ba6438 100644
@@ -18,4 +19,16 @@ index 0549a86..3ba6438 100644
  CONFIG_ROOT_NFS=y
  CONFIG_NFS_FSCACHE=y
  CONFIG_NFSD=y
+diff --git a/arch/powerpc/configs/bubbatwo_defconfig b/arch/powerpc/configs/bubbatwo_defconfig
+index 97944e2..4a6eaee 100644
+--- a/arch/powerpc/configs/bubbatwo_defconfig
++++ b/arch/powerpc/configs/bubbatwo_defconfig
+@@ -523,6 +523,7 @@ CONFIG_HFSPLUS_FS=m
+ CONFIG_NFS_FS=m
+ CONFIG_NFS_V3=y
+ CONFIG_NFS_V4=y
++CONFIG_NFS_V4_1=y
+ CONFIG_NFSD=m
+ CONFIG_NFSD_V3=y
+ CONFIG_NFSD_V3_ACL=y
 --