]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agoMerge branch 'akpm/master'
Stephen Rothwell [Mon, 6 Jan 2014 09:08:27 +0000 (20:08 +1100)]
Merge branch 'akpm/master'

10 years agomm: add strictlimit knob
Maxim Patlasov [Fri, 3 Jan 2014 03:16:53 +0000 (14:16 +1100)]
mm: add strictlimit knob

The "strictlimit" feature was introduced to enforce per-bdi dirty limits
for FUSE which sets bdi max_ratio to 1% by default:

http://article.gmane.org/gmane.linux.kernel.mm/105809

However the feature can be useful for other relatively slow or untrusted
BDIs like USB flash drives and DVD+RW.  The patch adds a knob to enable
the feature:

echo 1 > /sys/class/bdi/X:Y/strictlimit

Being enabled, the feature enforces bdi max_ratio limit even if global
(10%) dirty limit is not reached.  Of course, the effect is not visible
until /sys/class/bdi/X:Y/max_ratio is decreased to some reasonable value.

Signed-off-by: Maxim Patlasov <MPatlasov@parallels.com>
Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: "Artem S. Tashkinov" <t.artem@lycos.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Jan Kara <jack@suse.cz>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agocheckpatch.pl: check for function declarations without arguments
Joe Perches [Fri, 3 Jan 2014 03:16:53 +0000 (14:16 +1100)]
checkpatch.pl: check for function declarations without arguments

Functions like this one are evil:

void foo()
{
...
}

Because these functions allow variadic arguments without
checking the arguments at all.

Original patch by Richard Weinberger.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Borislav Petkov <bp@alien8.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agodrivers/net/phy/mdio_bus.c: call put_device on device_register() failure
Levente Kurusa [Fri, 3 Jan 2014 03:16:53 +0000 (14:16 +1100)]
drivers/net/phy/mdio_bus.c: call put_device on device_register() failure

It is required to call put_device() if device_register() fails, so that we
give up the last reference to the device.  Calling put_device allows for
mdiobus_release to be executed, kfreeing the bus.

Signed-off-by: Levente Kurusa <levex@linux.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: David Daney <david.daney@cavium.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agodrivers/video/backlight/lcd.c: call put_device if device_register fails
Levente Kurusa [Fri, 3 Jan 2014 03:16:53 +0000 (14:16 +1100)]
drivers/video/backlight/lcd.c: call put_device if device_register fails

Currently we kfree the container of the device which failed to register.
This is wrong as the last reference is not given up with a put_device
call.  Also, now that we have put_device() callen, we no longer need the
kfree as the new_ld->dev.release function will take care of kfreeing the
associated memory.

Signed-off-by: Levente Kurusa <levex@linux.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agodrivers/w1/w1_int.c: call put_device if device_register fails
Levente Kurusa [Fri, 3 Jan 2014 03:16:53 +0000 (14:16 +1100)]
drivers/w1/w1_int.c: call put_device if device_register fails

Currently, memsetting and kfreeing the device is bad behaviour.  The
device will have a reference count of 1 and hence can cause trouble
because it has kfree'd.  Proper way to handle a failed device_register is
to call put_device right after it fails.

Signed-off-by: Levente Kurusa <levex@linux.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agozram: promote zram from staging
Minchan Kim [Fri, 3 Jan 2014 03:16:52 +0000 (14:16 +1100)]
zram: promote zram from staging

Zram has lived in staging for a LONG LONG time and have been
fixed/improved by many contributors so code is clean and stable now.  Of
course, there are lots of product using zram in real practice.

The major TV companys have used zram as swap since two years ago and
recently our production team released android smart phone with zram which
is used as swap, too and recently Android Kitkat start to use zram for
small memory smart phone.  And there was a report Google released their
ChromeOS with zram, too and cyanogenmod have been used zram long time ago.
 And I heard some disto have used zram block device for tmpfs.  In
addition, I saw many report from many other peoples.  For example, Lubuntu
start to use it.

The benefit of zram is very clear.  With my experience, one of the benefit
was to remove jitter of video application with backgroud memory pressure.
It would be effect of efficient memory usage by compression but more issue
is whether swap is there or not in the system.  Recent mobile platforms
have used JAVA so there are many anonymous pages.  But embedded system
normally are reluctant to use eMMC or SDCard as swap because there is
wear-leveling and latency issues so if we do not use swap, it means we
can't reclaim anoymous pages and at last, we could encounter OOM kill.  :(

Although we have real storage as swap, it was a problem, too.  Because it
sometime ends up making system very unresponsible caused by slow swap
storage performance.

Quote from Luigi on Google
"
Since Chrome OS was mentioned: the main reason why we don't use swap
to a disk (rotating or SSD) is because it doesn't degrade gracefully
and leads to a bad interactive experience.  Generally we prefer to
manage RAM at a higher level, by transparently killing and restarting
processes.  But we noticed that zram is fast enough to be competitive
with the latter, and it lets us make more efficient use of the
available RAM.
"
and he announced. http://www.spinics.net/lists/linux-mm/msg57717.html

Other uses case is to use zram for block device.  Zram is block device so
anyone can format the block device and mount on it so some guys on the
internet start zram as /var/tmp.
http://forums.gentoo.org/viewtopic-t-838198-start-0.html

Let's promote zram and enhance/maintain it instead of removing.

Signed-off-by: Minchan Kim <minchan@kernel.org>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Nitin Gupta <ngupta@vflare.org>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Bob Liu <bob.liu@oracle.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Luigi Semenzato <semenzato@google.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Cc: Seth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agozsmalloc: move it under mm
Minchan Kim [Fri, 3 Jan 2014 03:16:52 +0000 (14:16 +1100)]
zsmalloc: move it under mm

This patch moves zsmalloc under mm directory.

Before that, description will explain why we have needed custom allocator.

Zsmalloc is a new slab-based memory allocator for storing compressed
pages.  It is designed for low fragmentation and high allocation success
rate on large object, but <= PAGE_SIZE allocations.

zsmalloc differs from the kernel slab allocator in two primary ways to
achieve these design goals.

zsmalloc never requires high order page allocations to back slabs, or
"size classes" in zsmalloc terms.  Instead it allows multiple single-order
pages to be stitched together into a "zspage" which backs the slab.  This
allows for higher allocation success rate under memory pressure.

Also, zsmalloc allows objects to span page boundaries within the zspage.
This allows for lower fragmentation than could be had with the kernel slab
allocator for objects between PAGE_SIZE/2 and PAGE_SIZE.  With the kernel
slab allocator, if a page compresses to 60% of it original size, the
memory savings gained through compression is lost in fragmentation because
another object of the same size can't be stored in the leftover space.

This ability to span pages results in zsmalloc allocations not being
directly addressable by the user.  The user is given an non-dereferencable
handle in response to an allocation request.  That handle must be mapped,
using zs_map_object(), which returns a pointer to the mapped region that
can be used.  The mapping is necessary since the object data may reside in
two different noncontigious pages.

The zsmalloc fulfills the allocation needs for zram perfectly

[sjenning@linux.vnet.ibm.com: borrow Seth's quote]
Signed-off-by: Minchan Kim <minchan@kernel.org>
Acked-by: Nitin Gupta <ngupta@vflare.org>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Bob Liu <bob.liu@oracle.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Luigi Semenzato <semenzato@google.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Seth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agomm/migrate.c: fix setting of cpupid on page migration twice against normal page
Wanpeng Li [Fri, 3 Jan 2014 03:16:52 +0000 (14:16 +1100)]
mm/migrate.c: fix setting of cpupid on page migration twice against normal page

7851a45cd3 ("mm: numa: Copy cpupid on page migration") copies over the
cpupid at page migration time.  it is unnecessary to set it again in
alloc_misplaced_dst_page().

Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Acked-by: Mel Gorman <mgorman@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agomm/migrate.c: fix set cpupid on page migration twice against thp
Wanpeng Li [Fri, 3 Jan 2014 03:16:52 +0000 (14:16 +1100)]
mm/migrate.c: fix set cpupid on page migration twice against thp

7851a45cd3 (mm: numa: Copy cpupid on page migration) copies over the
cpupid at page migration time.  It is unnecessary to set it again in
migrate_misplaced_transhuge_page().

Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Acked-by: Mel Gorman <mgorman@suse.de>
Reviewed-by: Rik van Riel <riel@redhat.com>
Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agosoftirq: use const char * const for softirq_to_name, whitespace neatening
Joe Perches [Fri, 3 Jan 2014 03:16:51 +0000 (14:16 +1100)]
softirq: use const char * const for softirq_to_name, whitespace neatening

Reduce data size a little.
Reduce checkpatch noise.

$ size kernel/softirq.o*
   text    data     bss     dec     hex filename
  11554    6013    4008   21575    5447 kernel/softirq.o.new
  11474    6093    4008   21575    5447 kernel/softirq.o.old

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agosoftirq: convert printks to pr_<level>
Joe Perches [Fri, 3 Jan 2014 03:16:51 +0000 (14:16 +1100)]
softirq: convert printks to pr_<level>

Use a more current logging style.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agosoftirq: use ffs() in __do_softirq()
Joe Perches [Fri, 3 Jan 2014 03:16:51 +0000 (14:16 +1100)]
softirq: use ffs() in __do_softirq()

Possible speed improvement of __do_softirq() by using ffs() instead of
using a while loop with an & 1 test then single bit shift.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agokernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcoreinfo_append_str()
Chen Gang [Fri, 3 Jan 2014 03:16:51 +0000 (14:16 +1100)]
kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcoreinfo_append_str()

vsnprintf() may let 'r' larger than sizeof(buf), in this case, if 'r' is
also less than "vmcoreinfo_max_size - vmcoreinfo_size" (left size of
destination buffer), next memcpy() will read the unexpected addresses.

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agoMerge branch 'akpm-current/current'
Stephen Rothwell [Mon, 6 Jan 2014 08:31:59 +0000 (19:31 +1100)]
Merge branch 'akpm-current/current'

Conflicts:
mm/memcontrol.c
mm/mlock.c

10 years agoMerge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Mon, 6 Jan 2014 08:25:37 +0000 (19:25 +1100)]
Merge remote-tracking branch 'lzo-update/lzo-update'

10 years agoMerge remote-tracking branch 'random/dev'
Stephen Rothwell [Mon, 6 Jan 2014 08:24:24 +0000 (19:24 +1100)]
Merge remote-tracking branch 'random/dev'

10 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Mon, 6 Jan 2014 08:22:56 +0000 (19:22 +1100)]
Merge remote-tracking branch 'clk/clk-next'

10 years agoMerge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 08:22:01 +0000 (19:22 +1100)]
Merge remote-tracking branch 'ktest/for-next'

10 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 08:20:47 +0000 (19:20 +1100)]
Merge remote-tracking branch 'userns/for-next'

10 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 08:19:38 +0000 (19:19 +1100)]
Merge remote-tracking branch 'pwm/for-next'

10 years agoMerge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 08:18:02 +0000 (19:18 +1100)]
Merge remote-tracking branch 'gpio/for-next'

10 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 08:16:50 +0000 (19:16 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'

10 years agoMerge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Mon, 6 Jan 2014 08:15:35 +0000 (19:15 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'

10 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 08:13:42 +0000 (19:13 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

Conflicts:
drivers/target/target_core_tpg.c

10 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 08:11:50 +0000 (19:11 +1100)]
Merge remote-tracking branch 'scsi/for-next'

10 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Mon, 6 Jan 2014 08:10:40 +0000 (19:10 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'

10 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Mon, 6 Jan 2014 08:08:51 +0000 (19:08 +1100)]
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/imx-drm/imx-drm-core.c

10 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:59:06 +0000 (18:59 +1100)]
Merge remote-tracking branch 'usb/usb-next'

10 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:48:39 +0000 (18:48 +1100)]
Merge remote-tracking branch 'tty/tty-next'

10 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:38:20 +0000 (18:38 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'

10 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:37:16 +0000 (18:37 +1100)]
Merge remote-tracking branch 'leds/for-next'

10 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:35:58 +0000 (18:35 +1100)]
Merge remote-tracking branch 'regmap/for-next'

10 years agoMerge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:35:07 +0000 (18:35 +1100)]
Merge remote-tracking branch 'chrome-platform/for-next'

10 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:26:46 +0000 (18:26 +1100)]
Merge remote-tracking branch 'xen-tip/linux-next'

10 years agoMerge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:25:48 +0000 (18:25 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

10 years agoMerge remote-tracking branch 'kvm-arm/kvm-arm-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:24:59 +0000 (18:24 +1100)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'

10 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:23:49 +0000 (18:23 +1100)]
Merge remote-tracking branch 'kvm/linux-next'

10 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:22:00 +0000 (18:22 +1100)]
Merge remote-tracking branch 'ftrace/for-next'

10 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 07:20:59 +0000 (18:20 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'

10 years agoMerge remote-tracking branch 'clockevents/clockevents/next'
Stephen Rothwell [Mon, 6 Jan 2014 07:20:04 +0000 (18:20 +1100)]
Merge remote-tracking branch 'clockevents/clockevents/next'

Conflicts:
drivers/clocksource/clksrc-of.c

10 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Mon, 6 Jan 2014 07:09:38 +0000 (18:09 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
drivers/acpi/acpi_extlog.c

10 years agonext-20131224/spi
Stephen Rothwell [Mon, 6 Jan 2014 07:02:18 +0000 (18:02 +1100)]
next-20131224/spi

Conflicts:
drivers/spi/spi-mpc512x-psc.c

10 years agoMerge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:54:12 +0000 (17:54 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'

10 years agoMerge remote-tracking branch 'audit/master'
Stephen Rothwell [Mon, 6 Jan 2014 06:54:05 +0000 (17:54 +1100)]
Merge remote-tracking branch 'audit/master'

10 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:45:49 +0000 (17:45 +1100)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
drivers/gpu/drm/qxl/Kconfig

10 years agoMerge remote-tracking branch 'vfio/next'
Stephen Rothwell [Mon, 6 Jan 2014 06:40:25 +0000 (17:40 +1100)]
Merge remote-tracking branch 'vfio/next'

10 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 6 Jan 2014 06:40:18 +0000 (17:40 +1100)]
Merge remote-tracking branch 'iommu/next'

10 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 6 Jan 2014 06:39:14 +0000 (17:39 +1100)]
Merge remote-tracking branch 'watchdog/master'

10 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Mon, 6 Jan 2014 06:38:08 +0000 (17:38 +1100)]
Merge remote-tracking branch 'selinux/master'

Conflicts:
security/selinux/hooks.c

10 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Mon, 6 Jan 2014 06:37:02 +0000 (17:37 +1100)]
Merge remote-tracking branch 'security/next'

10 years agoRevert "regulator: act8865: register all regulators regardless of how many are used"
Stephen Rothwell [Mon, 6 Jan 2014 06:35:47 +0000 (17:35 +1100)]
Revert "regulator: act8865: register all regulators regardless of how many are used"

This reverts commit d04b755273683ed31043563b8a3a2716bd8aa6a9.

10 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:28:56 +0000 (17:28 +1100)]
Merge remote-tracking branch 'regulator/for-next'

10 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Mon, 6 Jan 2014 06:27:34 +0000 (17:27 +1100)]
Merge remote-tracking branch 'battery/master'

10 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:26:19 +0000 (17:26 +1100)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

10 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:24:59 +0000 (17:24 +1100)]
Merge remote-tracking branch 'slab/for-next'

10 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:24:56 +0000 (17:24 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

Conflicts:
kernel/debug/debug_core.h

10 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 06:07:56 +0000 (17:07 +1100)]
Merge remote-tracking branch 'device-mapper/for-next'

Conflicts:
drivers/md/dm-thin.c

10 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:58:58 +0000 (16:58 +1100)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
fs/f2fs/data.c
fs/f2fs/segment.c
include/trace/events/f2fs.h

10 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:27:34 +0000 (16:27 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

10 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 6 Jan 2014 05:26:18 +0000 (16:26 +1100)]
Merge remote-tracking branch 'input/next'

10 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:25:30 +0000 (16:25 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

10 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:17:43 +0000 (16:17 +1100)]
Merge remote-tracking branch 'modules/modules-next'

Conflicts:
Documentation/module-signing.txt

10 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:16:20 +0000 (16:16 +1100)]
Merge remote-tracking branch 'sound/for-next'

Conflicts:
sound/soc/fsl/fsl_ssi.c

10 years agoMerge remote-tracking branch 'drm-tegra/drm/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:15:02 +0000 (16:15 +1100)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'

10 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:13:45 +0000 (16:13 +1100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_pm.c

10 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Mon, 6 Jan 2014 05:11:58 +0000 (16:11 +1100)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/drm_stub.c
drivers/gpu/drm/i915/intel_pm.c
drivers/staging/imx-drm/imx-drm-core.c

10 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 6 Jan 2014 05:01:34 +0000 (16:01 +1100)]
Merge remote-tracking branch 'crypto/master'

10 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 6 Jan 2014 05:00:39 +0000 (16:00 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

10 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 04:59:45 +0000 (15:59 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

10 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 6 Jan 2014 04:56:55 +0000 (15:56 +1100)]
Merge remote-tracking branch 'bluetooth/master'

10 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Mon, 6 Jan 2014 04:55:10 +0000 (15:55 +1100)]
Merge remote-tracking branch 'wireless-next/master'

10 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Mon, 6 Jan 2014 04:53:56 +0000 (15:53 +1100)]
Merge remote-tracking branch 'ipsec-next/master'

10 years agoRevert "macvlan: unify macvlan_pcpu_stats and vlan_pcpu_stats"
Stephen Rothwell [Mon, 6 Jan 2014 04:44:01 +0000 (15:44 +1100)]
Revert "macvlan: unify macvlan_pcpu_stats and vlan_pcpu_stats"

This reverts commit cdf3e274cf1b36e9a2fef2d175cabc566af841b2.

10 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Mon, 6 Jan 2014 04:34:14 +0000 (15:34 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
net/ipv6/ip6_tunnel.c
net/ipv6/ip6_vti.c

10 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 6 Jan 2014 03:17:09 +0000 (14:17 +1100)]
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi

10 years agoMerge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 03:16:16 +0000 (14:16 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'

10 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Mon, 6 Jan 2014 03:15:28 +0000 (14:15 +1100)]
Merge remote-tracking branch 'dlm/next'

10 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Mon, 6 Jan 2014 03:14:16 +0000 (14:14 +1100)]
Merge remote-tracking branch 'thermal/next'

Conflicts:
drivers/cpufreq/Kconfig

10 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Mon, 6 Jan 2014 01:54:27 +0000 (12:54 +1100)]
Merge remote-tracking branch 'idle/next'

10 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:44:21 +0000 (12:44 +1100)]
Merge remote-tracking branch 'pm/linux-next'

10 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:43:21 +0000 (12:43 +1100)]
Merge remote-tracking branch 'libata/for-next'

10 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:42:29 +0000 (12:42 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

10 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:41:02 +0000 (12:41 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

10 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:40:14 +0000 (12:40 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

10 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:39:26 +0000 (12:39 +1100)]
Merge branch 'jdelvare-hwmon/master'

10 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:38:37 +0000 (12:38 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'

10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:37:36 +0000 (12:37 +1100)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Mon, 6 Jan 2014 01:28:41 +0000 (12:28 +1100)]
Merge remote-tracking branch 'pci/next'

10 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:27:19 +0000 (12:27 +1100)]
Merge remote-tracking branch 'xfs/for-next'

10 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:26:29 +0000 (12:26 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

10 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:25:18 +0000 (12:25 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:23:54 +0000 (12:23 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:22:33 +0000 (12:22 +1100)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Mon, 6 Jan 2014 01:21:44 +0000 (12:21 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 6 Jan 2014 01:20:54 +0000 (12:20 +1100)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Mon, 6 Jan 2014 01:20:04 +0000 (12:20 +1100)]
Merge remote-tracking branch 'fscache/fscache'

10 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Mon, 6 Jan 2014 01:19:16 +0000 (12:19 +1100)]
Merge remote-tracking branch 'f2fs/dev'

10 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 6 Jan 2014 01:18:15 +0000 (12:18 +1100)]
Merge remote-tracking branch 'ext4/dev'

10 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Mon, 6 Jan 2014 01:17:21 +0000 (12:17 +1100)]
Merge remote-tracking branch 'ext3/for_next'