Andy Whitcroft [Wed, 15 Feb 2012 18:14:32 +0000 (18:14 +0000)]
UBUNTU: [Config] clean up the human consumable package descriptions
Each flavour has a human readable description in its flavour vars.
This is intended to describe the system type in words, for example as
here for powerpc:
desc="32-bit PowerPC"
desc="32-bit PowerPC SMP"
desc="64-bit PowerPC SMP"
On x86 we commonly share flavour names and there this is currently
rather unhelp:
desc="x86/x86_64"
Additionally for these shared flavours is it impossible to have an accurate
description as it must include all possible architectures, even though
the resultant description is on an architecture specific binary package.
Introduce a human_arch configuration at the archtecture level, this can
then be used as a component in the flavour description. Use this to
add descriptions for the x86 architectures:
human_arch = 64 bit x86
human_arch = 32 bit x86
Allowing descriptions as below to be specified:
desc="=HUMAN= SMP"
Resulting in full descriptions as below:
Linux kernel image for version 3.2.0 on 64 bit x86 SMP
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>
Leann Ogasawara [Tue, 14 Feb 2012 19:47:25 +0000 (11:47 -0800)]
UBUNTU: Drop ndiswrapper
ndiswrapper is now supported via a DKMS package:
https://launchpad.net/ubuntu/+source/ndiswrapper
It is therefore unnecessary to duplicate effort and support this as a
separate out of tree driver in the kernel. ndiswrapper was already
disabled in the Makefile so there should be no affects from dropping the
code.
I'm adding this commit commentary so that there is a paper trail for why
this was removed from the kernel. After the next upload, all evidence
of ndiswrapper will be rebased out of existence.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Tue, 14 Feb 2012 19:15:55 +0000 (11:15 -0800)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Mon, 13 Feb 2012 21:00:25 +0000 (13:00 -0800)]
UBUNTU: Ubuntu-3.2.0-16.25
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Mon, 13 Feb 2012 20:58:27 +0000 (12:58 -0800)]
UBUNTU: Rebase to v3.2.6
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Fri, 10 Feb 2012 17:22:42 +0000 (17:22 +0000)]
UBUNTU: d-i -- include the Hyper-V drivers in the virtio udeb
BugLink: http://bugs.launchpad.net/bugs/917135
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Fenghua Yu [Fri, 4 Nov 2011 20:31:23 +0000 (13:31 -0700)]
x86, mce, therm_throt: Don't report power limit and package level thermal throttle events in mcelog
BugLink: http://bugs.launchpad.net/bugs/930288
Thermal throttle and power limit events are not defined as MCE errors in x86
architecture and should not generate MCE errors in mcelog.
Current kernel generates fake software defined MCE errors for these events.
This may confuse users because they may think the machine has real MCE errors
while actually only thermal throttle or power limit events happen.
To make it worse, buggy firmware on some platforms may falsely generate
the events. Therefore, kernel reports MCE errors which users think as real
hardware errors. Although the firmware bugs should be fixed, on the other hand,
kernel should not report MCE errors either.
So mcelog is not a good mechanism to report these events. To report the events, we count them in respective counters (core_power_limit_count,
package_power_limit_count, core_throttle_count, and package_throttle_count) in
/sys/devices/system/cpu/cpu#/thermal_throttle/. Users can check the counters
for each event on each CPU. Please note that all CPU's on one package report
duplicate counters. It's user application's responsibity to retrieve a package
level counter for one package.
This patch doesn't report package level power limit, core level power limit, and
package level thermal throttle events in mcelog. When the events happen, only
report them in respective counters in sysfs.
Since core level thermal throttle has been legacy code in kernel for a while and
users accepted it as MCE error in mcelog, core level thermal throttle is still
reported in mcelog. In the mean time, the event is counted in a counter in sysfs
as well.
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Acked-by: Borislav Petkov <bp@amd64.org>
Acked-by: Tony Luck <tony.luck@intel.com>
Link: http://lkml.kernel.org/r/
20111215001945.GA21009@linux-os.sc.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
(cherry picked from commit
29e9bf1841e4f9df13b4992a716fece7087dd237)
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Sarah Sharp [Tue, 25 Oct 2011 11:55:30 +0000 (13:55 +0200)]
xhci: Remove scary warnings about transfer issues.
BugLink: http://bugs.launchpad.net/bugs/929656
Getting a short packet or a babble error is usually a recoverable error,
so stop scaring users with warnings in dmesg when xHCI debugging is turned
off.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
(cherry picked from commit
2a9227a5eeaeb3f91e3a72ceea4fa59016ca5d20)
Tested-by: Chris Van Hoof <vanhoof@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Sarah Sharp [Thu, 22 Dec 2011 23:02:13 +0000 (15:02 -0800)]
xhci: Remove warnings about MSI and MSI-X capabilities.
BugLink: http://bugs.launchpad.net/bugs/929656
xHCI host controllers may not be capable of MSI, but they should be able
to be used in legacy PCI interrupt mode. Similarly, some xHCI host
controllers will have MSI support but not MSI-X support. Lower the
dmesg log level from an error to debug. The message won't appear unless
CONFIG_USB_XHCI_HCD_DEBUGGING is turned on.
If we need to find out whether the device can support MSI or MSI-X and
it's not being enabled by the driver, it's easy to ask the user to run
lspci.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
(cherry picked from commit
3b9783b277e66731891ab42eeaacebbdcdd6e629)
Tested-by: Chris Van Hoof <vanhoof@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Wed, 8 Feb 2012 19:50:06 +0000 (11:50 -0800)]
UBUNTU: Fix typo in generic-pae description
BugLink: http://bugs.launchpad.net/bugs/928448
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Xiaotian Feng [Fri, 13 Jan 2012 01:17:08 +0000 (17:17 -0800)]
proc: fix null pointer deref in proc_pid_permission()
get_proc_task() can fail to search the task and return NULL,
put_task_struct() will then bomb the kernel with following oops:
BUG: unable to handle kernel NULL pointer dereference at
0000000000000010
IP: [<
ffffffff81217d34>] proc_pid_permission+0x64/0xe0
PGD
112075067 PUD
112814067 PMD 0
Oops: 0002 [#1] PREEMPT SMP
This is a regression introduced by commit
0499680a ("procfs: add hidepid=
and gid= mount options"). The kernel should return -ESRCH if
get_proc_task() failed.
Signed-off-by: Xiaotian Feng <dannyfeng@tencent.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Vasiliy Kulikov <segoon@openwall.com>
Cc: Stephen Wilson <wilsons@start.ca>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit
a2ef990ab5a6705a356d146dd773a3b359787497)
CVE-2011-4915
CVE-2011-4916
CVE-2011-4917
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Vasiliy Kulikov [Tue, 10 Jan 2012 23:11:31 +0000 (15:11 -0800)]
procfs: add hidepid= and gid= mount options
Add support for mount options to restrict access to /proc/PID/
directories. The default backward-compatible "relaxed" behaviour is left
untouched.
The first mount option is called "hidepid" and its value defines how much
info about processes we want to be available for non-owners:
hidepid=0 (default) means the old behavior - anybody may read all
world-readable /proc/PID/* files.
hidepid=1 means users may not access any /proc/<pid>/ directories, but
their own. Sensitive files like cmdline, sched*, status are now protected
against other users. As permission checking done in proc_pid_permission()
and files' permissions are left untouched, programs expecting specific
files' modes are not confused.
hidepid=2 means hidepid=1 plus all /proc/PID/ will be invisible to other
users. It doesn't mean that it hides whether a process exists (it can be
learned by other means, e.g. by kill -0 $PID), but it hides process' euid
and egid. It compicates intruder's task of gathering info about running
processes, whether some daemon runs with elevated privileges, whether
another user runs some sensitive program, whether other users run any
program at all, etc.
gid=XXX defines a group that will be able to gather all processes' info
(as in hidepid=0 mode). This group should be used instead of putting
nonroot user in sudoers file or something. However, untrusted users (like
daemons, etc.) which are not supposed to monitor the tasks in the whole
system should not be added to the group.
hidepid=1 or higher is designed to restrict access to procfs files, which
might reveal some sensitive private information like precise keystrokes
timings:
http://www.openwall.com/lists/oss-security/2011/11/05/3
hidepid=1/2 doesn't break monitoring userspace tools. ps, top, pgrep, and
conky gracefully handle EPERM/ENOENT and behave as if the current user is
the only user running processes. pstree shows the process subtree which
contains "pstree" process.
Note: the patch doesn't deal with setuid/setgid issues of keeping
preopened descriptors of procfs files (like
https://lkml.org/lkml/2011/2/7/368). We rely on that the leaked
information like the scheduling counters of setuid apps doesn't threaten
anybody's privacy - only the user started the setuid program may read the
counters.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Greg KH <greg@kroah.com>
Cc: Theodore Tso <tytso@MIT.EDU>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: James Morris <jmorris@namei.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(backported from commit
0499680a42141d86417a8fbaa8c8db806bea1201)
CVE-2011-4915
CVE-2011-4916
CVE-2011-4917
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Vasiliy Kulikov [Tue, 10 Jan 2012 23:11:27 +0000 (15:11 -0800)]
procfs: parse mount options
Add support for procfs mount options. Actual mount options are coming in
the next patches.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Greg KH <greg@kroah.com>
Cc: Theodore Tso <tytso@MIT.EDU>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: James Morris <jmorris@namei.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(backported from commit
97412950b10e64f347aec4a9b759395c2465adf6)
CVE-2011-4915
CVE-2011-4916
CVE-2011-4917
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Leann Ogasawara [Thu, 9 Feb 2012 14:34:42 +0000 (06:34 -0800)]
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Thu, 9 Feb 2012 14:31:44 +0000 (06:31 -0800)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Tue, 7 Feb 2012 19:48:05 +0000 (11:48 -0800)]
UBUNTU: Ubuntu-3.2.0-15.24
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Tue, 7 Feb 2012 18:13:03 +0000 (10:13 -0800)]
UBUNTU: Add CONFIG_THERM_ADT746X=y to config enforcer for powerpc and powerpc-smp flavours
BugLink: http://bugs.launchpad.net/bugs/923094
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Tim Gardner [Tue, 7 Feb 2012 17:11:32 +0000 (10:11 -0700)]
UBUNTU: [Config] CONFIG_THERM_ADT746X=y
BugLink: http://bugs.launchpad.net/bugs/923094
Build in kernel fan control for MacIntosh G4 Power PCs
lest it melt into a blob of aluminum.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Mon, 6 Feb 2012 20:29:05 +0000 (13:29 -0700)]
UBUNTU: [Config] Rebase to v3.2.5
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Merlin Schumacher [Mon, 6 Feb 2012 10:42:13 +0000 (18:42 +0800)]
UBUNTU: SAUCE: acer-wmi: support for P key on TM8372
Patch is on its way upstream.
BugLink: http://launchpad.net/bugs/865807
There is no entry for P key on TM8372, so when P key is pressed, only
"acer_wmi: Unknown key number - 0x29" in dmesg.
Signed-off-by: Merlin Schumacher <merlin.schumacher@gmail.com>
Signed-off-by: Ike Panhc <ike.pan@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Leann Ogasawara [Tue, 7 Feb 2012 16:31:22 +0000 (08:31 -0800)]
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Mon, 6 Feb 2012 14:43:37 +0000 (06:43 -0800)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 3 Feb 2012 20:14:59 +0000 (12:14 -0800)]
UBUNTU: Ubuntu-3.2.0-14.23
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Fri, 3 Feb 2012 18:38:38 +0000 (18:38 +0000)]
UBUNTU: debian -- add usage help to insert-mainline-changes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Tim Gardner [Fri, 3 Feb 2012 18:13:57 +0000 (11:13 -0700)]
UBUNTU: [Config] Rebase to v3.2.3
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Fri, 3 Feb 2012 18:00:09 +0000 (11:00 -0700)]
UBUNTU: Start new release, bump ABI
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Leann Ogasawara [Thu, 2 Feb 2012 21:28:30 +0000 (13:28 -0800)]
UBUNTU: Ubuntu-3.2.0-13.22
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Peter Lekensteyn [Thu, 2 Feb 2012 20:21:41 +0000 (14:21 -0600)]
nouveau: Support Optimus models for vga_switcheroo
Newer nVidia cards with Optimus do not support/use the DSM switching functions.
Instead, it require a DSM function to be called prior to bringing a device into
D3 state. No other _DSM calls are necessary before/after enabling/disabling a
device. Switching between discrete and integrated GPU is not supported by
this Optimus _DSM call, therefore return on the switching method.
Signed-off-by: Peter Lekensteyn <lekensteyn@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit
d099230cc355c485e556121c034b1fca5a5fd18b)
BugLink: http://bugs.launchpad.net/bugs/925608
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Peter Lekensteyn [Thu, 2 Feb 2012 20:21:40 +0000 (14:21 -0600)]
nouveau: properly check for _DSM function support
According to the ACPI spec version 4, section 9.14.1, _DSM functions
must return a value with the first bit enabled if any DSM functions are
supported for the given UUID and revision ID. For a given function index n
to be marked supported, bit n must be enabled.
Signed-off-by: Peter Lekensteyn <lekensteyn@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit
9075e85f46c598e4dfc852b16b256a32e2fb396f)
BugLink: http://bugs.launchpad.net/bugs/925608
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
David Henningsson [Tue, 31 Jan 2012 08:04:15 +0000 (09:04 +0100)]
UBUNTU: SAUCE: ALSA: HDA: Fix jack creation for codecs with front and rear Line In
If a codec has both a front and a rear Line In, two controls both
named "Line Jack" will be created, which causes parsing to fail.
While a long term solution might be to name the jacks differently,
this extra check is consistent with what is already being done in many
auto-parsers, and will also protect against other cases when two
inputs have the same label.
BugLink: https://bugs.launchpad.net/bugs/923409
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(backported from
05c3b36e539627b7aed67d038381d0d9fa9d61e7 in https://github.com/tiwai/sound.git for-linus)
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
David Henningsson [Tue, 31 Jan 2012 09:35:11 +0000 (10:35 +0100)]
UBUNTU: SAUCE: ALSA: HDA: Remove quirk for Toshiba Qosmio G50
BugLink: https://bugs.launchpad.net/bugs/923316
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Manoj Iyer [Thu, 2 Feb 2012 16:42:28 +0000 (10:42 -0600)]
UBUNTU: SAUCE: Add vendor specific ID (0a5c 21f3) for BCM20702A0.
https://lkml.org/lkml/2012/2/2/220
T: Bus=01 Lev=02 Prnt=02 Port=03 Cnt=03 Dev#= 5 Spd=12 MxCh= 0
D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=0a5c ProdID=21f3 Rev=01.12
S: Manufacturer=Broadcom Corp
S: Product=BCM20702A0
S: SerialNumber=
74DE2B344A7B
C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA
I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
BugLink: http://bugs.launchpad.net/bugs/925552
Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Tested-by: Dennis Chua <dennis.chua@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Jesse Barnes [Thu, 12 Jan 2012 22:51:17 +0000 (14:51 -0800)]
drm/i915: mask transcoder select bits before setting them on LVDS
BugLink: http://bugs.launchpad.net/bugs/924989
The transcoder port may changed from mode set to mode set, so make sure
to mask out the selection bits before setting the right ones or we'll
get black screens when going from transcoder B to A.
Tested-by: Vincent Vanackere <vincent.vanackere@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit
7885d2052bd94395e337709cfba093a41f273ff1)
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Seth Heasley [Tue, 24 Jan 2012 00:40:55 +0000 (16:40 -0800)]
watchdog: iTCO_wdt: add Intel Lynx Point DeviceIDs
BugLink: http://bugs.launchpad.net/bugs/900119
This patch adds the TCO Watchdog DeviceIDs for the Intel Lynx Point PCH.
Signed-off-by: Seth Heasley <seth.heasley@intel.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
(cherry picked from commit
84e83c2846ffb42772056a0f825d8578dc92d586)
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Tim Gardner [Tue, 31 Jan 2012 18:24:10 +0000 (11:24 -0700)]
UBUNTU: [Config] Enable USB3.0 in d-i
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Tue, 31 Jan 2012 18:15:07 +0000 (11:15 -0700)]
UBUNTU: [Config] Add mtip32xx to d-i block modules
BugLink: http://bugs.launchpad.net/bugs/922221
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Asai Thambi S P [Wed, 4 Jan 2012 21:01:32 +0000 (22:01 +0100)]
mtip32xx: do rebuild monitoring asynchronously
BugLink: http://bugs.launchpad.net/bugs/922221
Earlier, rebuild monitoring was done in the context of probe. Now the service
thread takes the responsibility of rebuild monitoring, and probe returns good
status.
Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: Sam Bradshaw <sbradshaw@micron.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit
62ee8c13e26cffe6483630f59932c3e936dfb586)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Dan Carpenter [Thu, 24 Nov 2011 11:59:00 +0000 (12:59 +0100)]
mtip32xx: uninitialized variable in mtip_quiesce_io()
BugLink: http://bugs.launchpad.net/bugs/922221
We recently introduce new continue in the loop which make gcc complain.
In theory if MTIP_FLAG_SVC_THD_ACTIVE_BIT is set, we could hit continue
over and over until eventually we time out of the loop. In that case
"active" should be set as true, but right now it's uninitialized.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit
3e54a3d1b83220d748f1a27c8999634be7a83949)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Asai Thambi S P [Wed, 23 Nov 2011 07:29:24 +0000 (08:29 +0100)]
mtip32xx: updates based on feedback
BugLink: http://bugs.launchpad.net/bugs/922221
* queue ncq commands when a non-ncq is in progress or error handling is active
* merge variables 'internal_cmd_in_progress' and 'eh_active' into new variable 'flags'
* get rid of read/write semaphore 'internal_sem'
* new service thread to issue queued commands
* use macros from ata.h for command codes
* return ENOTTY for BLKFLSBUF ioctl
* style changes
Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: Sam Bradshaw <sbradshaw@micron.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit
60ec0eecfa8968d0f1188e3730979196ac28b9de)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Jens Axboe [Sat, 5 Nov 2011 07:36:21 +0000 (08:36 +0100)]
mtip32xx: update to new ->make_request() API
BugLink: http://bugs.launchpad.net/bugs/922221
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit
a71f483d7957c74368a76a3a88ae54d524fa3b49)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Jens Axboe [Wed, 28 Sep 2011 13:35:40 +0000 (07:35 -0600)]
mtip32xx: add module.h include to avoid conflict with moduleh tree
BugLink: http://bugs.launchpad.net/bugs/922221
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit
0e838c624e04490985162a1b00d7aa1956c8834e)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Jens Axboe [Wed, 28 Sep 2011 03:33:53 +0000 (21:33 -0600)]
mtip32xx: mark a few more items static
BugLink: http://bugs.launchpad.net/bugs/922221
Missed two items: mtip_major, and mtip_pci_driver.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit
3ff147d3a88e43135b1861d964496101657fa9a2)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Jens Axboe [Wed, 28 Sep 2011 03:27:43 +0000 (21:27 -0600)]
mtip32xx: ensure that all local functions are static
BugLink: http://bugs.launchpad.net/bugs/922221
Kill the declarations in the header file and mark them as static.
Reshuffle a few functions to ensure that everything is properly
declared before being used.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit
6316668fbcf8a0a166830e7e84cdbdf0ab9392c8)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Jens Axboe [Wed, 28 Sep 2011 03:19:53 +0000 (21:19 -0600)]
mtip32xx: cleanup compat ioctl handling
BugLink: http://bugs.launchpad.net/bugs/922221
Do the conversion/copy up front instead of passing in a compat flag
to the ioctl handler and subsequently to the exec_drive_taskfile()
function.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit
ef0f1587343a4c17b9b0d9061546e36c1c1bb2ec)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Jens Axboe [Tue, 27 Sep 2011 21:50:01 +0000 (15:50 -0600)]
mtip32xx: fix warnings/errors on 32-bit compiles
BugLink: http://bugs.launchpad.net/bugs/922221
We need to clean up the compat ioctl handling, but this makes it
work for now at least.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit
16d02c040bb6769068f7c4b54ea8542f14237362)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Sam Bradshaw [Tue, 30 Aug 2011 14:34:26 +0000 (08:34 -0600)]
block: Add driver for Micron RealSSD pcie flash cards
BugLink: http://bugs.launchpad.net/bugs/922221
This adds mtip32xx, a driver supporting Microns line of
pci-express flash storage cards.
Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: Sam Bradshaw <sbradshaw@micron.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
(cherry picked from commit
88523a61558a040546bf7d8b079ae0755d8e7005)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Tue, 31 Jan 2012 17:41:08 +0000 (10:41 -0700)]
UBUNTU: [Config] CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
BugLink: http://bugs.launchpad.net/bugs/922221
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
James M. Leddy [Fri, 27 Jan 2012 23:42:38 +0000 (18:42 -0500)]
UBUNTU: SAUCE: Bluetooth: Add support for BCM20702A0 [0a5c:21e6]
Add another vendor specific ID for BCM20702A0.
output of usb-devices:
T: Bus=01 Lev=02 Prnt=02 Port=03 Cnt=04 Dev#= 6 Spd=12 MxCh= 0
D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=0a5c ProdID=21e6 Rev=01.12
S: Manufacturer=Broadcom Corp
S: Product=BCM20702A0
S: SerialNumber=
D0DF9AFB227B
C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA
I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none)
I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
BugLink: http://bugs.launchpad.net/bugs/906832
Signed-off-by: James M. Leddy <james.leddy@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Manoj Iyer [Mon, 30 Jan 2012 16:54:09 +0000 (08:54 -0800)]
UBUNTU: SAUCE: Bluetooth: Add support for BCM20702A0 [0a5c:21e1]
Add vendor specific ID for BCM20702A0.
usb-devices:
T: Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#= 4 Spd=12 MxCh= 0
D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=0a5c ProdID=21e1 Rev=01.12
S: Manufacturer=Broadcom Corp
S: Product=BCM20702A0
S: SerialNumber=
60D819F03A6D
C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA
I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
BugLink: http://bugs.launchpad.net/bugs/906832
Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Signed-off-by: James M. Leddy <james.leddy@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Fri, 27 Jan 2012 15:28:58 +0000 (15:28 +0000)]
UBUNTU: [Config] review IPv6 configuration options and enable
Reviewed all the IPv6 kernel options, most are enabled and those enabled
seem appropriate:
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m
CONFIG_INET6_TUNNEL=m
CONFIG_INET6_XFRM_MODE_BEET=m
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET6_XFRM_TUNNEL=m
CONFIG_IPV6_MIP6=m
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_NDISC_NODETYPE=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y
CONFIG_IPV6_SIT=m
CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_SUBTREES=y
CONFIG_IPV6_TUNNEL=m
There are three options which are not enabled:
# CONFIG_IPV6_OPTIMISTIC_DAD is not set
This seems to have some issues known in its implementation, so for now
it seems safer to leave it off as it is only a time optimisation and
enabling it later should be fine.
# CONFIG_IPV6_MROUTE is not set
# CONFIG_IPV6_PIMSM_V2 is not set
# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
This add support for multicast in IPv6. Although it is marked
EXPERIMENTAL it does sound like something we should be enabling
for testing in precise.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Leann Ogasawara [Tue, 31 Jan 2012 22:38:18 +0000 (14:38 -0800)]
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Tue, 31 Jan 2012 22:36:50 +0000 (14:36 -0800)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Tue, 31 Jan 2012 17:25:23 +0000 (09:25 -0800)]
UBUNTU: Ubuntu-3.2.0-12.21
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Tue, 31 Jan 2012 17:13:52 +0000 (09:13 -0800)]
Revert "ath9k_hw: fix interpretation of the rx KeyMiss flag"
BugLink: http://bugs.launchpad.net/bugs/923512
This reverts commit
b4a82a0a2e32777267b2c997fa55b90056447a40.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Mon, 30 Jan 2012 14:48:35 +0000 (06:48 -0800)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:57:46 +0000 (11:57 -0800)]
UBUNTU: Ubuntu-3.2.0-12.20
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:56:25 +0000 (11:56 -0800)]
Revert "CHROMIUM: seccomp_filter: new mode with configurable syscall filters"
This reverts commit
281fe21aadb593a33f19a9a087df576246de84b6.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:56:03 +0000 (11:56 -0800)]
Revert "CHROMIUM: seccomp_filter: add process state reporting"
This reverts commit
8932868c7fadcd42fdb0a67789023c2c9313dc08.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:55:43 +0000 (11:55 -0800)]
Revert "CHROMIUM: seccomp_filter: Document what seccomp_filter is and how it works."
This reverts commit
28c7d1cb17ca5694ab9cd08a936d8ecc73d610a6.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:55:26 +0000 (11:55 -0800)]
Revert "CHROMIUM: x86: add HAVE_SECCOMP_FILTER and seccomp_execve"
This reverts commit
8d1ac80a95b1168c7f4f0f76ebd4e886a70175ea.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:55:00 +0000 (11:55 -0800)]
Revert "CHROMIUM: arm: select HAVE_SECCOMP_FILTER"
This reverts commit
90aa5bf8d017a00a225a6d95d7f07bea8e49f9b5.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:54:41 +0000 (11:54 -0800)]
Revert "CHROMIUM: seccomp_filters: move to btrees"
This reverts commit
92dd4371dbd71b313c2318f93649923bb3742884.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:54:23 +0000 (11:54 -0800)]
Revert "CHROMIUM: enable CONFIG_BTREE"
This reverts commit
8152dc53556f84f2f5584b62e27defeb65d6a96e.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:53:30 +0000 (11:53 -0800)]
Revert "CHROMIUM: seccomp_filter: kill NR_syscall references"
This reverts commit
a7ef8ea9dbb1c125ecdeb00bcdd668eb5091413a.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:52:02 +0000 (11:52 -0800)]
Revert "CHROMIUM: seccomp_filters: guard all ftrace wrapper code"
This reverts commit
27216aa575b16f6dca7fda7f1c955dda6ea6da96.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:49:40 +0000 (11:49 -0800)]
Revert "CHROMIUM: seccomp_filters: clean up warnings; kref mistake"
This reverts commit
898a15e2f648a073f65d7d63324fe3fbf26ffcee.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:46:57 +0000 (11:46 -0800)]
Revert "CHROMIUM: seccomp_filter: remove "skip" from copy and add drop helper"
This reverts commit
496eb439bde047aaf331bb00ec1928abeacd25df.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:44:16 +0000 (11:44 -0800)]
Revert "CHROMIUM: seccomp_filter: allow CAP_SYS_ADMIN management of execve"
This reverts commit
09b02d793b77360739b25fa103a38ce633afc8f2.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:41:21 +0000 (11:41 -0800)]
Revert "CHROMIUM: seccomp_filter: inheritance documentation"
This reverts commit
d0e7762161f017ce28823039afa9b50602a291b6.
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:38:32 +0000 (11:38 -0800)]
Revert "CHROMIUM: seccomp_filter: make inherited filters composable"
This reverts commit
f6782d03ec66556e112073ce513dccaeba3c23ea.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:35:49 +0000 (11:35 -0800)]
Revert "CHROMIUM: Fix seccomp_t compile error"
This reverts commit
16273e2ded4e16ecc74cc3890936fabf58abfc92.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:07:37 +0000 (11:07 -0800)]
Revert "CHROMIUM: Fix kref usage"
This reverts commit
1750f615d552fa8ac143a34ed42fbc800500262d.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 27 Jan 2012 19:03:12 +0000 (11:03 -0800)]
Revert "CHROMIUM: enable CONFIG_SECCOMP_FILTER and CONFIG_HAVE_SECCOMP_FILTER"
This reverts commit
72d4faa9bc1968a4e619d7c66db0849351592ca7.
https://lists.ubuntu.com/archives/kernel-team/2012-January/018695.html
"At this point, since there are no consumers of the old API, and it
will be almost certainly replaced by the BPF API, I think in the face
of the 5-year support of the LTS release, we should probably just
remove all of the seccomp_filter patches from Ubuntu." - Kees Cook
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Tim Gardner [Fri, 27 Jan 2012 12:45:06 +0000 (05:45 -0700)]
UBUNTU: [Config] Add Hyper-V modules to virtual inclusion list
BugLink: http://bugs.launchpad.net/bugs/922063
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Leann Ogasawara [Thu, 26 Jan 2012 20:11:47 +0000 (12:11 -0800)]
UBUNTU: Add CONFIG_GPIO_TWL4030=y for arm[el|hf] to the config enforcer
BugLink: http://bugs.launchpad.net/bugs/921934
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Paolo Pisati [Thu, 26 Jan 2012 19:41:20 +0000 (20:41 +0100)]
UBUNTU: [Config] Switch CONFIG_GPIO_TWL4030=y back on arm[el|hf].
BugLink: http://bugs.launchpad.net/bugs/921934
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Andy Whitcroft [Thu, 26 Jan 2012 09:47:15 +0000 (09:47 +0000)]
UBUNTU: switch to new style rebase marker with bug number
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Tim Gardner [Thu, 26 Jan 2012 03:01:51 +0000 (20:01 -0700)]
UBUNTU: Rebase to v3.2.2, CONFIG_SND_KCTL_JACK=y
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Thu, 26 Jan 2012 02:56:13 +0000 (02:56 +0000)]
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Leann Ogasawara [Wed, 25 Jan 2012 17:57:58 +0000 (09:57 -0800)]
UBUNTU: Ubuntu-3.2.0-11.19
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Daniel Lezcano [Thu, 5 Jan 2012 09:06:50 +0000 (10:06 +0100)]
UBUNTU: SAUCE: Add reboot_pid_ns to handle the reboot syscall
In the case of a child pid namespace, rebooting the system does not
really makes sense. When the pid namespace is used in conjunction
with the other namespaces in order to create a linux container, the
reboot syscall leads to some problems.
A container can reboot the host. That can be fixed by dropping
the sys_reboot capability but we are unable to correctly to poweroff/
halt/reboot a container and the container stays stuck at the shutdown
time with the container's init process waiting indefinitively.
After several attempts, no solution from userspace was found to reliabily
handle the shutdown from a container.
This patch propose to make the init process of the child pid namespace to
exit with a signal status set to : SIGINT if the child pid namespace called
"halt/poweroff" and SIGHUP if the child pid namespace called "reboot".
When the reboot syscall is called and we are not in the initial
pid namespace, we kill the pid namespace for "HALT", "POWEROFF", "RESTART",
and "RESTART2". Otherwise we return EINVAL.
Returning EINVAL is also an easy way to check if this feature is supported
by the kernel when invoking another 'reboot' option like CAD.
By this way the parent process of the child pid namespace knows if
it rebooted or not and can take the right decision.
Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
BugLink: http://bugs.launchpad.net/bugs/914676
(backported from https://lkml.org/lkml/2012/1/5/58)
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Thu, 19 Jan 2012 14:03:48 +0000 (15:03 +0100)]
ALSA: hda/realtek - Remove use_jack_tbl field
Now that all quirks have the own unsol handlers, we don't need to check
use_jack_tbl flag any more. Let's kill it.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(backported from commit
a7309792c4e313d4e4c30084dc0ecbc834082433,
Conflicts:
sound/pci/hda/patch_realtek.c)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Thu, 19 Jan 2012 11:10:29 +0000 (12:10 +0100)]
ALSA: hda/realtek - Avoid conflict of unsol-events with static quirks
The recently added jack-kctl support sets the unsol event tags
dynamically, while static quirks usually set the fixed tags in the
init_verbs array. Due to this conflict, the own unsol event handler
can't retrieve the tag and handle it properly any more.
For fixing this, avoid calling snd_hda_jack_add_kctls() for static
quirks, and always let them use own handlers instead of the standard
one for the auto-pareser.
Reported-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(backported from commit
f21d78e2698b6380a5387461e3b126bb2dee23aa,
Conflicts:
sound/pci/hda/alc882_quirks.c)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Thu, 1 Dec 2011 16:41:36 +0000 (17:41 +0100)]
ALSA: hda - Integrate input-jack stuff into kctl-jack
Instead of managing input-jack stuff separately, call all stuff inside
the kctl-jack creation, deletion and report. The caller no longer needs
to care about input-jack.
The better integration between input-jack and kctl-jack should be done
in the upper layer in near future, but for now, it's implemented locally
for more tests.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(backported from commit
31ef22579302ac42054bebecb528710f46580925,
Conflicts:
sound/pci/hda/patch_hdmi.c)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Mon, 21 Nov 2011 13:34:20 +0000 (14:34 +0100)]
ALSA: hda - Don't add channel suffix for headphone pin labels
The multiple headphone pins are usually handled as copied from the same
source, not as individual channels like front and surround. Thus it'd
be more correct to avoid the channel suffix for "Headphone" pin labels
in snd_hda_get_pin_label() but give an index number instead.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
358b6e62b86f6313d114e0f6b7d8f8adaf85ed9c)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Mon, 21 Nov 2011 13:17:16 +0000 (14:17 +0100)]
ALSA: hda - Fix a typo
Reported-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
d6018bb566f6eef277184278b105e04705e8aeb6)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Wed, 16 Nov 2011 14:33:26 +0000 (15:33 +0100)]
ALSA: hda - Give more unique names by snd_hda_get_pin_label()
The function now gives more unique names for the output pins by adding
some prefix and suffix for the location and the channels. Otherwise, it
can pass the index number.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
201e06ffa9ef9b5265e636617f4fa20cd1490343)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Wed, 16 Nov 2011 13:28:33 +0000 (14:28 +0100)]
ALSA: hda - Add missing inclusion of linux/export.h
This is needed newly since 3.2...
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
bf815bf0a3c3b8ad6cd97cda6bc29cc3708fe749)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Mon, 14 Nov 2011 09:32:21 +0000 (10:32 +0100)]
ALSA: hda - Add missing initialization of kctl jack status
Otherwise the jack kctls will report invalid values until the jack
is re-plugged.
Reported-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
fc5b15f13886afad43fc6c0040af7cb5172a0bd8)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Fri, 11 Nov 2011 16:54:19 +0000 (17:54 +0100)]
ALSA: hda/jack - Fix the assignment of input jack-type
The type field was lost during the transition. Restored.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
344b01aecdc1e1173b5aa86208ef583489de7710)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Fri, 11 Nov 2011 16:53:03 +0000 (17:53 +0100)]
ALSA: hda/jack - Fix NULL-dereference at probing
At probing time, the elements that aren't assigned to kctl or jack may
be called. Need proper NULL-checks.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
cfc7c9d307b6a3557e333f960218d344d3a70ce7)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
David Henningsson [Fri, 11 Nov 2011 16:13:15 +0000 (17:13 +0100)]
ALSA: HDA: Jack: Export required functions from hda_jack.c
These two functions are being used by the codec-idt and codec-hdmi
modules, so they need to be exported properly.
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
d1cb620081f51c78cf95224efb593a886875078f)
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Wed, 2 Nov 2011 07:54:51 +0000 (08:54 +0100)]
ALSA: hda - Merge input-jack helpers to hda_jack.c
We can use the very same table in hda_jack.c for managing the list for
input-jack elements, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
aad37dbd563010252e1bedb6dad6cddb867b9235)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Wed, 2 Nov 2011 07:36:06 +0000 (08:36 +0100)]
ALSA: Introduce common helper functions for jack-detection control
Now move the helper function for creating and reporting the jack-detection
to the common place. The driver that needs this functionality should
select CONFIG_SND_KCTL_JACK kconfig.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
35be544af367170a9c6bf63adcf9d0cb2d569dbb)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Thu, 27 Oct 2011 23:16:55 +0000 (01:16 +0200)]
ALSA: hda - Manage unsol tags in hda_jack.c
Manage the tags assigned for unsolicited events dynamically together
with the jack-detection routines. Basically this is almost same as what
we've done in patch_sigmatel.c. Assign the new tag number for each new
unsol event, associate with the given NID and the action type, etc.
With this change, now all pins looked over in snd_hda_jack_add_kctls()
are actually enabled for detection now even if the pins aren't used for
jack-retasking by the driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(backported from commit
3a93897ea37cbb8277f8a4232c12c0c18168a7db,
Conflicts:
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_realtek.c)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Thu, 27 Oct 2011 22:03:22 +0000 (00:03 +0200)]
ALSA: hda - Create jack-detection kcontrols
Create kcontrols for pin jack-detections, which work similarly like
jack-input layer. Each control will notify when the jack is plugged or
unplugged, and also user can read the value at any time via the normal
control API.
The control elements are created with iface=CARD, so that they won't
appear in the mixer apps.
So far, only the pins that enabled the jack-detection are registered.
For covering all pins, the transition of the common unsol-tag handling
would be needed. Stay tuned.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(backported from commit
01a61e12b4602c82bde9797d0e153f3e53c95b04,
Conflicts:
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_via.c)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Thu, 27 Oct 2011 20:12:46 +0000 (22:12 +0200)]
ALSA: hda - Cache the jack-detection value
Introduce a table containing the pins and their jack-detection states
for avoiding the unnecessary verbs to check the pin status at each time.
When the unsol event is enabled via snd_hda_jack_detect_enable(), it
automatically adds the given NID to the table. Then the driver supposes
that the codec driver will set the dirty flag appropariately when an
unsolicited event is invoked for that pin.
The behavior for reading other pins that aren't registered in the table
doesn't change. Only the pins assigned to the table are cached, so far.
In near futre, this table can be extended to use the central place for
the unsolicited events of all pins, etc, and eventually include the
jack-detect kcontrols that replace the current input-jack stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(backported from commit
1835a0f9a2121ce3198dab67507d4d3e960cc09e,
Conflicts:
sound/pci/hda/patch_hdmi.c)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Thu, 27 Oct 2011 18:47:07 +0000 (20:47 +0200)]
ALSA: hda - Introduce snd_hda_get_pin_label()
Create a new helper function snd_hda_get_pin_label() for getting a label
string for both input and output pins. hda_get_input_pin_label() is
obsoleted by this function, and the callers are replaced appropriately
now by this patch.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
04f5ade6afc4326dc6cd10d235500972fba548eb)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Wed, 25 Jan 2012 17:56:24 +0000 (09:56 -0800)]
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Wed, 25 Jan 2012 15:01:35 +0000 (07:01 -0800)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
projects / linux-flexiantxendom0.git / log