~ubuntu-mainline/ubuntu-mainline/+git/linux-upstream:linux-3.3.y

Last commit made on 2012-06-01
Get this branch:
git clone -b linux-3.3.y https://git.launchpad.net/~ubuntu-mainline/ubuntu-mainline/+git/linux-upstream
Members of Ubuntu Mainline can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

8457206... by Greg Kroah-Hartman <email address hidden>

Linux 3.3.8

4f1f847... by Jes Sorensen

md: Avoid OOPS when reshaping raid1 to raid0

commit 24b961f811a3e790a9b93604d2594bfb6cce4fa4 upstream.

raid1 arrays do not have the notion of chunk size. Calculate the
largest chunk sector size we can use to avoid a divide by zero OOPS
when aligning the size of the new array to the chunk size.

Signed-off-by: Jes Sorensen <email address hidden>
Signed-off-by: NeilBrown <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>

0bbc879... by Larry Finger

rtlwifi: rtl8192de: Fix firmware initialization

commit 0298dc9f2273fb2d596ae10d7700f054bfce601d upstream.

Before the switch to asynchronous firmware loading (mainline commit b0302ab),
it was necessary to load firmware when initializing the first of the units
in a dual-mac system. After the change, it is necessary to load firmware in
both units.

Signed-off-by: Larry Finger <email address hidden>
Signed-off-by: John W. Linville <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>

88fad6c... by Laxman Kumar Dewangan

i2c: tegra: notify transfer-complete after clearing status.

commit c889e91d2cc22123f20f40dde0c0a91856a20eea upstream.

The notification of the transfer complete by calling complete()
should be done after clearing all interrupt status.
This avoids the race condition of misconfigure the i2c controller
in multi-core environment.

Signed-off-by: Laxman Dewangan <email address hidden>
Acked-by: Stephen Warren <email address hidden>
Signed-off-by: Wolfram Sang <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>

e9c769c... by Marcus Folkesson <email address hidden>

i2c: davinci: Free requested IRQ in remove

commit 9868a060ccf769c08ec378a9829137e272e9a92c upstream.

The freed IRQ is not necessary the one requested in probe.
Even if it was, with two or more i2c-controllers it will fails anyway.

Signed-off-by: Marcus Folkesson <email address hidden>
Signed-off-by: Wolfram Sang <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>

8fa23b6... by Andi Kleen <email address hidden>

MCE: Fix vm86 handling for 32bit mce handler

commit a129a7c84582629741e5fa6f40026efcd7a65bd4 upstream.

When running on 32bit the mce handler could misinterpret
vm86 mode as ring 0. This can affect whether it does recovery
or not; it was possible to panic when recovery was actually
possible.

Fix this by always forcing vm86 to look like ring 3.

Signed-off-by: Andi Kleen <email address hidden>
Signed-off-by: Tony Luck <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>

bb9fd9f... by Dima Zavin <email address hidden>

ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held

commit 435a7ef52db7d86e67a009b36cac1457f8972391 upstream.

We can't be holding the mmap_sem while calling flush_cache_user_range
because the flush can fault. If we fault on a user address, the
page fault handler will try to take mmap_sem again. Since both places
acquire the read lock, most of the time it succeeds. However, if another
thread tries to acquire the write lock on the mmap_sem (e.g. mmap) in
between the call to flush_cache_user_range and the fault, the down_read
in do_page_fault will deadlock.

[will: removed drop of vma parameter as already queued by rmk (7365/1)]

Acked-by: Catalin Marinas <email address hidden>
Signed-off-by: Dima Zavin <email address hidden>
Signed-off-by: John Stultz <email address hidden>
Signed-off-by: Will Deacon <email address hidden>
Signed-off-by: Russell King <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>

58d4de1... by Dima Zavin <email address hidden>

ARM: 7365/1: drop unused parameter from flush_cache_user_range

commit 4542b6a0fa6b48d9ae6b41c1efeb618b7a221b2a upstream.

vma isn't used and flush_cache_user_range isn't a standard macro that
is used on several archs with the same prototype. In fact only unicore32
has a macro with the same name (with an identical implementation and no
in-tree users).

This is a part of a patch proposed by Dima Zavin (with Message-id:
<email address hidden>) that didn't get
accepted.

Cc: Dima Zavin <email address hidden>
Acked-by: Catalin Marinas <email address hidden>
Signed-off-by: Uwe Kleine-König <email address hidden>
Signed-off-by: Russell King <email address hidden>
Cc: Will Deacon <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>

0adf705... by Larry Finger

rtlwifi: fix for race condition when firmware is cached

commit 574e02abaf816b582685805f0c1150ca9f1f18ee upstream.

In commit b0302ab, the rtlwifi family of drivers was converted to use
asynchronous firmware loading. Unfortumately, the implementation was
racy, and the ieee80211 routines could be started before rtl_init_core()
was called to setup the data.

This patch fixes the bug noted in https://bugzilla.kernel.org/show_bug.cgi?id=43187.

Reported-by: Joshua Roys <email address hidden>
Tested-by: Neptune Ning <email address hidden>
Signed-off-by: Larry Finger <email address hidden>
Signed-off-by: John W. Linville <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>

4f4e3f1... by Dan Carpenter <email address hidden>

iommu: Fix off by one in dmar_get_fault_reason()

commit fefe1ed1398b81e3fadc92d11d91162d343c8836 upstream.

fault_reason - 0x20 == ARRAY_SIZE(irq_remap_fault_reasons) is
one past the end of the array.

Signed-off-by: Dan Carpenter <email address hidden>
Cc: Joerg Roedel <email address hidden>
Cc: Youquan Song <email address hidden>
Cc: walter harms <email address hidden>
Cc: Suresh Siddha <email address hidden>
Link: http://<email address hidden>
Signed-off-by: Ingo Molnar <email address hidden>
[bwh: Backported to 3.2: s/irq_remap_fault_reasons/intr_remap_fault_reasons/]
Signed-off-by: Ben Hutchings <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>