]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agomm: replace remap_file_pages() syscall with emulation
Kirill A. Shutemov [Thu, 26 Jun 2014 00:43:21 +0000 (10:43 +1000)]
mm: replace remap_file_pages() syscall with emulation

remap_file_pages(2) was invented to be able efficiently map parts of huge
file into limited 32-bit virtual address space such as in database
workloads.

Nonlinear mappings are pain to support and it seems there's no legitimate
use-cases nowadays since 64-bit systems are widely available.

Let's drop it and get rid of all these special-cased code.

The patch replaces the syscall with emulation which creates new VMA on
each remap_file_pages(), unless they it can be merged with an adjacent
one.

I didn't find *any* real code that uses remap_file_pages(2) to test
emulation impact on.  I've checked Debian code search and source of all
packages in ALT Linux.  No real users: libc wrappers, mentions in strace,
gdb, valgrind and this kind of stuff.

There are few basic tests in LTP for the syscall. They work just fine
with emulation.

To test performance impact, I've written small test case which demonstrate
pretty much worst case scenario: map 4G shmfs file, write to begin of
every page pgoff of the page, remap pages in reverse order, read every
page.

The test creates 1 million of VMAs if emulation is in use, so I had to set
vm.max_map_count to 1100000 to avoid -ENOMEM.

Before: 23.3 ( +-  4.31% ) seconds
After: 43.9 ( +-  0.85% ) seconds
Slowdown: 1.88x

I believe we can live with that.

Test case:

#define _GNU_SOURCE
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <sys/mman.h>

#define MB (1024UL * 1024)
#define SIZE (4096 * MB)

int main(int argc, char **argv)
{
unsigned long *p;
long i, pass;

for (pass = 0; pass < 10; pass++) {
p = mmap(NULL, SIZE, PROT_READ|PROT_WRITE,
MAP_SHARED | MAP_ANONYMOUS, -1, 0);
if (p == MAP_FAILED) {
perror("mmap");
return -1;
}

for (i = 0; i < SIZE / 4096; i++)
p[i * 4096 / sizeof(*p)] = i;

for (i = 0; i < SIZE / 4096; i++) {
if (remap_file_pages(p + i * 4096 / sizeof(*p), 4096,
0, (SIZE - 4096 * (i + 1)) >> 12, 0)) {
perror("remap_file_pages");
return -1;
}
}

for (i = SIZE / 4096 - 1; i >= 0; i--)
assert(p[i * 4096 / sizeof(*p)] == SIZE / 4096 - i - 1);

munmap(p, SIZE);
}

return 0;
}

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Dave Jones <davej@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Armin Rigo <arigo@tunes.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agokernel/kprobes.c: convert printk to pr_foo()
Fabian Frederick [Thu, 26 Jun 2014 00:43:21 +0000 (10:43 +1000)]
kernel/kprobes.c: convert printk to pr_foo()

Also fixes some checkpatch warnings
-Static initialization
-Lines over 80 characters

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agodrivers/net/ethernet/amd/pcnet32.c: neaten and remove unnecessary OOM messages
Joe Perches [Thu, 26 Jun 2014 00:43:21 +0000 (10:43 +1000)]
drivers/net/ethernet/amd/pcnet32.c: neaten and remove unnecessary OOM messages

Make the code flow a little better for 80 columns.

Use a consistent style for the RX and TX rings allocation.
Use BIT macro.
Use a temporary unsiged int entries for (1<<size).
Remove the OOM messages as they duplicate the generic
OOM and dump_stack() provided by the memory subsystem.
Reflow allocs to 80 columns.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Don Fry <pcnet32@frontier.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agovme: bridges: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:20 +0000 (10:43 +1000)]
vme: bridges: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Martyn Welch <martyn.welch@ge.com>
Cc: Manohar Vanga <manohar.vanga@gmail.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agosynclink_gt: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:20 +0000 (10:43 +1000)]
synclink_gt: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agostaging: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:20 +0000 (10:43 +1000)]
staging: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Lior Dotan <liodot@gmail.com>
Cc: Christopher Harrer <charrer@alacritech.com>
Cc: Forest Bond <forest@alittletooquiet.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoscsi: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:20 +0000 (10:43 +1000)]
scsi: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Adam Radford <linuxraid@lsi.com>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Cc: Dario Ballabio <ballabio_dario@emc.com>
Cc: Michael Neuffer <mike@i-Connect.Net>
Cc: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Cc: Neela Syam Kolli <megaraidlinux@lsi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agortlwifi: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:19 +0000 (10:43 +1000)]
rtlwifi: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Chaoming Li <chaoming_li@realsil.com.cn>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agortl818x: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:19 +0000 (10:43 +1000)]
rtl818x: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agomwl8k: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:19 +0000 (10:43 +1000)]
mwl8k: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoipw2100: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:19 +0000 (10:43 +1000)]
ipw2100: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoirda: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:19 +0000 (10:43 +1000)]
irda: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Samuel Ortiz <samuel@sortiz.org>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoqlogic: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:18 +0000 (10:43 +1000)]
qlogic: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Manish Chopra <manish.chopra@qlogic.com>
Cc: Sony Chacko <sony.chacko@qlogic.com>
Cc: Rajesh Borundia <rajesh.borundia@qlogic.com>
Cc: Shahed Shaikh <shahed.shaikh@qlogic.com>
Cc: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Cc: Ron Mercer <ron.mercer@qlogic.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agomicrel: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:18 +0000 (10:43 +1000)]
micrel: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agosky2: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:18 +0000 (10:43 +1000)]
sky2: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Mirko Lindner <mlindner@marvell.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoenic: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:18 +0000 (10:43 +1000)]
enic: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Christian Benvenuti <benve@cisco.com>
Cc: Sujith Sankar <ssujith@cisco.com>
Cc: Govindarajulu Varadarajan <_govind@gmx.com>
Cc: Neel Patel <neepatel@cisco.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoatl1e: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:18 +0000 (10:43 +1000)]
atl1e: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoamd: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:17 +0000 (10:43 +1000)]
amd: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Don Fry <pcnet32@frontier.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agomedia: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:17 +0000 (10:43 +1000)]
media: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoi810: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:17 +0000 (10:43 +1000)]
i810: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoinfiniband: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:17 +0000 (10:43 +1000)]
infiniband: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Tom Tucker <tom@opengridcomputing.com>
Acked-by: Steve Wise <swise@opengridcomputing.com>
Cc: Roland Dreier <roland@kernel.org>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: Faisal Latif <faisal.latif@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agocrypto: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:16 +0000 (10:43 +1000)]
crypto: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoblock: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:16 +0000 (10:43 +1000)]
block: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Mike Miller <mike.miller@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoatm: use pci_zalloc_consistent
Joe Perches [Thu, 26 Jun 2014 00:43:16 +0000 (10:43 +1000)]
atm: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agopci-dma-compat: add pci_zalloc_consistent helper
Joe Perches [Thu, 26 Jun 2014 00:43:16 +0000 (10:43 +1000)]
pci-dma-compat: add pci_zalloc_consistent helper

Add this helper for consistency with pci_zalloc_coherent
and the ability to remove unnecessary memset(,0,) uses.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Cc: Adam Radford <linuxraid@lsi.com>
Cc: Chaoming Li <chaoming_li@realsil.com.cn>
Cc: Chas Williams <chas@cmf.nrl.navy.mil>
Cc: Christian Benvenuti <benve@cisco.com>
Cc: Christopher Harrer <charrer@alacritech.com>
Cc: Dario Ballabio <ballabio_dario@emc.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Don Fry <pcnet32@frontier.com>
Cc: Faisal Latif <faisal.latif@intel.com>
Cc: Forest Bond <forest@alittletooquiet.net>
Cc: Govindarajulu Varadarajan <_govind@gmx.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: Lior Dotan <liodot@gmail.com>
Cc: Manish Chopra <manish.chopra@qlogic.com>
Cc: Manohar Vanga <manohar.vanga@gmail.com>
Cc: Martyn Welch <martyn.welch@ge.com>
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
Cc: Michael Neuffer <mike@i-Connect.Net>
Cc: Mirko Lindner <mlindner@marvell.com>
Cc: Neel Patel <neepatel@cisco.com>
Cc: Neela Syam Kolli <megaraidlinux@lsi.com>
Cc: Rajesh Borundia <rajesh.borundia@qlogic.com>
Cc: Roland Dreier <roland@kernel.org>
Cc: Ron Mercer <ron.mercer@qlogic.com>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Shahed Shaikh <shahed.shaikh@qlogic.com>
Cc: Sony Chacko <sony.chacko@qlogic.com>
Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Steve Wise <swise@opengridcomputing.com>
Cc: Sujith Sankar <ssujith@cisco.com>
Cc: Tom Tucker <tom@opengridcomputing.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoinclude/linux: remove strict_strto* definitions
Daniel Walter [Thu, 26 Jun 2014 00:43:16 +0000 (10:43 +1000)]
include/linux: remove strict_strto* definitions

Remove obsolete and unused strict_strto* functions

Signed-off-by: Daniel Walter <dwalter@google.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agonet/sunrpc: replace strict_strto calls
Daniel Walter [Thu, 26 Jun 2014 00:43:15 +0000 (10:43 +1000)]
net/sunrpc: replace strict_strto calls

Replace obsolete strict_strto calls with appropriate kstrto calls

Signed-off-by: Daniel Walter <dwalter@google.com>
Cc: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agodrivers/scsi: replace strict_strto calls
Daniel Walter [Thu, 26 Jun 2014 00:43:15 +0000 (10:43 +1000)]
drivers/scsi: replace strict_strto calls

Replace obsolete strict_strto with more appropriate kstrto calls

Signed-off-by: Daniel Walter <dwalter@google.com>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoarch/x86: replace strict_strto calls
Daniel Walter [Thu, 26 Jun 2014 00:43:15 +0000 (10:43 +1000)]
arch/x86: replace strict_strto calls

Replace obsolete strict_strto calls with appropriate kstrto calls

Signed-off-by: Daniel Walter <dwalter@google.com>
Acked-by: Borislav Petkov <bp@suse.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoarch/powerpc: replace obsolete strict_strto* calls
Daniel Walter [Thu, 26 Jun 2014 00:43:15 +0000 (10:43 +1000)]
arch/powerpc: replace obsolete strict_strto* calls

Replace strict_strto calls with more appropriate kstrto calls

Signed-off-by: Daniel Walter <dwalter@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoarch/arm/mach-w90x900/cpu.c: replace obsolete strict_strto
Daniel Walter [Thu, 26 Jun 2014 00:43:15 +0000 (10:43 +1000)]
arch/arm/mach-w90x900/cpu.c: replace obsolete strict_strto

Replace obsolete strict_strto with kstrto calls

Signed-off-by: Daniel Walter <dwalter@google.com>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoarch/arm/mach-s3c24xx/mach-jive.c: replace strict_strto* with kstrto*
Daniel Walter [Thu, 26 Jun 2014 00:43:14 +0000 (10:43 +1000)]
arch/arm/mach-s3c24xx/mach-jive.c: replace strict_strto* with kstrto*

Replace obsolete strict_strto call with kstrto

Signed-off-by: Daniel Walter <dwalter@google.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoarch/arm/mach-pxa: replace strict_strto call with kstrto
Daniel Walter [Thu, 26 Jun 2014 00:43:14 +0000 (10:43 +1000)]
arch/arm/mach-pxa: replace strict_strto call with kstrto

Replace obsolete call to strict_strto with kstrto

Signed-off-by: Daniel Walter <dwalter@google.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoarch/arm/mach-omap2: replace strict_strto* with kstrto*
Daniel Walter [Thu, 26 Jun 2014 00:43:14 +0000 (10:43 +1000)]
arch/arm/mach-omap2: replace strict_strto* with kstrto*

Replace obsolete strict_strto call with kstrto calls.
Simplify copy_from_user/strict_strto by using kstrto_from_user

Signed-off-by: Daniel Walter <dwalter@google.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoinit/main.c: code clean-up
Fabian Frederick [Thu, 26 Jun 2014 00:43:14 +0000 (10:43 +1000)]
init/main.c: code clean-up

Fixing some checkpatch warnings(remove global initialization, move
__initdata, coalesce formats ...)

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agodrivers/gpio/gpio-zevio.c: fix build
Andrew Morton [Thu, 26 Jun 2014 00:43:14 +0000 (10:43 +1000)]
drivers/gpio/gpio-zevio.c: fix build

Unbreak i386 allmodconfig.

This is a hack - please fix properly ;)

Cc: Fabian Vogt <fabian@ritter-vogt.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoMerge branch 'akpm-current/current'
Stephen Rothwell [Fri, 27 Jun 2014 04:08:28 +0000 (14:08 +1000)]
Merge branch 'akpm-current/current'

10 years agoMerge branch 'rd-docs/master'
Stephen Rothwell [Fri, 27 Jun 2014 03:46:56 +0000 (13:46 +1000)]
Merge branch 'rd-docs/master'

10 years agoMerge remote-tracking branch 'aio/master'
Stephen Rothwell [Fri, 27 Jun 2014 03:45:31 +0000 (13:45 +1000)]
Merge remote-tracking branch 'aio/master'

10 years agoMerge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Fri, 27 Jun 2014 03:43:54 +0000 (13:43 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'

10 years agoMerge remote-tracking branch 'random/dev'
Stephen Rothwell [Fri, 27 Jun 2014 03:42:30 +0000 (13:42 +1000)]
Merge remote-tracking branch 'random/dev'

10 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:41:17 +0000 (13:41 +1000)]
Merge remote-tracking branch 'clk/clk-next'

10 years agoMerge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:40:20 +0000 (13:40 +1000)]
Merge remote-tracking branch 'ktest/for-next'

10 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:30:22 +0000 (13:30 +1000)]
Merge remote-tracking branch 'userns/for-next'

Conflicts:
fs/btrfs/ioctl.c
fs/dcache.c
fs/namei.c
fs/namespace.c

10 years agoMerge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:29:02 +0000 (13:29 +1000)]
Merge remote-tracking branch 'gpio/for-next'

10 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:28:53 +0000 (13:28 +1000)]
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/vhost/net.c

10 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:27:52 +0000 (13:27 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'

10 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:18:46 +0000 (13:18 +1000)]
Merge remote-tracking branch 'scsi/for-next'

10 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:17:31 +0000 (13:17 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

10 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:13:19 +0000 (13:13 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'

Conflicts:
drivers/w1/masters/mxc_w1.c

10 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:11:36 +0000 (13:11 +1000)]
Merge remote-tracking branch 'staging/staging-next'

10 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:10:33 +0000 (13:10 +1000)]
Merge remote-tracking branch 'usb/usb-next'

10 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Fri, 27 Jun 2014 03:00:12 +0000 (13:00 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'

10 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:58:40 +0000 (12:58 +1000)]
Merge remote-tracking branch 'workqueues/for-next'

10 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:47:01 +0000 (12:47 +1000)]
Merge remote-tracking branch 'percpu/for-next'

10 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:37:35 +0000 (12:37 +1000)]
Merge remote-tracking branch 'kvm/linux-next'

10 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Fri, 27 Jun 2014 02:25:53 +0000 (12:25 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

10 years agoMerge remote-tracking branch 'irqchip/irqchip/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:24:54 +0000 (12:24 +1000)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'

10 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:23:51 +0000 (12:23 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

10 years agoMerge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Fri, 27 Jun 2014 02:22:30 +0000 (12:22 +1000)]
Merge remote-tracking branch 'edac/linux_next'

10 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Fri, 27 Jun 2014 02:10:38 +0000 (12:10 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

10 years agoMerge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:09:23 +0000 (12:09 +1000)]
Merge remote-tracking branch 'spi/for-next'

10 years agoMerge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Fri, 27 Jun 2014 02:05:45 +0000 (12:05 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'

10 years agoMerge remote-tracking branch 'audit/master'
Stephen Rothwell [Fri, 27 Jun 2014 02:03:56 +0000 (12:03 +1000)]
Merge remote-tracking branch 'audit/master'

Conflicts:
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/x86/Kconfig
kernel/audit.c

10 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 02:02:28 +0000 (12:02 +1000)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
arch/arm/mach-msm/Kconfig

10 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 27 Jun 2014 02:01:07 +0000 (12:01 +1000)]
Merge remote-tracking branch 'iommu/next'

10 years agoMerge remote-tracking branch 'selinux/next'
Stephen Rothwell [Fri, 27 Jun 2014 01:59:49 +0000 (11:59 +1000)]
Merge remote-tracking branch 'selinux/next'

10 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 27 Jun 2014 01:59:40 +0000 (11:59 +1000)]
Merge remote-tracking branch 'security/next'

10 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:58:25 +0000 (11:58 +1000)]
Merge remote-tracking branch 'regulator/for-next'

10 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:57:15 +0000 (11:57 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

10 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:55:46 +0000 (11:55 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

10 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:54:14 +0000 (11:54 +1000)]
Merge remote-tracking branch 'slab/for-next'

10 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:53:55 +0000 (11:53 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

10 years agoMerge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Fri, 27 Jun 2014 01:52:41 +0000 (11:52 +1000)]
Merge remote-tracking branch 'mmc-uh/next'

10 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:50:27 +0000 (11:50 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'

10 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:50:24 +0000 (11:50 +1000)]
Merge remote-tracking branch 'block/for-next'

10 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:48:53 +0000 (11:48 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

10 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:47:58 +0000 (11:47 +1000)]
Merge remote-tracking branch 'sound/for-next'

10 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:46:18 +0000 (11:46 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

10 years agoMerge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:45:23 +0000 (11:45 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'

10 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:43:09 +0000 (11:43 +1000)]
Merge remote-tracking branch 'crypto/master'

10 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:41:43 +0000 (11:41 +1000)]
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/hci_conn.c
net/bluetooth/smp.c

10 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:39:36 +0000 (11:39 +1000)]
Merge remote-tracking branch 'wireless-next/master'

10 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:27:49 +0000 (11:27 +1000)]
Merge remote-tracking branch 'net-next/master'

10 years agoMerge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Fri, 27 Jun 2014 01:26:48 +0000 (11:26 +1000)]
Merge remote-tracking branch 'dmaengine/next'

10 years agoMerge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:25:34 +0000 (11:25 +1000)]
Merge remote-tracking branch 'swiotlb/linux-next'

10 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:25:29 +0000 (11:25 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

10 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:23:42 +0000 (11:23 +1000)]
Merge remote-tracking branch 'pm/linux-next'

10 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:22:44 +0000 (11:22 +1000)]
Merge remote-tracking branch 'libata/for-next'

10 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:21:23 +0000 (11:21 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

10 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:20:06 +0000 (11:20 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

10 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:19:06 +0000 (11:19 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:17:54 +0000 (11:17 +1000)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:11:25 +0000 (11:11 +1000)]
Merge remote-tracking branch 'vfs/for-next'

10 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:10:20 +0000 (11:10 +1000)]
Merge remote-tracking branch 'xfs/for-next'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 27 Jun 2014 01:08:40 +0000 (11:08 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:06:47 +0000 (11:06 +1000)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 27 Jun 2014 01:05:49 +0000 (11:05 +1000)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Fri, 27 Jun 2014 01:05:40 +0000 (11:05 +1000)]
Merge remote-tracking branch 'fscache/fscache'

10 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 27 Jun 2014 01:04:46 +0000 (11:04 +1000)]
Merge remote-tracking branch 'f2fs/dev'