linux-flexiantxendom0-natty.git
13 years agoUBUNTU: ubuntu: AUFS -- aufs2-standalone.patch aufs2.1-37
Andy Whitcroft [Mon, 22 Nov 2010 15:48:36 +0000 (15:48 +0000)]
UBUNTU: ubuntu: AUFS -- aufs2-standalone.patch aufs2.1-37

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-37
Andy Whitcroft [Mon, 22 Nov 2010 15:47:50 +0000 (15:47 +0000)]
UBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-37

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "UBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-36-UNRELEASED-20101103"
Andy Whitcroft [Mon, 22 Nov 2010 15:04:58 +0000 (15:04 +0000)]
Revert "UBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-36-UNRELEASED-20101103"

This reverts commit f628a4f95358f73b2393bec6c5a8df31b903e2ea.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "UBUNTU: ubuntu: AUFS -- aufs2-standalone.patch aufs2.1-36-UNRELEASED-20101103"
Andy Whitcroft [Mon, 22 Nov 2010 15:04:45 +0000 (15:04 +0000)]
Revert "UBUNTU: ubuntu: AUFS -- aufs2-standalone.patch aufs2.1-36-UNRELEASED-20101103"

This reverts commit 39e47347774cd894b19cb173770081473c97e2c2.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] CONFIG_EASYCAP=m after fixing FTBS
Tim Gardner [Mon, 22 Nov 2010 17:31:53 +0000 (10:31 -0700)]
UBUNTU: [Config] CONFIG_EASYCAP=m after fixing FTBS

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: SAUCE: Fix drivers/staging/easycap FTBS
Tim Gardner [Mon, 22 Nov 2010 17:28:54 +0000 (10:28 -0700)]
UBUNTU: SAUCE: Fix drivers/staging/easycap FTBS

Added '#include <linux/smp_lock.h>" as suggested by Randy Dunlap in LKML.
This is almost guarenteed to conflict eventually.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: [Config] CONFIG_IRDA=n for FTBS (arm)
Andy Whitcroft [Mon, 22 Nov 2010 16:14:03 +0000 (16:14 +0000)]
UBUNTU: [Config] CONFIG_IRDA=n for FTBS (arm)

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] CONFIG_INPUT_TOUCHSCREEN=n for FTBS (arm)
Andy Whitcroft [Mon, 22 Nov 2010 15:46:52 +0000 (15:46 +0000)]
UBUNTU: [Config] CONFIG_INPUT_TOUCHSCREEN=n for FTBS (arm)

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_INPUT_TOUCHSCREEN
Andy Whitcroft [Mon, 22 Nov 2010 14:40:30 +0000 (14:40 +0000)]
UBUNTU: [Config] standardise CONFIG_INPUT_TOUCHSCREEN

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_INPUT_JOYSTICK
Andy Whitcroft [Mon, 22 Nov 2010 14:39:35 +0000 (14:39 +0000)]
UBUNTU: [Config] standardise CONFIG_INPUT_JOYSTICK

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_INPUT_JOYDEV
Andy Whitcroft [Mon, 22 Nov 2010 14:38:44 +0000 (14:38 +0000)]
UBUNTU: [Config] standardise CONFIG_INPUT_JOYDEV

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_INPUT_EVDEV
Andy Whitcroft [Mon, 22 Nov 2010 14:37:38 +0000 (14:37 +0000)]
UBUNTU: [Config] standardise CONFIG_INPUT_EVDEV

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_X25
Andy Whitcroft [Mon, 22 Nov 2010 14:32:45 +0000 (14:32 +0000)]
UBUNTU: [Config] standardise CONFIG_X25

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_TIPC
Andy Whitcroft [Mon, 22 Nov 2010 14:31:50 +0000 (14:31 +0000)]
UBUNTU: [Config] standardise CONFIG_TIPC

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_RFKILL
Andy Whitcroft [Mon, 22 Nov 2010 14:30:40 +0000 (14:30 +0000)]
UBUNTU: [Config] standardise CONFIG_RFKILL

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_RDS
Andy Whitcroft [Mon, 22 Nov 2010 14:29:41 +0000 (14:29 +0000)]
UBUNTU: [Config] standardise CONFIG_RDS

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_LAPB
Andy Whitcroft [Mon, 22 Nov 2010 14:25:17 +0000 (14:25 +0000)]
UBUNTU: [Config] standardise CONFIG_LAPB

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_IRDA
Andy Whitcroft [Mon, 22 Nov 2010 14:24:03 +0000 (14:24 +0000)]
UBUNTU: [Config] standardise CONFIG_IRDA

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_BT
Andy Whitcroft [Mon, 22 Nov 2010 14:21:04 +0000 (14:21 +0000)]
UBUNTU: [Config] standardise CONFIG_BT

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.37-6.16
Andy Whitcroft [Mon, 22 Nov 2010 12:14:08 +0000 (12:14 +0000)]
UBUNTU: Ubuntu-2.6.37-6.16

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] CONFIG_SCHED_AUTOGROUP=y
Tim Gardner [Sun, 21 Nov 2010 03:06:28 +0000 (20:06 -0700)]
UBUNTU: [Config] CONFIG_SCHED_AUTOGROUP=y

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: rebase to v2.6.37-rc3
Andy Whitcroft [Mon, 22 Nov 2010 11:57:23 +0000 (11:57 +0000)]
UBUNTU: rebase to v2.6.37-rc3

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Start new release
Andy Whitcroft [Mon, 22 Nov 2010 10:12:31 +0000 (10:12 +0000)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.37-6.15
Andy Whitcroft [Sat, 20 Nov 2010 11:40:18 +0000 (11:40 +0000)]
UBUNTU: Ubuntu-2.6.37-6.15

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Rebase to v2.6.32-rc2+git
Tim Gardner [Sat, 20 Nov 2010 11:37:39 +0000 (11:37 +0000)]
UBUNTU: Rebase to v2.6.32-rc2+git

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] CONFIG_EASYCAP=n for FTBS
Tim Gardner [Sat, 20 Nov 2010 01:50:34 +0000 (18:50 -0700)]
UBUNTU: [Config] CONFIG_EASYCAP=n for FTBS

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: [Config] updateconfigs after rebase
Tim Gardner [Sat, 20 Nov 2010 01:49:10 +0000 (18:49 -0700)]
UBUNTU: [Config] updateconfigs after rebase

Ignore: yes

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: Start new release
Tim Gardner [Sat, 20 Nov 2010 00:27:18 +0000 (17:27 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: SAUCE: enable rfkill for rtl8192se driver
Manoj Iyer [Wed, 17 Nov 2010 23:02:38 +0000 (23:02 +0000)]
UBUNTU: SAUCE: enable rfkill for rtl8192se driver

This driver is not upstream, it is part of the ubuntu delta.

On thinkpad Edge with RTL8192SE wifi device, wifi on/off hotkey does
not work. Enabled RFKILL in the rtl8192se module to enable this
hotkey.

BugLink: http://bugs.launchpad.net/bugs/640992

Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_USB_GADGET_DEBUG_FS
Andy Whitcroft [Fri, 19 Nov 2010 17:13:20 +0000 (17:13 +0000)]
UBUNTU: [Config] standardise CONFIG_USB_GADGET_DEBUG_FS

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_UBIFS_FS
Andy Whitcroft [Fri, 19 Nov 2010 17:10:46 +0000 (17:10 +0000)]
UBUNTU: [Config] standardise CONFIG_UBIFS_FS

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_SCSI_PROC_FS
Andy Whitcroft [Fri, 19 Nov 2010 17:09:04 +0000 (17:09 +0000)]
UBUNTU: [Config] standardise CONFIG_SCSI_PROC_FS

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_SCSI_LPFC_DEBUG_FS
Andy Whitcroft [Fri, 19 Nov 2010 17:06:21 +0000 (17:06 +0000)]
UBUNTU: [Config] standardise CONFIG_SCSI_LPFC_DEBUG_FS

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] standardise CONFIG_CEPH_FS
Andy Whitcroft [Fri, 19 Nov 2010 16:52:32 +0000 (16:52 +0000)]
UBUNTU: [Config] standardise CONFIG_CEPH_FS

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.37-5.14
Andy Whitcroft [Fri, 19 Nov 2010 17:15:35 +0000 (17:15 +0000)]
UBUNTU: Ubuntu-2.6.37-5.14

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Start new release
Andy Whitcroft [Thu, 18 Nov 2010 18:12:54 +0000 (18:12 +0000)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] cleanup configs
Andy Whitcroft [Wed, 17 Nov 2010 10:56:03 +0000 (10:56 +0000)]
UBUNTU: [Config] cleanup configs

Ignore: yes

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.37-5.13
Tim Gardner [Tue, 16 Nov 2010 21:25:10 +0000 (21:25 +0000)]
UBUNTU: Ubuntu-2.6.37-5.13

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: Bump ABI
Tim Gardner [Tue, 16 Nov 2010 15:11:56 +0000 (15:11 +0000)]
UBUNTU: Bump ABI

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: updateconfigs following rebase to v2.6.37-rc2
Andy Whitcroft [Tue, 16 Nov 2010 13:18:04 +0000 (13:18 +0000)]
UBUNTU: updateconfigs following rebase to v2.6.37-rc2

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: rebased to v2.6.37-rc2
Andy Whitcroft [Tue, 16 Nov 2010 13:14:47 +0000 (13:14 +0000)]
UBUNTU: rebased to v2.6.37-rc2

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Start new release
Andy Whitcroft [Tue, 16 Nov 2010 13:13:57 +0000 (13:13 +0000)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] Added NFS and related modules to virtual flavour
Tim Gardner [Mon, 15 Nov 2010 20:50:08 +0000 (13:50 -0700)]
UBUNTU: [Config] Added NFS and related modules to virtual flavour

BugLink: http://bugs.launchpad.net/bugs/659084

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.37-4.12
Andy Whitcroft [Mon, 15 Nov 2010 19:32:30 +0000 (19:32 +0000)]
UBUNTU: Ubuntu-2.6.37-4.12

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Bump ABI
Andy Whitcroft [Mon, 15 Nov 2010 19:31:26 +0000 (19:31 +0000)]
UBUNTU: Bump ABI

Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Start new release
Andy Whitcroft [Mon, 15 Nov 2010 18:58:13 +0000 (18:58 +0000)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "perf probe: Add kernel source path option"
Andy Whitcroft [Fri, 12 Nov 2010 17:04:41 +0000 (17:04 +0000)]
Revert "perf probe: Add kernel source path option"

This reverts commit 3543e22c53d289293ab20c20fed16cad57320fb9.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "UBUNTU: [Upstream] HID: magicmouse: scroll on entire surface, not just middle...
Andy Whitcroft [Fri, 12 Nov 2010 17:03:34 +0000 (17:03 +0000)]
Revert "UBUNTU: [Upstream] HID: magicmouse: scroll on entire surface, not just middle of mouse"

This reverts commit 0100ce314c261ccc4fbecf30a3d01f71f509af5b.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "UBUNTU: [Upstream] HID: magicmouse: disable and add module param for scroll...
Andy Whitcroft [Fri, 12 Nov 2010 17:03:18 +0000 (17:03 +0000)]
Revert "UBUNTU: [Upstream] HID: magicmouse: disable and add module param for scroll acceleration"

This reverts commit 896149320c79dc9c7b74d482d81f5f42f78165ab.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "UBUNTU: [Upstream] HID: magicmouse: properly account for scroll movement...
Andy Whitcroft [Fri, 12 Nov 2010 17:02:50 +0000 (17:02 +0000)]
Revert "UBUNTU: [Upstream] HID: magicmouse: properly account for scroll movement in state"

This reverts commit c32a2d5632b4e00e0eb393543dd44c902b3f6abd.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "UBUNTU: [Upstream] HID: magicmouse: add param for scroll speed"
Andy Whitcroft [Fri, 12 Nov 2010 17:02:40 +0000 (17:02 +0000)]
Revert "UBUNTU: [Upstream] HID: magicmouse: add param for scroll speed"

This reverts commit a63fcae229bfab4307e82a531861b7f311641630.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "ALSA: hda - Handle missing NID 0x1b on ALC259 codec"
Andy Whitcroft [Fri, 12 Nov 2010 17:01:02 +0000 (17:01 +0000)]
Revert "ALSA: hda - Handle missing NID 0x1b on ALC259 codec"

This reverts commit 7093079a8c9da1c3cc46096ac4dad66c928c3ea2.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "ALSA: hda - Handle pin NID 0x1a on ALC259/269"
Andy Whitcroft [Fri, 12 Nov 2010 17:00:10 +0000 (17:00 +0000)]
Revert "ALSA: hda - Handle pin NID 0x1a on ALC259/269"

This reverts commit eed7c0e7e41020539a384e56de757a4f28302e20.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "ARM: initial stack protector (-fstack-protector) support"
Andy Whitcroft [Fri, 12 Nov 2010 16:59:43 +0000 (16:59 +0000)]
Revert "ARM: initial stack protector (-fstack-protector) support"

This reverts commit e186433a0b95417413ac9726d974de80322ea72c.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "[ARM] implement arch_randomize_brk()"
Andy Whitcroft [Fri, 12 Nov 2010 16:57:49 +0000 (16:57 +0000)]
Revert "[ARM] implement arch_randomize_brk()"

This reverts commit 5523e01b790d956164021e6ac4bde605723946a8.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "mmc: fix all hangs related to mmc/sd card insert/removal during suspend/resume"
Andy Whitcroft [Fri, 12 Nov 2010 16:57:18 +0000 (16:57 +0000)]
Revert "mmc: fix all hangs related to mmc/sd card insert/removal during suspend/resume"

This reverts commit 93cddb91e1a94859adfd99982b47da8328c3cfc1.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: SAUCE: Added quirk to recognize GE0301 3G modem as an interface.
Manoj Iyer [Mon, 6 Apr 2009 15:58:49 +0000 (10:58 -0500)]
UBUNTU: SAUCE: Added quirk to recognize GE0301 3G modem as an interface.

OriginalAuthor: Timo Aaltonen <tjaalton@ubuntu.com>
BugLink: http://bugs.launchpad.net/bugs/348861

Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>

13 years agohid: ntrig: Mask pen switch events
Henrik Rydberg [Fri, 12 Nov 2010 08:11:54 +0000 (09:11 +0100)]
hid: ntrig: Mask pen switch events

When the pen comes in proximity, special packets appear on the
multitouch device. This confuses userland to misinterpret the
touch state. This patch masks the special pen packets consisting
of a single finger of width 10, thereby fixing the problem.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agohid: ntrig: Support single-touch devices
Henrik Rydberg [Fri, 12 Nov 2010 08:11:53 +0000 (09:11 +0100)]
hid: ntrig: Support single-touch devices

The current driver was regressed to not work for single-touch devices,
and the driver occasionally crashes in those cases. The HID report
which resets the array index is never received, resulting in out-of-range
memory access. This patch restores functionality by detecting the presence
of the multitouch firmware, and adds a range check to make the driver
resilient to unknown firmware versions.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: SAUCE: hid: ntrig: New ghost-filtering event logic
Henrik Rydberg [Fri, 12 Nov 2010 08:11:52 +0000 (09:11 +0100)]
UBUNTU: SAUCE: hid: ntrig: New ghost-filtering event logic

The ntrig devices are notoriously poor at resolving ghost touches,
which affects almost every device on the market. Moreoever, the
performance degrades over time, rendering the screen unusable.
In order to work out of the box, the driver needs to cater for this
deficiency, and should ideally do so without any special tuning.

This patch attempts to paper over this problem, by detecting and
filtering out ghost touches using additional knowledge of the sensor
mechanism. A small number of dimensionless parameters are used, to
keep the complexity at a minimum. The driver has been reported to
work well on Dell Studio 17, Dell XT2, HP TX2 and Lenovo T410s.

Also added Canonical, Ltd. to the copyright.

Not likely to go upstream in its present form. However, it does help
constitue a tuning-free driver which works well together with Unity,
and as such are vital to the MT push.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: SAUCE: hid: ntrig: Setup input filtering manually
Henrik Rydberg [Fri, 12 Nov 2010 08:11:51 +0000 (09:11 +0100)]
UBUNTU: SAUCE: hid: ntrig: Setup input filtering manually

The hid core does not set fuzz parameters properly, so take
over setup of all input parameters for the multitouch device.

Has been tested succesfully on Dell Studio 17, Dell XT2, HP TX2 and
Lenovo T410s. Not likely to go upstream in its present form. However,
it does help constitue a tuning-free driver which works well together
with Unity, and as such are vital to the MT push.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: SAUCE: hid: ntrig: remove sysfs nodes
Henrik Rydberg [Fri, 12 Nov 2010 08:11:50 +0000 (09:11 +0100)]
UBUNTU: SAUCE: hid: ntrig: remove sysfs nodes

Aiming at a driver that requires no tuning, remove the sysfs nodes
for the filter parameters.

Has been tested succesfully on Dell Studio 17, Dell XT2, HP TX2 and
Lenovo T410s. Not likely to go upstream in its present form. However,
it does help constitue a tuning-free driver which works well together
with Unity, and as such are vital to the MT push.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.37-3.11
Andy Whitcroft [Thu, 11 Nov 2010 23:46:00 +0000 (23:46 +0000)]
UBUNTU: Ubuntu-2.6.37-3.11

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] Build-in powermac ZILOG serial driver
Jeremy Kerr [Thu, 11 Nov 2010 10:07:49 +0000 (10:07 +0000)]
UBUNTU: [Config] Build-in powermac ZILOG serial driver

SERIAL_PMAC_ZILOG allows us to get a serial device on KVM-virtualised
powerpc, so build it in to the kernel to allow serial console on these
platforms. This also requires SERIAL_PMAC_ZILOG_CONSOLE.

Since we now set SERIAL_CORE=y on powerpc, this change moves it into the
common.ubuntu config.

BugLink: http://bugs.launchpad.net/bugs/673346

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: SAUCE: drm -- stop early access to drm devices
Andy Whitcroft [Thu, 29 Jul 2010 15:48:21 +0000 (16:48 +0100)]
UBUNTU: SAUCE: drm -- stop early access to drm devices

When a drm driver is initialised we first allocate and initialise the
drm minor numbers including creating the sysfs files, then we trigger
the driver load method.  The act of creating the sysfs files triggers the
uevent.  This means udev may start programs which open /dev/dri/card0 and
other interfaces, this can occur before the load method has even started
and thus before the driver has fully initialised its data structures.
In the case of plymouthd this leads to it opening and closing (in disgust)
the interface, which in turn leads to a kernel panic as the mutexes are
yet to be initialised.

This patch delays the linking up of the drm devices minor numbers until
the driver is fully initialised.  As it is possible for consumers of
these interfaces to reach them before they are fully initialised we
arrange for opens of these devices to return EAGAIN until the device is
fully initialised.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: SAUCE: fbcon -- fix OOPs triggered by race prevention fixes
Andy Whitcroft [Fri, 10 Sep 2010 16:26:55 +0000 (17:26 +0100)]
UBUNTU: SAUCE: fbcon -- fix OOPs triggered by race prevention fixes

BugLink: http://bugs.launchpad.net/bugs/614008

The fix below added reference counting to framebuffer opens, it
inadvertantly does not handle the totally missing framebuffer case:

    UBUNTU: SAUCE: fbcon -- fix race between open and removal of framebuffers

lshw tickles this searching for framebuffers leading to an OOPs and boot
hangs for some machines.

Initial-fix-by: Dave Gilbert
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: SAUCE: fbcon -- fix race between open and removal of framebuffers
Andy Whitcroft [Thu, 29 Jul 2010 15:48:20 +0000 (16:48 +0100)]
UBUNTU: SAUCE: fbcon -- fix race between open and removal of framebuffers

Currently there is no locking for updates to the registered_fb list.
This allows an open through /dev/fbN to pick up a registered framebuffer
pointer in parallel with it being released, as happens when a conflicting
framebuffer is ejected or on module unload.  There is also no reference
counting on the framebuffer descriptor which is referenced from all open
files, leading to references to released or reused memory to persist on
these open files.

This patch adds a reference count to the framebuffer descriptor to prevent
it from being released until after all pending opens are closed.  This
allows the pending opens to detect the closed status and unmap themselves.
It also adds locking to the framebuffer lookup path, locking it against
the removal path such that it is possible to atomically lookup and take a
reference to the descriptor.  It also adds locking to the read and write
paths which currently could access the framebuffer descriptor after it
has been freed.  Finally it moves the device to FBINFO_STATE_REMOVED to
indicate that all access should be errored for this device.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: ubuntu: AUFS -- track changes to llseek in v2.6.37-rc1
Andy Whitcroft [Sun, 7 Nov 2010 13:18:11 +0000 (13:18 +0000)]
UBUNTU: ubuntu: AUFS -- track changes to llseek in v2.6.37-rc1

The commit below changed the default llseek function to no_llseek,
reinstate the previous default for aufs2:

  commit 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f
  Author: Arnd Bergmann <arnd@arndb.de>
  Date:   Wed Jul 7 23:10:11 2010 +0200

    vfs: make no_llseek the default

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: ubuntu: AUFS -- track changes to work queue initialisation
Andy Whitcroft [Sun, 7 Nov 2010 04:20:29 +0000 (04:20 +0000)]
UBUNTU: ubuntu: AUFS -- track changes to work queue initialisation

The commit below modified the static initialisers for work queues, track
those changes in aufs2:

  commit ca1cab37d91cbe8a8333732540d43cabb54cfa85
  Author: Andrew Morton <akpm@linux-foundation.org>
  Date:   Tue Oct 26 14:22:34 2010 -0700

    workqueues: s/ON_STACK/ONSTACK/

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: ubuntu: AUFS -- re-enable
Andy Whitcroft [Sun, 7 Nov 2010 02:21:03 +0000 (02:21 +0000)]
UBUNTU: ubuntu: AUFS -- re-enable

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: ubuntu: AUFS -- update to aufs2.1-36-UNRELEASED-20101103
Andy Whitcroft [Sun, 7 Nov 2010 02:15:33 +0000 (02:15 +0000)]
UBUNTU: ubuntu: AUFS -- update to aufs2.1-36-UNRELEASED-20101103

Pull aufs up to the experimental aufs2.1-36-UNRELEASED-20101103
from the URL below:

    http://livenet.selfip.com/ftp/debian/aufs2.1-36/

Based on patches from J.R.Okajima and Jordi Pujol, see the mail thread
below from the aufs-users list for further information:

    http://www.mail-archive.com/aufs-users@lists.sourceforge.net/msg02921.html

Signed-off-by: Andy Whitcroft <apw@shadowen.org>

13 years agoUBUNTU: ubuntu: AUFS -- aufs2-standalone.patch aufs2.1-36-UNRELEASED-20101103
Andy Whitcroft [Sun, 7 Nov 2010 02:14:56 +0000 (02:14 +0000)]
UBUNTU: ubuntu: AUFS -- aufs2-standalone.patch aufs2.1-36-UNRELEASED-20101103

Pull aufs up to the experimental aufs2.1-36-UNRELEASED-20101103
from the URL below:

    http://livenet.selfip.com/ftp/debian/aufs2.1-36/

Based on patches from J.R.Okajima and Jordi Pujol, see the mail thread
below from the aufs-users list for further information:

    http://www.mail-archive.com/aufs-users@lists.sourceforge.net/msg02921.html

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-36-UNRELEASED-20101103
Andy Whitcroft [Sun, 7 Nov 2010 02:13:30 +0000 (02:13 +0000)]
UBUNTU: ubuntu: AUFS -- aufs2-base.patch aufs2.1-36-UNRELEASED-20101103

Pull aufs up to the experimental aufs2.1-36-UNRELEASED-20101103
from the URL below:

    http://livenet.selfip.com/ftp/debian/aufs2.1-36/

Based on patches from J.R.Okajima and Jordi Pujol and others, see the
mail thread below from the aufs-users list for further information:

    http://www.mail-archive.com/aufs-users@lists.sourceforge.net/msg02921.html

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "UBUNTU: ubuntu: AUFS -- aufs2 base patch for linux-2.6.34"
Andy Whitcroft [Sun, 7 Nov 2010 02:11:12 +0000 (02:11 +0000)]
Revert "UBUNTU: ubuntu: AUFS -- aufs2 base patch for linux-2.6.34"

This reverts commit 8e85bed37962e980e0a72cc3a8eb5fd9b16df630.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "UBUNTU: ubuntu: AUFS -- update to standalone 2.6.34 as at 20100601"
Andy Whitcroft [Sun, 7 Nov 2010 02:10:07 +0000 (02:10 +0000)]
Revert "UBUNTU: ubuntu: AUFS -- update to standalone 2.6.34 as at 20100601"

This reverts commit 91ecb392f16a39b72f8745d5125680182d3b86af.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "UBUNTU: ubuntu: AUFS -- update to standalone 2.6.35-rcN as at 20100601"
Andy Whitcroft [Sun, 7 Nov 2010 02:08:43 +0000 (02:08 +0000)]
Revert "UBUNTU: ubuntu: AUFS -- update to standalone 2.6.35-rcN as at 20100601"

This reverts commit bb05516aec3ef56a2b7e82d042a537e63e144be1.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "UBUNTU: ubuntu: AUFS -- track changes to the arguements to fop fsync()"
Andy Whitcroft [Sun, 7 Nov 2010 02:07:16 +0000 (02:07 +0000)]
Revert "UBUNTU: ubuntu: AUFS -- track changes to the arguements to fop fsync()"

This reverts commit d4e9501eeeee43450c1675a1cd2724371db736e5.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "UBUNTU: ubuntu: AUFS -- update to b37c575759dc4535ccc03241c584ad5fe69e3b25"
Andy Whitcroft [Sun, 7 Nov 2010 02:06:22 +0000 (02:06 +0000)]
Revert "UBUNTU: ubuntu: AUFS -- update to b37c575759dc4535ccc03241c584ad5fe69e3b25"

This reverts commit ed0be8fa661ac39ddea61ed5ee1e892396438769.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] enforcer -- ensure CONFIG_IPV6=y
Andy Whitcroft [Tue, 9 Nov 2010 22:47:51 +0000 (17:47 -0500)]
UBUNTU: [Config] enforcer -- ensure CONFIG_IPV6=y

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] ensure CONFIG_IPV6=y for powerpc
Andy Whitcroft [Tue, 9 Nov 2010 22:46:38 +0000 (17:46 -0500)]
UBUNTU: [Config] ensure CONFIG_IPV6=y for powerpc

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] enforcer -- ensure CONFIG_INTEL_IDLE is off for -virtual
Andy Whitcroft [Tue, 9 Nov 2010 22:32:45 +0000 (17:32 -0500)]
UBUNTU: [Config] enforcer -- ensure CONFIG_INTEL_IDLE is off for -virtual

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: debian -- pass the correct flavour name when checking configs
Andy Whitcroft [Tue, 9 Nov 2010 22:31:31 +0000 (17:31 -0500)]
UBUNTU: debian -- pass the correct flavour name when checking configs

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] enforcer -- ensure we never enable CONFIG_IMA
Andy Whitcroft [Tue, 9 Nov 2010 21:37:05 +0000 (16:37 -0500)]
UBUNTU: [Config] enforcer -- ensure we never enable CONFIG_IMA

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] Disable intel_idle for -virtual kernels
Andy Whitcroft [Tue, 9 Nov 2010 20:22:30 +0000 (15:22 -0500)]
UBUNTU: [Config] Disable intel_idle for -virtual kernels

BugLink: http://bugs.launchpad.net/bugs/651370

EC2 Xen does not properly handle the mwait instruction used by intel_idle
resulting in an invalid opcode when an instance is launched on newer
intel hardware.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: SAUCE: nx-emu: use upstream ASLR when possible
Kees Cook [Fri, 5 Nov 2010 20:05:37 +0000 (13:05 -0700)]
UBUNTU: SAUCE: nx-emu: use upstream ASLR when possible

Only perform ASCII-armor ASLR when nx-emulation is happening.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoexec-randomization: brk away from exec rand area
Kees Cook [Fri, 5 Nov 2010 18:59:32 +0000 (11:59 -0700)]
exec-randomization: brk away from exec rand area

This is a fix for the NX emulation patch to force the brk area well
outside of the exec randomization area to avoid future allocation or brk
growth collisions. Normally this isn't a problem, except when the text
region has been loaded from a PIE binary and the CS limit can't be put
just above bss.

A test-case that will show failures without this patch can be found here:
http://bazaar.launchpad.net/~ubuntu-bugcontrol/qa-regression-testing/master/annotate/head%3A/scripts/kernel-aslr-collisions/explode-brk.c

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agommap randomization for executable mappings on 32-bit
Roland McGrath [Wed, 14 Jul 2010 07:55:23 +0000 (00:55 -0700)]
mmap randomization for executable mappings on 32-bit

This code is originally from Ingo, with some later rebasing and
fixes to respect all the randomization-disabling knobs.

It provides a new address randomization algorithm that's preferable
for executable mappings in 32-bit processes.

Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agonx-emu: standardize boottime message prefix
Kees Cook [Fri, 5 Nov 2010 18:55:00 +0000 (11:55 -0700)]
nx-emu: standardize boottime message prefix

The state of NX in the booted kernel is easier to find in dmesg if
all the possible modes start with the same bit of text. There's no
good reason to have the NX-emulation message have a different format.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agonx-emu: drop exec-shield sysctl, merge with disable_nx
Kees Cook [Fri, 5 Nov 2010 18:44:16 +0000 (11:44 -0700)]
nx-emu: drop exec-shield sysctl, merge with disable_nx

The "exec-shield" sysctl doesn't really make much sense any more, and
the functionality is better merged with the existing "disable_nx"
kernel boot option.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoi386: NX emulation
Roland McGrath [Wed, 14 Jul 2010 07:50:02 +0000 (00:50 -0700)]
i386: NX emulation

This is old code with some cruft, all originally by Ingo with much
later rebasing by Fedora folks and at least one arcane fix by Roland
a few years ago.

Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Bump ABI
Andy Whitcroft [Sun, 7 Nov 2010 17:32:48 +0000 (17:32 +0000)]
UBUNTU: Bump ABI

Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Start new release
Andy Whitcroft [Sun, 7 Nov 2010 17:31:55 +0000 (17:31 +0000)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] Use correct be2iscsi module name in d-i/modules/scsi-modules
Tim Gardner [Fri, 5 Nov 2010 14:57:20 +0000 (14:57 +0000)]
UBUNTU: [Config] Use correct be2iscsi module name in d-i/modules/scsi-modules

BugLink: http://bugs.launchpad.net/bugs/628776

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.37-2.10
Andy Whitcroft [Thu, 4 Nov 2010 14:48:19 +0000 (14:48 +0000)]
UBUNTU: Ubuntu-2.6.37-2.10

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] CONFIG_GPIO_VX855=n for armel FTBS
Andy Whitcroft [Thu, 4 Nov 2010 11:00:06 +0000 (11:00 +0000)]
UBUNTU: [Config] CONFIG_GPIO_VX855=n for armel FTBS

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Start new release
Andy Whitcroft [Wed, 3 Nov 2010 22:22:17 +0000 (22:22 +0000)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] CONFIG_GPIO_PCH=n for armel FTBS
Andy Whitcroft [Wed, 3 Nov 2010 20:07:37 +0000 (20:07 +0000)]
UBUNTU: [Config] CONFIG_GPIO_PCH=n for armel FTBS

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.37-2.9
Andy Whitcroft [Tue, 2 Nov 2010 20:53:27 +0000 (20:53 +0000)]
UBUNTU: Ubuntu-2.6.37-2.9

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: SAUCE: fix documentation strings for struct input_keymap_entry
Andy Whitcroft [Tue, 2 Nov 2010 19:57:56 +0000 (19:57 +0000)]
UBUNTU: SAUCE: fix documentation strings for struct input_keymap_entry

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: bump master version number to match contained kernel
Andy Whitcroft [Tue, 2 Nov 2010 15:20:49 +0000 (15:20 +0000)]
UBUNTU: bump master version number to match contained kernel

Signed-off-by: Andy Whitcroft <apw@canonical.com>