UBUNTU: SAUCE: Increase the default hard limit for open FDs to 4096

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

This presumes that INR_OPEN is 1024.

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

UBUNTU: SAUCE: (drop after 2.6.38) eeepc-wmi: Add support for T101MT Home/Express Gate key

This key is different than other hotkeys, having seperate scan
codes for press, release, and hold, so it requires some special
filtering. Press and release events are passed on, and hold events
are ignored since sparse-keymap does not support hardware
autorepeat. Instead, the input core's software autorepeat is
enabled for the input device.

Note that "Home" in the context of this button doesn't mean the
same thing as the usual Home key, and it really isn't clear at
all what is meant by "Home". The manufacurer's description of the
button indicates that it should launch some sort of touch screen
settings interface on short press and apply a desktop rotation on
long press.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Ubuntu-2.6.38-8.40

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: SAUCE: nx-emu: further clarify dmesg reporting

When booting a 32bit non-PAE kernel on a CPU that supports hardware NX,
dmesg did not indicate that NX emulation was being used. This changes
the dmesg reporting to be more clear. Warnings about lacking hardware
NX remain, and the state of NX-emulation is reported when enabled.

BugLink: https://launchpad.net/bugs/745181

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.

This patch was submitted upstream and acked by maintainer but not yet in
linus tree.

Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>

BugLink: http://launchpad.net/bugs/745217
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: reorder device ids

Each device seems to be in a "group" (devid >> 16 & 0xFF).

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 43815941efb1374c2f71eb1fb0a2814b049030eb)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: add touchpad sysfs file

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 4615bb661352acb7032796185c8c5573e47dfa1d)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: comments keymap to clarify the meaning of some keys

Found while checking PDF manuals...

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 77ca5b0197138db1260bbbb95ce3fd015dd10437)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: real touchpad led device id is 0x001000012

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 8571d75d614702e3e0278c92892012dbf7c2e65b)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: respect wireless_hotplug setting

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit c14d4b8ea799515cd44134b8eddd8f789f0b6286)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: support backlight power (bl_power) attribute

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit b71872650fe967eb0a38aa0d7dcbe9c60d160032)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: set the right key code for 0xe9

This key should power off the backlight, not the display,
it is also used in acpi/video.c to do the same thing.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 54c799a50f58285f5f6a93d87470cba1847943a3)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: add wimax support

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 2e9e159d8e18c37d60a7d5040314f579a40f4c63)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: add camera and card reader support

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 9e1565bc390123d3c74b940ba3466faf196970ec)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: use the presence bit correctly

I checked some more DSDT, and it seems that I wasn't
totally right about the meaning of DSTS return value.
Bit 0 is clearly the status of the device, and I discovered
that bit 16 is set when the device is present.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit aafa719dcd0cb0c05bb0690c816b13263c8b36e6)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: reorder defines

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 33e0e6fed04dc6067562c65e3e6d551dc0eb11fc)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: switch to platform_create_bundle()

This allow to remove ~30 lines of code.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit a04ce290bffe6b39edf18bac0fdb302503a53a4e)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: add hibernate/resume callbacks

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 0773d7f9f1c0ad5fb86d23ad7e4ef5bfd2f48b5e)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: add an helper using simple return codes

eeepc_wmi_get_devstate returns an acpi_status, so each
call need extra logic to handle the return code. This
patch add a simple getter, returning a boolean (or a
negative error code).

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 5c95638d115f9c6661fff254b3beb14b19f88e41)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: return proper error code in eeepc_rfkill_set()

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 7898cf1a3665d22c4d16308f73e981c6464be81b)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: serialize access to wmi method

\AMW0.WMBC, which is the main method that we use,
is not reentrant. When wireless hotpluging is enabled,
toggling the status of the wireless device using WMBC will
trigger a notification and the notification handler need to
call WMBC again to get the new status of the device, this
will trigger the following error:

ACPI Error (dswload-0802): [_T_0] Namespace lookup failure, AE_ALREADY_EXISTS
ACPI Exception: AE_ALREADY_EXISTS, During name lookup/catalog (20100428/psloop-231)
ACPI Error (psparse-0537): Method parse/execution failed [\AMW0.WMBC] (Node f7023b88), AE_ALREADY_EXISTS
ACPI: Marking method WMBC as Serialized because of AE_ALREADY_EXISTS error

Since there is currently no way to tell the acpi subsystem to mark
a method as serialized, we do it in eeepc-wmi.

Of course, we could let the first call fail, and then it would work,
but it doesn't seems really clean, and it will make the first
WMBC call return a random value.

This patch was tested on EeePc 1000H with a RaLink RT2860
wireless card using the rt2800pci driver. rt2860sta driver
seems to deadlock when we remove the pci device...

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 279f8f95493c9aaa0a85520c863ccba87c4bf930)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

eeepc-wmi: add hotplug code for Eeepc 1000H

Implement wireless like hotplug handling (code stolen from eeepc-laptop).

Reminder: on some models rfkill is implemented by logically unplugging the
wireless card from the PCI bus. Despite sending ACPI notifications, this does
not appear to be implemented using standard ACPI hotplug - nor does the
firmware provide the _OSC method required to support native PCIe hotplug.
The only sensible choice appears to be to handle the hotplugging directly in
the platform driver.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit afa7c886578ce264d9b66d4bcb1fea51fac47925)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: rebase to v2.6.38.2

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: [Config] update configs after v2.6.38.1 rebase

Basically, enable HID_ACRUX=m

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: rebase to v2.6.38.1

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: [Config] packaging: adjust perms on vmlinuz as well

Since kernel symbols are resolvable internally to the kernel, the kernel
itself has a map of the symbols. Continuing the tradition of frustrating
off-the-shelf kernel exploits, make vmlinuz unreadable for non-root, just
like has been done for System.map, etc.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: HID: ntrig: fix suspend/resume on recent models

The recent 1b96:0006 model does not come up after suspend, which
seems to be related to the initialization problems reported
upstream. This patch adds a wakeup call via the reset-resume hook,
which fixes the problem.

Tested on older hardware without sign of regressions.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: SAUCE: HID: hid-ntrig: add support for 1b96:0006 model

This patch adds support for 1b96:0006 with firmware version
1.12.1.41.0.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

(drop after v2.6.38) HID: hid-ntrig: init settle and mode check

Adding a wait before the wakeup signal.

As a precautionary measure sanity check the current sensor mode.  If
needed reset it to "dual".

When the device is responding poorly and needs the wakeup call, it was
missing it.  Giving it a chance to settle first improves the chances
that signal gets through.

Upstream commit 7b2a64c96ad53c4299f7e6ddf8c2f99cb48940a9

Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

(drop after v2.6.38) HID: ntrig: apply NO_INIT_REPORTS quirk

Probing reports does bad things with some ntrig firmwares, better to
just leave them alone.

Upstream commit 6638dedaec6e3d32654f0ac5786f5d32963e208b

[rydberg@euromail.se: wiggled for natty]
Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

(drop after v2.6.38) HID: ntrig don't dereference unclaimed hidinput

Check before dereferencing field->hidinput to fix a reported invalid
deference bug.

Upstream commit f41a52d3010579949a3b9fd76783120d9643b60b

Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: [Config] Set CONFIG_NR_CPUS=256 for amd64 generic

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

SRU Justification

Impact: Workstations with greater than 64 cores cannot boot.

        See: http://bugs.launchpad.net/bugs/706058 for information
about memory impact.

Signed-off-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: Bump ABI

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

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Ubuntu-2.6.38-7.39

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Ubuntu-2.6.38-7.38

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Ubuntu-2.6.38-7.37

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Ubuntu-2.6.38-7.36

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

UBUNTU: [Config] switch CONFIG_FB_VESA back to module

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

Yama: fix default relationship to check thread group

Yet another case of a thread needing to match against the group leader.

BugLink: http://bugs.launchpad.net/bugs/737676
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: SAUCE: drm/i915: Fix pipelined fencing

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34584
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

[We are expecting this to appear in upstream shortly, but the symptoms
are pretty serious corruption in gnome-terminal and other scrollable
text, and this is well understood and tested.]

BugLink: http://bugs.launchpad.net/bugs/717114
Signed-off-by: Andy Whitcroft <apw@canonical.com>

Revert "UBUNTU: SAUCE: KLUDGE: work around failed 'shrink-wrap' compiler optimisation"

This reverts commit a717f5c8013cb097975295592353c5adcb5253fd.

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

UBUNTU: Enable common packages for armhf

Add armhf to Architecture: list of common packages where armel was
already listed, like linux-libc-dev or linux-tools.

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: Add initial armhf.mk

Copy armel.mk for armhf, but disable all flavours for now.

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: Add armhf to Debian -> Linux arch map

debian/scripts/misc/kernelconfig: add support for armhf to Debian ->
Linux arch map.

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: Enforce DEFAULT_MMAP_MIN_ADDR on armhf

Also enforce CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 on armhf.

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: Fix couple of typos in 0-common-vars.mk

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: Support arch= cross-compilation for any arch

Use "dpkg-architecture -a$(arch) -qDEB_HOST_GNU_TYPE" to compute
CROSS_COMPILE when calling debian/rules arch=foo instead of harcoding
support for only armel / arm-linux-gnueabi.

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: purge last vestiges of maverick

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

UBUNTU: Include nls_cp437 module in virtual for fat

The virtual flavor only ships whitelisted modules including the fat and
vfat modules, but because it doesn't include any codepage modules
(nls_cp*) FAT support is useless.  Include the default codepage
(nls_cp437) in virtual to allow mounting FAT filesystems.

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

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: Start new release

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

UBUNTU: Ubuntu-2.6.38-7.35

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

UBUNTU: rebase to v2.6.38 final

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

UBUNTU: Bump ABI

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

UBUNTU: [Config] disable CONFIG_SCSI_QLA_ISCSI for powerpc 32bit to fix FTBS

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

UBUNTU: rebase fixes bug #715330

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

UBUNTU: rebase to 2fbfac4e053861925fa3fffcdc327649b09af54c

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

UBUNTU: [Confg] CONFIG_BOOT_PRINTK_DELAY=y

Allows the boot parameter boot_delay=X

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

Yama: use thread group leader when creating match

Like the earlier bug-fix for thread group leader when matching,
we also need to find the thread group leader for "current" when
creating the match.

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

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: Start new release

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

UBUNTU: Ubuntu-2.6.38-6.34

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

UBUNTU: rebase to mainline v2.6.38-rc8

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

UBUNTU: Start new release

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

UBUNTU: SAUCE: KLUDGE: work around failed 'shrink-wrap' compiler optimisation

We are getting internal GCC failures compiling on non-i386
architectures:

    .../drivers/isdn/gigaset/isocdata.c: In function 'gigaset_isoc_buildframe':
    .../drivers/isdn/gigaset/isocdata.c:496:1:
    internal compiler error: in dwarf2out_frame_debug_adjust_cfa, at dwarf2out.c:1861
    Please submit a full bug report,
    with preprocessed source if appropriate.
    See <file:///usr/share/doc/gcc-4.5/README.Bugs> for instructions.
    {standard input}: Assembler messages:
    {standard input}:1376: Error: open CFI at the end of file; missing
    .cfi_endproc directive
    make[5]: *** [drivers/isdn/gigaset/isocdata.o] Error 1

BugLink: http://bugs.launchpad.net/bugs/730860
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: [Config] normalise CONFIG_INTEL_TXT

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

UBUNTU: Ubuntu-2.6.38-6.33

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

UBUNTU: [Config] pps_gen_parport no longer built

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

UBUNTU: [Config] update configs after rebase to fb62c00a6d8942775abc23d1621db1252e2d93d1

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

UBUNTU: SAUCE: (drop after 2.6.38) eeepc-wmi: add wlan key found on 1015P

BugLink: http://bugs.launchpad.net/bugs/689393
(cherry picked from commit 3e9153bad40cb40c8f91d9d2915ee28240c9200e linux-next)

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Keng-Yu Lin <keng-yu.lin@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: (drop after 2.6.38) eeepc-wmi: reorder keymap

BugLink: http://bugs.launchpad.net/bugs/689393
(cherry picked from commit 0f8d4d6c6cc709d3f5328d9184898f0a46f94c7d linux-next)

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Keng-Yu Lin <keng-yu.lin@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: rebase to fb62c00a6d8942775abc23d1621db1252e2d93d1

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

UBUNTU: rebase fixes LP#715318

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

UBUNTU: rebase to 2.6.38-rc7

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

UBUNTU: rebase fixes LP#722925

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

UBUNTU: SAUCE: Fix aufs calling of security_path_mknod

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

The security_path_mknod hook requires an encoded 'dev' for its 'dev' paramet
but aufs is calling security_path_mknod with a 'dev' that was already
converted by 'new_decode_dev(dev)'.  However security_path_mknod and its
consumer TOMOYO is expecting 'dev' rather than 'new_decode_dev(dev)'.

This will result in TOMOYO doing new_decode_dev(new_decode_dev(dev))
(which is wrong) when security_path_mknod() is called from aufs' vfsub_mknod

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: SAUCE: proc: hide kernel addresses via %pK in /proc/<pid>/stack

[in -mm as proc-hide-kernel-addresses-via-%pk-in-proc-pid-stack.patch]

OriginalAuthor: Konstantin Khlebnikov <khlebnikov@openvz.org>

This file is readable for the task owner.  Hide kernel addresses from
unprivileged users, leave them function names and offsets.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Acked-by: Kees Cook <kees.cook@canonical.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: [Config] resync ppc64 configuration

Reset us to the Ubuntu ppc64 configuration as cleaned up in the previous
commit.  Plus the following configuration tweaks:

    CONFIG_LOG_BUF_SHIFT=19
    CONFIG_PPC_SPLPAR=y
    CONFIG_EEH=y
    CONFIG_PSERIES_MSI=y
    CONFIG_PSERIES_ENERGY=y
    CONFIG_SCANLOG=y
    CONFIG_LPARCFG=y
    CONFIG_PPC_SMLPAR=y
    CONFIG_CMM=y
    CONFIG_DTL=y
    CONFIG_RTAS_FLASH=y
    CONFIG_IBMEBUS=y
    CONFIG_IRQ_ALL_CPUS=y
    CONFIG_MEMORY_HOTREMOVE=y
    CONFIG_COMPACTION=y
    # CONFIG_PPC_4K_PAGES is not set
    CONFIG_PPC_64K_PAGES=y
    CONFIG_FORCE_MAX_ZONEORDER=9
    CONFIG_PPC_SUBPAGE_PROT=y
    CONFIG_HOTPLUG_PCI_PCIE=y
    CONFIG_PCI_STUB=y
    CONFIG_PCI_IOV=y
    CONFIG_HOTPLUG_PCI=y
    # CONFIG_HOTPLUG_PCI_FAKE is not set
    # CONFIG_HOTPLUG_PCI_CPCI is not set
    CONFIG_HOTPLUG_PCI_SHPC=m
    CONFIG_HOTPLUG_PCI_RPA=y
    CONFIG_HOTPLUG_PCI_RPA_DLPAR=y
    CONFIG_BLK_DEV_SR_VENDOR=y
    CONFIG_SCSI_ENCLOSURE=m
    CONFIG_SCSI_IBMVSCSI=m
    CONFIG_SCSI_IBMVSCSIS=m
    CONFIG_SCSI_IBMVFC=m
    CONFIG_SCSI_IBMVFC_TRACE=y
    CONFIG_SCSI_IPR=m
    CONFIG_SCSI_IPR_TRACE=y
    CONFIG_SCSI_IPR_DUMP=y
    CONFIG_IBMVETH=m
    CONFIG_HVC_CONSOLE=y
    CONFIG_IBM_BSR=y
    CONFIG_HVCS=m
    CONFIG_MAX_RAW_DEVS=8192
    CONFIG_I2C_PASEMI=m
    CONFIG_POWER_SUPPLY=m
    CONFIG_SSB_PCMCIAHOST=y
    CONFIG_VGA_ARB_MAX_GPUS=64
    CONFIG_FB_VIRTUAL=m
    CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
    CONFIG_EDAC_PASEMI=m
    CONFIG_EDAC_CPC925=m
    CONFIG_KVM_MMIO=y
    CONFIG_VIRTUALIZATION=y
    CONFIG_KVM=y
    CONFIG_KVM_BOOK3S_HANDLER=y
    CONFIG_KVM_BOOK3S_64_HANDLER=y
    CONFIG_KVM_BOOK3S_64=y

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

UBUNTU: [Config] cleanup powerpc config fixing unexpected inconsistancies

    CONFIG_CGROUP_CPUACCT=y
    CONFIG_RESOURCE_COUNTERS=y
    CONFIG_UTS_NS=y
    CONFIG_IPC_NS=y
    CONFIG_USER_NS=y
    CONFIG_PID_NS=y
    CONFIG_ELECTRA_CF=m
    CONFIG_IPV6_MULTIPLE_TABLES=y
    CONFIG_NETFILTER_XT_TARGET_RATEEST=m
    CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
    CONFIG_NETFILTER_XT_MATCH_OWNER=m
    CONFIG_NETFILTER_XT_MATCH_RATEEST=m
    CONFIG_CONNECTOR=y
    CONFIG_PROC_EVENTS=y
    CONFIG_BLK_DEV_LOOP=y
    CONFIG_ENCLOSURE_SERVICES=m
    CONFIG_SCSI_MVSAS=m
    CONFIG_SCSI_QLA_ISCSI=m
    CONFIG_PATA_ALI=m
    CONFIG_PATA_ARTOP=m
    CONFIG_PATA_ATIIXP=m
    CONFIG_PATA_CMD64X=m
    CONFIG_PATA_CS5530=m
    CONFIG_PATA_CYPRESS=m
    CONFIG_PATA_HPT366=m
    CONFIG_PATA_HPT37X=m
    CONFIG_PATA_HPT3X2N=m
    CONFIG_PATA_HPT3X3=m
    CONFIG_PATA_NS87415=m
    CONFIG_PATA_OPTIDMA=m
    CONFIG_PATA_PDC_OLD=m
    CONFIG_PATA_RADISYS=m
    CONFIG_PATA_SC1200=m
    CONFIG_REALTEK_PHY=y
    CONFIG_NIU=m
    CONFIG_USB_NET_RNDIS_WLAN=m
    CONFIG_RTL8180=m
    CONFIG_ATH5K=m
    CONFIG_IWL4965=y
    CONFIG_PLX_HERMES=m
    CONFIG_TMD_HERMES=m
    CONFIG_NORTEL_HERMES=m
    CONFIG_USB_NET_ZAURUS=m
    CONFIG_ISDN=y
    CONFIG_ISDN_AUDIO=y
    CONFIG_ISDN_CAPI=m
    CONFIG_ISDN_CAPI_CAPI20=m
    CONFIG_ISDN_CAPI_CAPIDRV=m
    CONFIG_ISDN_CAPI_CAPIFS=m
    CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
    CONFIG_ISDN_CAPI_MIDDLEWARE=y
    CONFIG_ISDN_DIVAS=m
    CONFIG_ISDN_DIVAS_BRIPCI=y
    CONFIG_ISDN_DIVAS_DIVACAPI=m
    CONFIG_ISDN_DIVAS_MAINT=m
    CONFIG_ISDN_DIVAS_PRIPCI=y
    CONFIG_ISDN_DIVAS_USERIDI=m
    CONFIG_ISDN_DIVERSION=m
    CONFIG_ISDN_DRV_ACT2000=m
    CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
    CONFIG_ISDN_DRV_AVMB1_B1ISA=m
    CONFIG_ISDN_DRV_AVMB1_B1PCI=m
    CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
    CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
    CONFIG_ISDN_DRV_AVMB1_C4=m
    CONFIG_ISDN_DRV_AVMB1_T1ISA=m
    CONFIG_ISDN_DRV_AVMB1_T1PCI=m
    CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
    CONFIG_ISDN_DRV_GIGASET=m
    CONFIG_ISDN_DRV_HISAX=m
    CONFIG_ISDN_DRV_ICN=m
    CONFIG_ISDN_DRV_LOOP=m
    CONFIG_ISDN_DRV_PCBIT=m
    CONFIG_ISDN_DRV_SC=m
    CONFIG_ISDN_HDLC=m
    CONFIG_ISDN_I4L=m
    CONFIG_ISDN_MPP=y
    CONFIG_ISDN_PPP=y
    CONFIG_ISDN_PPP_VJ=y
    CONFIG_ISDN_TTY_FAX=y
    CONFIG_ISDN_X25=y
    CONFIG_NOZOMI=m
    CONFIG_CARDMAN_4000=m
    CONFIG_CARDMAN_4040=m
    CONFIG_IPWIRELESS=m
    CONFIG_SENSORS_ADS7828=m
    CONFIG_SENSORS_W83L786NG=m
    CONFIG_THERMAL=y
    CONFIG_VIDEO_EM28XX_ALSA=m
    CONFIG_USB_STKWEBCAM=m
    CONFIG_DVB_BUDGET_CORE=m
    CONFIG_DVB_BUDGET=m
    CONFIG_DVB_BUDGET_CI=m
    CONFIG_DVB_BUDGET_AV=m
    CONFIG_DVB_BUDGET_PATCH=m
    CONFIG_VGA_CONSOLE=y
    CONFIG_SND_OXYGEN=m
    CONFIG_SND_VIRTUOSO=m
    CONFIG_MEMSTICK=m
    # CONFIG_MEMSTICK_DEBUG is not set
    # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
    CONFIG_MSPRO_BLOCK=m
    CONFIG_MEMSTICK_TIFM_MS=m
    CONFIG_MEMSTICK_JMICRON_38X=m
    CONFIG_DMADEVICES=y
    CONFIG_SCHED_TRACER=y
    CGROUP_MEM_RES_CTLR_SWAP=y
    CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
    CONFIG_SCSI_MVSAS_DEBUG=y
    CONFIG_ISDN_PPP_BSDCOMP=m
    # CONFIG_HISAX_NO_SENDCOMPLETE is not set
    # CONFIG_HISAX_NO_LLC is not set
    # CONFIG_HISAX_NO_KEYPAD is not set
    CONFIG_HISAX_HFCUSB=m
    CONFIG_CAPI_TRACE=y
    CONFIG_CAPI_EICON=y
    CONFIG_SERIAL_PCH_UART=m
    # CONFIG_VGACON_SOFT_SCROLLBACK is not set
    # CONFIG_ASYNC_TX_DMA is not set

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

UBUNTU: [Config] debian PPC64 configuration

Pull in very close to an 'preferred' configuration.

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

UBUNTU: rebase fixes LP#721389

Ignore: yes

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

UBUNTU: rebase to 493f3358cb289ccf716c5a14fa5bb52ab75943e5

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

UBUNTU: d-i -- enable speakup-modules udeb

Add the speakup-modules udeb for the installer CDs

BugLink: http://bugs.launchpad.net/bugs/672699
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: Bump ABI

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

UBUNTU: Start new release

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

UBUNTU: Ubuntu-2.6.38-5.32

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

UBUNTU: rebase fixes Bug #722310

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

UBUNTU: rebase fixes Bug #722689

Ignore: yes

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

UBUNTU: v2.6.38-rc5 rebased fixes Bug #716811

Ignore: yes

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

UBUNTU: [Config] enable CONFIG_DMAR

Enable CONFIG_DMAR, support for DMA remapping devices which allows
devices to be used more efficiently under KVM.

BugLink: http://bugs.launchpad.net/bugs/552311
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: [Config] updateconfigs following rebase to v2.6.38-rc6

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

UBUNTU: rebase to mainline 6f576d57f1fa0d6026b495d8746d56d949989161

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

UBUNTU: Bump ABI

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

UBUNTU: Start new release

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

UBUNTU: Ubuntu-2.6.38-4.31

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

UBUNTU: rebase fixes Bug #710371

Ignore: yes

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

UBUNTU: rebase fixes Bug #713769

Ignore: yes

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