aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2010-07-06 18:41:18 -0600
committerTim Gardner <tim.gardner@canonical.com>2010-07-06 18:42:48 -0600
commitfa65da5e9d2342921de05223d8f324bd576ed277 (patch)
treefe88414400cfa70f233bda3e362bb3784ee646bb
parentf672aec2b8ab4dbd279fb1bc374a23cb6c1355ed (diff)
UBUNTU: Ubuntu-2.6.35-7.11Ubuntu-2.6.35-7.11
Ignore: yes Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
-rw-r--r--debian.master/abi/2.6.35-7.10/abiname (renamed from debian.master/abi/2.6.35-6.9/abiname)0
-rw-r--r--debian.master/abi/2.6.35-7.10/amd64/generic (renamed from debian.master/abi/2.6.35-6.9/amd64/generic)0
-rw-r--r--debian.master/abi/2.6.35-7.10/amd64/generic.modules (renamed from debian.master/abi/2.6.35-6.9/amd64/generic.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/amd64/ignore1
-rw-r--r--debian.master/abi/2.6.35-7.10/amd64/server (renamed from debian.master/abi/2.6.35-6.9/amd64/server)0
-rw-r--r--debian.master/abi/2.6.35-7.10/amd64/server.modules (renamed from debian.master/abi/2.6.35-6.9/amd64/server.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/amd64/virtual (renamed from debian.master/abi/2.6.35-6.9/amd64/virtual)0
-rw-r--r--debian.master/abi/2.6.35-7.10/amd64/virtual.modules (renamed from debian.master/abi/2.6.35-6.9/amd64/virtual.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/armel/ignore1
-rw-r--r--debian.master/abi/2.6.35-7.10/armel/omap (renamed from debian.master/abi/2.6.35-6.9/armel/omap)0
-rw-r--r--debian.master/abi/2.6.35-7.10/armel/omap.modules (renamed from debian.master/abi/2.6.35-6.9/armel/omap.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/armel/versatile (renamed from debian.master/abi/2.6.35-6.9/armel/versatile)0
-rw-r--r--debian.master/abi/2.6.35-7.10/armel/versatile.modules (renamed from debian.master/abi/2.6.35-6.9/armel/versatile.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/i386/generic (renamed from debian.master/abi/2.6.35-6.9/i386/generic)0
-rw-r--r--debian.master/abi/2.6.35-7.10/i386/generic-pae (renamed from debian.master/abi/2.6.35-6.9/i386/generic-pae)0
-rw-r--r--debian.master/abi/2.6.35-7.10/i386/generic-pae.modules (renamed from debian.master/abi/2.6.35-6.9/i386/generic-pae.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/i386/generic.modules (renamed from debian.master/abi/2.6.35-6.9/i386/generic.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/i386/ignore1
-rw-r--r--debian.master/abi/2.6.35-7.10/i386/virtual (renamed from debian.master/abi/2.6.35-6.9/i386/virtual)0
-rw-r--r--debian.master/abi/2.6.35-7.10/i386/virtual.modules (renamed from debian.master/abi/2.6.35-6.9/i386/virtual.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/ia64/ia64 (renamed from debian.master/abi/2.6.35-6.9/ia64/ia64)0
-rw-r--r--debian.master/abi/2.6.35-7.10/ia64/ia64.modules (renamed from debian.master/abi/2.6.35-6.9/ia64/ia64.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/ia64/ignore1
-rw-r--r--debian.master/abi/2.6.35-7.10/powerpc/ignore1
-rw-r--r--debian.master/abi/2.6.35-7.10/powerpc/powerpc (renamed from debian.master/abi/2.6.35-6.9/powerpc/powerpc)0
-rw-r--r--debian.master/abi/2.6.35-7.10/powerpc/powerpc-smp (renamed from debian.master/abi/2.6.35-6.9/powerpc/powerpc-smp)0
-rw-r--r--debian.master/abi/2.6.35-7.10/powerpc/powerpc-smp.modules (renamed from debian.master/abi/2.6.35-6.9/powerpc/powerpc-smp.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/powerpc/powerpc.modules (renamed from debian.master/abi/2.6.35-6.9/powerpc/powerpc.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/powerpc/powerpc64-smp (renamed from debian.master/abi/2.6.35-6.9/powerpc/powerpc64-smp)0
-rw-r--r--debian.master/abi/2.6.35-7.10/powerpc/powerpc64-smp.modules (renamed from debian.master/abi/2.6.35-6.9/powerpc/powerpc64-smp.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/sparc/ignore1
-rw-r--r--debian.master/abi/2.6.35-7.10/sparc/sparc64 (renamed from debian.master/abi/2.6.35-6.9/sparc/sparc64)0
-rw-r--r--debian.master/abi/2.6.35-7.10/sparc/sparc64-smp (renamed from debian.master/abi/2.6.35-6.9/sparc/sparc64-smp)0
-rw-r--r--debian.master/abi/2.6.35-7.10/sparc/sparc64-smp.modules (renamed from debian.master/abi/2.6.35-6.9/sparc/sparc64-smp.modules)0
-rw-r--r--debian.master/abi/2.6.35-7.10/sparc/sparc64.modules (renamed from debian.master/abi/2.6.35-6.9/sparc/sparc64.modules)0
-rw-r--r--debian.master/changelog14
36 files changed, 20 insertions, 0 deletions
diff --git a/debian.master/abi/2.6.35-6.9/abiname b/debian.master/abi/2.6.35-7.10/abiname
index 1e8b3149621..1e8b3149621 100644
--- a/debian.master/abi/2.6.35-6.9/abiname
+++ b/debian.master/abi/2.6.35-7.10/abiname
diff --git a/debian.master/abi/2.6.35-6.9/amd64/generic b/debian.master/abi/2.6.35-7.10/amd64/generic
index 1e6a1af6279..1e6a1af6279 100644
--- a/debian.master/abi/2.6.35-6.9/amd64/generic
+++ b/debian.master/abi/2.6.35-7.10/amd64/generic
diff --git a/debian.master/abi/2.6.35-6.9/amd64/generic.modules b/debian.master/abi/2.6.35-7.10/amd64/generic.modules
index 1f95eb20eb9..1f95eb20eb9 100644
--- a/debian.master/abi/2.6.35-6.9/amd64/generic.modules
+++ b/debian.master/abi/2.6.35-7.10/amd64/generic.modules
diff --git a/debian.master/abi/2.6.35-7.10/amd64/ignore b/debian.master/abi/2.6.35-7.10/amd64/ignore
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/debian.master/abi/2.6.35-7.10/amd64/ignore
@@ -0,0 +1 @@
+1
diff --git a/debian.master/abi/2.6.35-6.9/amd64/server b/debian.master/abi/2.6.35-7.10/amd64/server
index 477ae4b79fb..477ae4b79fb 100644
--- a/debian.master/abi/2.6.35-6.9/amd64/server
+++ b/debian.master/abi/2.6.35-7.10/amd64/server
diff --git a/debian.master/abi/2.6.35-6.9/amd64/server.modules b/debian.master/abi/2.6.35-7.10/amd64/server.modules
index 3b4084d2739..3b4084d2739 100644
--- a/debian.master/abi/2.6.35-6.9/amd64/server.modules
+++ b/debian.master/abi/2.6.35-7.10/amd64/server.modules
diff --git a/debian.master/abi/2.6.35-6.9/amd64/virtual b/debian.master/abi/2.6.35-7.10/amd64/virtual
index 477ae4b79fb..477ae4b79fb 100644
--- a/debian.master/abi/2.6.35-6.9/amd64/virtual
+++ b/debian.master/abi/2.6.35-7.10/amd64/virtual
diff --git a/debian.master/abi/2.6.35-6.9/amd64/virtual.modules b/debian.master/abi/2.6.35-7.10/amd64/virtual.modules
index 8b4ddd3fd2b..8b4ddd3fd2b 100644
--- a/debian.master/abi/2.6.35-6.9/amd64/virtual.modules
+++ b/debian.master/abi/2.6.35-7.10/amd64/virtual.modules
diff --git a/debian.master/abi/2.6.35-7.10/armel/ignore b/debian.master/abi/2.6.35-7.10/armel/ignore
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/debian.master/abi/2.6.35-7.10/armel/ignore
@@ -0,0 +1 @@
+1
diff --git a/debian.master/abi/2.6.35-6.9/armel/omap b/debian.master/abi/2.6.35-7.10/armel/omap
index 379c782f75e..379c782f75e 100644
--- a/debian.master/abi/2.6.35-6.9/armel/omap
+++ b/debian.master/abi/2.6.35-7.10/armel/omap
diff --git a/debian.master/abi/2.6.35-6.9/armel/omap.modules b/debian.master/abi/2.6.35-7.10/armel/omap.modules
index 1a83971f470..1a83971f470 100644
--- a/debian.master/abi/2.6.35-6.9/armel/omap.modules
+++ b/debian.master/abi/2.6.35-7.10/armel/omap.modules
diff --git a/debian.master/abi/2.6.35-6.9/armel/versatile b/debian.master/abi/2.6.35-7.10/armel/versatile
index e1de06cc0c8..e1de06cc0c8 100644
--- a/debian.master/abi/2.6.35-6.9/armel/versatile
+++ b/debian.master/abi/2.6.35-7.10/armel/versatile
diff --git a/debian.master/abi/2.6.35-6.9/armel/versatile.modules b/debian.master/abi/2.6.35-7.10/armel/versatile.modules
index 93216838072..93216838072 100644
--- a/debian.master/abi/2.6.35-6.9/armel/versatile.modules
+++ b/debian.master/abi/2.6.35-7.10/armel/versatile.modules
diff --git a/debian.master/abi/2.6.35-6.9/i386/generic b/debian.master/abi/2.6.35-7.10/i386/generic
index e5c6ca1dee7..e5c6ca1dee7 100644
--- a/debian.master/abi/2.6.35-6.9/i386/generic
+++ b/debian.master/abi/2.6.35-7.10/i386/generic
diff --git a/debian.master/abi/2.6.35-6.9/i386/generic-pae b/debian.master/abi/2.6.35-7.10/i386/generic-pae
index 296cd3454f7..296cd3454f7 100644
--- a/debian.master/abi/2.6.35-6.9/i386/generic-pae
+++ b/debian.master/abi/2.6.35-7.10/i386/generic-pae
diff --git a/debian.master/abi/2.6.35-6.9/i386/generic-pae.modules b/debian.master/abi/2.6.35-7.10/i386/generic-pae.modules
index 74c4471dbcf..74c4471dbcf 100644
--- a/debian.master/abi/2.6.35-6.9/i386/generic-pae.modules
+++ b/debian.master/abi/2.6.35-7.10/i386/generic-pae.modules
diff --git a/debian.master/abi/2.6.35-6.9/i386/generic.modules b/debian.master/abi/2.6.35-7.10/i386/generic.modules
index 646b5b66367..646b5b66367 100644
--- a/debian.master/abi/2.6.35-6.9/i386/generic.modules
+++ b/debian.master/abi/2.6.35-7.10/i386/generic.modules
diff --git a/debian.master/abi/2.6.35-7.10/i386/ignore b/debian.master/abi/2.6.35-7.10/i386/ignore
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/debian.master/abi/2.6.35-7.10/i386/ignore
@@ -0,0 +1 @@
+1
diff --git a/debian.master/abi/2.6.35-6.9/i386/virtual b/debian.master/abi/2.6.35-7.10/i386/virtual
index 296cd3454f7..296cd3454f7 100644
--- a/debian.master/abi/2.6.35-6.9/i386/virtual
+++ b/debian.master/abi/2.6.35-7.10/i386/virtual
diff --git a/debian.master/abi/2.6.35-6.9/i386/virtual.modules b/debian.master/abi/2.6.35-7.10/i386/virtual.modules
index 83079da1230..83079da1230 100644
--- a/debian.master/abi/2.6.35-6.9/i386/virtual.modules
+++ b/debian.master/abi/2.6.35-7.10/i386/virtual.modules
diff --git a/debian.master/abi/2.6.35-6.9/ia64/ia64 b/debian.master/abi/2.6.35-7.10/ia64/ia64
index 22a54053d0f..22a54053d0f 100644
--- a/debian.master/abi/2.6.35-6.9/ia64/ia64
+++ b/debian.master/abi/2.6.35-7.10/ia64/ia64
diff --git a/debian.master/abi/2.6.35-6.9/ia64/ia64.modules b/debian.master/abi/2.6.35-7.10/ia64/ia64.modules
index e0c27db5f22..e0c27db5f22 100644
--- a/debian.master/abi/2.6.35-6.9/ia64/ia64.modules
+++ b/debian.master/abi/2.6.35-7.10/ia64/ia64.modules
diff --git a/debian.master/abi/2.6.35-7.10/ia64/ignore b/debian.master/abi/2.6.35-7.10/ia64/ignore
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/debian.master/abi/2.6.35-7.10/ia64/ignore
@@ -0,0 +1 @@
+1
diff --git a/debian.master/abi/2.6.35-7.10/powerpc/ignore b/debian.master/abi/2.6.35-7.10/powerpc/ignore
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/debian.master/abi/2.6.35-7.10/powerpc/ignore
@@ -0,0 +1 @@
+1
diff --git a/debian.master/abi/2.6.35-6.9/powerpc/powerpc b/debian.master/abi/2.6.35-7.10/powerpc/powerpc
index a3c833b00eb..a3c833b00eb 100644
--- a/debian.master/abi/2.6.35-6.9/powerpc/powerpc
+++ b/debian.master/abi/2.6.35-7.10/powerpc/powerpc
diff --git a/debian.master/abi/2.6.35-6.9/powerpc/powerpc-smp b/debian.master/abi/2.6.35-7.10/powerpc/powerpc-smp
index bdbf0c34bc1..bdbf0c34bc1 100644
--- a/debian.master/abi/2.6.35-6.9/powerpc/powerpc-smp
+++ b/debian.master/abi/2.6.35-7.10/powerpc/powerpc-smp
diff --git a/debian.master/abi/2.6.35-6.9/powerpc/powerpc-smp.modules b/debian.master/abi/2.6.35-7.10/powerpc/powerpc-smp.modules
index c70400b0fb4..c70400b0fb4 100644
--- a/debian.master/abi/2.6.35-6.9/powerpc/powerpc-smp.modules
+++ b/debian.master/abi/2.6.35-7.10/powerpc/powerpc-smp.modules
diff --git a/debian.master/abi/2.6.35-6.9/powerpc/powerpc.modules b/debian.master/abi/2.6.35-7.10/powerpc/powerpc.modules
index 974279d1f61..974279d1f61 100644
--- a/debian.master/abi/2.6.35-6.9/powerpc/powerpc.modules
+++ b/debian.master/abi/2.6.35-7.10/powerpc/powerpc.modules
diff --git a/debian.master/abi/2.6.35-6.9/powerpc/powerpc64-smp b/debian.master/abi/2.6.35-7.10/powerpc/powerpc64-smp
index 72d6863cb99..72d6863cb99 100644
--- a/debian.master/abi/2.6.35-6.9/powerpc/powerpc64-smp
+++ b/debian.master/abi/2.6.35-7.10/powerpc/powerpc64-smp
diff --git a/debian.master/abi/2.6.35-6.9/powerpc/powerpc64-smp.modules b/debian.master/abi/2.6.35-7.10/powerpc/powerpc64-smp.modules
index 6eaa84bcd54..6eaa84bcd54 100644
--- a/debian.master/abi/2.6.35-6.9/powerpc/powerpc64-smp.modules
+++ b/debian.master/abi/2.6.35-7.10/powerpc/powerpc64-smp.modules
diff --git a/debian.master/abi/2.6.35-7.10/sparc/ignore b/debian.master/abi/2.6.35-7.10/sparc/ignore
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/debian.master/abi/2.6.35-7.10/sparc/ignore
@@ -0,0 +1 @@
+1
diff --git a/debian.master/abi/2.6.35-6.9/sparc/sparc64 b/debian.master/abi/2.6.35-7.10/sparc/sparc64
index 9dc0ce29415..9dc0ce29415 100644
--- a/debian.master/abi/2.6.35-6.9/sparc/sparc64
+++ b/debian.master/abi/2.6.35-7.10/sparc/sparc64
diff --git a/debian.master/abi/2.6.35-6.9/sparc/sparc64-smp b/debian.master/abi/2.6.35-7.10/sparc/sparc64-smp
index 93541526fa4..93541526fa4 100644
--- a/debian.master/abi/2.6.35-6.9/sparc/sparc64-smp
+++ b/debian.master/abi/2.6.35-7.10/sparc/sparc64-smp
diff --git a/debian.master/abi/2.6.35-6.9/sparc/sparc64-smp.modules b/debian.master/abi/2.6.35-7.10/sparc/sparc64-smp.modules
index 542fc0ed779..542fc0ed779 100644
--- a/debian.master/abi/2.6.35-6.9/sparc/sparc64-smp.modules
+++ b/debian.master/abi/2.6.35-7.10/sparc/sparc64-smp.modules
diff --git a/debian.master/abi/2.6.35-6.9/sparc/sparc64.modules b/debian.master/abi/2.6.35-7.10/sparc/sparc64.modules
index 35e28021350..35e28021350 100644
--- a/debian.master/abi/2.6.35-6.9/sparc/sparc64.modules
+++ b/debian.master/abi/2.6.35-7.10/sparc/sparc64.modules
diff --git a/debian.master/changelog b/debian.master/changelog
index 19ecc501dca..a8090b994df 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,3 +1,17 @@
+linux (2.6.35-7.11) maverick; urgency=low
+
+ [ Tim Gardner ]
+
+ * [Config] CONFIG_X86_MRST=n
+
+ [ Upstream Kernel Changes ]
+
+ * (drop after 2.6.35-rc5) writeback: remove writeback_inodes_wbc
+ * (drop after 2.6.35-rc5) writeback: split writeback_inodes_wb
+ * (drop after 2.6.35-rc5) writeback: simplify the write back thread queue
+
+ -- Tim Gardner <tim.gardner@canonical.com> Tue, 06 Jul 2010 18:39:08 -0600
+
linux (2.6.35-7.10) maverick; urgency=low
[ Kees Cook ]