[kernel] r20070 - in dists/sid/linux/debian: config config/kernelarch-x86 patches patches/debian

[Ben Hutchings]

Author: benh
Date: Fri May 10 03:46:24 2013
New Revision: 20070

Log:
Deal with ABI changes in 3.8.12

Ignore changes in jbd2 and snd-emu10k1, which shouldn't be used by OOT
modules.

Revert change to cgroup structure.

[x86] zsmalloc: Change to built-in, as it can no longer be modular

Added:
   dists/sid/linux/debian/patches/debian/cgroup-avoid-ABI-change-in-3.8.12.patch
Modified:
   dists/sid/linux/debian/config/defines
   dists/sid/linux/debian/config/kernelarch-x86/config
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/config/defines
==============================================================================
--- dists/sid/linux/debian/config/defines	Fri May 10 01:52:59 2013	(r20069)
+++ dists/sid/linux/debian/config/defines	Fri May 10 03:46:24 2013	(r20070)
@@ -1,5 +1,8 @@
 [abi]
 abiname: 1
+ignore-changes:
+ module:fs/jbd2/jbd2
+ module:sound/pci/emu10k1/snd-emu10k1
 
 [base]
 arches:

Modified: dists/sid/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-x86/config	Fri May 10 01:52:59 2013	(r20069)
+++ dists/sid/linux/debian/config/kernelarch-x86/config	Fri May 10 03:46:24 2013	(r20070)
@@ -1413,7 +1413,7 @@
 ##
 ## file: drivers/staging/zsmalloc/Kconfig
 ##
-CONFIG_ZSMALLOC=m
+CONFIG_ZSMALLOC=y
 
 ##
 ## file: drivers/thermal/Kconfig

Added: dists/sid/linux/debian/patches/debian/cgroup-avoid-ABI-change-in-3.8.12.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/cgroup-avoid-ABI-change-in-3.8.12.patch	Fri May 10 03:46:24 2013	(r20070)
@@ -0,0 +1,12 @@
+--- a/include/linux/cgroup.h
++++ b/include/linux/cgroup.h
+@@ -303,6 +303,9 @@ struct cftype {
+ 	/* CFTYPE_* flags */
+ 	unsigned int flags;
+ 
++	/* unused; for ABI compatibility only */
++	struct simple_xattrs xattrs;
++
+ 	int (*open)(struct inode *inode, struct file *file);
+ 	ssize_t (*read)(struct cgroup *cgrp, struct cftype *cft,
+ 			struct file *file,

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Fri May 10 01:52:59 2013	(r20069)
+++ dists/sid/linux/debian/patches/series	Fri May 10 03:46:24 2013	(r20070)
@@ -80,3 +80,4 @@
 bugfix/all/efivars-Handle-duplicate-names-from-get_next_variabl.patch
 debian/efivars-remove-check-for-50-full-on-write.patch
 debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch
+debian/cgroup-avoid-ABI-change-in-3.8.12.patch