Andy Whitcroft [Wed, 23 Feb 2011 12:36:22 +0000 (12:36 +0000)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 22 Feb 2011 13:29:12 +0000 (13:29 +0000)]
UBUNTU: Ubuntu-2.6.38-5.32
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 22 Feb 2011 13:28:24 +0000 (13:28 +0000)]
UBUNTU: rebase fixes Bug #722310
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 22 Feb 2011 13:27:56 +0000 (13:27 +0000)]
UBUNTU: rebase fixes Bug #722689
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 21 Feb 2011 16:47:42 +0000 (16:47 +0000)]
UBUNTU: v2.6.38-rc5 rebased fixes Bug #716811
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 21 Feb 2011 16:40:31 +0000 (16:40 +0000)]
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>
Andy Whitcroft [Mon, 21 Feb 2011 16:13:18 +0000 (16:13 +0000)]
UBUNTU: [Config] updateconfigs following rebase to v2.6.38-rc6
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 21 Feb 2011 16:12:18 +0000 (16:12 +0000)]
UBUNTU: rebase to mainline
6f576d57f1fa0d6026b495d8746d56d949989161
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 18 Feb 2011 15:20:41 +0000 (15:20 +0000)]
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 18 Feb 2011 15:19:35 +0000 (15:19 +0000)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 16 Feb 2011 21:53:13 +0000 (21:53 +0000)]
UBUNTU: Ubuntu-2.6.38-4.31
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 16 Feb 2011 12:14:09 +0000 (12:14 +0000)]
UBUNTU: rebase fixes Bug #710371
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 16 Feb 2011 10:22:07 +0000 (10:22 +0000)]
UBUNTU: rebase fixes Bug #713769
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 16 Feb 2011 02:00:47 +0000 (02:00 +0000)]
UBUNTU: rebase to mainline v2.6.38-rc5
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 16 Feb 2011 01:59:46 +0000 (01:59 +0000)]
UBUNTU: resync with maverick
98defa1c5773a3d7e4c524967eb01d5bae035816
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Manoj Iyer [Fri, 14 Jan 2011 10:17:15 +0000 (10:17 +0000)]
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>
Andy Whitcroft [Tue, 15 Feb 2011 13:38:41 +0000 (13:38 +0000)]
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>
Colin Ian King [Mon, 14 Feb 2011 15:04:21 +0000 (15:04 +0000)]
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>
Andy Whitcroft [Fri, 11 Feb 2011 18:25:24 +0000 (18:25 +0000)]
UBUNTU: rebase to
795abaf1e4e188c4171e3cd3dbb11a9fcacaf505
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Tim Gardner [Thu, 10 Feb 2011 14:53:26 +0000 (07:53 -0700)]
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>
Andy Whitcroft [Fri, 11 Feb 2011 17:48:02 +0000 (17:48 +0000)]
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 11 Feb 2011 17:46:52 +0000 (17:46 +0000)]
UBUNTU: Start new release
Ignore: yes
Andy Whitcroft [Thu, 10 Feb 2011 11:37:57 +0000 (11:37 +0000)]
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>
Andy Whitcroft [Wed, 9 Feb 2011 22:27:20 +0000 (22:27 +0000)]
UBUNTU: Ubuntu-2.6.38-3.30
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Tim Gardner [Wed, 9 Feb 2011 18:50:38 +0000 (11:50 -0700)]
UBUNTU: [Config] CONFIG_DELL_WMI_AIO=m
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Colin Ian King [Wed, 9 Feb 2011 18:17:55 +0000 (18:17 +0000)]
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>
Colin Ian King [Wed, 9 Feb 2011 18:17:54 +0000 (18:17 +0000)]
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>
Colin Ian King [Wed, 9 Feb 2011 18:17:53 +0000 (18:17 +0000)]
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>
Andy Whitcroft [Wed, 9 Feb 2011 09:49:56 +0000 (09:49 +0000)]
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>
Andy Whitcroft [Wed, 17 Nov 2010 09:52:33 +0000 (09:52 +0000)]
UBUNTU: ppc64 -- add basic architecture
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 8 Feb 2011 02:11:02 +0000 (02:11 +0000)]
UBUNTU: rebase to v2.6.38-rc4
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 8 Feb 2011 02:09:59 +0000 (02:09 +0000)]
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 8 Feb 2011 02:08:15 +0000 (02:08 +0000)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Dan Rosenberg [Thu, 23 Dec 2010 03:22:27 +0000 (22:22 -0500)]
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>
Kees Cook [Sat, 5 Feb 2011 07:13:58 +0000 (23:13 -0800)]
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>
Kees Cook [Sat, 5 Feb 2011 17:27:39 +0000 (09:27 -0800)]
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>
Tim Gardner [Fri, 4 Feb 2011 20:30:49 +0000 (13:30 -0700)]
UBUNTU: [Config] CONFIG_BLK_CGROUP=y
BugLink: http://bugs.launchpad,net/bugs/706394
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Andy Whitcroft [Fri, 4 Feb 2011 10:00:11 +0000 (10:00 +0000)]
UBUNTU: Ubuntu-2.6.38-2.29
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Kamal Mostafa [Tue, 1 Feb 2011 20:36:11 +0000 (12:36 -0800)]
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>
Kamal Mostafa [Tue, 1 Feb 2011 20:34:23 +0000 (12:34 -0800)]
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>
Kamal Mostafa [Tue, 1 Feb 2011 20:23:15 +0000 (12:23 -0800)]
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>
Stefan Bader [Tue, 1 Feb 2011 13:58:42 +0000 (14:58 +0100)]
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>
Ricardo Salveti de Araujo [Fri, 28 Jan 2011 17:17:56 +0000 (15:17 -0200)]
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>
Kees Cook [Mon, 31 Jan 2011 21:43:13 +0000 (13:43 -0800)]
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>
Andy Whitcroft [Tue, 1 Feb 2011 09:38:46 +0000 (09:38 +0000)]
UBUNTU: [Config] reenable CONFIG_CRASH_DUMP
This got lost during an early Natty rebase.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 1 Feb 2011 09:33:27 +0000 (09:33 +0000)]
UBUNTU: rebase to v2.6.38-rc3
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 31 Jan 2011 20:19:18 +0000 (20:19 +0000)]
UBUNTU: [Config] reenable HIBERNATE
BugLink: http://bugs.launchpad.net/bugs/710877
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 31 Jan 2011 09:37:38 +0000 (09:37 +0000)]
UBUNTU: rebase to
70d1f365568e0cdbc9f4ab92428e1830fdb09ab0
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Tim Gardner [Fri, 28 Jan 2011 19:53:09 +0000 (12:53 -0700)]
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>
Andy Whitcroft [Fri, 28 Jan 2011 16:29:54 +0000 (16:29 +0000)]
UBUNTU: [Config] updateconfigs following rebase to
1f0324caefd39985e9fe052fac97da31694db31e
CONFIG_CAN_SOFTING=m
CONFIG_CAN_SOFTING_CS=m
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 28 Jan 2011 16:32:29 +0000 (16:32 +0000)]
UBUNTU: rebase to
1f0324caefd39985e9fe052fac97da31694db31e
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 1 Feb 2011 09:40:18 +0000 (09:40 +0000)]
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 28 Jan 2011 16:31:22 +0000 (16:31 +0000)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 28 Jan 2011 14:26:17 +0000 (14:26 +0000)]
UBUNTU: Ubuntu-2.6.38-1.28
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 28 Jan 2011 10:53:05 +0000 (10:53 +0000)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Ricardo Salveti de Araujo [Fri, 28 Jan 2011 04:10:38 +0000 (02:10 -0200)]
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>
Ricardo Salveti de Araujo [Fri, 28 Jan 2011 04:10:37 +0000 (02:10 -0200)]
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>
Andy Whitcroft [Thu, 27 Jan 2011 11:33:32 +0000 (11:33 +0000)]
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>
Andy Whitcroft [Wed, 26 Jan 2011 18:30:27 +0000 (18:30 +0000)]
UBUNTU: Ubuntu-2.6.38-1.27
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 26 Jan 2011 17:16:41 +0000 (17:16 +0000)]
tty: include linux/slab.h for kfree
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 26 Jan 2011 16:46:27 +0000 (16:46 +0000)]
gpio/ml_ioh_gpio: include linux/slab.h for kfree
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 26 Jan 2011 16:30:31 +0000 (16:30 +0000)]
pch_dma: add include/slab.h for kfree
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 26 Jan 2011 17:08:07 +0000 (17:08 +0000)]
brcm80211: include linux/slab.h for kfree
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 26 Jan 2011 17:00:34 +0000 (17:00 +0000)]
UBUNTU: [Config] disable CONFIG_MANTIS_CORE to fix FTBS on armel versatile
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 26 Jan 2011 15:08:06 +0000 (15:08 +0000)]
UBUNTU: [Config] disable CONFIG_RTL8192CE to fix FTBS on armel omap
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 26 Jan 2011 18:01:57 +0000 (18:01 +0000)]
UBUNTU: [Config] disable CONFIG_AD7150 to fix FTBS on armel versatile
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 26 Jan 2011 17:36:07 +0000 (17:36 +0000)]
UBUNTU: [Config] disable CONFIG_AD7152 to fix FTBS on armel versatile
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 25 Jan 2011 17:14:20 +0000 (17:14 +0000)]
UBUNTU: rebase fixes bug #686333
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 25 Jan 2011 16:47:37 +0000 (16:47 +0000)]
UBUNTU: [Config] update configs following rebase to
c723fdab8aa728dc2bf0da6a0de8bb9c3f588d84
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 25 Jan 2011 15:57:19 +0000 (15:57 +0000)]
UBUNTU: rebase to
c723fdab8aa728dc2bf0da6a0de8bb9c3f588d84
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 24 Jan 2011 19:07:31 +0000 (19:07 +0000)]
UBUNTU: rebase to mainline
d315777b32a4696feb86f2a0c9e9f39c94683649
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 24 Jan 2011 13:29:57 +0000 (13:29 +0000)]
UBUNTU: rebase fixes bug #215802
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 24 Jan 2011 12:56:34 +0000 (12:56 +0000)]
UBUNTU: rebase fixes bug #608775
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 24 Jan 2011 11:54:06 +0000 (11:54 +0000)]
Revert "UBUNTU: [Config] ensure sysrq is enabled by default"
This reverts commit
998a862457265beccf760c89a67541ebdc0a62df.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Yong Zhang [Mon, 24 Jan 2011 00:59:17 +0000 (00:59 +0000)]
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>
Andy Whitcroft [Mon, 24 Jan 2011 00:40:09 +0000 (00:40 +0000)]
UBUNTU: rebase to v2.6.38-rc2
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 21 Jan 2011 15:03:39 +0000 (15:03 +0000)]
UBUNTU: [Config] CONFIG_NR_CPUS=256 for amd64 -server flavour
We are starting to see machines with more than 64 CPUs. Move to
supporting 256 CPUs in the amd64 -server flavour.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 21 Jan 2011 14:59:24 +0000 (14:59 +0000)]
Revert "drm/radeon/bo: add some fallback placements for VRAM only objects."
This reverts commit
5c690591b22b00b429ba3addca714b6558f709ae.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 21 Jan 2011 14:41:48 +0000 (14:41 +0000)]
UBUNTU: ubuntu: AUFS -- suppress benign plink warning messages
We are getting a lot of bug reports for unexpectedly high plink counts.
This message is benign and not worth reporting as a bug. Suppress.
BugLink: http://bugs.launchpad.net/bugs/621195
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 21 Jan 2011 14:40:55 +0000 (14:40 +0000)]
UBUNTU: [Config] disable CONFIG_TRANSPARENT_HUGEPAGE to fix i386 boot crashes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 21 Jan 2011 13:43:12 +0000 (13:43 +0000)]
UBUNTU: [Config] updateconfigs following rebase to
2b1caf6ed7b888c95a1909d343799672731651a5
CONFIG_EXPERT=y
CONFIG_PROCESSOR_SELECT=y
CONFIG_MAC80211_RC_PID=y
CONFIG_TTY_PRINTK=y
# CONFIG_SSB_SILENT is not set
CONFIG_FB_INTEL=m
# CONFIG_FB_INTEL_DEBUG is not set
CONFIG_FB_INTEL_I2C=y
CONFIG_USB_KBD=m
CONFIG_USB_MOUSE=m
CONFIG_INPUT_APMPOWER=m
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 21 Jan 2011 13:19:19 +0000 (13:19 +0000)]
UBUNTU: rebase to linus tip
2b1caf6ed7b888c95a1909d343799672731651a5
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 20 Jan 2011 22:07:14 +0000 (22:07 +0000)]
UBUNTU: SAUCE: x86 fix up jiffies/jiffies_64 handling
Based on a patched by Anvin, H Peter <h.peter.anvin@intel.com> and Shaohua
Li <shaohua.li@intel.com>.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 19 Jan 2011 12:00:38 +0000 (12:00 +0000)]
UBUNTU: rebase fixes bug #702125
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 19 Jan 2011 11:58:01 +0000 (11:58 +0000)]
UBUNTU: rebase fixes bug #689886
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 19 Jan 2011 01:02:41 +0000 (01:02 +0000)]
UBUNTU: [Config] updateconfigs following rebase to v2.6.38-rc1
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 19 Jan 2011 01:00:48 +0000 (01:00 +0000)]
UBUNTU: rebase to v2.6.38-rc1
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Tim Gardner [Tue, 18 Jan 2011 15:57:59 +0000 (08:57 -0700)]
UBUNTU: update bnx2 firmware files in d-i/firmware/nic-modules
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Andy Whitcroft [Tue, 18 Jan 2011 09:35:41 +0000 (09:35 +0000)]
UBUNTU: rebase to
e6f597a1425b5af64917be3448b29e2d5a585ac8
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 17 Jan 2011 16:03:57 +0000 (16:03 +0000)]
UBUNTU: update package version to match payload version
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 17 Jan 2011 14:14:49 +0000 (14:14 +0000)]
UBUNTU: ubuntu: AUFS -- update to
806051bcbeec27748aae2b7957726a4e63ff308e
commit
806051bcbeec27748aae2b7957726a4e63ff308e
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jan 14 16:05:18 2011 +0900
aufs: follow the changes in 2.6.38-rcN, testing
This work is not done yet.
- review is required for aufs code.
- there are several known problems in mainline which are being fixed
now.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
f996d6b1adcd2c677c818fdf453ba257660f74c0
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Mon Jan 10 17:32:50 2011 +0900
aufs: bugfix, valid ptr in radix tree instead of dummy 1
When a process whose pid is larger than 32768 (default),
si_pid_set_slow() crashes due to a dummy value.
Replace the value by a valid pointer.
Reported-by: P.L.H.Bloom@tudelft.nl
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
fb2bbc5fddc96fe90ae86f29dbcb104c224f1831
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Mon Jan 10 13:11:51 2011 +0900
aufs: tiny, version string for aufs2.1-38-rcN
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
1cbb90f7fc05ea86e872191bc4bc3422d7ef6401
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Mon Jan 10 11:07:29 2011 +0900
aufs: tiny, version string for aufs2.1-37
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
795be8aa5ea8ac132e4ad4a0e9f1a0e33b9cd692
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sat Jan 8 02:07:07 2011 +0900
aufs: tiny, describe installing in aufs2-standalone.git
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
3714bfd727bb7afbfe9a1e8eee8f6aefcc0f4e58
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jan 7 12:25:06 2011 +0900
aufs: tiny, new year in copyright
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
6a9bf4a4ebf0c4a5e694de2952d36e576b051692
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jan 7 12:21:14 2011 +0900
aufs: tiny, new year in copyright
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
7c771c6f660d9e0f17def9550e396418589e4340
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jan 7 12:03:19 2011 +0900
aufs: tiny, describe union-mount and dm-snapshot
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
05a6d7153c58c13bca10ef7eb19ef3e3832d1c40
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jan 7 10:44:44 2011 +0900
aufs: bugfix, O_CLOEXEC for the plink maintenance mode
/sbin/mount.aufs (and others) puts aufs into the plink maintenance mode
via /proc/fs/aufs/plink_maint which make many other operations to return
error or block.
During in this mode, /sbin/mount.aufs exec(2) the original mount(8).
If mount(8) is not statically linked, it may mmap(2) ld.so (and
others). And if ld.so is inside of the target aufs, then aufs mmap(2)
blocks, ie. deadlock.
To address this problem, specify O_CLOEXEC for /proc/fs/aufs/plink_maint
which makes aufs to exit the plink maintenance mode, and ->release()
doesn't care about pid.
Reported-by: Marco Clocchiatti <ziapannocchia@gmail.com>
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
24b389a51f85350d6fa465d22006cdd0a421ee30
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Mon Jan 3 10:16:17 2011 +0900
aufs: tiny, describe installing in aufs2-standalone.git
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
58276fb0ea7dbfa57498fc96f87ecad91606fcd6
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Dec 21 21:25:11 2010 +0900
aufs: new make target 'install' for stdalone
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
c1cf055abebe4e25d67aeb32208c60ae49da37ac
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Mon Dec 20 16:00:01 2010 +0900
aufs: follow the changes in 2.6.37-rcN, aop->freepage
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 17 Jan 2011 14:14:18 +0000 (14:14 +0000)]
UBUNTU: ubuntu: ndiswrapper -- fix interaction between __packed and packed
Andy Whitcroft [Mon, 17 Jan 2011 13:39:33 +0000 (13:39 +0000)]
UBUNTU: ubuntu: iscsitarget -- follow changes to open_bdev_exclusive
commit
e525fd89d380c4a94c0d63913a1dd1a593ed25e7
Author: Tejun Heo <tj@kernel.org>
Date: Sat Nov 13 11:55:17 2010 +0100
block: make blkdev_get/put() handle exclusive access
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 17 Jan 2011 12:48:48 +0000 (12:48 +0000)]
UBUNTU: ubuntu: compcache -- follow changes to bd_claim/bd_release
Follow changes to bd_claim/bd_release semantics as per the upstream
commit below:
commit
e525fd89d380c4a94c0d63913a1dd1a593ed25e7
Author: Tejun Heo <tj@kernel.org>
Date: Sat Nov 13 11:55:17 2010 +0100
block: make blkdev_get/put() handle exclusive access
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 17 Jan 2011 10:57:56 +0000 (10:57 +0000)]
UBUNTU: SAUCE: Yama: follow changes to generic_permission
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 17 Jan 2011 09:45:04 +0000 (09:45 +0000)]
UBUNTU: [Config] update configs following rebase
e78bf5e6cbe837daa6ab628a5f679548742994d3
CONFIG_AMD_NUMA=y
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_ACPI_IPMI=m
CONFIG_CAN_SLCAN=m
CONFIG_SATA_ACARD_AHCI=m
CONFIG_DM_RAID=m
CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m
CONFIG_B43_PHY_N=y
CONFIG_RT2800PCI_RT33XX=y
CONFIG_RT2800USB_RT33XX=y
CONFIG_RTL8192CE=m
CONFIG_WL12XX_MENU=m
# CONFIG_WL12XX_HT is not set
CONFIG_WL12XX_SPI=m
CONFIG_WL12XX_SDIO=m
# CONFIG_WL12XX_SDIO_TEST is not set
CONFIG_USB_NET_CDC_NCM=m
CONFIG_JOYSTICK_AS5011=m
CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
# CONFIG_SERIAL_IFX6X60 is not set
CONFIG_SERIAL_PCH_UART=m
CONFIG_I2C_MUX_GPIO=m
CONFIG_I2C_EG20T=m
CONFIG_SPI_DW_MID_DMA=y
CONFIG_PPS_CLIENT_PARPORT=m
CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_GPIO_ML_IOH=m
CONFIG_W1_SLAVE_DS2423=m
CONFIG_BATTERY_MAX17042=m
CONFIG_CHARGER_GPIO=m
CONFIG_SENSORS_DS620=m
CONFIG_SENSORS_SHT21=m
CONFIG_SP5100_TCO=m
CONFIG_NV_TCO=m
CONFIG_MFD_TC3589X=y
CONFIG_AB8500_CORE=y
CONFIG_AB8500_DEBUG=y
CONFIG_MFD_CS5535=m
CONFIG_REGULATOR_MC13892=m
CONFIG_REGULATOR_AB8500=y
CONFIG_REGULATOR_TPS6524X=m
CONFIG_RC_CORE=m
CONFIG_IR_WINBOND_CIR=m
CONFIG_RC_LOOPBACK=m
CONFIG_VIDEO_TIMBERDALE=m
CONFIG_SOC_CAMERA_OV2640=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_RADIO_WL1273=m
CONFIG_SND_SOC_CACHE_LZO=?
# CONFIG_SND_SOC_CACHE_LZO is not set
CONFIG_HID_EMS_FF=m
CONFIG_HID_MULTITOUCH=m
CONFIG_HID_ROCCAT_KONEPLUS=m
CONFIG_USB_G_NCM=m
CONFIG_AB8500_USB=m
# CONFIG_MMC_CLKGATE is not set
CONFIG_NFC_DEVICES=?
CONFIG_NFC_DEVICES=y
CONFIG_PN544_NFC=m
CONFIG_RTC_DRV_AB8500=m
CONFIG_XEN_BACKEND=?
CONFIG_XEN_BACKEND=y
CONFIG_XEN_GNTDEV=m
CONFIG_DX_SEP=m
CONFIG_ADIS16201=m
CONFIG_ADIS16203=m
CONFIG_ADIS16204=m
CONFIG_AD7150=m
CONFIG_AD7152=m
CONFIG_AD7291=m
CONFIG_AD7298=m
CONFIG_AD7314=m
CONFIG_AD7887=m
CONFIG_AD7745=m
CONFIG_AD7816=m
CONFIG_ADT75=m
CONFIG_ADT7310=m
CONFIG_ADT7410=m
CONFIG_ADT7316=m
CONFIG_ADT7316_SPI=m
CONFIG_ADT7316_I2C=m
CONFIG_AD5624R_SPI=m
CONFIG_AD5446=m
CONFIG_AD5930=m
CONFIG_AD9832=m
CONFIG_AD9834=m
CONFIG_AD9850=m
CONFIG_AD9852=m
CONFIG_AD9910=m
CONFIG_AD9951=m
CONFIG_ADIS16060=m
CONFIG_ADIS16080=m
CONFIG_ADIS16130=m
CONFIG_ADIS16251=m
CONFIG_ADE7753=m
CONFIG_ADE7754=m
CONFIG_ADE7758=m
CONFIG_ADE7759=m
CONFIG_ADE7854=m
CONFIG_ADE7854_I2C=m
CONFIG_ADE7854_SPI=m
CONFIG_AD2S90=m
CONFIG_AD2S120X=m
CONFIG_AD2S1210=m
CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
CONFIG_SQUASHFS_XZ=y
# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
CONFIG_TRUSTED_KEYS=m
CONFIG_ENCRYPTED_KEYS=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_XZ_DEC=y
CONFIG_XZ_DEC_TEST=m
CONFIG_KEYBOARD_TC3589X=m
CONFIG_INPUT_AB8500_PONKEY=m
CONFIG_GPIO_TC3589X=?
CONFIG_GPIO_TC3589X=y
CONFIG_X86_32_IRIS=m
CONFIG_SPI_PXA2XX=m
CONFIG_LEDS_GPIO_OF=y
# CONFIG_OMAP_SMARTREFLEX is not set
CONFIG_MACH_CRANEBOARD=?
# CONFIG_MACH_CRANEBOARD is not set
CONFIG_MACH_NOKIA_RM680=y
CONFIG_SWP_EMULATE=?
# CONFIG_SWP_EMULATE is not set
# CONFIG_CRASH_DUMP is not set
CONFIG_HVC_DCC=?
CONFIG_HVC_DCC=y
CONFIG_DVB_MB86A20S=m
CONFIG_PANEL_GENERIC_DPI=m
CONFIG_PANEL_NEC_NL8048HL11_01B=m
CONFIG_USB_EHCI_HCD_OMAP=?
CONFIG_USB_EHCI_HCD_OMAP=y
CONFIG_TWL6030_USB=m
CONFIG_MMC_DW=m
CONFIG_MMC_DW_IDMAC=?
# CONFIG_MMC_DW_IDMAC is not set
# CONFIG_NTP_PPS is not set
CONFIG_ATH5K_PCI=y
CONFIG_ATH5K_PCI=y
CONFIG_PSERIES_ENERGY=m
CONFIG_ATH5K_PCI=y
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 17 Jan 2011 09:08:58 +0000 (09:08 +0000)]
UBUNTU: rebase to linux tip
e78bf5e6cbe837daa6ab628a5f679548742994d3
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 12 Jan 2011 21:59:02 +0000 (21:59 +0000)]
UBUNTU: [Config] ensure sysrq is enabled by default
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Kees Cook [Fri, 14 Jan 2011 20:24:57 +0000 (12:24 -0800)]
packaging: make System.map mode 0600
To complement the 0400 /proc/kallsyms patch, this makes the installed
System.map file mode 0600 so that security vulnerability exploitation
isn't as trivial. This, like kallsyms, does not stop a serious attacker,
since they can always just fetch the package and read the file.
I'm not aware of any non-root consumer of this file, so there should be
no impact. FWIW, my system boots fine with this change.
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Stefan Bader [Tue, 11 Jan 2011 23:29:25 +0000 (23:29 +0000)]
UBUNTU: Temporarily disable RODATA for virtual i386
Setting to RO was ok, but the whole patchset seems to cause
i386 EC instances to panic on boot when setting the kernel data
to read-only and no-execute. So while there is no proper fix
found disable this in the i386 virtual flavour.
BugLink: http://bugs.launchpad.net/bugs/699828
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>