[kernel] r19409 - in dists/trunk/linux/debian: . patches patches/bugfix/all patches/bugfix/x86 patches/debian patches/debian/dfsg patches/features/all patches/features/all/wacom patches/features/arm
Bastian Blank
waldi at alioth.debian.org
Thu Oct 4 19:15:21 UTC 2012
Author: waldi
Date: Thu Oct 4 19:15:20 2012
New Revision: 19409
Log:
* debian/changelog: Update version to 3.6-1~experimental.1
* debian/patches: Fixup broken and remove applied patches.
Deleted:
dists/trunk/linux/debian/patches/bugfix/all/hwmon-applesmc-Allow-negative-temperature-values.patch
dists/trunk/linux/debian/patches/bugfix/all/hwmon-applesmc-Decode-and-act-on-read-write-status-c.patch
dists/trunk/linux/debian/patches/bugfix/all/hwmon-applesmc-Ignore-some-temperature-registers.patch
dists/trunk/linux/debian/patches/bugfix/all/hwmon-applesmc-Shorten-minimum-wait-time.patch
dists/trunk/linux/debian/patches/bugfix/all/hwmon-applesmc-Skip-sensor-mapping.patch
dists/trunk/linux/debian/patches/bugfix/all/net-e100-ucode-is-optional-in-some-cases.patch
dists/trunk/linux/debian/patches/bugfix/all/usb-Add-USB_QUIRK_RESET_RESUME-for-all-Logitech-UVC-.patch
dists/trunk/linux/debian/patches/bugfix/all/usb-Add-quirk-detection-based-on-interface-informati.patch
dists/trunk/linux/debian/patches/bugfix/x86/mfd-lpc_ich-Fix-a-3.5-kernel-regression-for-iTCO_wdt.patch
dists/trunk/linux/debian/patches/features/all/fs-add-link-restriction-audit-reporting.patch
dists/trunk/linux/debian/patches/features/all/fs-add-link-restrictions.patch
dists/trunk/linux/debian/patches/features/all/wacom/0030-wacom-ignore-new-style-Wacom-multi-touch-packets-on-.patch
dists/trunk/linux/debian/patches/features/arm/ahci-Add-JMicron-362-device-IDs.patch
Modified:
dists/trunk/linux/debian/changelog
dists/trunk/linux/debian/patches/debian/dfsg/vs6624-disable.patch
dists/trunk/linux/debian/patches/debian/version.patch
dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
dists/trunk/linux/debian/patches/series
Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog Thu Oct 4 15:48:27 2012 (r19408)
+++ dists/trunk/linux/debian/changelog Thu Oct 4 19:15:20 2012 (r19409)
@@ -1,3 +1,9 @@
+linux (3.6-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream release: http://kernelnewbies.org/Linux_3.6
+
+ -- Bastian Blank <waldi at debian.org> Thu, 04 Oct 2012 17:50:39 +0200
+
linux (3.5.5-1~experimental.1) experimental; urgency=low
* New upstream stable update:
Modified: dists/trunk/linux/debian/patches/debian/dfsg/vs6624-disable.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/dfsg/vs6624-disable.patch Thu Oct 4 15:48:27 2012 (r19408)
+++ dists/trunk/linux/debian/patches/debian/dfsg/vs6624-disable.patch Thu Oct 4 19:15:20 2012 (r19409)
@@ -2,11 +2,7 @@
index ce1e7ba..4bd5a0c 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
-@@ -483,6 +483,7 @@ config VIDEO_OV7670
+@@ -497,2 +497,3 @@ config VIDEO_OV7670
config VIDEO_VS6624
- tristate "ST VS6624 sensor support"
- depends on VIDEO_V4L2 && I2C
+ depends on BROKEN
- ---help---
- This is a Video4Linux2 sensor-level driver for the ST VS6624
- camera.
+ tristate "ST VS6624 sensor support"
Modified: dists/trunk/linux/debian/patches/debian/version.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/version.patch Thu Oct 4 15:48:27 2012 (r19408)
+++ dists/trunk/linux/debian/patches/debian/version.patch Thu Oct 4 19:15:20 2012 (r19409)
@@ -8,7 +8,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -806,7 +806,7 @@ endif
+@@ -806,7 +806,7 @@
prepare2: prepare3 outputmakefile asm-generic
prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
@@ -17,7 +17,7 @@
$(cmd_crmodverdir)
archprepare: archheaders archscripts prepare1 scripts_basic
-@@ -838,12 +838,25 @@ define filechk_version.h
+@@ -838,12 +838,25 @@
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
endef
@@ -45,7 +45,7 @@
$(Q)find $(srctree)/include/ -name '*.h' | xargs --max-args 1 \
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
-@@ -33,6 +33,7 @@
+@@ -31,6 +31,7 @@
#include <linux/kprobes.h>
#include <linux/bug.h>
#include <linux/utsname.h>
@@ -53,7 +53,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
#include <linux/atomic.h>
-@@ -166,11 +167,12 @@ static void show_last_breaking_event(str
+@@ -164,11 +165,12 @@
*/
void dump_stack(void)
{
@@ -68,7 +68,7 @@
printk("Process %s (pid: %d, task: %p, ksp: %p)\n",
current->comm, current->pid, current,
(void *) current->thread.ksp);
-@@ -217,11 +219,12 @@ void show_registers(struct pt_regs *regs
+@@ -215,11 +217,12 @@
void show_regs(struct pt_regs *regs)
{
print_modules();
@@ -93,7 +93,7 @@
#include <asm/current.h>
#include <asm/ptrace.h>
#include "sysrq.h"
-@@ -16,8 +17,9 @@ void __show_regs(struct pt_regs *regs)
+@@ -16,8 +17,9 @@
{
printk("\n");
print_modules();
@@ -107,7 +107,7 @@
printk(KERN_INFO "RSP: %016lx EFLAGS: %08lx\n", PT_REGS_SP(regs),
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
-@@ -17,6 +17,7 @@
+@@ -19,6 +19,7 @@
#include <linux/cpuidle.h>
#include <trace/events/power.h>
#include <linux/hw_breakpoint.h>
@@ -115,21 +115,20 @@
#include <asm/cpu.h>
#include <asm/apic.h>
#include <asm/syscalls.h>
-@@ -146,11 +147,12 @@ void show_regs_common(void)
+@@ -147,11 +148,12 @@
+ /* Board Name is optional */
board = dmi_get_system_info(DMI_BOARD_NAME);
- printk(KERN_CONT "\n");
-- printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
-+ printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s%s",
- current->pid, current->comm, print_tainted(),
- init_utsname()->release,
- (int)strcspn(init_utsname()->version, " "),
-- init_utsname()->version);
-+ init_utsname()->version,
-+ LINUX_PACKAGE_ID);
- printk(KERN_CONT " %s %s", vendor, product);
- if (board)
- printk(KERN_CONT "/%s", board);
+- printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s %s%s%s\n",
++ printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s%s %s %s%s%s\n",
+ current->pid, current->comm, print_tainted(),
+ init_utsname()->release,
+ (int)strcspn(init_utsname()->version, " "),
+ init_utsname()->version,
++ LINUX_PACKAGE_ID,
+ vendor, product,
+ board ? "/" : "",
+ board ? board : "");
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -15,6 +15,7 @@
@@ -140,7 +139,7 @@
#include <asm/stacktrace.h>
-@@ -188,11 +189,12 @@ void dump_stack(void)
+@@ -188,11 +189,12 @@
unsigned long stack;
bp = stack_frame(current, NULL);
@@ -165,7 +164,7 @@
#include <asm/cpu.h>
#include <asm/delay.h>
-@@ -112,9 +113,9 @@ show_regs (struct pt_regs *regs)
+@@ -112,9 +113,9 @@
print_modules();
printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
smp_processor_id(), current->comm);
@@ -187,7 +186,7 @@
#include <asm/cacheflush.h>
#include <asm/leds.h>
-@@ -278,11 +279,12 @@ void __show_regs(struct pt_regs *regs)
+@@ -278,11 +279,12 @@
unsigned long flags;
char buf[64];
@@ -212,7 +211,7 @@
#include <asm/pgtable.h>
#include <asm/uaccess.h>
-@@ -644,8 +645,9 @@ void show_regs(struct pt_regs * regs)
+@@ -644,8 +645,9 @@
printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
regs->nip, regs->link, regs->ctr);
@@ -234,7 +233,7 @@
#include <asm/uaccess.h>
#include <asm/mmu_context.h>
#include <asm/fpu.h>
-@@ -33,10 +34,11 @@ void show_regs(struct pt_regs * regs)
+@@ -33,10 +34,11 @@
{
printk("\n");
printk("Pid : %d, Comm: \t\t%s\n", task_pid_nr(current), current->comm);
Modified: dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
==============================================================================
--- dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch Thu Oct 4 15:48:27 2012 (r19408)
+++ dists/trunk/linux/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch Thu Oct 4 19:15:20 2012 (r19409)
@@ -16,11 +16,9 @@
mm/memcontrol.c | 3 +++
4 files changed, 29 insertions(+), 6 deletions(-)
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index cc85a92..38e0b44 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -425,8 +425,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -455,8 +455,8 @@
ccw_timeout_log [S390]
See Documentation/s390/CommonIO for details.
@@ -31,30 +29,26 @@
{Currently supported controllers - "memory"}
checkreqprot [SELINUX] Set initial checkreqprot flag value.
-diff --git a/init/Kconfig b/init/Kconfig
-index d886b1e..3410369 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -659,6 +659,14 @@ config CGROUP_MEM_RES_CTLR
+@@ -709,6 +709,14 @@
This config option also selects MM_OWNER config option, which
could in turn add some fork/exit overhead.
-+config CGROUP_MEM_RES_CTLR_DISABLED
++config MEMCG_DISABLED
+ bool "Memory Resource Controller disabled by default"
-+ depends on CGROUP_MEM_RES_CTLR
++ depends on MEMCG
+ default n
+ help
+ Disable the memory group resource controller unless explicitly
+ enabled using the kernel parameter "cgroup_enable=memory".
+
- config CGROUP_MEM_RES_CTLR_SWAP
+ config MEMCG_SWAP
bool "Memory Resource Controller Swap Extension"
- depends on CGROUP_MEM_RES_CTLR && SWAP
-diff --git a/kernel/cgroup.c b/kernel/cgroup.c
-index 25c7eb5..b3c5aa7 100644
+ depends on MEMCG && SWAP
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
-@@ -4526,7 +4526,7 @@ static void cgroup_release_agent(struct work_struct *work)
+@@ -5029,7 +5029,7 @@
mutex_unlock(&cgroup_mutex);
}
@@ -63,7 +57,7 @@
{
int i;
char *token;
-@@ -4542,17 +4542,29 @@ static int __init cgroup_disable(char *str)
+@@ -5045,17 +5045,29 @@
struct cgroup_subsys *ss = subsys[i];
if (!strcmp(token, ss->name)) {
@@ -96,11 +90,9 @@
/*
* Functons for CSS ID.
*/
-diff --git a/mm/memcontrol.c b/mm/memcontrol.c
-index 010f916..f660a07 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
-@@ -5153,6 +5153,9 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss,
+@@ -5596,6 +5596,9 @@
struct cgroup_subsys mem_cgroup_subsys = {
.name = "memory",
@@ -110,6 +102,3 @@
.subsys_id = mem_cgroup_subsys_id,
.create = mem_cgroup_create,
.pre_destroy = mem_cgroup_pre_destroy,
---
-1.7.4.4
-
Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series Thu Oct 4 15:48:27 2012 (r19408)
+++ dists/trunk/linux/debian/patches/series Thu Oct 4 19:15:20 2012 (r19409)
@@ -8,12 +8,12 @@
# Patches and source files from aufs3 repository, imported with
# debian/patches/features/all/aufs3/gen-patch.
-features/all/aufs3/aufs3-base.patch
-features/all/aufs3/aufs3-standalone.patch
-features/all/aufs3/aufs3-kbuild.patch
-features/all/aufs3/aufs3-add.patch
+#features/all/aufs3/aufs3-base.patch
+#features/all/aufs3/aufs3-standalone.patch
+#features/all/aufs3/aufs3-kbuild.patch
+#features/all/aufs3/aufs3-add.patch
# mark as staging/crap
-features/all/aufs3/mark-as-staging.patch
+#features/all/aufs3/mark-as-staging.patch
# fix added exports from security/device_cgroup.c
features/all/aufs3/aufs3-fix-export-__devcgroup_inode_permission.patch
@@ -41,28 +41,13 @@
bugfix/arm/ixp4xx_iobe.patch
debian/x86-memtest-WARN-if-bad-RAM-found.patch
-# Add link security restrictions from 3.6
-features/all/fs-add-link-restrictions.patch
-features/all/fs-add-link-restriction-audit-reporting.patch
-
features/all/wacom/0029-wacom-do-not-request-tablet-data-on-MT-Tablet-PC-pen.patch
-features/all/wacom/0030-wacom-ignore-new-style-Wacom-multi-touch-packets-on-.patch
bugfix/ia64/IA64-Export-asm-cmpxchg.h-to-userland.patch
features/all/cpu-devices/Partially-revert-cpufreq-Add-support-for-x86-cpuinfo.patch
-bugfix/all/net-e100-ucode-is-optional-in-some-cases.patch
-bugfix/all/hwmon-applesmc-Skip-sensor-mapping.patch
-bugfix/all/hwmon-applesmc-Shorten-minimum-wait-time.patch
-bugfix/all/hwmon-applesmc-Allow-negative-temperature-values.patch
-bugfix/all/hwmon-applesmc-Ignore-some-temperature-registers.patch
-bugfix/all/hwmon-applesmc-Decode-and-act-on-read-write-status-c.patch
-bugfix/x86/mfd-lpc_ich-Fix-a-3.5-kernel-regression-for-iTCO_wdt.patch
debian/debugfs-set-default-mode-to-700.patch
bugfix/all/media-rc-ite-cir-Initialise-ite_dev-rdev-earlier.patch
features/all/USB-add-USB_VENDOR_AND_INTERFACE_INFO-macro.patch
-bugfix/all/usb-Add-quirk-detection-based-on-interface-informati.patch
-bugfix/all/usb-Add-USB_QUIRK_RESET_RESUME-for-all-Logitech-UVC-.patch
bugfix/alpha/alpha-use-large-data-model.diff
-features/arm/ahci-Add-JMicron-362-device-IDs.patch
bugfix/all/speakup-lower-default-software-speech-rate.patch
More information about the Kernel-svn-changes
mailing list