aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-25UBUNTU: ensure debian/ is not excluded from git by defaultAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: SAUCE: ipv6: make the net.ipv6.conf.all.use_tempaddr sysctl ↵Mathieu Trudel-Lapierre
propagate to interface settings The description for IPV6_PRIVACY mentions using .../all/use_tempaddr to enable IPv6 Privacy Extensions, and IP sysctl documentation mentions 'all' as setting all interface-specific settings. We make sure at least use_tempaddr actually works as documented. Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-25UBUNTU: ubuntu: AUFS -- disable in favor of overlayfsAndy Whitcroft
Remain disabled while we acertain whether there are any hard requirements for aufs that overlayfs cannot handle. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: ubuntu: AUFS -- enable in config and makefileAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: ubuntu: AUFS -- suppress benign plink warning messagesAndy Whitcroft
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>
2012-06-25UBUNTU: ubuntu: AUFS -- update to 4cf5db36bcd9748e8e7270022f295f84d1fc2245Andy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: ubuntu: AUFS -- fix undefined security_path_linkAndy Whitcroft
Fix: ERROR: "security_path_link" [ubuntu/aufs/aufs.ko] undefined! Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: ubuntu: AUFS -- fix undefined __devcgroup_inode_permissionAndy Whitcroft
Fix: ERROR: "__devcgroup_inode_permission" [ubuntu/aufs/aufs.ko] undefined! Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: ubuntu: AUFS -- aufs3-standalone.patchAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: ubuntu: AUFS -- aufs3-base.patchAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: ubuntu: AUFS -- documentation on updating aufs2Andy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: ubuntu: AUFS -- clean up the aufs updater and BOMAndy Whitcroft
Clean up the updater to record and use the real sha1 of the tip of the standalone tree as well as recording and tracking the nominal tip in the changelog for commit generation. Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: ubuntu: AUFS -- update aufs-update to track new locations of headersAndy Whitcroft
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>
2012-06-25UBUNTU: ubuntu: AUFS -- include the aufs_types.h file in linux-libc-headersAndy Whitcroft
BugLink: http://bugs.launchpad.net/bugs/684666 Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: ubuntu: AUFS -- add BOM and automated update scriptAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: dell-wmi: Demote unknown WMI event message to pr_debugSeth Forshee
BugLink: http://bugs.launchpad.net/bugs/581312 This message is informational in nature but is causing users to think that there's a problem. Demote to pr_debug to silence it by default. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: include <linux/printk.h> and <stdarg.h> for mmc_core arm buildLeann Ogasawara
Fixes arm build failure: drivers/net/ethernet/stmicro/stmmac/mmc_core.c:142:2: error: implicit declaration of function 'pr_debug' [-Werror=implicit-function-declaration] include/linux/printk.h:47:2: error: unknown type name 'va_list' Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: ensure root is ready before running usermodehelpers in itAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: [Config] Disable vt6656Tim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-25UBUNTU: [Config] Disabled dm-raid4-5Tim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-25UBUNTU: SAUCE: headers_install: fix #include "..." usage for userspaceAndy Whitcroft
When headers are converted to userspace headers they may include relative includes. For example x86 has the following in its asm/posix_types.h: # ifdef __i386__ # include "posix_types_32.h" # else # include "posix_types_64.h" # endif However this is not safe in the face of the gcc option -I- which removes "the directory the file I am being included from" from the search list. Convert these references to <dir/...> form avoiding this. BugLink: http://bugs.launchpad.net/bugs/824377 Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Latitude E6220 use reboot=pciLeann Ogasawara
BugLink: http://bugs.launchpad.net/bugs/838402 The Dell Latitude E6220 doesn't reboot unless reboot=pci is set. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Seth Forshee <seth.forshee@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Optiplex 990 use reboot=pciLeann Ogasawara
BugLink: http://bugs.launchpad.net/bugs/768039 The Dell Optiplex 990 doesn't reboot unless reboot=pci is set. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-25UBUNTU: SAUCE: fireware: add NO_MSI quirks for o2micro controllerMing Lei
Disable MSI for the O2 Micro, Inc. firewire controller. BugLink: http://bugs.launchpad.net/bugs/801719 Upstream: http://marc.info/?t=131475896500002&r=1&w=2 Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Optiplex 790 use reboot=pciLeann Ogasawara
BugLink: http://bugs.launchpad.net/bugs/818933 The Dell Optiplex 790 doesn't reboot unless reboot=pci is set. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Latitude E6520 use reboot=pciLeann Ogasawara
The Dell Latitude E6520 doesn't reboot unless reboot=pci is set. BugLink: http://bugs.launchpad.net/bugs/833705 Cc: <stable@kernel.org> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-25UBUNTU: SAUCE: vt -- allow grub to request automatic vt_handoffAndy Whitcroft
Grub may be able to select a graphics mode and paint a splash screen for us. If so it needs to be able to tell us it has done so. Add support for detecting a new graphics mode selected bit in the screen_info passed over at boot. Use this to automatically enable vt_handoff mode. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: vt -- maintain bootloader screen mode and content until vt switchAndy Whitcroft
Introduce a new VT mode KD_TRANSPARENT which endevours to leave the current content of the framebuffer untouched. This allows the bootloader to insert a graphical splash and have the kernel maintain it until the OS splash can take over. When we finally switch away (either through programs like plymouth or manually) the content is lost and the VT reverts to text mode. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) vfs: Add a trace point in the mark_inode_dirty functionArjan van de Ven
[apw@canonical.com: This has no upstream traction but is used by powertop, so its worth carrying.] PowerTOP would like to be able to show who is keeping the disk busy by dirtying data. The most logical spot for this is in the vfs in the mark_inode_dirty() function. Doing this on the block level is not possible because by the time the IO hits the block layer the guilty party can no longer be found ("kjournald" and "pdflush" are not useful answers to "who caused this file to be dirty). The trace point follows the same logic/style as the block_dump code and pretty much dumps the same data, just not to dmesg (and thus to /var/log/messages) but via the trace events streams. Note: This patch was posted to lkml and might potentially go into 2.6.33 but I have not seen which maintainer will take it. Signed-of-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) add tracing for user initiated readahead requestsAndy Whitcroft
Track pages which undergo readahead and for each record which were actually consumed, via either read or faulted into a map. This allows userspace readahead applications (such as ureadahead) to track which pages in core at the end of a boot are actually required and generate an optimal readahead pack. It also allows pack adjustment and optimisation in parallel with readahead, allowing the pack to evolve to be accurate as userspace paths change. The status of the pages are reported back via the mincore() call using a newly allocated bit. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: ubuntu: dm-raid4-5 fix up build failureLeann Ogasawara
ubuntu-2.6/ubuntu/dm-raid4-5/dm-raid4-5.c:1579:9: error: too many arguments to function 'dm_io_client_create' The above build failure was a result of upstream commit: commit bda8efec5c706a672e0714d341a342e811f0262a Author: Mikulas Patocka <mpatocka@redhat.com> Date: Sun May 29 13:03:09 2011 +0100 dm io: use fixed initial mempool size Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: Convert dm-raid45 to new block pluggingStefan Bader
Plugging for IOs to block devices was changed to an explicit, per task base. This converts the module to the new framework, fixing the compile failure. Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: S3 early resume debug via keyboard LEDsColin Ian King
Add support to debug S3 early resume by flashing the keyboard LEDs three times in the realmode path. This is useful to allow one to determine if S3 hangs occur in the BIOS or during the early resume phase. Add kernel parameter acpi_sleep=s3_leds to enable the s3 debugging option. This can also be enabled by writing 8 to /proc/sys/kernel/acpi_video_flags. Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Acked-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: vesafb: enable mtrr WC by defaultThomas Schlichter
BugLink: http://bugs.launchpad.net/bugs/778043 Move to enabling a write-combining MTRR by default, this then matches the uvesafb module. Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com> Acked-by: Brad Figg <brad.figg@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: SAUCE: vesafb: mtrr module parameter is uint, not boolThomas Schlichter
BugLink: http://bugs.launchpad.net/bugs/778043 As noted by the reporter the mtrr kernel command line option is actually a positive numeric not a boolean, move the module parameter we add to match. Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com> Acked-by: Brad Figg <brad.figg@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: SAUCE: [arm] fixup __aeabi_uldivmod undefined build errorLeann Ogasawara
When building on arm we run into the following build error due to gcc-4.6 optimizing do_div into a uldivmod call: ERROR: "__aeabi_uldivmod" [drivers/scsi/megaraid/megaraid_sas.ko] undefined! Inline some assembly to prevent the compiler optimization. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: ubuntu: dm-raid4-5 -- follow changes to bio flagsAndy Whitcroft
commit 7b6d91daee5cac6402186ff224c3af39d79f4a0e Author: Christoph Hellwig <hch@lst.de> Date: Sat Aug 7 18:20:39 2010 +0200 block: unify flags for struct bio and struct request Follow the following transitions: bio_rw_flagged(bio, BIO_RW_BARRIER)) -> (bio->bi_rw & REQ_HARDBARRIER) -> (bio->bi_rw & REQ_FLUSH) Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: (no-up) add support for installed header files to ubuntu directoryAndy Whitcroft
BugLink: http://bugs.launchpad.net/bugs/684666 We need the aufs headers in the linux-libc-headers, add support for including files from the ubuntu include directory. Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25Revert "mmc: fix all hangs related to mmc/sd card insert/removal during ↵Andy Whitcroft
suspend/resume" This reverts commit 93cddb91e1a94859adfd99982b47da8328c3cfc1. Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: SAUCE: Added quirk to recognize GE0301 3G modem as an interface.Manoj Iyer
OriginalAuthor: Timo Aaltonen <tjaalton@ubuntu.com> BugLink: http://bugs.launchpad.net/bugs/348861 Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com>
2012-06-25UBUNTU: SAUCE: drm -- stop early access to drm devicesAndy Whitcroft
When a drm driver is initialised we first allocate and initialise the drm minor numbers including creating the sysfs files, then we trigger the driver load method. The act of creating the sysfs files triggers the uevent. This means udev may start programs which open /dev/dri/card0 and other interfaces, this can occur before the load method has even started and thus before the driver has fully initialised its data structures. In the case of plymouthd this leads to it opening and closing (in disgust) the interface, which in turn leads to a kernel panic as the mutexes are yet to be initialised. This patch delays the linking up of the drm devices minor numbers until the driver is fully initialised. As it is possible for consumers of these interfaces to reach them before they are fully initialised we arrange for opens of these devices to return EAGAIN until the device is fully initialised. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: Improve Amazon EBS performance for EC2John Johansen
OriginalAuthor: Amazona from Ben Howard <behoward@amazon.com> BugLink: http://bugs.launchpad.net/bugs/634316 The pv-ops kernel suffers from poor performance when using Amazon's Elastic block storage (EBS). This patch from Amazon improves pv-ops kernel performance, and has not exhibited any regressions. Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) ARM: Resetting power_mode to its original value.Mathieu J. Poirier
This reverts the second part of patch: commit 6da20c89af64b75302399369a90b9d50c1a87665 Author: Adrian Hunter <adrian.hunter@nokia.com> Date: Mon Feb 15 10:03:34 2010 -0800 omap_hsmmc: Ensure regulator enable / disable are paired Without this the kernel fails to initialize the SDHC card and find the root partition. Work is currently underway with the community to find a real solution to the problem. This a temporary measure to unblock developers and will have to be reverted when the real fix gets upstream. BugLink: https://bugs.launchpad.net/bugs/591941 Signed-off-by: Mathieu Poirier <mathieu.poirier@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) Modularize vesafb -- fix initialisationAndy Whitcroft
When this patch was rolled forward, likely between Dapper and Hardy a chunk of initialisation was lost. Pull this back in so we actually have an vesafb_info structure initialised. Else we may well panic when we rmmod vesafb. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Acked-by: Brad Figg <brad.figg@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) Stop ARM boards crashing when CUPS is loadedLee Jones
BugLink: http://bugs.launchpad.net/bugs/601226 When CUPS loads, it tries to load several drivers it may need. When one of these drivers, specifically parport_pc is loaded, it attempts to write to address space normally reserved for ISA transactions. On OMAP based systems, this causes a segmentation fault. Signed-off-by: Lee Jones <lee.jones@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: fix build error with CONFIG_BLK_DEV_INITRD=nTim Gardner
The original aynchronous boot patch (UBUNTU: SAUCE: Make populate_rootfs asynchronous) did not take into consideration the case when CONFIG_BLK_DEV_INITRD=n, e.g., populate_rootfs_domain becomes undefined. Therefore, add it to noinitramfs.c where its use is benign. Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Original-patch-by: Nicolas Pitre <nicolas.pitre@linaro.org> Cc: Surbhi Palande <surbhi.palande@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: add option to hand off all kernel parameters to initAndy Whitcroft
BugLink: http://bugs.launchpad.net/bugs/586386 Some init packages such as upstart find having all of the kernel parameters passed in useful. Currently they have to open up /proc/cmdline and reparse that to obtain this information. Add a kernel configuration option to enable passing of all options. Note, enabling this option will reduce the chances that a fallback from /sbin/init to /bin/bash or /bin/sh will succeed. Though it should be noted that there are commonly unknown options present which would already break this fallback. init=/bin/foo provides explicit control over options which is unaffected by this change. Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) dma-mapping: Remove WARN_ON in dma_free_coherentStefan Bader
BugLink: http://bugs.launchpad.net/bugs/458201 Triggered by the following backtrace: WARNING: at /build/buildd/linux-2.6.32/arch/x86/include/asm/dma-mapping.h:154 ___free_dma_mem_cluster+0x102/0x110() [<ffffffff81064f9b>] warn_slowpath_common+0x7b/0xc0 [<ffffffff81064ff4>] warn_slowpath_null+0x14/0x20 [<ffffffff8139a2a2>] ___free_dma_mem_cluster+0x102/0x110 [<ffffffff8139a072>] __sym_mfree+0xd2/0x100 [<ffffffff8139a109>] __sym_mfree_dma+0x69/0x100 [<ffffffff8139245f>] sym_hcb_free+0x8f/0x1f0 This patch never will be accepted upstream because the WARN_ON is supposed to perevent driver development which is only compatible with x86 on x86 (ARM can sleep in that function). The right way to fix it would be to make the offending function use locks in the right way but that requires careful implementation. Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Acked-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: ubuntu: dm-raid4-5 -- update to compile with 2.6.34-rc4Leann Ogasawara
Need to include linux/slab.h to prevent implicit declaration of functions which otherwise result in build failures. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-25UBUNTU: ubuntu: dm-raid4-5 -- update to compile with 2.6.34-rc2Leann Ogasawara
The following commit removes unused params from dm_get_device(). Convert dm-raid4-5 to match: commit 8215d6ec5fee1e76545decea2cd73717efb5cb42 Author: Nikanth Karthikesan <knikanth@novell.com> Date: Sat Mar 6 02:32:27 2010 +0000 dm table: remove unused dm_get_device range parameters Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>