]> git.kernelconcepts.de Git - karo-tx-linux.git/log
karo-tx-linux.git
9 years agoAdd linux-next specific files for 20140506 next-20140506
Stephen Rothwell [Tue, 6 May 2014 06:49:25 +0000 (16:49 +1000)]
Add linux-next specific files for 20140506

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
9 years agoMerge branch 'akpm/master'
Stephen Rothwell [Tue, 6 May 2014 06:21:09 +0000 (16:21 +1000)]
Merge branch 'akpm/master'

9 years agomm: add strictlimit knob
Maxim Patlasov [Tue, 6 May 2014 00:26:46 +0000 (10:26 +1000)]
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>
9 years agoufs: sb mutex merge + mutex_destroy
Fabian Frederick [Tue, 6 May 2014 00:26:46 +0000 (10:26 +1000)]
ufs: sb mutex merge + mutex_destroy

788257d6101d9 ("ufs: remove the BKL") replaced BKL with mutex protection
using functions lock_ufs, unlock_ufs and struct mutex 'mutex' in sb_info.

b6963327e052 ("ufs: drop lock/unlock super") removed lock/unlock super and
added struct mutex 's_lock' in sb_info.

Those 2 mutexes are generally locked/unlocked at the same time except in
allocation (balloc, ialloc).

This patch merges the 2 mutexes and propagates first commit solution.  It
also adds mutex destruction before kfree during ufs_fill_super failure and
ufs_put_super.

[akpm@linux-foundation.org: avoid ifdefs, return -EROFS not -EINVAL]
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Evgeniy Dushistov <dushistov@mail.ru>
Cc: "Chen, Jet" <jet.chen@intel.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agoarm: move arm_dma_limit to setup_dma_zone
Vladimir Murzin [Tue, 6 May 2014 00:26:46 +0000 (10:26 +1000)]
arm: move arm_dma_limit to setup_dma_zone

Since 4dcfa600 ("ARM: DMA-API: better handing of DMA masks for coherent
allocations") arm_dma_limit_pfn has almost substituted the arm_dma_limit.
The remaining user is dma_contiguous_reserve().  It is also referenced in
setup_dma_zone() to calculate arm_dma_limit_pfn.

Kill the global arm_dma_limit and equip setup_zone_dma with the local one.

Signed-off-by: Vladimir Murzin <murzin.v@gmail.com>
Reported-by: Vassili Karpov <av1474@comtv.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agodrivers/w1/w1_int.c: call put_device if device_register fails
Levente Kurusa [Tue, 6 May 2014 00:26:46 +0000 (10:26 +1000)]
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>
9 years agoinit/main.c: code clean-up
Fabian Frederick [Tue, 6 May 2014 00:26:45 +0000 (10:26 +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>
9 years agokernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix-2
Jan Moskyto Matejka [Tue, 6 May 2014 00:26:45 +0000 (10:26 +1000)]
kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix-2

This commit fixes this warning:

kernel/watchdog.c: In function `watchdog_timer_fn':
kernel/watchdog.c:368:4: warning: `smp_mb__after_clear_bit' is deprecated (declared at include/linux/bitops.h:48) [-Wdeprecated-declarations]
    smp_mb__after_clear_bit();

That code was introduced in commit 90e6b763ca8a5eb739e59489f42d45e13431d157
("kernel/watchdog.c: print traces for all cpus on lockup detection") and then
merged with another branch containing commit
febdbfe8a91ce0d11939d4940b592eb0dba8d663 ("arch: Prepare for
smp_mb__{before,after}_atomic()") which deprecates the
smp_mb__after_clear_bit() call in favour of smp_mb__after_atomic().

Signed-off-by: Jan Moskyto Matejka <mq@suse.cz>
Acked-by: Aaron Tomlin <atomlin@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agokernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix
Andrew Morton [Tue, 6 May 2014 00:26:45 +0000 (10:26 +1000)]
kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix

additional CONFIG_SMP=n optimisations

Cc: Aaron Tomlin <atomlin@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Mateusz Guzik <mguzik@redhat.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agokernel/watchdog.c: print traces for all cpus on lockup detection
Aaron Tomlin [Tue, 6 May 2014 00:26:45 +0000 (10:26 +1000)]
kernel/watchdog.c: print traces for all cpus on lockup detection

A 'softlockup' is defined as a bug that causes the kernel to loop in
kernel mode for more than a predefined period to time, without giving
other tasks a chance to run.

Currently, upon detection of this condition by the per-cpu watchdog task,
debug information (including a stack trace) is sent to the system log.

On some occasions, we have observed that the "victim" rather than the
actual "culprit" (i.e.  the owner/holder of the contended resource) is
reported to the user.  Often this information has proven to be
insufficient to assist debugging efforts.

To avoid loss of useful debug information, for architectures which support
NMI, this patch makes it possible to improve soft lockup reporting.  This
is accomplished by issuing an NMI to each cpu to obtain a stack trace.

If NMI is not supported we just revert back to the old method.  A sysctl
and boot-time parameter is available to toggle this feature.

[dzickus@redhat.com: add CONFIG_SMP in certain areas]
Signed-off-by: Aaron Tomlin <atomlin@redhat.com>
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Mateusz Guzik <mguzik@redhat.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agoblackfin/ptrace: call find_vma with the mmap_sem held
Davidlohr Bueso [Tue, 6 May 2014 00:26:44 +0000 (10:26 +1000)]
blackfin/ptrace: call find_vma with the mmap_sem held

Performing vma lookups without taking the mm->mmap_sem is asking for
trouble.  While doing the search, the vma in question can be modified or
even removed before returning to the caller.  Take the lock (shared) in
order to avoid races while iterating through the vmacache and/or rbtree.

Signed-off-by: Davidlohr Bueso <davidlohr@hp.com>
Cc: Steven Miao <realmz6@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agortc: s5m: consolidate two device type switch statements
Krzysztof Kozlowski [Tue, 6 May 2014 00:26:44 +0000 (10:26 +1000)]
rtc: s5m: consolidate two device type switch statements

In probe the configuration of driver for different chipsets was done in
two switch (pdata->device_type) statements.  Consolidate them into one
switch statement to increase code readability.

Additionally check the return value of regmap_irq_get_virq and exit probe
on error.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agortc: s5m: add support for S2MPS14 RTC
Krzysztof Kozlowski [Tue, 6 May 2014 00:26:44 +0000 (10:26 +1000)]
rtc: s5m: add support for S2MPS14 RTC

Add support for S2MPS14 to the rtc-s5m driver. Differences in S2MPS14
(in comparison to S5M8767):

 - Layout of registers;
 - Lack of century support for time and alarms (7 registers used for
   storing time/alarm);
 - Two buffer control registers: WUDR and RUDR;
 - No register for enabling writing time;
 - RTC interrupts are reported in main PMIC I2C device;

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agortc: s5m: support different register layout
Krzysztof Kozlowski [Tue, 6 May 2014 00:26:44 +0000 (10:26 +1000)]
rtc: s5m: support different register layout

Prepare for adding support for S2MPS14 RTC device to the
rtc-s5m driver:

1. Add a map of registers used by the driver which differ between
   the chipsets (S5M876X and S2MPS14).

2. Move code of checking for alarm pending to separate function.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agortc: s5m: use shorter time of register update
Krzysztof Kozlowski [Tue, 6 May 2014 00:26:43 +0000 (10:26 +1000)]
rtc: s5m: use shorter time of register update

Set the time needed for updating alarm and time registers to 0.45 ms.
The default is 7.32 ms which is too long and leads to warnings when
setting alarm or time:

s5m-rtc: waiting for UDR update, reached max number of retries

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agortc: s5m: remove undocumented time init on first boot
Krzysztof Kozlowski [Tue, 6 May 2014 00:26:43 +0000 (10:26 +1000)]
rtc: s5m: remove undocumented time init on first boot

Remove the code for initializing time if this is first boot.

The code for detecting first boot uses undocumented field RTC_TCON in
RTC_UDR_CON register.  According to S5M8767's datasheet this field is
reserved.  On S2MPS14 it is not documented at all.  On device first boot
the registers will be initialized with reset value (2000-01-01 00:00:00).

The code might work on S5M8763 but still this does not look like a task
for RTC driver.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agomfd/rtc: sec/s5m: rename SEC* symbols to S5M
Krzysztof Kozlowski [Tue, 6 May 2014 00:26:43 +0000 (10:26 +1000)]
mfd/rtc: sec/s5m: rename SEC* symbols to S5M

Prepare for adding support for S2MPS14 RTC device to the rtc-s5m driver:

1. Rename SEC* symbols to S5M.
2. Add S5M prefix to some of defines which are different between S5M876X
   and S2MPS14.

This is only a rename-like patch, new code is not added.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agomm: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:43 +0000 (10:26 +1000)]
mm: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agosysctl: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:42 +0000 (10:26 +1000)]
sysctl: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agoipc: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:42 +0000 (10:26 +1000)]
ipc: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agokey: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:42 +0000 (10:26 +1000)]
key: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agofs: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:42 +0000 (10:26 +1000)]
fs: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agontfs: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:41 +0000 (10:26 +1000)]
ntfs: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agoinotify: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:41 +0000 (10:26 +1000)]
inotify: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agonfs: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:41 +0000 (10:26 +1000)]
nfs: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agolockd: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:41 +0000 (10:26 +1000)]
lockd: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agofscache: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:41 +0000 (10:26 +1000)]
fscache: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agocoda: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:40 +0000 (10:26 +1000)]
coda: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agoscsi: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:40 +0000 (10:26 +1000)]
scsi: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agoparport: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:40 +0000 (10:26 +1000)]
parport: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agorandom: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:40 +0000 (10:26 +1000)]
random: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agocdrom: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:39 +0000 (10:26 +1000)]
cdrom: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agotile: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:39 +0000 (10:26 +1000)]
tile: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agoia64: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:39 +0000 (10:26 +1000)]
ia64: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agoarm: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Tue, 6 May 2014 00:26:39 +0000 (10:26 +1000)]
arm: convert use of typedef ctl_table to struct ctl_table

This typedef is unnecessary and should just be removed.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agomm/page_io.c: work around gcc bug
Andrew Morton [Tue, 6 May 2014 00:26:38 +0000 (10:26 +1000)]
mm/page_io.c: work around gcc bug

gcc-4.4.4 (at least) screws up this initialization.

mm/page_io.c: In function '__swap_writepage':
mm/page_io.c:277: error: unknown field 'bvec' specified in initializer
mm/page_io.c:278: warning: excess elements in struct initializer
mm/page_io.c:278: warning: (near initialization for 'from')

Fixes f990bbc9bfa3cbd2d ("bio_vec-backed iov_iter").

Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
9 years agodrivers/gpio/gpio-zevio.c: fix build
Andrew Morton [Tue, 6 May 2014 00:26:38 +0000 (10:26 +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>
9 years agoMerge branch 'akpm-current/current'
Stephen Rothwell [Tue, 6 May 2014 06:02:09 +0000 (16:02 +1000)]
Merge branch 'akpm-current/current'

Conflicts:
arch/x86/kernel/apic/hw_nmi.c
mm/memblock.c

9 years agoMerge branch 'rd-docs/master'
Stephen Rothwell [Tue, 6 May 2014 05:41:08 +0000 (15:41 +1000)]
Merge branch 'rd-docs/master'

9 years agoMerge remote-tracking branch 'llvmlinux/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:39:38 +0000 (15:39 +1000)]
Merge remote-tracking branch 'llvmlinux/for-next'

9 years agoMerge remote-tracking branch 'aio/master'
Stephen Rothwell [Tue, 6 May 2014 05:38:19 +0000 (15:38 +1000)]
Merge remote-tracking branch 'aio/master'

9 years agoMerge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Tue, 6 May 2014 05:36:48 +0000 (15:36 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'

9 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Tue, 6 May 2014 05:35:33 +0000 (15:35 +1000)]
Merge remote-tracking branch 'clk/clk-next'

9 years agoMerge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:34:39 +0000 (15:34 +1000)]
Merge remote-tracking branch 'ktest/for-next'

9 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:22:50 +0000 (15:22 +1000)]
Merge remote-tracking branch 'userns/for-next'

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

9 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:21:49 +0000 (15:21 +1000)]
Merge remote-tracking branch 'pwm/for-next'

9 years agoMerge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:20:18 +0000 (15:20 +1000)]
Merge remote-tracking branch 'gpio/for-next'

9 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:19:02 +0000 (15:19 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'

9 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:18:51 +0000 (15:18 +1000)]
Merge remote-tracking branch 'scsi/for-next'

9 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Tue, 6 May 2014 05:12:54 +0000 (15:12 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

9 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Tue, 6 May 2014 05:11:55 +0000 (15:11 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'

9 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Tue, 6 May 2014 05:02:11 +0000 (15:02 +1000)]
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/iio/adc/Kconfig

9 years agoMerge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Tue, 6 May 2014 05:01:11 +0000 (15:01 +1000)]
Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/phy/phy-mv-u3d-usb.c

9 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 6 May 2014 04:53:40 +0000 (14:53 +1000)]
Merge remote-tracking branch 'usb/usb-next'

9 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Tue, 6 May 2014 04:51:59 +0000 (14:51 +1000)]
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
arch/arm64/kernel/early_printk.c

9 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 6 May 2014 04:40:35 +0000 (14:40 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'

9 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:39:42 +0000 (14:39 +1000)]
Merge remote-tracking branch 'leds/for-next'

9 years agoMerge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:38:50 +0000 (14:38 +1000)]
Merge remote-tracking branch 'hsi/for-next'

9 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:37:28 +0000 (14:37 +1000)]
Merge remote-tracking branch 'regmap/for-next'

9 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Tue, 6 May 2014 04:37:21 +0000 (14:37 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'

9 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:36:03 +0000 (14:36 +1000)]
Merge remote-tracking branch 'workqueues/for-next'

9 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:25:09 +0000 (14:25 +1000)]
Merge remote-tracking branch 'percpu/for-next'

9 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Tue, 6 May 2014 04:24:15 +0000 (14:24 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'

9 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Tue, 6 May 2014 04:23:04 +0000 (14:23 +1000)]
Merge remote-tracking branch 'kvm/linux-next'

9 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 6 May 2014 04:12:07 +0000 (14:12 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

9 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:10:17 +0000 (14:10 +1000)]
Merge remote-tracking branch 'ftrace/for-next'

9 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 6 May 2014 04:10:15 +0000 (14:10 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

9 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Tue, 6 May 2014 03:59:12 +0000 (13:59 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
net/ipv4/tcp_output.c

9 years agoMerge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:58:00 +0000 (13:58 +1000)]
Merge remote-tracking branch 'spi/for-next'

9 years agoMerge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:56:29 +0000 (13:56 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'

9 years agoMerge remote-tracking branch 'audit/master'
Stephen Rothwell [Tue, 6 May 2014 03:54:45 +0000 (13:54 +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

9 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:52:59 +0000 (13:52 +1000)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt

9 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 6 May 2014 03:31:42 +0000 (13:31 +1000)]
Merge remote-tracking branch 'iommu/next'

9 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Tue, 6 May 2014 03:30:50 +0000 (13:30 +1000)]
Merge remote-tracking branch 'watchdog/master'

9 years agoMerge remote-tracking branch 'selinux/next'
Stephen Rothwell [Tue, 6 May 2014 03:29:39 +0000 (13:29 +1000)]
Merge remote-tracking branch 'selinux/next'

9 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Tue, 6 May 2014 03:19:54 +0000 (13:19 +1000)]
Merge remote-tracking branch 'security/next'

9 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:18:40 +0000 (13:18 +1000)]
Merge remote-tracking branch 'regulator/for-next'

Conflicts:
drivers/regulator/tps65090-regulator.c

9 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:16:41 +0000 (13:16 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

9 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Tue, 6 May 2014 03:15:22 +0000 (13:15 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

9 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:14:17 +0000 (13:14 +1000)]
Merge remote-tracking branch 'md/for-next'

9 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 6 May 2014 03:14:00 +0000 (13:14 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

9 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 6 May 2014 03:12:47 +0000 (13:12 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

9 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 6 May 2014 03:09:42 +0000 (13:09 +1000)]
Merge remote-tracking branch 'block/for-next'

9 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 6 May 2014 03:08:43 +0000 (13:08 +1000)]
Merge remote-tracking branch 'input/next'

9 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Tue, 6 May 2014 03:07:39 +0000 (13:07 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'

9 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Tue, 6 May 2014 02:59:29 +0000 (12:59 +1000)]
Merge remote-tracking branch 'modules/modules-next'

9 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 6 May 2014 02:58:25 +0000 (12:58 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

9 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 6 May 2014 02:57:21 +0000 (12:57 +1000)]
Merge remote-tracking branch 'sound/for-next'

9 years agoMerge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Tue, 6 May 2014 02:56:23 +0000 (12:56 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

9 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Tue, 6 May 2014 02:55:02 +0000 (12:55 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

9 years agoMerge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Tue, 6 May 2014 02:54:10 +0000 (12:54 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'

9 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Tue, 6 May 2014 02:52:37 +0000 (12:52 +1000)]
Merge remote-tracking branch 'drm/drm-next'

9 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 6 May 2014 02:51:37 +0000 (12:51 +1000)]
Merge remote-tracking branch 'crypto/master'

Conflicts:
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h

9 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 6 May 2014 02:14:32 +0000 (12:14 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

9 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Tue, 6 May 2014 02:13:40 +0000 (12:13 +1000)]
Merge remote-tracking branch 'mtd/master'

9 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Tue, 6 May 2014 02:12:09 +0000 (12:12 +1000)]
Merge remote-tracking branch 'ipsec-next/master'

9 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Tue, 6 May 2014 02:01:50 +0000 (12:01 +1000)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c
net/sched/cls_api.c
net/sched/sch_api.c

9 years agoMerge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Tue, 6 May 2014 01:56:28 +0000 (11:56 +1000)]
Merge remote-tracking branch 'dmaengine/next'

9 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 6 May 2014 01:55:17 +0000 (11:55 +1000)]
Merge remote-tracking branch 'slave-dma/next'

9 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Tue, 6 May 2014 01:53:19 +0000 (11:53 +1000)]
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/mips/loongson/lemote-2f/clock.c