git.karo-electronics.de Git - karo-tx-linux.git/log

Merge remote-tracking branch 'xilinx/arm-next'

Conflicts:
arch/arm/mach-highbank/highbank.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-spear/spear13xx.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mach-zynq/platsmp.c
drivers/clocksource/Makefile
drivers/clocksource/tegra20_timer.c

commit | commitdiff | tree

Stephen Rothwell [Mon, 27 May 2013 00:28:39 +0000 (10:28 +1000)]

Merge remote-tracking branch 'arm/for-next'

commit | commitdiff | tree

Stephen Rothwell [Mon, 27 May 2013 00:27:06 +0000 (10:27 +1000)]

Merge remote-tracking branch 'arc/for-next'

commit | commitdiff | tree

Stephen Rothwell [Mon, 27 May 2013 00:25:19 +0000 (10:25 +1000)]

Merge remote-tracking branch 'ide/master'

commit | commitdiff | tree

Stephen Rothwell [Mon, 27 May 2013 00:25:17 +0000 (10:25 +1000)]

Merge remote-tracking branch 'crypto-current/master'

commit | commitdiff | tree

Stephen Rothwell [Mon, 27 May 2013 00:25:11 +0000 (10:25 +1000)]

Merge remote-tracking branch 'wireless/master'

commit | commitdiff | tree

Stephen Rothwell [Mon, 27 May 2013 00:25:10 +0000 (10:25 +1000)]

Merge remote-tracking branch 'sound-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Mon, 27 May 2013 00:25:09 +0000 (10:25 +1000)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Mon, 27 May 2013 00:25:08 +0000 (10:25 +1000)]

Merge remote-tracking branch 'm68k-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Mon, 27 May 2013 00:25:06 +0000 (10:25 +1000)]

Merge remote-tracking branch 'kbuild-current/rc-fixes'

commit | commitdiff | tree

Linus Torvalds [Sun, 26 May 2013 23:00:47 +0000 (16:00 -0700)]

Linux 3.10-rc3

commit | commitdiff | tree

Manfred Spraul [Sun, 26 May 2013 09:08:52 +0000 (11:08 +0200)]

ipc/sem.c: Fix missing wakeups in do_smart_update_queue()

do_smart_update_queue() is called when an operation (semop,
semctl(SETVAL), semctl(SETALL), ...) modified the array.  It must check
which of the sleeping tasks can proceed.

do_smart_update_queue() missed a few wakeups:
- if a sleeping complex op was completed, then all per-semaphore queues
   must be scanned - not only those that were modified by *sops
- if a sleeping simple op proceeded, then the global queue must be
   scanned again

And:
- the test for "|sops == NULL) before scanning the global queue is not
   required: If the global queue is empty, then it doesn't need to be
   scanned - regardless of the reason for calling do_smart_update_queue()

The patch is not optimized, i.e.  even completing a wait-for-zero
operation causes a rescan.  This is done to keep the patch as simple as
possible.

Signed-off-by: Manfred Spraul <manfred@colorfullife.com>
Acked-by: Davidlohr Bueso <davidlohr.bueso@hp.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit | commitdiff | tree

Linus Torvalds [Sun, 26 May 2013 19:33:05 +0000 (12:33 -0700)]

Merge tag 'nfs-for-3.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client bugfixes from Trond Myklebust:

- Stable fix to prevent an rpc_task wakeup race
- Fix a NFSv4.1 session drain deadlock
- Fix a NFSv4/v4.1 mount regression when not running rpc.gssd
- Ensure auth_gss pipe detection works in namespaces
- Fix SETCLIENTID fallback if rpcsec_gss is not available

* tag 'nfs-for-3.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: Fix SETCLIENTID fallback if GSS is not available
  SUNRPC: Prevent an rpc_task wakeup race
  NFSv4.1 Fix a pNFS session draining deadlock
  SUNRPC: Convert auth_gss pipe detection to work in namespaces
  SUNRPC: Faster detection if gssd is actually running
  SUNRPC: Fix a bug in gss_create_upcall

commit | commitdiff | tree

Adrian Hunter [Mon, 6 May 2013 09:17:34 +0000 (12:17 +0300)]

mmc: sdhci-pci: support runtime PM for BYT SD cards

Add support for runtime PM for BYT SD cards.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

commit | commitdiff | tree

Adrian Hunter [Mon, 6 May 2013 09:17:33 +0000 (12:17 +0300)]

mmc: sdhci-acpi: support runtime PM for ACPI HID 80860F14 SD cards

Enable runtime PM for ACPI HID 80860F14 SD cards, adding support for
card detect GPIO.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

Linux kernel for KaRo TX COM modules

RSS Atom