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>
Tim Gardner [Thu, 13 Jan 2011 16:20:40 +0000 (09:20 -0700)]
UBUNTU: [Config] CONFIG_HIBERNATION=n
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Kees Cook [Tue, 11 Jan 2011 23:54:17 +0000 (15:54 -0800)]
UBUNTU: SAUCE: kernel: make /proc/kallsyms mode 400 to reduce ease of attacking
Making /proc/kallsyms readable only for root makes it harder
for attackers to write generic kernel exploits by removing
one source of knowledge where things are in the kernel.
This is the second submit, discussion happened on this on first submit
and mostly concerned that this is just one hole of the sieve ... but
one of the bigger ones.
Changing the permissions of at least System.map and vmlinux is
also required to fix the same set, but a packaging issue.
Target of this starter patch and follow ups is removing any kind of
kernel space address information leak from the kernel.
Ciao, Marcus
[not upstream because some old sysklog daemons have a bug with this]
OriginalAuthor: Marcus Meissner <meissner@suse.de>
Signed-off-by: Marcus Meissner <meissner@suse.de>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Eugene Teo <eugeneteo@kernel.org>
Reviewed-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Andy Whitcroft [Tue, 11 Jan 2011 22:59:47 +0000 (22:59 +0000)]
UBUNTU: correct the Vcs linkage to point to natty
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 6 Jan 2011 18:42:23 +0000 (18:42 +0000)]
UBUNTU: SAUCE: ensure root is ready before running usermodehelpers in it
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 6 Jan 2011 16:14:12 +0000 (16:14 +0000)]
UBUNTU: ubuntu: AUFS -- update to
c5021514085a5d96364e096dbd34cadb2251abfd
commit
c5021514085a5d96364e096dbd34cadb2251abfd
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Dec 16 01:29:04 2010 +0900
aufs: bugfix, missign test for branch management
In aufs_lookup(), the parent dir MAY be removed logically by branch
management.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
5df24d5e0dc992ab991d0113703b9c90416ce527
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Dec 15 22:55:09 2010 +0900
aufs: debugging, stop dcsub in sysrq handler
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
3f141020200c0e39c41c039eb261f65db0b3f18e
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Dec 15 22:50:15 2010 +0900
aufs: tiny, revised simply
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
8f46271b6cd7521da44a087dcbf3d783f4af24c7
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Dec 15 22:18:33 2010 +0900
aufs: debugging, false positive around NOPLMW
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
788f93f121fcafecaca33dafb824495db02edfe7
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Dec 15 21:19:26 2010 +0900
aufs: tiny, just an indentation
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
9a8dc61df4b4b722f9a9ef8a568cfcb78a4eb0aa
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Dec 15 21:19:09 2010 +0900
aufs: minor optimization, skip file-refresh for root
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
9784a821611537ad9d0d4593ba775bb816ace3e9
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Mon Dec 13 17:13:59 2010 +0900
aufs: possible bugfix, protect branch from deleting in nfsd fh_to_dentry()
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
8c017b90207d3e0914f53f7e15ff9fb30d33ffac
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Mon Dec 13 17:00:20 2010 +0900
aufs: possible bugfix, br_count in async rmdir
There is a missing decrement br_count for 'br' member in struct
au_whtmp_rmdir in an error path. Introduce a larger and bigger but more
generic and simple solution.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
29c19e545f53894ca89a9525685572b9c99f34c3
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sun Dec 12 10:25:26 2010 +0900
aufs: move missing declaration
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
0de8fbc346a9bc5cf314ea82063a65c08ca9e41b
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Dec 10 13:25:09 2010 +0900
aufs: possible bugfix, walk in dcache limited to aufs
In some cases, au_dcsub_pages_rev() should not handle out of aufs or
broken (but still cached) aufs dentry.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
52f9727243bf644db05168e6c77d2f063bcc01ba
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Dec 10 13:20:06 2010 +0900
aufs: d_instantiate in link(2)
Historically there was(were?) filesystem which calls d_drop() after the
success of link(2). In order to support such filesystem, old aufs1
follows it if h_dentry is dropped without d_instantiate().
Recently I looked whether there still exists such filesystem or not, and
could not find. So aufs_link() uncondionally calls d_instantiate() after
success of vfs_link() for branch fs.
But, as a fallback, d_drop() call with a d_unhashed() test are left.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
6b0be66a68b95ca0bab3068133c8730882a38385
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Dec 10 02:29:50 2010 +0900
aufs: bugfix, lock subclass in copying-up a dir hierarchy
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
e1d13b721d930c72217df0a9b6e8a87e51ed1810
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Dec 10 02:27:55 2010 +0900
aufs: bugfix, restore the internal array after special copyup
When copyup a file which exists on the lower readonly branch and already
removed logically, au_do_cpup_wh() operates the internal array in dinfo
before copyup. After that, regardless an error happened in copyup,
restore the internal array.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
d539fca6887a013c6fbd1b579898aa78ba7c65c9
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Dec 9 02:19:42 2010 +0900
aufs: minor, make inode bad before unlock
If an error happens in settting a new inode, we call iget_failed() and
make it "bad inode." Since someone else is wating for the inode is
unlocked, call iget_failed() before unlock it.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
b69574acb527171af24eddb51ac414664d70ddc4
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Dec 9 02:17:00 2010 +0900
aufs: bugfix, assign inode number for hardlink
If the cached inode doesn't match the dentry in operation, never combine
them (instatiate). Find another inode number.
Basically the known inode number is stored in XINO file. But UDBA or
branch management easily break it.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
efa578c51e3132442f8cd65e6efe4e344969449f
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Dec 8 02:28:32 2010 +0900
aufs: tiny, a comment
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
ff7babf5257fa57b341eb7230817a9ec0b45767c
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Dec 8 02:28:16 2010 +0900
aufs: debug by lockdep_depth()
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
f44393848b3d0ab046de672752d4c23cf14c6b62
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Dec 8 02:27:04 2010 +0900
aufs: minor, sysrq+A prints all
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
8fa5bfe552fdab2c900309f73f8a4174f705282d
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Dec 8 02:26:03 2010 +0900
aufs: limit of rdcache
MAX_SEC_IN_JIFFIES is less meaningful and hard to handle.
Introduce a new reasonable upper limit AUFS_RDCACHE_MAX.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
f85351d0360f40a2595c99f1182ddf1de0eed8a1
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Dec 8 02:24:40 2010 +0900
aufs: limit of MFS seconds
MAX_SEC_IN_JIFFIES is less meaningful and hard to handle.
Introduce a new reasonable upper limit AUFS_MFS_MAX_SEC.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
b64f629ab85e8d0641704fea2f2787d53713afd9
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Dec 8 02:21:00 2010 +0900
aufs: tiny, revise error messages
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
3e17bf45f4ab40d6516c9de073417942661cd31f
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Dec 7 01:19:32 2010 +0900
aufs: bugfix, hfsnotify for multiple aufs 2/2
Implement new operations, ->fin_br(), ->init_br() and ->reset_br().
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
fec63cfd00c69fe89ecc60fdf22e610b836e0785
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Dec 7 01:18:47 2010 +0900
aufs: bugfix, hfsnotify for multiple aufs 1/2
Since fsnotify doesn't allow registering a same fsnotify_ops to the same
fsnotify_group, aufs should make them per branch.
Theoritically it is enough to make them per aufs super_block, but users
MAY move branch into the same filesystem where other branch exists. To
support such case, make them per branch.
Introduce new operations, ->fin_br(), ->init_br() and ->reset_br().
Reported-by: Joonwoo Park <joonwpark81@gmail.com>
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
3da80541bb8d42a8f3cd2e2caf04b3037a0040bf
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Mon Dec 6 23:53:49 2010 +0900
aufs: tiny, revise the parameter for hinotify
- convert au_hnotify to au_hinode, remove h_inode from au_hn_alloc() and
->alloc().
- convert au_hnotify to au_hinode, ->free().
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
b632f916658d019669d393975bdc66644b333269
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Dec 10 13:29:13 2010 +0900
aufs: debugging dinfo
New debug function to verify the correctness of dinfo.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
1341643c5de13471e781f9c0bcd8d987023494b6
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Mon Dec 6 23:41:42 2010 +0900
aufs: bugfix, return value of au_do_refresh_d()
Intialize it as success (0).
Add some debug messgages.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
a4935871b43ea40fa73a67f228da6ef8c3dd0b14
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Dec 8 02:27:39 2010 +0900
aufs stdalone: export debug_locks
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
09853aaa34cca5eeedb9277591668258de081813
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Dec 7 21:53:59 2010 +0900
aufs: support for 2.6.34, protect f_mode
By introducing FMODE_RANDOM, file->f_mode may be modified out of aufs.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
f1617ce6112b85ed5a686be5e0cb8f48794ea2c4
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Dec 2 03:48:57 2010 +0900
aufs: revise how to build
Reported-by: wanyanqing <udknight@gmail.com>
Reported-by: Alex Vogt <elias@linexa.de>
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
543820e74625523e263faad047928266dc672cfd
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Nov 30 15:39:35 2010 +0900
aufs: tiny, remove unnecesary var
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
38fe8516196e35e6fab39a49f650dd5dd24deb63
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Nov 30 06:27:32 2010 +0900
aufs: refreshing, replace functions for remount time
(This is a part of a patch series "new strategy for refreshing")
In remounting (branch management), refresh all dentries and inodes
regardless their status (unhashed, unlinked, etc).
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
f822af6506e20cd2bd328dfc678ffbcf31c6f910
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Nov 30 06:25:27 2010 +0900
aufs: refreshing, new functions for remount time
(This is a part of a patch series "new strategy for refreshing")
Introduce new functions do_refresh, au_do_refresh_d, au_refresh_d, and
au_refresh_i which will replace current functions.
Since they are large and to keep single commit simple, this commit just
define these functions. The behaviour won't change.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
85a3a786f9fb483aea021caf66d71a930a327974
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sat Nov 27 14:32:52 2010 +0900
aufs: refreshing, replace old function by new one
(This is a part of a patch series "new strategy for refreshing")
Replace au_refresh_hinode() by au_refresh_dentry() which was committed
previously.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
872472221dc4771c29010fb89609ffc4ec31d9f9
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sat Nov 27 03:32:18 2010 +0900
aufs: refreshing, new functions to refresh dentry
(This is a part of a patch series "new strategy for refreshing")
Introduce new functions au_do_hide, au_hide_children, au_hide,
au_refresh_by_dinfo, and au_refresh_dentry which will replace current
au_refresh_hdentry.
Since they are large and to keep single commit simple, this commit just
define these functions. The behaviour won't change.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
92dcda8894818f43b7a627d4a3062996552306b3
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Nov 26 22:10:47 2010 +0900
aufs: refreshing, refine au_do_refresh_hdentry
(This is a part of a patch series "new strategy for refreshing")
Now dinfo sets -1 to dbstart and dbend to represent invalid.
Currently its return value is ignored. It will be used in later commits.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
db0c0d602004fe2884225624af19e9ac97d8b19c
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Nov 26 16:59:17 2010 +0900
aufs: refreshing, stop updating iigen in test_inode_busy()
(This is a part of a patch series "new strategy for refreshing")
In order to force refreshing in the later au_remount_refresh().
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
48c759bfc43e795092bf0c0f31c6a8047cc6c9b1
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Nov 26 03:19:02 2010 +0900
aufs: refreshing, consolidate REFRESH macros
(This is a part of a patch series "new strategy for refreshing")
At remounting (branch management), aufs refreshes some internal arrays.
In this refreshing, objects for a dir and non-dir are separatedly
handled for performance. This commit forces always refreshing both.
And rename a macro AuSi_FAILED_REFRESH_DIRS to AuSiFAILED_REFRESH_DIR.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
40058d7c0ee7d8f449f5eef9ed178335303924a5
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Nov 25 02:40:13 2010 +0900
aufs: new strategy for refreshing, refresh negative dentries
(This is a part of a patch series "new strategy for refreshing")
In branch management at remount, refresh negative dentries too, since
they may hold a refrence to an object in the deleting branch.
Also they may be in freeing, so call dget_locked() instead of simple
dget().
The permission of the branch who has the negative dentry may be changed
to readonly, so confirm it in au_pin_and_icpup().
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
97f1369508bf1e71935363adc85c5fd52695a915
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sun Nov 28 11:24:12 2010 +0900
aufs: keep dinfo valid by temp dinfo
To decide creating a new whiteout is necessary or not, aufs tries
finding whiteout on the lower branches. In this lookup, use another
dinfo temporary to keep the original dinfo.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
381ba01af8e781512742858854a510ebb7667b1f
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Nov 26 00:52:57 2010 +0900
aufs: temporary dinfo
Introduce some functions to handle dinfo which will be used to make a
temporary dinfo. The existing interfaces (di_init() and di_fin()) are
not changed.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
ca7dc2240a3b787761d31dc096fe95f3beb9a18a
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Nov 26 21:59:45 2010 +0900
aufs: store br_id in dinfo
In order to identify the index of branch at refreshing, store br_id in
dinfo.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
447344925adad5f89950e409d3de501e7431468e
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sun Nov 28 22:47:25 2010 +0900
aufs: bugfix, write to a removed file more than once
In file write, the file may be already removed and au_ready_to_write()
supports such case. But the write to the removed file, eg, the file
had been already handled by au_ready_to_write(), then the function
doesn't detect it and a bug appear.
- when the file is removed, au_cpup_dirs() is unnecessary.
- when the file is removevd and already handled by au_ready_to_write(),
just re-open without copyup.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
24dddc56d3cab8671e30ad2213436b405ca715bc
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Nov 26 16:55:26 2010 +0900
aufs: split au_refresh_hinode_self()
Extract a part of au_refresh_hinode_self() and create a new function
au_ii_refresh(). The 'do_attr' parameter of au_refresh_hinode_self()
becomes unnecessary.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
d954281d7bd5f2523804290b120fd8a8bc7bb7fe
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Nov 26 15:46:32 2010 +0900
aufs: refine au_update_ibrange()
Now iinfo sets -1 to ibstart and ibend to represent invalid.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
bbc392af26ace27fc5e41e68f9437ad57ec2b85e
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Nov 26 01:45:43 2010 +0900
aufs: keep dinfo valid
Keep dinfo valid even if an error happened.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
49b3e86c8b8337fc7db9093ec98906de4cd4acb3
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Nov 25 17:00:04 2010 +0900
aufs: use a generic warpper dbrange_test()
Call au_dbrange_test() near au_digen_test() call.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
e3d0c8ea457f3192caacaaeb83a01e9befb5176c
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Nov 25 16:59:11 2010 +0900
aufs: use a generic warpper [di]i_gen_test()
Replace some direct test codes by au_[di]igen_test().
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
6680a2cc71b37511097df27149ae072034e89491
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Nov 30 13:35:07 2010 +0900
aufs: bugfix, missing unlock in an error path
File revalidating in au_reval_and_lock_fdi().
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
f1abf5b5d55ffeae0d3850a62853c99c02286228
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Mon Nov 29 03:22:07 2010 +0900
aufs: possible bugfix, the generation of dentry 3/3
Test the generation of a dentry in the beginning of many operations.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
69e55ee7c6f87380df71b37dca94f6023407e1c2
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Mon Nov 29 03:21:36 2010 +0900
aufs: possible bugfix, the generation of dentry 2/3
Introduce AuLock_GEN flag to test the generation of a dentry in the
beginning of many operations.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
8755a096f8cc12a00b5f4826ac6cf8a3f5014535
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Nov 25 01:25:57 2010 +0900
aufs: possible bugfix, the generation of dentry 1/3
Introduce new functions au_[di]igen_test() and au_dbrange_test().
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
49bfb76c10c75603561fcd6e9d79d5ccf000e7ce
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sun Nov 28 23:33:50 2010 +0900
aufs: possible bugfix, test valid dentry 2/2
Test the validity of a dentry in the beginning of many operations.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
2ecf50571003219f9d7ab257420c570764332469
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sun Nov 28 23:05:57 2010 +0900
aufs: possible bugfix, test valid dentry 1/2
Introduce some functions to test the validity of a dentry.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
952cec591bffdb1d470286eeea4ae27ed196bf94
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sun Nov 28 22:51:06 2010 +0900
aufs: tiny, debug code for i_mode
To detect setting type unmatching h_inode to iinfo, initialize i_mode.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
c00655e4c8f66871decf0d79a2d3b4c1fb6207d7
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Nov 25 00:00:44 2010 +0900
aufs: tiny, comment around d_drop
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
426ed6061a419cb1c7a5e1504052a50c5198d3a7
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Nov 24 23:59:08 2010 +0900
aufs: possible bugfix, keep dentry of renamed target valid
Basically the renamed target is removed, but it may be still referenced
and alive. Call d_drop in aufs and keep its dinfo valid.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
6f00617abf56f74429ab06751df6519b957fc325
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sat Nov 27 22:06:48 2010 +0900
aufs: possible bugfix, decrement the link count of non-dir rename target
Fix a missing drop_nlink() for the non-dir rename target.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
b8ee2bd5b62c5dece464571a83f4142181a67a72
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Nov 26 17:28:15 2010 +0900
aufs: set S_DEAD to i_flags in aufs
The S_DEAD flag is set in VFS, but we need to do it by ourselves because
a race condition may happen with aufs remount/branch-mgmt operation.
Set the flag within the aufs lock region.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
68fd4a243e4b9bbf397040c68ccc0f11da12c304
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Nov 24 23:58:35 2010 +0900
aufs: minor optimization, d_drop after failure of adding an entry
After the failure of creating an entry, the aufs dentry private data may
still refer the dentry in the branch fs's or may have invalid info.
Discard it by d_drop() in error case.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
6f7ebf0d44bacda459a8ae6235c59f47c9715808
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Nov 24 15:57:22 2010 +0900
aufs: possible bugfix, d_drop() job for hnotify
Current d_drop() calls may have unexpected side effects.
In order to force re-lookup, aufs should use di_gen instead of testing
unhashed. When the test (in d_revalidate) fails, make it obsoleted.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
ade2eb21fc942caa1c48bd931b5b8e2411eaadde
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Nov 25 02:52:39 2010 +0900
aufs: tiny, remove an empty line
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
16514eeea2d4b3ddcdd01b6cf54c8ae60cdc9bdf
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Nov 24 15:09:23 2010 +0900
aufs: tiny, use a wrapper for fs private data
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
8823675f5fd00ef30d6fea5f6779b45b3eb3bfd1
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sat Nov 27 04:05:07 2010 +0900
aufs: possible bugfix, test d_fsdata in revalidating
The passed dentry may not be created correctly, error case in previous
lookup.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
33d73de5ae0c44312ce6fbce59819cf04b9de9fa
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Nov 24 13:22:02 2010 +0900
aufs: possible bugfix, release all before au_nwt_done()
In racing unmount process, iput() after au_nwt_done() MAY cause a problem.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 6 Jan 2011 16:12:34 +0000 (16:12 +0000)]
UBUNTU: ubuntu: AUFS -- update aufs-update to track new locations of headers
Track the new location of the headers as per the commit below:
commit
de699ab60a2f8a55b9c8313a04c7863897fb88bd
Author: Andy Whitcroft <apw@canonical.com>
Date: Fri Dec 3 11:12:17 2010 +0000
UBUNTU: ubuntu: AUFS -- include the aufs_types.h file in linux-libc-headers
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Sun, 9 Jan 2011 13:45:46 +0000 (13:45 +0000)]
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Tim Gardner [Wed, 5 Jan 2011 20:24:59 +0000 (13:24 -0700)]
UBUNTU: [Config] CONFIG_NLS_DEFAULT=utf8
BugLink: http://bugs.launchpad.net/bugs/683690
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Andy Whitcroft [Mon, 17 Jan 2011 16:01:11 +0000 (16:01 +0000)]
UBUNTU: Ubuntu-2.6.38-0.0
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Sun, 9 Jan 2011 13:45:17 +0000 (13:45 +0000)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 5 Jan 2011 14:27:05 +0000 (14:27 +0000)]
UBUNTU: Ubuntu-2.6.37-12.26
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Stefan Bader [Wed, 5 Jan 2011 09:02:14 +0000 (10:02 +0100)]
Revert "UBUNTU: SAUCE: blkfront: default to sd devices"
This reverts commit
38096c28f13d0c2dd08584ff834da6d81306c7b3. When using
PV on HVM the emulated devices can in some cases stay present and then
lead to a kernel bug because both the real and the virtual driver try
to use the sd* namespace.
Originally this patch was needed because EC2 passed sd* names to the
instance for the root device. Since we now use a label instead of the
block device name we can drop this patch and be more upstream compliant.
BugLink: http://bug.launchpad.net/bugs/684875
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 5 Jan 2011 03:29:38 +0000 (03:29 +0000)]
UBUNTU: rebase to v2.6.37 final
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 4 Jan 2011 20:45:42 +0000 (20:45 +0000)]
UBUNTU: [Config] track missing modules
The following modules have gone, as their configuration options
have gone. This is related to the commit below:
commit
7ad1227818f09242cfe9bf1845fd24211f5f99bd
Author: Jan Beulich <JBeulich@novell.com>
Date: Thu Dec 9 08:11:38 2010 +0000
kconfig: fix undesirable side effect of adding "visible" menu attribute
We are missing the following modules:
ak881x
drx397xD
ec100
lgs8gl5
s5h1432
s921
tvp7002
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 4 Jan 2011 18:38:04 +0000 (18:38 +0000)]
UBUNTU: rebase to mainline
989d873fc5b6a96695b97738dea8d9f02a60f8ab
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 16 Dec 2010 18:43:02 +0000 (18:43 +0000)]
UBUNTU: [Config] disable CONFIG_TI_DAVINCI_EMAC to fix FTBS on omap armel
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 16 Dec 2010 18:41:31 +0000 (18:41 +0000)]
UBUNTU: [Config] disable CONFIG_WESTBRIDGE_ASTORIA to fix FTBS on omap armel
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 16 Dec 2010 18:23:52 +0000 (18:23 +0000)]
UBUNTU: [Config] disable CONFIG_GPIO_VX855 to fix FTBS on omap armel
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 16 Dec 2010 18:17:25 +0000 (18:17 +0000)]
UBUNTU: [Config] disable CONFIG_MACH_OMAP3517EVM to fix FTBS on armel omap
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 16 Dec 2010 18:04:29 +0000 (18:04 +0000)]
UBUNTU: [Config] armel -- reenable omap flavour
This reverts commit
b891f5efa2dd63f2a2e86bdc38450ee79e1e57c6.
Conflicts:
debian.master/changelog
Also update the ABI ignores to the latest version.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Tim Gardner [Mon, 3 Jan 2011 18:31:39 +0000 (11:31 -0700)]
Revert "UBUNTU: SAUCE: (no-up) libata: Ignore HPA by default."
This reverts commit
3f220112fc599e4216aab05b262f3c0284f1ece4.
See discussion at
https://lists.ubuntu.com/archives/kernel-team/2010-December/013882.html
BugLink: http://bugs.launchpad.net/bugs/380138
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Rezwanul Kabir [Tue, 23 Nov 2010 20:15:14 +0000 (20:15 +0000)]
Add support for Intellimouse Mode in ALPS touchpad on Dell E2 series Laptops
Resending modified patch to fix suspend/resume issues and restricting the
quirks to Dell portables only.
Dell E2 series laptops ( M4500, E6510, E6410 etc.) have ALPS touchpads
which are enabled by default as 3-byte generic PS/2 mouse mode. This
patch enables the 4-byte "Intellimouse Mode" ( e.g scrolling support).
Signed-off-by: Rezwanul_Kabir <Rezwanul_Kabir@dell.com>
BugLink: http://bugs.launchpad.net/bugs/632884
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 29 Dec 2010 17:47:56 +0000 (17:47 +0000)]
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 29 Dec 2010 17:35:31 +0000 (17:35 +0000)]
UBUNTU: rebase to v2.6.37-rc8
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 23 Dec 2010 18:35:40 +0000 (18:35 +0000)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Tim Gardner [Thu, 23 Dec 2010 17:32:58 +0000 (10:32 -0700)]
UBUNTU: [Config] Added autofs4.ko to -virtual flavour
BugLink: http://bugs.launchpad.net/bugs/692917
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Andy Whitcroft [Tue, 21 Dec 2010 20:51:00 +0000 (20:51 +0000)]
UBUNTU: Ubuntu-2.6.37-11.25
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 21 Dec 2010 20:43:34 +0000 (20:43 +0000)]
UBUNTU: rebase to v2.6.37-rc7
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 21 Dec 2010 19:35:54 +0000 (19:35 +0000)]
UBUNTU: [Config] add vmw-balloon driver to -virtual flavour
BugLink: http://bugs.launchpad.net/bugs/592039
Signed-off-by: Andy Whitcroft <apw@canonical.com>
projects / linux-flexiantxendom0-natty.git / log