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

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

projects / karo-tx-linux.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Kees Cook [Fri, 2 Dec 2011 03:06:48 +0000 (14:06 +1100)]

CREDITS: update Kees's expired fingerprint and fix details

Small clean-up for my CREDITS entry; the GPG fingerprint was not up to
date, so I fixed other details at the same time too.

Signed-off-by: Kees Cook <kees@outflux.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

commit | commitdiff | tree

Andrea Arcangeli [Fri, 2 Dec 2011 03:06:48 +0000 (14:06 +1100)]

thp: reduce khugepaged freezing latency

Use wait_event_freezable_timeout() instead of
schedule_timeout_interruptible() to avoid missing freezer wakeups. A
try_to_freeze() would have been needed in the khugepaged_alloc_hugepage
tight loop too in case of the allocation failing repeatedly, and
wait_event_freezable_timeout will provide it too.

khugepaged would still freeze just fine by trying again the next minute
but it's better if it freezes immediately.

Reported-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Tested-by: Jiri Slaby <jslaby@suse.cz>
Cc: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Cc: "Rafael J. Wysocki" <rjw@suse.com
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

commit | commitdiff | tree

Claudio Scordino [Fri, 2 Dec 2011 03:06:47 +0000 (14:06 +1100)]

fs/proc/meminfo.c: fix compilation error

Fix the error message "directives may not be used inside a macro argument"
which appears when the kernel is compiled for the cris architecture.

Signed-off-by: Claudio Scordino <claudio@evidence.eu.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

commit | commitdiff | tree

Konstantin Khlebnikov [Fri, 2 Dec 2011 03:06:45 +0000 (14:06 +1100)]

vmscan: use atomic-long for shrinker batching

Use atomic-long operations instead of looping around cmpxchg().

[akpm@linux-foundation.org: massage atomic.h inclusions]
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Dave Chinner <david@fromorbit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

commit | commitdiff | tree

Konstantin Khlebnikov [Fri, 2 Dec 2011 03:06:44 +0000 (14:06 +1100)]

vmscan: fix initial shrinker size handling

A shrinker function can return -1, means that it cannot do anything
without a risk of deadlock.  For example prune_super() does this if it
cannot grab a superblock refrence, even if nr_to_scan=0.  Currently we
interpret this -1 as a ULONG_MAX size shrinker and evaluate `total_scan'
according to this.  So the next time around this shrinker can cause really
big pressure.  Let's skip such shrinkers instead.

Also make total_scan signed, otherwise the check (total_scan < 0) below
never works.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Dave Chinner <david@fromorbit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 03:38:17 +0000 (14:38 +1100)]

Merge remote-tracking branch 'kvmtool/master'

Conflicts:
include/net/9p/9p.h
scripts/kconfig/Makefile

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:53:37 +0000 (13:53 +1100)]

Merge remote-tracking branch 'kmap_atomic/kmap_atomic'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:46:59 +0000 (13:46 +1100)]

Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
arch/hexagon/Kconfig
arch/m68k/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:45:34 +0000 (13:45 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:39:13 +0000 (13:39 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:33:51 +0000 (13:33 +1100)]

Merge remote-tracking branch 'tmem/tmem'

Conflicts:
mm/swapfile.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:32:18 +0000 (13:32 +1100)]

Merge remote-tracking branch 'char-misc/char-misc-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:30:42 +0000 (13:30 +1100)]

Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/hid/hid-hyperv.c
drivers/staging/hv/Kconfig
drivers/staging/hv/Makefile
drivers/staging/iio/adc/ad799x_core.c
drivers/staging/iio/industrialio-core.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:26:22 +0000 (13:26 +1100)]

Merge remote-tracking branch 'usb/usb-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:24:29 +0000 (13:24 +1100)]

Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:18:17 +0000 (13:18 +1100)]

Merge remote-tracking branch 'driver-core/driver-core-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:16:47 +0000 (13:16 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:15:16 +0000 (13:15 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:13:44 +0000 (13:13 +1100)]

Merge remote-tracking branch 'namespace/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:12:12 +0000 (13:12 +1100)]

Merge remote-tracking branch 'sysctl/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:06:09 +0000 (13:06 +1100)]

Merge remote-tracking branch 'xen-two/linux-next'

Conflicts:
arch/x86/xen/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 02:04:45 +0000 (13:04 +1100)]

Merge remote-tracking branch 'xen/upstream/xen'

Conflicts:
arch/x86/xen/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:58:00 +0000 (12:58 +1100)]

Merge remote-tracking branch 'kmemleak/kmemleak'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:51:07 +0000 (12:51 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:44:15 +0000 (12:44 +1100)]

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/mips/kernel/perf_event_mipsxx.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:42:47 +0000 (12:42 +1100)]

Merge remote-tracking branch 'edac-amd/for-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:39:44 +0000 (12:39 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:38:18 +0000 (12:38 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:31:32 +0000 (12:31 +1100)]

Merge remote-tracking branch 'pm/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:27:56 +0000 (12:27 +1100)]

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

Conflicts:
arch/powerpc/platforms/40x/Kconfig
net/mac80211/work.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:27:46 +0000 (12:27 +1100)]

Merge remote-tracking branch 'osd/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:21:36 +0000 (12:21 +1100)]

Merge remote-tracking branch 'cputime/cputime'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:20:13 +0000 (12:20 +1100)]

Merge remote-tracking branch 'iommu/next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:18:44 +0000 (12:18 +1100)]

Merge remote-tracking branch 'watchdog/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:16:02 +0000 (12:16 +1100)]

Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:14:35 +0000 (12:14 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:13:05 +0000 (12:13 +1100)]

Merge remote-tracking branch 'fbdev/fbdev-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:11:32 +0000 (12:11 +1100)]

Merge remote-tracking branch 'drm/drm-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:09:54 +0000 (12:09 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:08:29 +0000 (12:08 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:08:20 +0000 (12:08 +1100)]

Merge remote-tracking branch 'kgdb/kgdb-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:06:50 +0000 (12:06 +1100)]

Merge remote-tracking branch 'mmc/mmc-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:05:24 +0000 (12:05 +1100)]

Merge remote-tracking branch 'battery/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:03:02 +0000 (12:03 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:01:30 +0000 (12:01 +1100)]

Merge remote-tracking branch 'input/next'

Conflicts:
drivers/input/keyboard/samsung-keypad.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 01:00:08 +0000 (12:00 +1100)]

Merge branch 'quilt/rr'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:58:49 +0000 (11:58 +1100)]

Merge remote-tracking branch 'cpufreq/next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:57:23 +0000 (11:57 +1100)]

Merge remote-tracking branch 'sound-asoc/for-next'

Conflicts:
arch/arm/mach-s3c64xx/mach-crag6410.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:55:50 +0000 (11:55 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:54:17 +0000 (11:54 +1100)]

Merge remote-tracking branch 'crypto/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:52:47 +0000 (11:52 +1100)]

Merge remote-tracking branch 'l2-mtd/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:51:28 +0000 (11:51 +1100)]

Merge remote-tracking branch 'mtd/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:49:57 +0000 (11:49 +1100)]

Merge remote-tracking branch 'bluetooth/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:48:14 +0000 (11:48 +1100)]

Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:42:17 +0000 (11:42 +1100)]

Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:38:36 +0000 (11:38 +1100)]

Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/pl330.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:37:11 +0000 (11:37 +1100)]

Merge remote-tracking branch 'target-merge/for-next-merge'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:35:42 +0000 (11:35 +1100)]

Merge remote-tracking branch 'dlm/next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:34:23 +0000 (11:34 +1100)]

Merge remote-tracking branch 'ubi/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:32:54 +0000 (11:32 +1100)]

Merge remote-tracking branch 'libata/NEXT'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:32:50 +0000 (11:32 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:31:26 +0000 (11:31 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:28:07 +0000 (11:28 +1100)]

Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/staging/media/as102/as102_drv.h

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:26:47 +0000 (11:26 +1100)]

Merge remote-tracking branch 'hwmon-staging/hwmon-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:25:30 +0000 (11:25 +1100)]

Merge branch 'quilt/jdelvare-hwmon'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:24:12 +0000 (11:24 +1100)]

Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:22:39 +0000 (11:22 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:16:35 +0000 (11:16 +1100)]

Merge commit 'refs/next/20111205/pci'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:08:16 +0000 (11:08 +1100)]

Merge remote-tracking branch 'xfs/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:06:58 +0000 (11:06 +1100)]

Merge remote-tracking branch 'ubifs/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:05:35 +0000 (11:05 +1100)]

Merge remote-tracking branch 'nfsd/nfsd-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:04:18 +0000 (11:04 +1100)]

Merge remote-tracking branch 'nfs/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:03:00 +0000 (11:03 +1100)]

Merge remote-tracking branch 'logfs/master'

Conflicts:
fs/logfs/file.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:01:25 +0000 (11:01 +1100)]

Merge remote-tracking branch 'gfs2/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:01:20 +0000 (11:01 +1100)]

Merge remote-tracking branch 'ecryptfs/next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 6 Dec 2011 00:00:03 +0000 (11:00 +1100)]

Merge remote-tracking branch 'cifs/master'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:58:39 +0000 (10:58 +1100)]

Merge remote-tracking branch 'xtensa/master'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:53:12 +0000 (10:53 +1100)]

Merge remote-tracking branch 'tile/master'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:51:52 +0000 (10:51 +1100)]

Merge remote-tracking branch 's390/features'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:51:35 +0000 (10:51 +1100)]

Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:50:18 +0000 (10:50 +1100)]

Merge remote-tracking branch '4xx/next'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:47:52 +0000 (10:47 +1100)]

Merge remote-tracking branch 'powerpc/next'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:46:29 +0000 (10:46 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:44:40 +0000 (10:44 +1100)]

Merge remote-tracking branch 'mips/mips-for-linux-next'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:43:15 +0000 (10:43 +1100)]

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

Conflicts:
arch/m68k/Kconfig.debug

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:41:49 +0000 (10:41 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:40:33 +0000 (10:40 +1100)]

Merge remote-tracking branch 'ia64/next'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:39:17 +0000 (10:39 +1100)]

Merge branch 'quilt/hexagon'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:37:43 +0000 (10:37 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:32:24 +0000 (10:32 +1100)]

Merge remote-tracking branch 'c6x/for-linux-next'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:31:00 +0000 (10:31 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:29:44 +0000 (10:29 +1100)]

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

Conflicts:
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/include/mach/entry-macro.S
arch/arm/mach-s3c64xx/mach-crag6410.c

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:28:18 +0000 (10:28 +1100)]

Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/mach-imx/devices-imx53.h
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/pm-imx5.c
arch/arm/plat-mxc/include/mach/hardware.h

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:25:38 +0000 (10:25 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:24:16 +0000 (10:24 +1100)]

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

Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/setup.c

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:22:56 +0000 (10:22 +1100)]

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

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/mm/ioremap.c

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:17:05 +0000 (10:17 +1100)]

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

Conflicts:
arch/arm/plat-omap/include/plat/common.h
arch/arm/tools/mach-types

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:10:21 +0000 (10:10 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:10:19 +0000 (10:10 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:10:18 +0000 (10:10 +1100)]

Merge remote-tracking branch 'sparc/master'

Linux kernel for KaRo TX COM modules