[alsa-cvslog] alsa-kernel: Official ALSA project GIT repository for Linux 2.6 branch, linux-2.6 now
Brought to you by:
perex
Menu
▾
▴
[alsa-cvslog] alsa-kernel: Official ALSA project GIT repository for Linux 2.6 branch, linux-2.6 now at v3.3-rc6-258-g2f1c2b8
|
From: <nor...@al...> - 2012-03-13 07:57:02
|
Hello,
This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.
Updating branch, linux-2.6,
via 2f1c2b8155865ba3c2909f468ac8be60f52ed56b (commit)
via 0ae5eaf1032ca3cd5a0097f72992fc4821c762fa (commit)
via 212ad2f5f9287e019b61da5bb0409a6094161f5c (commit)
via a10a854365503ad5e374b3cd48f06aa486df7211 (commit)
via e424fb8cc4e6634c10f8159b1ff5618cf7bab9c6 (commit)
via 461e74377cfcfc2c0d6bbdfa8fc5fbc21b052c2a (commit)
via 2d24c49080afdb80816f6cedaef0e3999f344c4b (commit)
via c215ab9a7530d415707430de8d51a58ca6a41808 (commit)
via fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (commit)
via c7b285550544c22bc005ec20978472c9ac7138c6 (commit)
via 86b62a2cb4fc09037bbce2959d2992962396fd7f (commit)
via 86e06008338e5712603613a0f6770500f79e83bd (commit)
via be22aece684f5a700e6247b9861c3759d5798a3c (commit)
via a7f4255f906f60f72e00aad2fb000939449ff32e (commit)
via c447064de46a942e2d91a4cf22afa70538d781dd (commit)
via 8cd5c8661df33674daa67bf552a73497eeeba710 (commit)
via 0ab5d757db3beb865f52cb59fe4240c4fdc2da55 (commit)
via 0cacaf51a0b3092fc84e5c8d483721baee67b60f (commit)
via 45b8da90f2e1af7e1a233f03791c78ed0f831fca (commit)
via e304dfdb030bab29888151021843bd9e1743a535 (commit)
via 048be431e40ee32df8e6c1a2c216693afe3ee358 (commit)
via d31b20fcc89efa8c5d3f5ea2720e08a286b69a36 (commit)
via 8de5d6f19bbe7c77676a62ab52be901aa10d6b54 (commit)
via 6b7f000eb6a0b81d7a809833edb7a457eedf8512 (commit)
via 38aa4a568ba4c3ccba83e862a01e3e60e3b811ee (commit)
via cf00790dea6f210ddd01a6656da58c7c9a4ea0e4 (commit)
via 4231d47e6fe69f061f96c98c30eaf9fb4c14b96d (commit)
via ac3f48de09d8f4b73397047e413fadff7f65cfa7 (commit)
via 5faa5df1fa2024bd750089ff21dcc4191798263d (commit)
via dcf353b17007841f91e1735e33790508c84c9ad0 (commit)
via 783154573236f46b730b2eea17d2e6e04bdb3251 (commit)
via 5200959b833ddacf28b6ffce8c331dfd6e0ca797 (commit)
via d9e179ecec0805c41b17f9a0c3b925d415677772 (commit)
via 09c1d446fe0e2e3f34b366a6b3c1b19efa1522af (commit)
via 9259c483a34a4efbaf60583af3719bed28a3fe45 (commit)
via 4949be16822e92a18ea0cc1616319926628092ee (commit)
via 81e5d41d7ed4f6c61ba3d2414f4f9ddf6d934ebb (commit)
via d47775c4a7a40ecd048400cf770504ad1f2cd3df (commit)
via 4cd7c0a03ea44ef88fa0d3901d671798d23cbc35 (commit)
via aaefcd4284a5399641ed02ac3e696b5e50ce185e (commit)
via 0be70439f2dcf4a2048e4b02f23f2c239b35a110 (commit)
via e49d603c181b6004e2f6b5ad6d86daab84f22fe6 (commit)
via 1740d3448012475f6b63172631c60cbcd1994a81 (commit)
via e9db93a4711bb0586f6786f21274c3b74d8b608b (commit)
via 63d71126bc767dc648af314a7256fa2fc61131a8 (commit)
via 526af6eb4dc71302f59806e2ccac7793963a7fe0 (commit)
via 948c46a195691a214811538ee4b6c0312ec15cb5 (commit)
via fb4340656fda27bd38914ef382ee3235c23d8f58 (commit)
via de3a49b8a44cb6b272450cef060385a83dc05d74 (commit)
via 651a68ea2ce9738b84e928836053b2e0fb5db2ba (commit)
via 7f466cff75f16ac545f34c7876e6f80225a36a6d (commit)
via 8f2392142346f2754c8292a94cc62a157ed1e093 (commit)
via 182ada1c712a4ebe14d6a023cfab3559b2527d69 (commit)
via 134d12fae0bb8f3d60dc7440a9e1950bb5427167 (commit)
via 019ae33410581e09f429fba5cbbf0daa96d6659a (commit)
via b2ccf065f7b23147ed135a41b01d05a332ca6b7e (commit)
via a175423c831ea582c06784d1e172d2ce1d79923a (commit)
via d3b010640e5c59b98d3b11229ba4cc2838dc7cbf (commit)
via 00f157b49780e194c38dafdf9df8e10b8a6a9626 (commit)
via 9926a67557532acb6cddb1c1add02952175b5c72 (commit)
via 992d52529d7840236d3059b51c15d5eb9e81a869 (commit)
from 9f8050c4f99789d03ca96d4e625bd6637241828f (commit)
- Log -----------------------------------------------------------------
commit 2f1c2b8155865ba3c2909f468ac8be60f52ed56b
Merge: 0ae5eaf1032ca3cd5a0097f72992fc4821c762fa e424fb8cc4e6634c10f8159b1ff5618cf7bab9c6
Author: Linus Torvalds <tor...@li...>
AuthorDate: Mon Mar 12 22:59:34 2012 -0700
Commit: Linus Torvalds <tor...@li...>
CommitDate: Mon Mar 12 22:59:34 2012 -0700
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
Pull x86 platfrm driver fixes from Matthew Garrett:
"Some trivial patches that fix wifi on some Lenovos and avoid a
potential memory corruption issue on some Panasonics, plus two
straightforward new drivers that touch no existing code."
* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
panasonic-laptop: avoid overflow in acpi_pcc_hotkey_add()
acer-wmi: No wifi rfkill on Lenovo machines
Fujitsu tablet extras driver
x86: Add amilo-rfkill driver for some Fujitsu-Siemens Amilo laptops
commit 0ae5eaf1032ca3cd5a0097f72992fc4821c762fa
Merge: 212ad2f5f9287e019b61da5bb0409a6094161f5c 4949be16822e92a18ea0cc1616319926628092ee
Author: Linus Torvalds <tor...@li...>
AuthorDate: Mon Mar 12 22:53:37 2012 -0700
Commit: Linus Torvalds <tor...@li...>
CommitDate: Mon Mar 12 22:53:37 2012 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
Pull PCI changes from Jesse Barnes:
"A single fix for a regression that affects some people who try to
disable ASPM for whatever reason."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled
commit 212ad2f5f9287e019b61da5bb0409a6094161f5c
Merge: a10a854365503ad5e374b3cd48f06aa486df7211 048be431e40ee32df8e6c1a2c216693afe3ee358
Author: Linus Torvalds <tor...@li...>
AuthorDate: Mon Mar 12 22:50:20 2012 -0700
Commit: Linus Torvalds <tor...@li...>
CommitDate: Mon Mar 12 22:50:20 2012 -0700
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH fixes from Paul Mundt.
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
sh-sci / PM: Avoid deadlocking runtime PM
sh: fix up the ubc clock definition for sh7785.
sh: add parameter for RSPI in clock-sh7757
sh: Fix sh2a vbr table for more than 255 irqs
commit a10a854365503ad5e374b3cd48f06aa486df7211
Merge: fde7d9049e55ab85a390be7f415d74c9f62dd0f9 e49d603c181b6004e2f6b5ad6d86daab84f22fe6
Author: Linus Torvalds <tor...@li...>
AuthorDate: Mon Mar 12 22:47:20 2012 -0700
Commit: Linus Torvalds <tor...@li...>
CommitDate: Mon Mar 12 22:47:20 2012 -0700
Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh
Pull SH/R-Mobile fixes from Paul Mundt.
* tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh:
ARM: mach-shmobile: ap4evb: fixup fsi2_ak4643_info typo
ARM: mach-shmobile: mackerel: Reserve DMA memory for the frame buffer
ARM: mach-shmobile: Fix ag5evm compilation by including linux/videodev2.h
ARM: mach-shmobile: Fix bonito compile breakage
commit e424fb8cc4e6634c10f8159b1ff5618cf7bab9c6
Author: Xi Wang <xi...@gm...>
AuthorDate: Wed Dec 28 23:49:06 2011 -0500
Commit: Matthew Garrett <mj...@re...>
CommitDate: Mon Mar 12 10:25:51 2012 -0400
panasonic-laptop: avoid overflow in acpi_pcc_hotkey_add()
num_sifr could go negative since acpi_pcc_get_sqty() returns -EINVAL
on error. Then it could bypass the sanity check (num_sifr > 255).
The subsequent call to kzalloc() would allocate a small buffer, leading
to a memory corruption.
Signed-off-by: Xi Wang <xi...@gm...>
Signed-off-by: Matthew Garrett <mj...@re...>
commit 461e74377cfcfc2c0d6bbdfa8fc5fbc21b052c2a
Author: Ike Panhc <ik...@ca...>
AuthorDate: Fri Feb 3 16:46:39 2012 +0800
Commit: Matthew Garrett <mj...@re...>
CommitDate: Mon Mar 12 09:58:02 2012 -0400
acer-wmi: No wifi rfkill on Lenovo machines
We have several reports which says acer-wmi is loaded on ideapads
and register rfkill for wifi which can not be unblocked.
Since ideapad-laptop also register rfkill for wifi and it works
reliably, it will be fine acer-wmi is not going to register rfkill
for wifi once VPC2004 is found.
Also put IBM0068/LEN0068 in the list. Though thinkpad_acpi has no
wifi rfkill capability, there are reports which says acer-wmi also
block wireless on Thinkpad E520/E420.
Signed-off-by: Ike Panhc <ik...@ca...>
Signed-off-by: Matthew Garrett <mj...@re...>
commit 2d24c49080afdb80816f6cedaef0e3999f344c4b
Author: Robert Gerlach <kh...@gm...>
AuthorDate: Wed Jan 18 14:26:22 2012 +0100
Commit: Matthew Garrett <mj...@re...>
CommitDate: Mon Mar 12 09:57:52 2012 -0400
Fujitsu tablet extras driver
This patch adds support for some of the devices within a wide variety
of Fujitsu Tablet Computers, both convertibles and slates. Primarily
it allows for the automatic detection of the tablet/notebook mode for
convertible tablet pc's, and orientation for docked slates. It also
adds support for the application panel buttons usually found next to
the tablet screen, and docking station detection for slates.
Signed-off-by: Robert Gerlach <kh...@gm...>
Signed-off-by: Matthew Garrett <mj...@re...>
commit c215ab9a7530d415707430de8d51a58ca6a41808
Author: Ben Hutchings <be...@de...>
AuthorDate: Fri Nov 25 04:09:37 2011 +0000
Commit: Matthew Garrett <mj...@re...>
CommitDate: Mon Mar 12 09:56:47 2012 -0400
x86: Add amilo-rfkill driver for some Fujitsu-Siemens Amilo laptops
An rfkill driver based on the fsaa1655g and fsam7440 drivers for
Fujitsu-Siemens Amilo A1655 and M7440 models found at:
http://sourceforge.net/projects/fsaa1655g/
http://sourceforge.net/projects/fsam7440/
This adds DMI matching, replaces the procfs files with rfkill devices,
and uses the proper functions to write to the i8042 safely.
Signed-off-by: Ben Hutchings <be...@de...>
Signed-off-by: Matthew Garrett <mj...@re...>
commit fde7d9049e55ab85a390be7f415d74c9f62dd0f9
Author: Linus Torvalds <tor...@li...>
AuthorDate: Sat Mar 10 13:49:52 2012 -0800
Commit: Linus Torvalds <tor...@li...>
CommitDate: Sat Mar 10 13:49:52 2012 -0800
Linux 3.3-rc7
commit c7b285550544c22bc005ec20978472c9ac7138c6
Author: Al Viro <viro@ZenIV.linux.org.uk>
AuthorDate: Thu Mar 8 17:51:19 2012 +0000
Commit: Linus Torvalds <tor...@li...>
CommitDate: Fri Mar 9 18:59:59 2012 -0800
aio: fix the "too late munmap()" race
Current code has put_ioctx() called asynchronously from aio_fput_routine();
that's done *after* we have killed the request that used to pin ioctx,
so there's nothing to stop io_destroy() waiting in wait_for_all_aios()
from progressing. As the result, we can end up with async call of
put_ioctx() being the last one and possibly happening during exit_mmap()
or elf_core_dump(), neither of which expects stray munmap() being done
to them...
We do need to prevent _freeing_ ioctx until aio_fput_routine() is done
with that, but that's all we care about - neither io_destroy() nor
exit_aio() will progress past wait_for_all_aios() until aio_fput_routine()
does really_put_req(), so the ioctx teardown won't be done until then
and we don't care about the contents of ioctx past that point.
Since actual freeing of these suckers is RCU-delayed, we don't need to
bump ioctx refcount when request goes into list for async removal.
All we need is rcu_read_lock held just over the ->ctx_lock-protected
area in aio_fput_routine().
Signed-off-by: Al Viro <vi...@ze...>
Reviewed-by: Jeff Moyer <jm...@re...>
Acked-by: Benjamin LaHaise <bc...@kv...>
Cc: st...@vg...
Signed-off-by: Linus Torvalds <tor...@li...>
commit 86b62a2cb4fc09037bbce2959d2992962396fd7f
Author: Al Viro <viro@ZenIV.linux.org.uk>
AuthorDate: Wed Mar 7 05:16:35 2012 +0000
Commit: Linus Torvalds <tor...@li...>
CommitDate: Fri Mar 9 18:59:59 2012 -0800
aio: fix io_setup/io_destroy race
Have ioctx_alloc() return an extra reference, so that caller would drop it
on success and not bother with re-grabbing it on failure exit. The current
code is obviously broken - io_destroy() from another thread that managed
to guess the address io_setup() would've returned would free ioctx right
under us; gets especially interesting if aio_context_t * we pass to
io_setup() points to PROT_READ mapping, so put_user() fails and we end
up doing io_destroy() on kioctx another thread has just got freed...
Signed-off-by: Al Viro <vi...@ze...>
Acked-by: Benjamin LaHaise <bc...@kv...>
Reviewed-by: Jeff Moyer <jm...@re...>
Cc: st...@vg...
Signed-off-by: Linus Torvalds <tor...@li...>
commit 86e06008338e5712603613a0f6770500f79e83bd
Merge: be22aece684f5a700e6247b9861c3759d5798a3c a175423c831ea582c06784d1e172d2ce1d79923a
Author: Linus Torvalds <tor...@li...>
AuthorDate: Fri Mar 9 18:09:18 2012 -0800
Commit: Linus Torvalds <tor...@li...>
CommitDate: Fri Mar 9 18:09:18 2012 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs updates from Chris Mason:
"I have two additional and btrfs fixes in my for-linus branch. One is
a casting error that leads to memory corruption on i386 during scrub,
and the other fixes a corner case in the backref walking code (also
triggered by scrub)."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix casting error in scrub reada code
btrfs: fix locking issues in find_parent_nodes()
commit be22aece684f5a700e6247b9861c3759d5798a3c
Author: Hugh Dickins <hu...@go...>
AuthorDate: Fri Mar 9 13:37:32 2012 -0800
Commit: Linus Torvalds <tor...@li...>
CommitDate: Fri Mar 9 15:32:20 2012 -0800
memcg: revert fix to mapcount check for this release
Respectfully revert commit e6ca7b89dc76 "memcg: fix mapcount check
in move charge code for anonymous page" for the 3.3 release, so that
it behaves exactly like releases 2.6.35 through 3.2 in this respect.
Horiguchi-san's commit is correct in itself, 1 makes much more sense
than 2 in that check; but it does not go far enough - swapcount
should be considered too - if we really want such a check at all.
We appear to have reached agreement now, and expect that 3.4 will
remove the mapcount check, but had better not make 3.3 different.
Signed-off-by: Hugh Dickins <hu...@go...>
Reviewed-by: Naoya Horiguchi <n-h...@ah...>
Signed-off-by: Linus Torvalds <tor...@li...>
commit a7f4255f906f60f72e00aad2fb000939449ff32e
Author: Thomas Gleixner <tg...@li...>
AuthorDate: Fri Mar 9 20:55:10 2012 +0100
Commit: Linus Torvalds <tor...@li...>
CommitDate: Fri Mar 9 12:43:27 2012 -0800
x86: Derandom delay_tsc for 64 bit
Commit f0fbf0abc093 ("x86: integrate delay functions") converted
delay_tsc() into a random delay generator for 64 bit. The reason is
that it merged the mostly identical versions of delay_32.c and
delay_64.c. Though the subtle difference of the result was:
static void delay_tsc(unsigned long loops)
{
- unsigned bclock, now;
+ unsigned long bclock, now;
Now the function uses rdtscl() which returns the lower 32bit of the
TSC. On 32bit that's not problematic as unsigned long is 32bit. On 64
bit this fails when the lower 32bit are close to wrap around when
bclock is read, because the following check
if ((now - bclock) >= loops)
break;
evaluated to true on 64bit for e.g. bclock = 0xffffffff and now = 0
because the unsigned long (now - bclock) of these values results in
0xffffffff00000001 which is definitely larger than the loops
value. That explains Tvortkos observation:
"Because I am seeing udelay(500) (_occasionally_) being short, and
that by delaying for some duration between 0us (yep) and 491us."
Make those variables explicitely u32 again, so this works for both 32
and 64 bit.
Reported-by: Tvrtko Ursulin <tvr...@on...>
Signed-off-by: Thomas Gleixner <tg...@li...>
Cc: st...@vg... # >= 2.6.27
Signed-off-by: Linus Torvalds <tor...@li...>
commit c447064de46a942e2d91a4cf22afa70538d781dd
Merge: 8cd5c8661df33674daa67bf552a73497eeeba710 8de5d6f19bbe7c77676a62ab52be901aa10d6b54
Author: Linus Torvalds <tor...@li...>
AuthorDate: Fri Mar 9 12:14:23 2012 -0800
Commit: Linus Torvalds <tor...@li...>
CommitDate: Fri Mar 9 12:14:23 2012 -0800
Merge tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Nothing exciting here: just a few regression fixes for HD-audio and
ASoC, also the support of missing 32bit compat ioctl for HDSPM."
* tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hdspm - Provide ioctl_compat
ALSA: hda/realtek - Apply the coef-setup only to ALC269VB
ALSA: hda - add quirk to detect CD input on Gigabyte EP45-DS3
ASoC: neo1973: fix neo1973 wm8753 initialization
commit 8cd5c8661df33674daa67bf552a73497eeeba710
Author: David Brown <da...@co...>
AuthorDate: Fri Mar 9 11:39:32 2012 -0800
Commit: Linus Torvalds <tor...@li...>
CommitDate: Fri Mar 9 12:13:36 2012 -0800
MAINTAINERS: new git entry for arm/mach-msm
The msm git tree moved to
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
Signed-off-by: David Brown <da...@co...>
Signed-off-by: Linus Torvalds <tor...@li...>
commit 0ab5d757db3beb865f52cb59fe4240c4fdc2da55
Merge: 0cacaf51a0b3092fc84e5c8d483721baee67b60f 4cd7c0a03ea44ef88fa0d3901d671798d23cbc35
Author: Linus Torvalds <tor...@li...>
AuthorDate: Fri Mar 9 07:27:38 2012 -0800
Commit: Linus Torvalds <tor...@li...>
CommitDate: Fri Mar 9 07:27:38 2012 -0800
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull C6X fix from Mark Salter:
"Fix for C6X KSTK_EIP and KSTK_ESP macros."
* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
C6X: fix KSTK_EIP and KSTK_ESP macros
commit 0cacaf51a0b3092fc84e5c8d483721baee67b60f
Merge: 45b8da90f2e1af7e1a233f03791c78ed0f831fca 6b7f000eb6a0b81d7a809833edb7a457eedf8512
Author: Linus Torvalds <tor...@li...>
AuthorDate: Fri Mar 9 07:26:25 2012 -0800
Commit: Linus Torvalds <tor...@li...>
CommitDate: Fri Mar 9 07:26:25 2012 -0800
Merge tag 'iommu-fixes-v3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull two IOMMU fixes from Joerg Roedel:
"The first is an additional fix for the OMAP initialization order issue
and the second patch fixes a possible section mismatch which can lead
to a kernel crash in the AMD IOMMU driver when suspend/resume is used
and the compiler has not inlined the iommu_set_device_table function."
* tag 'iommu-fixes-v3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
x86/amd: iommu_set_device_table() must not be __init
ARM: OMAP: fix iommu, not mailbox
commit 45b8da90f2e1af7e1a233f03791c78ed0f831fca
Merge: e304dfdb030bab29888151021843bd9e1743a535 38aa4a568ba4c3ccba83e862a01e3e60e3b811ee
Author: Linus Torvalds <tor...@li...>
AuthorDate: Fri Mar 9 07:23:17 2012 -0800
Commit: Linus Torvalds <tor...@li...>
CommitDate: Fri Mar 9 07:23:17 2012 -0800
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull radeon drm stuff from Dave Airlie:
"Just some radeon fixes, one is for an oops where we run out of ioremap
space on some big hardware systems in 32-bit mode, stuff doesn't work
properly but at least the machine will boot.
One regression fix, and two bugs, one hw, one blit code."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon/kms: fix hdmi duallink checks
drm/radeon/kms: set SX_MISC in the r6xx blit code (v2)
drm/radeon: deal with errors from framebuffer init path.
drm/radeon: fix a semaphore deadlock on pre cayman asics
commit e304dfdb030bab29888151021843bd9e1743a535
Merge: 9f8050c4f99789d03ca96d4e625bd6637241828f d31b20fcc89efa8c5d3f5ea2720e08a286b69a36
Author: Linus Torvalds <tor...@li...>
AuthorDate: Fri Mar 9 07:14:44 2012 -0800
Commit: Linus Torvalds <tor...@li...>
CommitDate: Fri Mar 9 07:14:44 2012 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking from David Miller:
1) IPV4 routing metrics can become stale when routes are changed by the
administrator, fix from Steffen Klassert.
2) atl1c does "val |= XXX;" where XXX is a bit number not a bit mask,
fix by using set_bit. From Dan Carpenter.
3) Memory accounting bug in carl9170 driver results in wedged TX queue.
Fix from Nicolas Cavallari.
4) iwlwifi accidently uses "sizeof(ptr)" instead of "sizeof(*ptr)", fix
from Johannes Berg.
5) Openvswitch doesn't honor dp_ifindex when doing vport lookups, fix
from Ben Pfaff.
6) ehea conversion to 64-bit stats lost multicast and rx_errors
accounting, fix from Eric Dumazet.
7) Bridge state transition logging in br_stp_disable_port() is busted,
it's emitted at the wrong time and the message is in the wrong tense,
fix from Paulius Zaleckas.
8) mlx4 device erroneously invokes the queue resize firmware operation
twice, fix from Jack Morgenstein.
9) Fix deadlock in usbnet, need to drop lock when invoking usb_unlink_urb()
otherwise we recurse into taking it again. Fix from Sebastian Siewior.
10) hyperv network driver uses the wrong driver name string, fix from
Haiyang Zhang.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
net/hyperv: Use the built-in macro KBUILD_MODNAME for this driver
net/usbnet: avoid recursive locking in usbnet_stop()
route: Remove redirect_genid
inetpeer: Invalidate the inetpeer tree along with the routing cache
mlx4_core: fix bug in modify_cq wrapper for resize flow.
atl1c: set ATL1C_WORK_EVENT_RESET bit correctly
bridge: fix state reporting when port is disabled
bridge: br_log_state() s/entering/entered/
ehea: restore multicast and rx_errors fields
openvswitch: Fix checksum update for actions on UDP packets.
openvswitch: Honor dp_ifindex, when specified, for vport lookup by name.
iwlwifi: fix wowlan suspend
mwifiex: reset encryption mode flag before association
carl9170: fix frame delivery if sta is in powersave mode
carl9170: Fix memory accounting when sta is in power-save mode.
commit 048be431e40ee32df8e6c1a2c216693afe3ee358
Author: Rafael J. Wysocki <rj...@si...>
AuthorDate: Fri Mar 9 12:59:44 2012 +0900
Commit: Paul Mundt <le...@li...>
CommitDate: Fri Mar 9 12:59:44 2012 +0900
sh-sci / PM: Avoid deadlocking runtime PM
The runtime PM of sh-sci devices is enabled when sci_probe() returns,
so the pm_runtime_put_sync() executed by driver_probe_device()
attempts to suspend the device. Then, in some situations, a
diagnostic message is printed to the console by one of the runtime
suspend routines handling the sh-sci device, which causes synchronous
runtime resume to be started from the device's own runtime suspend
callback. This causes rpm_resume() to be run eventually, which sees
the RPM_SUSPENDING status set by rpm_suspend() and waits for it to
change. However, the device's runtime PM status cannot change at
that point, because the routine that has set it waits for the
rpm_suspend() to return. A deadlock occurs as a result.
To avoid that make sci_init_single() increment the device's
runtime PM usage counter, so that it cannot be suspended by
driver_probe_device(). That counter has to be decremented
eventually, so make sci_startup() do that before starting to
actually use the device and make sci_shutdown() increment it
again before returning to balance the incrementation carried out by
sci_startup().
Signed-off-by: Rafael J. Wysocki <rj...@si...>
Tested-by: Kuninori Morimoto <kun...@re...>
Signed-off-by: Paul Mundt <le...@li...>
commit d31b20fcc89efa8c5d3f5ea2720e08a286b69a36
Author: Haiyang Zhang <hai...@mi...>
AuthorDate: Wed Mar 7 10:02:00 2012 +0000
Commit: David S. Miller <da...@da...>
CommitDate: Thu Mar 8 13:55:27 2012 -0800
net/hyperv: Use the built-in macro KBUILD_MODNAME for this driver
Signed-off-by: Haiyang Zhang <hai...@mi...>
Signed-off-by: K. Y. Srinivasan <ky...@mi...>
Cc: Olaf Hering <ol...@ae...>
Signed-off-by: David S. Miller <da...@da...>
commit 8de5d6f19bbe7c77676a62ab52be901aa10d6b54
Author: Adrian Knoth <ad...@dr...>
AuthorDate: Thu Mar 8 15:38:04 2012 +0100
Commit: Takashi Iwai <ti...@su...>
CommitDate: Thu Mar 8 15:58:58 2012 +0100
ALSA: hdspm - Provide ioctl_compat
snd_hdspm uses its own ioctls to acquire config- and status information.
Expose the corresponding ioctl handler via ioctl_compat, so that 32bit
applications can use it on 64bit kernels.
Signed-off-by: Adrian Knoth <ad...@dr...>
Signed-off-by: Takashi Iwai <ti...@su...>
commit 6b7f000eb6a0b81d7a809833edb7a457eedf8512
Author: Jan Beulich <JBe...@su...>
AuthorDate: Thu Mar 8 08:58:13 2012 +0000
Commit: Joerg Roedel <joe...@am...>
CommitDate: Thu Mar 8 11:36:06 2012 +0100
x86/amd: iommu_set_device_table() must not be __init
This function is called from enable_iommus(), which in turn is used
from amd_iommu_resume().
Cc: st...@vg...
Signed-off-by: Jan Beulich <jbe...@su...>
Signed-off-by: Joerg Roedel <joe...@am...>
commit 38aa4a568ba4c3ccba83e862a01e3e60e3b811ee
Author: Alex Deucher <ale...@am...>
AuthorDate: Wed Mar 7 19:05:01 2012 -0500
Commit: Dave Airlie <ai...@re...>
CommitDate: Thu Mar 8 09:39:54 2012 +0000
drm/radeon/kms: fix hdmi duallink checks
All pre-SI chips are limited to 165 Mhz for single link.
Code in question will be re-enabled when SI support is added.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=44755
https://bugzilla.kernel.org/show_bug.cgi?id=42887
Signed-off-by: Alex Deucher <ale...@am...>
Cc: st...@vg...
Signed-off-by: Dave Airlie <ai...@re...>
commit cf00790dea6f210ddd01a6656da58c7c9a4ea0e4
Author: Marek Olšák <ma...@gm...>
AuthorDate: Wed Mar 7 23:33:00 2012 +0100
Commit: Dave Airlie <ai...@re...>
CommitDate: Thu Mar 8 09:39:29 2012 +0000
drm/radeon/kms: set SX_MISC in the r6xx blit code (v2)
Mesa may set it to 1, causing all primitives to be killed.
v2: also update the r7xx code
Signed-off-by: Marek Olšák <ma...@gm...>
Reviewed-by: Alex Deucher <ale...@am...>
Cc: st...@ke...
Signed-off-by: Dave Airlie <ai...@re...>
commit 4231d47e6fe69f061f96c98c30eaf9fb4c14b96d
Author: Sebastian Siewior <bi...@li...>
AuthorDate: Wed Mar 7 10:19:28 2012 +0000
Commit: David S. Miller <da...@da...>
CommitDate: Thu Mar 8 00:49:29 2012 -0800
net/usbnet: avoid recursive locking in usbnet_stop()
|kernel BUG at kernel/rtmutex.c:724!
|[<c029599c>] (rt_spin_lock_slowlock+0x108/0x2bc) from [<c01c2330>] (defer_bh+0x1c/0xb4)
|[<c01c2330>] (defer_bh+0x1c/0xb4) from [<c01c3afc>] (rx_complete+0x14c/0x194)
|[<c01c3afc>] (rx_complete+0x14c/0x194) from [<c01cac88>] (usb_hcd_giveback_urb+0xa0/0xf0)
|[<c01cac88>] (usb_hcd_giveback_urb+0xa0/0xf0) from [<c01e1ff4>] (musb_giveback+0x34/0x40)
|[<c01e1ff4>] (musb_giveback+0x34/0x40) from [<c01e2b1c>] (musb_advance_schedule+0xb4/0x1c0)
|[<c01e2b1c>] (musb_advance_schedule+0xb4/0x1c0) from [<c01e2ca8>] (musb_cleanup_urb.isra.9+0x80/0x8c)
|[<c01e2ca8>] (musb_cleanup_urb.isra.9+0x80/0x8c) from [<c01e2ed0>] (musb_urb_dequeue+0xec/0x108)
|[<c01e2ed0>] (musb_urb_dequeue+0xec/0x108) from [<c01cbb90>] (unlink1+0xbc/0xcc)
|[<c01cbb90>] (unlink1+0xbc/0xcc) from [<c01cc2ec>] (usb_hcd_unlink_urb+0x54/0xa8)
|[<c01cc2ec>] (usb_hcd_unlink_urb+0x54/0xa8) from [<c01c2a84>] (unlink_urbs.isra.17+0x2c/0x58)
|[<c01c2a84>] (unlink_urbs.isra.17+0x2c/0x58) from [<c01c2b44>] (usbnet_terminate_urbs+0x94/0x10c)
|[<c01c2b44>] (usbnet_terminate_urbs+0x94/0x10c) from [<c01c2d68>] (usbnet_stop+0x100/0x15c)
|[<c01c2d68>] (usbnet_stop+0x100/0x15c) from [<c020f718>] (__dev_close_many+0x94/0xc8)
defer_bh() takes the lock which is hold during unlink_urbs(). The safe
walk suggest that the skb will be removed from the list and this is done
by defer_bh() so it seems to be okay to drop the lock here.
Cc: st...@ke...
Reported-by: AnÃÂbal Almeida Pinto <ani...@ef...>
Signed-off-by: Sebastian Andrzej Siewior <bi...@li...>
Acked-by: Oliver Neukum <ol...@ne...>
Signed-off-by: David S. Miller <da...@da...>
commit ac3f48de09d8f4b73397047e413fadff7f65cfa7
Author: Steffen Klassert <ste...@se...>
AuthorDate: Tue Mar 6 21:21:10 2012 +0000
Commit: David S. Miller <da...@da...>
CommitDate: Thu Mar 8 00:30:32 2012 -0800
route: Remove redirect_genid
As we invalidate the inetpeer tree along with the routing cache now,
we don't need a genid to reset the redirect handling when the routing
cache is flushed.
Signed-off-by: Steffen Klassert <ste...@se...>
Signed-off-by: David S. Miller <da...@da...>
commit 5faa5df1fa2024bd750089ff21dcc4191798263d
Author: Steffen Klassert <ste...@se...>
AuthorDate: Tue Mar 6 21:20:26 2012 +0000
Commit: David S. Miller <da...@da...>
CommitDate: Thu Mar 8 00:30:24 2012 -0800
inetpeer: Invalidate the inetpeer tree along with the routing cache
We initialize the routing metrics with the values cached on the
inetpeer in rt_init_metrics(). So if we have the metrics cached on the
inetpeer, we ignore the user configured fib_metrics.
To fix this issue, we replace the old tree with a fresh initialized
inet_peer_base. The old tree is removed later with a delayed work queue.
Signed-off-by: Steffen Klassert <ste...@se...>
Signed-off-by: David S. Miller <da...@da...>
commit dcf353b17007841f91e1735e33790508c84c9ad0
Author: Jack Morgenstein <ja...@de...>
AuthorDate: Wed Mar 7 05:56:35 2012 +0000
Commit: David S. Miller <da...@da...>
CommitDate: Thu Mar 8 00:28:01 2012 -0800
mlx4_core: fix bug in modify_cq wrapper for resize flow.
The actual FW command is called in procedure "handle_resize".
Code incorrectly invoked the FW command again (in good flow), in
the modify_cq wrapper function.
Fix by skipping second FW invocation unconditionally for resize.
Signed-off-by: Jack Morgenstein <ja...@de...>
Signed-off-by: David S. Miller <da...@da...>
commit 783154573236f46b730b2eea17d2e6e04bdb3251
Author: Dan Carpenter <dan...@or...>
AuthorDate: Wed Mar 7 00:02:04 2012 +0000
Commit: David S. Miller <da...@da...>
CommitDate: Thu Mar 8 00:27:45 2012 -0800
atl1c: set ATL1C_WORK_EVENT_RESET bit correctly
ATL1C_WORK_EVENT_RESET is zero so the original code here is a nop. The
intent was to set the zero bit.
Signed-off-by: Dan Carpenter <dan...@or...>
Signed-off-by: David S. Miller <da...@da...>
commit 5200959b833ddacf28b6ffce8c331dfd6e0ca797
Author: Paulius Zaleckas <pau...@gm...>
AuthorDate: Tue Mar 6 22:25:22 2012 +0000
Commit: David S. Miller <da...@da...>
CommitDate: Thu Mar 8 00:25:25 2012 -0800
bridge: fix state reporting when port is disabled
Now we have:
eth0: link *down*
br0: port 1(eth0) entered *forwarding* state
br_log_state(p) should be called *after* p->state is set
to BR_STATE_DISABLED.
Reported-by: Zilvinas Valinskas <zil...@wi...>
Signed-off-by: Paulius Zaleckas <pau...@gm...>
Acked-by: Stephen Hemminger <she...@vy...>
Signed-off-by: David S. Miller <da...@da...>
commit d9e179ecec0805c41b17f9a0c3b925d415677772
Author: Paulius Zaleckas <pau...@gm...>
AuthorDate: Tue Mar 6 22:25:14 2012 +0000
Commit: David S. Miller <da...@da...>
CommitDate: Thu Mar 8 00:25:25 2012 -0800
bridge: br_log_state() s/entering/entered/
When br_log_state() is reporting state it should say "entered"
istead of "entering" since state at this point is already
changed.
Signed-off-by: Paulius Zaleckas <pau...@gm...>
Signed-off-by: David S. Miller <da...@da...>
commit 09c1d446fe0e2e3f34b366a6b3c1b19efa1522af
Author: Eric Dumazet <eri...@gm...>
AuthorDate: Tue Mar 6 19:46:41 2012 +0000
Commit: David S. Miller <da...@da...>
CommitDate: Thu Mar 8 00:23:04 2012 -0800
ehea: restore multicast and rx_errors fields
Commit 239c562c94d (ehea: Add 64bit statistics) added a regression,
since we no longer report multicast & rx_errors fields, taken from
port->stats structure. These fields are updated in ehea_update_stats()
every second.
Signed-off-by: Eric Dumazet <eri...@gm...>
Cc: Anton Blanchard <an...@sa...>
Cc: Thadeu Lima de Souza Cascardo <cas...@li...>
Acked-by: Thadeu Lima de Souza Cascardo <cas...@li...>
Tested-by: Thadeu Lima de Souza Cascardo <cas...@li...>
Signed-off-by: David S. Miller <da...@da...>
commit 9259c483a34a4efbaf60583af3719bed28a3fe45
Merge: d47775c4a7a40ecd048400cf770504ad1f2cd3df 81e5d41d7ed4f6c61ba3d2414f4f9ddf6d934ebb
Author: David S. Miller <da...@da...>
AuthorDate: Wed Mar 7 22:49:01 2012 -0800
Commit: David S. Miller <da...@da...>
CommitDate: Wed Mar 7 22:49:01 2012 -0800
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
commit 4949be16822e92a18ea0cc1616319926628092ee
Author: Matthew Garrett <mj...@re...>
AuthorDate: Tue Mar 6 13:41:49 2012 -0500
Commit: Jesse Barnes <jb...@vi...>
CommitDate: Wed Mar 7 20:26:47 2012 -0800
PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled
Right now we won't touch ASPM state if ASPM is disabled, except in the case
where we find a device that appears to be too old to reliably support ASPM.
Right now we'll clear it in that case, which is almost certainly the wrong
thing to do. The easiest way around this is just to disable the blacklisting
when ASPM is disabled.
Signed-off-by: Matthew Garrett <mj...@re...>
Cc: st...@vg...
Signed-off-by: Jesse Barnes <jb...@vi...>
commit 81e5d41d7ed4f6c61ba3d2414f4f9ddf6d934ebb
Author: Jesse Gross <je...@ni...>
AuthorDate: Tue Mar 6 15:05:46 2012 -0800
Commit: Jesse Gross <je...@ni...>
CommitDate: Wed Mar 7 14:36:57 2012 -0800
openvswitch: Fix checksum update for actions on UDP packets.
When modifying IP addresses or ports on a UDP packet we don't
correctly follow the rules for unchecksummed packets. This meant
that packets without a checksum can be given a incorrect new checksum
and packets with a checksum can become marked as being unchecksummed.
This fixes it to handle those requirements.
Signed-off-by: Jesse Gross <je...@ni...>
commit d47775c4a7a40ecd048400cf770504ad1f2cd3df
Merge: 4f262acfde22b63498b5e4f165e53d3bb4e96400 7f466cff75f16ac545f34c7876e6f80225a36a6d
Author: David S. Miller <da...@da...>
AuthorDate: Wed Mar 7 15:34:42 2012 -0500
Commit: David S. Miller <da...@da...>
CommitDate: Wed Mar 7 15:34:42 2012 -0500
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
commit 4cd7c0a03ea44ef88fa0d3901d671798d23cbc35
Author: Mark Salter <ms...@re...>
AuthorDate: Wed Mar 7 11:19:31 2012 -0500
Commit: Mark Salter <ms...@re...>
CommitDate: Wed Mar 7 11:28:22 2012 -0500
C6X: fix KSTK_EIP and KSTK_ESP macros
There was a latent typo in the C6X KSTK_EIP and KSTK_ESP macros which
caused a problem with a new patch which used them. The broken definitions
were of the form:
#define KSTK_FOO(tsk) (task_pt_regs(task)->foo)
Note the use of task vs tsk. This actually worked before because the
only place in the kernel which used these macros passed in a local
pointer named task.
Signed-off-by: Mark Salter <ms...@re...>
commit aaefcd4284a5399641ed02ac3e696b5e50ce185e
Author: Dave Airlie <ai...@re...>
AuthorDate: Tue Mar 6 10:44:40 2012 +0000
Commit: Dave Airlie <ai...@re...>
CommitDate: Wed Mar 7 14:07:40 2012 +0000
drm/radeon: deal with errors from framebuffer init path.
We've been getting occasional oops running a 32-bit kernel on a certain
system in our RHEL test hw. It appears that we fail to get sufficent ioremap
space for the framebuffer, and this leads to an oops.
This patch should fix the oops and leave a message in the logs we can
check for.
A future fix would probably to resize the console to a size that we can
ioremap.
Reviewed-by: Alex Deucher <ale...@am...>
Signed-off-by: Dave Airlie <ai...@re...>
commit 0be70439f2dcf4a2048e4b02f23f2c239b35a110
Author: Christian König <dea...@vo...>
AuthorDate: Wed Mar 7 11:28:57 2012 +0100
Commit: Dave Airlie <ai...@re...>
CommitDate: Wed Mar 7 14:07:29 2012 +0000
drm/radeon: fix a semaphore deadlock on pre cayman asics
The out of order execution of semaphore commands on
pre cayman asics doesn't work correctly and can
cause deadlocks, so turn it off for now.
Signed-off-by: Christian König <dea...@vo...>
Reviewed-by: Alex Deucher <ale...@am...>
Signed-off-by: Dave Airlie <ai...@re...>
commit e49d603c181b6004e2f6b5ad6d86daab84f22fe6
Author: Kuninori Morimoto <kun...@re...>
AuthorDate: Tue Mar 6 16:14:15 2012 -0800
Commit: Paul Mundt <le...@li...>
CommitDate: Wed Mar 7 17:04:29 2012 +0900
ARM: mach-shmobile: ap4evb: fixup fsi2_ak4643_info typo
Signed-off-by: Kuninori Morimoto <kun...@re...>
Signed-off-by: Paul Mundt <le...@li...>
commit 1740d3448012475f6b63172631c60cbcd1994a81
Author: Laurent Pinchart <lau...@id...>
AuthorDate: Thu Mar 1 15:45:16 2012 +0100
Commit: Paul Mundt <le...@li...>
CommitDate: Wed Mar 7 17:04:29 2012 +0900
ARM: mach-shmobile: mackerel: Reserve DMA memory for the frame buffer
The default 2MB size of DMA coherent memory isn't enough for allocate
frame buffer memory.
Signed-off-by: Laurent Pinchart <lau...@id...>
Signed-off-by: Paul Mundt <le...@li...>
commit e9db93a4711bb0586f6786f21274c3b74d8b608b
Author: Laurent Pinchart <lau...@id...>
AuthorDate: Thu Mar 1 14:57:11 2012 +0100
Commit: Paul Mundt <le...@li...>
CommitDate: Wed Mar 7 17:04:28 2012 +0900
ARM: mach-shmobile: Fix ag5evm compilation by including linux/videodev2.h
The board file uses a 4CC defined in linux/videodev2.h. Include the
header to fix
arch/arm/mach-shmobile/board-ag5evm.c:262: error: 'V4L2_PIX_FMT_RGB565'
undeclared here (not in a function)
Signed-off-by: Laurent Pinchart <lau...@id...>
Signed-off-by: Paul Mundt <le...@li...>
commit 63d71126bc767dc648af314a7256fa2fc61131a8
Author: Phil Edworthy <phi...@re...>
AuthorDate: Wed Feb 29 13:46:24 2012 +0000
Commit: Paul Mundt <le...@li...>
CommitDate: Wed Mar 7 17:03:43 2012 +0900
ARM: mach-shmobile: Fix bonito compile breakage
arch/arm/mach-shmobile/board-bonito.c:244:3: error: unknown field 'bpp' specified in initializer
make[2]: *** [arch/arm/mach-shmobile/board-bonito.o] Error 1
caused by commit "fbdev: sh_mobile_lcdc: Support FOURCC-based format API"
Signed-off-by: Phil Edworthy <phi...@re...>
Acked-by: Laurent Pinchart <lau...@id...>
Signed-off-by: Paul Mundt <le...@li...>
commit 526af6eb4dc71302f59806e2ccac7793963a7fe0
Author: Kailang Yang <ka...@re...>
AuthorDate: Wed Mar 7 08:25:20 2012 +0100
Commit: Takashi Iwai <ti...@su...>
CommitDate: Wed Mar 7 09:03:29 2012 +0100
ALSA: hda/realtek - Apply the coef-setup only to ALC269VB
The coef setup in alc269_fill_coef() was designed only for ALC269VB
model, and this has some bad effects for other ALC269 variants, such
as turning off the external mic input. Apply it only to ALC269VB.
Signed-off-by: Kailang Yang <ka...@re...>
Cc: <st...@ke...>
Signed-off-by: Takashi Iwai <ti...@su...>
commit 948c46a195691a214811538ee4b6c0312ec15cb5
Author: Thomas Schwinge <th...@co...>
AuthorDate: Tue Feb 14 16:19:49 2012 +0100
Commit: Paul Mundt <le...@li...>
CommitDate: Wed Mar 7 15:28:32 2012 +0900
sh: fix up the ubc clock definition for sh7785.
Presently the SH7785 code misdefines the UBC clock connection ID in
relation to the other CPUs. This makes it uniform, so that things like
single-stepping work again.
Signed-off-by: Thomas Schwinge <th...@co...>
Signed-off-by: Paul Mundt <le...@li...>
commit fb4340656fda27bd38914ef382ee3235c23d8f58
Author: Shimoda, Yoshihiro <yos...@re...>
AuthorDate: Wed Mar 7 14:46:38 2012 +0900
Commit: Paul Mundt <le...@li...>
CommitDate: Wed Mar 7 15:26:04 2012 +0900
sh: add parameter for RSPI in clock-sh7757
Signed-off-by: Yoshihiro Shimoda <yos...@re...>
Signed-off-by: Paul Mundt <le...@li...>
commit de3a49b8a44cb6b272450cef060385a83dc05d74
Author: Phil Edworthy <phi...@re...>
AuthorDate: Wed Feb 29 13:50:46 2012 +0000
Commit: Paul Mundt <le...@li...>
CommitDate: Wed Mar 7 15:26:03 2012 +0900
sh: Fix sh2a vbr table for more than 255 irqs
Signed-off-by: Phil Edworthy <phi...@re...>
Signed-off-by: Paul Mundt <le...@li...>
commit 651a68ea2ce9738b84e928836053b2e0fb5db2ba
Author: Ben Pfaff <bl...@ni...>
AuthorDate: Tue Mar 6 15:04:04 2012 -0800
Commit: Jesse Gross <je...@ni...>
CommitDate: Tue Mar 6 15:04:04 2012 -0800
openvswitch: Honor dp_ifindex, when specified, for vport lookup by name.
When OVS_VPORT_ATTR_NAME is specified and dp_ifindex is nonzero, the
logical behavior would be for the vport name lookup scope to be limited
to the specified datapath, but in fact the dp_ifindex value was ignored.
This commit causes the search scope to be honored.
Signed-off-by: Ben Pfaff <bl...@ni...>
Signed-off-by: Jesse Gross <je...@ni...>
commit 7f466cff75f16ac545f34c7876e6f80225a36a6d
Merge: 5cb917bc4f3882ecee87064483111023086757d3 182ada1c712a4ebe14d6a023cfab3559b2527d69
Author: John W. Linville <lin...@tu...>
AuthorDate: Tue Mar 6 14:16:48 2012 -0500
Commit: John W. Linville <lin...@tu...>
CommitDate: Tue Mar 6 14:16:48 2012 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
commit 8f2392142346f2754c8292a94cc62a157ed1e093
Author: Marton Balint <cu...@pa...>
AuthorDate: Mon Mar 5 21:33:23 2012 +0100
Commit: Takashi Iwai <ti...@su...>
CommitDate: Tue Mar 6 10:44:01 2012 +0100
ALSA: hda - add quirk to detect CD input on Gigabyte EP45-DS3
My CD input got lost in commit 68ef0561efe494143516df38c03a16b837b8e79c.
Raymond helped me to add the necessary pin fixup to make it appear again. In
fact, this is basically his patch. It fixes alsa bug #5541.
Signed-off-by: Marton Balint <cu...@pa...>
Signed-off-by: Takashi Iwai <ti...@su...>
commit 182ada1c712a4ebe14d6a023cfab3559b2527d69
Author: Johannes Berg <joh...@in...>
AuthorDate: Sun Mar 4 08:31:35 2012 -0800
Commit: John W. Linville <lin...@tu...>
CommitDate: Mon Mar 5 14:44:39 2012 -0500
iwlwifi: fix wowlan suspend
This was broken by the commit 023ca58f1
"iwlwifi: Move the core suspend function to iwl-agn-lib"
where for some reason the code changed while moving,
from
.len[0] = sizeof(*key_data.rsc_tsc),
to
.len[0] = sizeof(key_data.rsc_tsc),
Cc: st...@ke...
Signed-off-by: Johannes Berg <joh...@in...>
Signed-off-by: Wey-Yi Guy <wey...@in...>
Signed-off-by: John W. Linville <lin...@tu...>
commit 134d12fae0bb8f3d60dc7440a9e1950bb5427167
Author: Ohad Ben-Cohen <oh...@wi...>
AuthorDate: Sun Mar 4 12:01:11 2012 +0200
Commit: Joerg Roedel <joe...@am...>
CommitDate: Mon Mar 5 15:18:20 2012 +0100
ARM: OMAP: fix iommu, not mailbox
For some weird (freudian?) reason, commit 435792d "ARM: OMAP: make
iommu subsys_initcall to fix builtin omap3isp" unintentionally changed
the mailbox's initcall instead of the iommu's.
Fix that.
Reported-by: Fernando Guzman Lugo <fer...@ti...>
Signed-off-by: Ohad Ben-Cohen <oh...@wi...>
Cc: Laurent Pinchart <lau...@id...>
Cc: Joerg Roedel <Joe...@am...>
Cc: Tony Lindgren <to...@at...>
Signed-off-by: Joerg Roedel <joe...@am...>
commit 019ae33410581e09f429fba5cbbf0daa96d6659a
Merge: e49a3434f1bc64dc49ff3a56e416bb5894868dde b2ccf065f7b23147ed135a41b01d05a332ca6b7e
Author: Takashi Iwai <ti...@su...>
AuthorDate: Sun Mar 4 16:13:58 2012 +0100
Commit: Takashi Iwai <ti...@su...>
CommitDate: Sun Mar 4 16:13:58 2012 +0100
Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
A driver specific fix that wasn't noticed as the OpenMoko guys have been
stuck on 2.6.39 for a very long time now and are just starting to catch
up again.
commit b2ccf065f7b23147ed135a41b01d05a332ca6b7e
Author: Denis 'GNUtoo' Carikli <GN...@no...>
AuthorDate: Sun Feb 26 19:21:54 2012 +0100
Commit: Mark Brown <br...@op...>
CommitDate: Sun Mar 4 14:30:18 2012 +0000
ASoC: neo1973: fix neo1973 wm8753 initialization
The neo1973 driver had wrong codec name which prevented the "sound card"
from appearing.
Signed-off-by: Denis 'GNUtoo' Carikli <GN...@no...>
Signed-off-by: Mark Brown <br...@op...>
Cc: st...@vg...
commit a175423c831ea582c06784d1e172d2ce1d79923a
Author: Chris Mason <chr...@or...>
AuthorDate: Tue Feb 28 12:42:44 2012 -0500
Commit: Chris Mason <chr...@or...>
CommitDate: Sat Mar 3 07:42:35 2012 -0500
Btrfs: fix casting error in scrub reada code
The reada code from scrub was casting down a u64 to
an unsigned long so it could insert it into a radix tree.
What it really wanted to do was cast down the result of a shift, instead
of casting down the u64. The bug resulted in trying to insert our
reada struct into the wrong place, which caused soft lockups and other
problems.
Signed-off-by: Chris Mason <chr...@or...>
commit d3b010640e5c59b98d3b11229ba4cc2838dc7cbf
Author: Li Zefan <li...@cn...>
AuthorDate: Sat Mar 3 07:41:15 2012 -0500
Commit: Chris Mason <chr...@or...>
CommitDate: Sat Mar 3 07:41:15 2012 -0500
btrfs: fix locking issues in find_parent_nodes()
- We might unlock head->mutex while it was not locked
- We might leave the function without unlocking delayed_refs->lock
Signed-off-by: Li Zefan <li...@cn...>
Signed-off-by: Chris Mason <chr...@or...>
commit 00f157b49780e194c38dafdf9df8e10b8a6a9626
Author: Amitkumar Karwar <ak...@ma...>
AuthorDate: Fri Feb 24 21:35:35 2012 -0800
Commit: John W. Linville <lin...@tu...>
CommitDate: Wed Feb 29 13:08:52 2012 -0500
mwifiex: reset encryption mode flag before association
Recent commit
"mwifiex: clear previous security setting during association"
fixes association failure problems observed in some corner cases
by clearing previous security setting before each association.
We should reset encryption mode flag as well. This patch takes care
of it.
Signed-off-by: Amitkumar Karwar <ak...@ma...>
Signed-off-by: Bing Zhao <bz...@ma...>
Signed-off-by: John W. Linville <lin...@tu...>
commit 9926a67557532acb6cddb1c1add02952175b5c72
Author: Christian Lamparter <chu...@go...>
AuthorDate: Sat Feb 25 21:36:36 2012 +0100
Commit: John W. Linville <lin...@tu...>
CommitDate: Wed Feb 29 13:08:51 2012 -0500
carl9170: fix frame delivery if sta is in powersave mode
Nicolas Cavallari discovered that carl9170 has some
serious problems delivering data to sleeping stations.
It turns out that the driver was not honoring two
important flags (IEEE80211_TX_CTL_POLL_RESPONSE and
IEEE80211_TX_CTL_CLEAR_PS_FILT) which are set on
frames that should be sent although the receiving
station is still in powersave mode.
Cc: stable <st...@vg...>
Reported-by: Nicolas Cavallari <Nic...@lr...>
Signed-off-by: Christian Lamparter <chu...@go...>
Signed-off-by: John W. Linville <lin...@tu...>
commit 992d52529d7840236d3059b51c15d5eb9e81a869
Author: Nicolas Cavallari <Nic...@lr...>
AuthorDate: Thu Feb 23 16:53:34 2012 +0100
Commit: John W. Linville <lin...@tu...>
CommitDate: Wed Feb 29 13:08:51 2012 -0500
carl9170: Fix memory accounting when sta is in power-save mode.
On Access Point mode, when transmitting a packet, if the destination
station is in powersave mode, we abort transmitting the packet to the
device queue, but we do not reclaim the allocated memory. Given enough
packets, we can go in a state where there is no packet on the device
queue, but we think the device has no memory left, so no packet gets
transmitted, connections breaks and the AP stops working.
This undo the allocation done in the TX path when the station is in
power-save mode.
Signed-off-by: Nicolas Cavallari <cav...@lr...>
Acked-by: Christian Lamparter <chu...@go...>
Cc: stable <st...@vg...>
Signed-off-by: John W. Linville <lin...@tu...>
-----------------------------------------------------------------------
Diffstat:
MAINTAINERS | 8 +-
Makefile | 2 +-
arch/arm/mach-omap2/mailbox.c | 3 +-
arch/arm/mach-omap2/omap-iommu.c | 3 +-
arch/arm/mach-shmobile/board-ag5evm.c | 1 +
arch/arm/mach-shmobile/board-ap4evb.c | 2 +-
arch/arm/mach-shmobile/board-bonito.c | 3 +-
arch/arm/mach-shmobile/board-mackerel.c | 4 +
arch/c6x/include/asm/processor.h | 4 +-
arch/sh/kernel/cpu/sh2a/ex.S | 1 +
arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 4 +-
arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 2 +-
arch/x86/lib/delay.c | 4 +-
drivers/gpu/drm/radeon/r600.c | 3 +
drivers/gpu/drm/radeon/r600_blit_shaders.c | 8 +
drivers/gpu/drm/radeon/r600d.h | 1 +
drivers/gpu/drm/radeon/radeon_connectors.c | 2 +-
drivers/gpu/drm/radeon/radeon_display.c | 18 +-
drivers/gpu/drm/radeon/radeon_encoders.c | 6 +-
drivers/gpu/drm/radeon/radeon_fb.c | 11 +-
drivers/gpu/drm/radeon/radeon_mode.h | 2 +-
drivers/iommu/amd_iommu_init.c | 2 +-
drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +-
drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +-
.../net/ethernet/mellanox/mlx4/resource_tracker.c | 3 +-
drivers/net/hyperv/netvsc_drv.c | 4 +-
drivers/net/usb/usbnet.c | 2 +
drivers/net/wireless/ath/carl9170/tx.c | 9 +-
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 +-
drivers/net/wireless/mwifiex/cfg80211.c | 1 +
drivers/pci/pcie/aspm.c | 3 +
drivers/platform/x86/Kconfig | 24 +
drivers/platform/x86/Makefile | 2 +
drivers/platform/x86/acer-wmi.c | 30 ++-
drivers/platform/x86/amilo-rfkill.c | 173 +++++++
drivers/platform/x86/fujitsu-tablet.c | 478 ++++++++++++++++++++
drivers/platform/x86/panasonic-laptop.c | 4 +-
drivers/tty/serial/sh-sci.c | 5 +
fs/aio.c | 22 +-
fs/btrfs/backref.c | 8 +-
fs/btrfs/reada.c | 2 +-
include/net/inetpeer.h | 4 +-
mm/memcontrol.c | 2 +-
net/bridge/br_stp.c | 2 +-
net/bridge/br_stp_if.c | 3 +-
net/ipv4/inetpeer.c | 81 ++++-
net/ipv4/route.c | 12 +-
net/openvswitch/actions.c | 44 ++-
net/openvswitch/datapath.c | 3 +
sound/pci/hda/patch_realtek.c | 17 +
sound/pci/rme9652/hdspm.c | 1 +
sound/soc/samsung/neo1973_wm8753.c | 4 +-
52 files changed, 963 insertions(+), 82 deletions(-)
Patch -------------- (max 1500 lines)
diff --git a/MAINTAINERS b/MAINTAINERS
index b087b3b..95e4e43 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -962,7 +962,7 @@ F: drivers/tty/serial/msm_serial.c
F: drivers/platform/msm/
F: drivers/*/pm8???-*
F: include/linux/mfd/pm8xxx/
-T: git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
S: Maintained
ARM/TOSA MACHINE SUPPORT
@@ -2845,6 +2845,12 @@ S: Maintained
F: drivers/media/video/m5mols/
F: include/media/m5mols.h
+FUJITSU TABLET EXTRAS
+M: Robert Gerlach <kh...@gm...>
+L: pla...@vg...
+S: Maintained
+F: drivers/platform/x86/fujitsu-tablet.c
+
FUSE: FILESYSTEM IN USERSPACE
M: Miklos Szeredi <mi...@sz...>
L: fus...@li...
diff --git a/Makefile b/Makefile
index 66d13c9..56d4817 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 3
SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
NAME = Saber-toothed Squirrel
# *DOCUMENTATION*
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 2cc1aa0..415a6f1 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -420,8 +420,7 @@ static void __exit omap2_mbox_exit(void)
platform_driver_unregister(&omap2_mbox_driver);
}
-/* must be ready before omap3isp is probed */
-subsys_initcall(omap2_mbox_init);
+module_init(omap2_mbox_init);
module_exit(omap2_mbox_exit);
MODULE_LICENSE("GPL v2");
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index b882204..ac49384 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -150,7 +150,8 @@ err_out:
platform_device_put(omap_iommu_pdev[i]);
return err;
}
-module_init(omap_iommu_init);
+/* must be ready before omap3isp is probed */
+subsys_initcall(omap_iommu_init);
static void __exit omap_iommu_exit(void)
{
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index 068b754..8aea3a2 100644
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -38,6 +38,7 @@
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/mfd/tmio.h>
#include <linux/sh_clk.h>
+#include <linux/videodev2.h>
#include <video/sh_mobile_lcdc.h>
#include <video/sh_mipi_dsi.h>
#include <sound/sh_fsi.h>
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index eeb4d96..b4718b0 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -794,7 +794,7 @@ static struct fsi_ak4642_info fsi2_ak4643_info = {
static struct platform_device fsi_ak4643_device = {
.name = "fsi-ak4642-audio",
.dev = {
- .platform_data = &fsi_info,
+ .platform_data = &fsi2_ak4643_info,
},
};
diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c
index 4d22016..4bd1162 100644
--- a/arch/arm/mach-shmobile/board-bonito.c
+++ b/arch/arm/mach-shmobile/board-bonito.c
@@ -27,6 +27,7 @@
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/smsc911x.h>
+#include <linux/videodev2.h>
#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -241,7 +242,7 @@ static struct sh_mobile_lcdc_info lcdc0_info = {
.clock_source = LCDC_CLK_BUS,
.ch[0] = {
.chan = LCDC_CHAN_MAINLCD,
- .bpp = 16,
+ .fourcc = V4L2_PIX_FMT_RGB565,
.interface_type = RGB24,
.clock_divider = 5,
.flags = 0,
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index a281324..7b53cda 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1352,6 +1352,10 @@ static struct map_desc mackerel_io_desc[] __initdata = {
static void __init mackerel_map_io(void)
{
iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc));
+ /* DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't
+ * enough to allocate the frame buffer memory.
+ */
+ init_consistent_dma_size(12 << 20);
/* setup early devices and console here as well */
sh7372_add_early_devices();
diff --git a/arch/c6x/include/asm/processor.h b/arch/c6x/include/asm/processor.h
index 8154c4e..77ecbde 100644
--- a/arch/c6x/include/asm/processor.h
+++ b/arch/c6x/include/asm/processor.h
@@ -122,8 +122,8 @@ extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
extern unsigned long get_wchan(struct task_struct *p);
-#define KSTK_EIP(tsk) (task_pt_regs(task)->pc)
-#define KSTK_ESP(tsk) (tas...
[truncated message content] |