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>

UBUNTU: rebase to mainline v2.6.38-rc5

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

UBUNTU: resync with maverick 98defa1c5773a3d7e4c524967eb01d5bae035816

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

Quirk to fix suspend/resume on Lenovo Edge 11,13,14,15

Set acpi_skip_timer_override to force ignoring BIOS
IRQ0 pin2 override. This fixes resume from suspend on
AMD based ThinkPad Edge 11,13,14 and 15.

Please note that with this patch applied, you will see
a warning message from the kernel, this is printed in acpi/boot.c
before it sets acpi_skip_timer_override=1;

[    0.000000] ------------[ cut here ]------------
[    0.000000] WARNING: at /home/manjo/ubuntu-maverick-674710/arch/x86/kernel/acpi/boot.c:1345 dmi_ignore_irq0_timer_override+0x2e/0x52()
[    0.000000] Hardware name: 254523U
[    0.000000] ati_ixp4x0 quirk not complete.
[    0.000000] Modules linked in:
[    0.000000] Pid: 0, comm: swapper Not tainted 2.6.35-25-generic #43
[    0.000000] Call Trace:
[    0.000000]  [<c014ad42>] warn_slowpath_common+0x72/0xa0
[    0.000000]  [<c0826724>] ? dmi_ignore_irq0_timer_override+0x2e/0x52
[    0.000000]  [<c0826724>] ? dmi_ignore_irq0_timer_override+0x2e/0x52
[    0.000000]  [<c014ae13>] warn_slowpath_fmt+0x33/0x40
[    0.000000]  [<c0826724>] dmi_ignore_irq0_timer_override+0x2e/0x52
[    0.000000]  [<c04dd7d0>] dmi_check_system+0x30/0x50
[    0.000000]  [<c0826df4>] acpi_boot_table_init+0x10/0x7d
[    0.000000]  [<c0821ea7>] ? io_delay_init+0x16/0x18
[    0.000000]  [<c081f556>] setup_arch+0x562/0x645
[    0.000000]  [<c012cf19>] ? default_spin_lock_flags+0x9/0x10
[    0.000000]  [<c081b57b>] start_kernel+0xcf/0x374
[    0.000000]  [<c081b0d7>] i386_start_kernel+0xd7/0xdf
[    0.000000] ---[ end trace a7919e7f17c0a725 ]---
[    0.000000] ThinkPad Edge detected: Ignoring BIOS IRQ0 pin2 override

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

BugLink: http://launchpad.net/bugs/702434
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: [Config] enable CONFIG_VSX to allow use of vector instuctions

Enable VSX support which allows the use of the vector capabilities of
newer power processors, similar to MMX.

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

UBUNTU: SAUCE: Dell All-In-One: Remove need for Dell module alias

The driver originally used a workaround to load the All-In-One
module based on a Dell DMI module alias.  Since the WMI sys interface
supports the WMI GUIDs listed in the driver we can remove this
unneccessary work around.  Also, fix GUIDs to have no lower case hex
characters.

http://bugs.launchpad.net/bugs/718775

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: rebase to 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505

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

UBUNTU: [Config] CONFIG_CRYPTO_CRC32C_INTEL=y

Since crc32 is one of the most widely used algorithms in the kernel,
it makes sense to build in the assembler optimized versions for the
CPUs with that capability.

https://lists.ubuntu.com/archives/kernel-team/2011-February/014438.html

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

UBUNTU: Bump ABI

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

UBUNTU: Start new release

Ignore: yes

UBUNTU: add in bugs closed by upstream patches pulled in by rebases

When we rebase any bug numbers in the rebase are missed by the current
tooling.  The list is trivial to obtain using the fragment below, use
this to update the most recent rebases (which will be applied manually).

    git log <from>..<to> | \
./debian/scripts/misc/git-ubuntu-log | grep LP:

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

UBUNTU: Ubuntu-2.6.38-3.30

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

UBUNTU: [Config] CONFIG_DELL_WMI_AIO=m

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

UBUNTU: SAUCE: Dell WMI: Use sparse keymaps and tidy up code.

The original implementaion failed to use spare keymaps which resulted
in quite a bit of unwanted bloat.  Use spare keymaps and tidy up the
code.

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

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Brad Figg<brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: Add WMI hotkeys support for another Dell All-In-One series

Enable WMI hotkeys on event GUID 02314822-307C-4F66-bf0E-48AEAEB26CC8. This
enables the volume up and down keys.  This Dell All-In-One enablement also works
around an implementation bug where the _WED method should return an integer
containing the key code and in fact the method returns the key code in element
zero of a buffer.

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

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Brad Figg<brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: Add WMI hotkeys support for Dell All-In-One series

Enable WMI hotkeys on event GUID 284A0E6B-380E-472A-921F-E52786257FB4. This driver
enables the volume up and down keys.

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

Signed-off-by: Eric Miao <eric.miao@canonical.com>
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: ubuntu: AUFS -- update to 65835da20b77c98fb538c9114fc31f5de1328230

    commit 65835da20b77c98fb538c9114fc31f5de1328230
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Thu Feb 3 04:46:48 2011 +0900

        aufs: possible bugfix, exclude the freeing file

        There is a small window from VFS:file_kill() and au_farray_cb(), and
        the freeing file may remain in s_files list when au_farray_cb()
        traverses it.
        Test the file count and exclude the files whose count is zero in
        au_farray_cb().

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>

    commit 1b2e182ba7e6e6d88b22ec25ef059bf932fe6e5b
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Thu Feb 3 04:41:12 2011 +0900

        aufs: tiny, remove an unused variable

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>

    commit 845a9e8515ce06e90145724eaab7b725f0a4f5ae
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Thu Feb 3 04:40:54 2011 +0900

        aufs: test bad inode in d_revalidate

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>

    commit 14602769d431dd07aaadca403f7eecb5fa58f1cf
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Mon Jan 31 15:23:54 2011 +0900

        aufs: for 2.6.38-rcN, protect d_count

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>

    commit 5caa6667bc16649365f79b441cddfd80109eb60c
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Fri Jan 28 23:18:59 2011 +0900

        aufs: force the hardest test for remote branch

        When the branch fs is remote, for the hardest (udba=notify) test even if
        udba=notify is not specified.

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>

    commit 2175d65a31af1c415606d7f45aeae363cf399de2
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Fri Jan 28 23:17:37 2011 +0900

        aufs: bugfix, test in rename

        Force the test for the case when dst is a decendant of src regardless
        its existence.

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>

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

UBUNTU: ppc64 -- add basic architecture

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

UBUNTU: rebase to v2.6.38-rc4

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: SAUCE: (drop after 2.6.38) Convert net %p usage %pK

This should be in the 2.6.39 kernel from the -mm tree

The %pK format specifier is designed to hide exposed kernel pointers,
specifically via /proc interfaces. Exposing these pointers provides an
easy target for kernel write vulnerabilities, since they reveal the
locations of writable structures containing easily triggerable function
pointers. The behavior of %pK depends on the kptr_restrict sysctl.

If kptr_restrict is set to 0, no deviation from the standard %p behavior
occurs.  If kptr_restrict is set to 1, the default, if the current user
(intended to be a reader via seq_printf(), etc.) does not have
CAP_SYSLOG (currently in the LSM tree), kernel pointers using %pK are
printed as 0's.  If kptr_restrict is set to 2, kernel pointers using %pK
are printed as 0's regardless of privileges.  Replacing with 0's was
chosen over the default "(null)", which cannot be parsed by userland %p,
which expects "(nil)".

The supporting code for kptr_restrict and %pK are currently in the -mm
tree.  This patch converts users of %p in net/ to %pK.  Cases of
printing pointers to the syslog are not covered, since this would
eliminate useful information for postmortem debugging and the reading of
the syslog is already optionally protected by the dmesg_restrict sysctl.

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

UBUNTU: SAUCE: (drop after 2.6.38) use %pK for /proc/kallsyms and /proc/modules

This should be in the 2.6.39 kernel from the -mm tree

In an effort to reduce kernel address leaks that might be used to
help target kernel privilege escalation exploits, this patch uses
%pK when displaying addresses in /proc/kallsyms, /proc/modules, and
/sys/module/*/sections/*.

Note that this changes %x to %p, so some legitimately 0 values in
/proc/kallsyms would have changed from 00000000 to "(null)". To avoid
this, "(null)" is not used when using the "K" format. Anything that was
already successfully parsing "(null)" in addition to full hex digits
should have no problem with this change. (Thanks to Joe Perches for
the suggestion.) Due to the %x to %p, "void *" casts are needed since
these addresses are already "unsigned long" everywhere internally, due
to their starting life as ELF section offsets.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Cc: Eugene Teo <eugene@redhat.com>
Cc: Dan Rosenberg <drosenberg@vsecurity.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Revert "UBUNTU: SAUCE: kernel: make /proc/kallsyms mode 400 to reduce ease of attacking"

This reverts commit befcdadcedaf84e9498db9accd9cfcdcf1724fc4.

Functionality replaced by %pK filtering from -mm.

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

UBUNTU: [Config] CONFIG_BLK_CGROUP=y

BugLink: http://bugs.launchpad,net/bugs/706394

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

UBUNTU: Ubuntu-2.6.38-2.29

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

UBUNTU: SAUCE: omnibook: fix source file newline

Add missing final newline to avoid dpkg-source warning.

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