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>

UBUNTU: SAUCE: rtl8192se: 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>

UBUNTU: SAUCE: rtl8192se: fix source file perms

Change file permissions of source files in ubuntu/rtl8192se/
from 0755 to 0644 to avoid dpkg-source warning.

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

UBUNTU: [Config] Set physical start and alignment 1M for virtual i386

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

This also sets the PHYSICAL_ALIGNMENT to 16M for normal i386 flavours
because this is the default since around 2.6.31 and we just happened to
carry an older default value. But a recent update of the configuration
changed the PHYSICAL_START to the new default of 16M. So now both values
are in sync again.

That said, unfortunately there seems to be a problem with pv-grub on
i386 when the physical start is set to 16M which prevents booting the
t1.micro instances on EC2 (again). Therefor the physical start and
alignment is changed back for the virtual flavour of i386.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: OMAP3630: PM: don't warn the user with a trace in case of PM34XX_ERRATUM

This patch has been submitted upstream, but likely won't make 2.6.38.

In case in user has a OMAP3630 < ES1.2 the kernel should warn the user
about the ERRATUM, but using pr_warning instead of WARN_ON is already
enough, as there is nothing else the user can do besides changing the
board.

With this we avoid having the following calltrace while booting with some
Beagle xM revisions:
WARNING: at /home/apw/build/ubuntu-natty2/ubuntu-natty2/arch/arm/mach-omap2/cpuidle34xx.c:468 omap_init_power_states+0x230/0x238()
omap_init_power_states: core off state C7 disabled due to i583
Modules linked in:
[<c00596f4>] (unwind_backtrace+0x0/0xfc) from [<c04f29a8>] (dump_stack+0x18/0x1c)
[<c04f29a8>] (dump_stack+0x18/0x1c) from [<c008510c>] (warn_slowpath_common+0x5c/0x6c)
[<c008510c>] (warn_slowpath_common+0x5c/0x6c) from [<c00851c0>] (warn_slowpath_fmt+0x38/0x40)
[<c00851c0>] (warn_slowpath_fmt+0x38/0x40) from [<c00676f4>] (omap_init_power_states+0x230/0x238)
[<c00676f4>] (omap_init_power_states+0x230/0x238) from [<c00131a0>] (omap3_idle_init+0x74/0x18c)
[<c00131a0>] (omap3_idle_init+0x74/0x18c) from [<c00126b4>] (omap3_pm_init+0x1ac/0x308)
[<c00126b4>] (omap3_pm_init+0x1ac/0x308) from [<c00474c0>] (do_one_initcall+0x3c/0x1b4)
[<c00474c0>] (do_one_initcall+0x3c/0x1b4) from [<c0008d58>] (kernel_init+0xe0/0x178)
[<c0008d58>] (kernel_init+0xe0/0x178) from [<c00532c8>] (kernel_thread_exit+0x0/0x8)
---[ end trace e639b107cbbc60f1 ]---

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: [Config] packaging: really make System.map mode 0600

799f11e9c88770eb1017a297c1a456013a80f324 tried to make System.map mode
0600. It turns out that dh_fixperms undoes that change. This patch fixes
this up, corrects perms for sub-flavors, and adds vmcoreinfo to the mode
0600 list.

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

UBUNTU: [Config] reenable CONFIG_CRASH_DUMP

This got lost during an early Natty rebase.

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

UBUNTU: rebase to v2.6.38-rc3

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

UBUNTU: [Config] reenable HIBERNATE

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

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

UBUNTU: rebase to 70d1f365568e0cdbc9f4ab92428e1830fdb09ab0

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

UBUNTU: SAUCE: Disable building the ACPI debugfs source

The ACPI debugfs interface allows arbitrary writes to memory.

https://lists.ubuntu.com/archives/kernel-team/2011-January/014138.html

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

UBUNTU: [Config] updateconfigs following rebase to 1f0324caefd39985e9fe052fac97da31694db31e

    CONFIG_CAN_SOFTING=m
    CONFIG_CAN_SOFTING_CS=m

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

UBUNTU: rebase to 1f0324caefd39985e9fe052fac97da31694db31e

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-1.28

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

UBUNTU: Start new release

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

UBUNTU: [Config] omap: move CONFIG_PANEL_GENERIC_DPI to build in to make display work at Beagle

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: omap3: beaglexm: fix DVI initialization

Function beagle_twl_gpio_setup is called after beagle_display_init, what
makes lets reset_gpio with an invalid value at the time it request the
gpio. As a side effect the DVI reset GPIO is not properly set.

Also removing old code that power down DVI in a hardcoded way, as it's
not necessary anymore.

Tested with Beagle-xM and C4.

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: ubuntu: AUFS -- update to b1cee06249dfa0ab30951e7f06490a75c155b620

    commit b1cee06249dfa0ab30951e7f06490a75c155b620
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Sun Jan 23 23:06:51 2011 +0900

        aufs: for 2.6.38-rcN, testing, revert stop_sillyrename

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

    commit fb742969486f39f4a7a6f0859758a42189bd38d0
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Fri Jan 21 16:13:16 2011 +0900

        aufs: for 2.6.38-rcN, use a new member s_d_op

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

    commit 6e91ff14940eeaf587dd0386a31e1f0c718ded1d
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Fri Jan 21 16:14:03 2011 +0900

        aufs: for 2.6.38-rcN, tiny, just a comment

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

    commit 0cbbdfb0411cc28445761990079c929946f0b3b2
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Fri Jan 21 16:02:21 2011 +0900

        aufs: for 2.6.38-rcN, force write lock for rename_lock

        Because au_dcsub_pages() cannot discard the intermediate result and
        restart the traversal, always write_lock.

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

    commit 742f879080f69bd1c5bf428f74fefb1b6e38565e
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Fri Jan 21 16:12:01 2011 +0900

        aufs: for 2.6.38-rcN, protect d_unhashed() by d_lock

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

    commit 90ea0a0815b44e919737de424bce249c817ebbd6
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Sat Jan 22 16:17:28 2011 +0900

        aufs: possible bugfix, protect d_unhashed() by di_write_lock

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

    commit 7489e85817cc5154c35664c794041c2582590616
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Fri Jan 21 15:58:59 2011 +0900

        aufs: tiny, replace au_d_removed() by d_unlinked()

        These two small functions are identical.

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

    commit 97bf43fd682b2c9aaa74eba39a405f669b4c3b31
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Fri Jan 21 16:15:12 2011 +0900

        aufs: testing, stop unhashing in hnotify

        In aufs, all hash/unhash for dentries should follow VFS.

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

    commit f1fdfd580181ae75af84d347aa13c7b3f632a7e5
    Author: J. R. Okajima <hooanon05@yahoo.co.jp>
    Date:   Fri Jan 21 16:00:14 2011 +0900

        aufs: tiny, modify a comment

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

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

UBUNTU: Ubuntu-2.6.38-1.27

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

tty: include linux/slab.h for kfree

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

gpio/ml_ioh_gpio: include linux/slab.h for kfree

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

pch_dma: add include/slab.h for kfree

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

brcm80211: include linux/slab.h for kfree

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

UBUNTU: [Config] disable CONFIG_MANTIS_CORE to fix FTBS on armel versatile

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

UBUNTU: [Config] disable CONFIG_RTL8192CE to fix FTBS on armel omap

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

UBUNTU: [Config] disable CONFIG_AD7150 to fix FTBS on armel versatile

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

UBUNTU: [Config] disable CONFIG_AD7152 to fix FTBS on armel versatile

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

UBUNTU: rebase fixes bug #686333

Ignore: yes

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

UBUNTU: [Config] update configs following rebase to c723fdab8aa728dc2bf0da6a0de8bb9c3f588d84

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

UBUNTU: rebase to c723fdab8aa728dc2bf0da6a0de8bb9c3f588d84

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

UBUNTU: rebase to mainline d315777b32a4696feb86f2a0c9e9f39c94683649

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

UBUNTU: rebase fixes bug #215802

Ignore: yes

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

UBUNTU: rebase fixes bug #608775

Ignore: yes

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

Revert "UBUNTU: [Config] ensure sysrq is enabled by default"

This reverts commit 998a862457265beccf760c89a67541ebdc0a62df.

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

sched: tg->se->load should be initialised to tg->shares

Michael reported that when enable autogroup on UP, system
responsiveness becomes very bad.
Because in init_tg_cfs_entry() we initialise se->load
to 0 instead of tg->shares, in the end we have 0-weight
sched entity on rq, then lead to misbehavior.

Reported-by: Michael Witten <mfwitten@gmail.com>
Reported-by: Christian Kujau <christian@nerdbynature.de>
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>