]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agokernel/watchdog.c: convert printk/pr_warning to pr_foo()
Fabian Frederick [Sat, 17 May 2014 13:19:23 +0000 (23:19 +1000)]
kernel/watchdog.c: convert printk/pr_warning to pr_foo()

Replace some obsolete functions.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agokernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix-2
Jan Moskyto Matejka [Sat, 17 May 2014 13:19:22 +0000 (23:19 +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>
10 years agokernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix
Andrew Morton [Sat, 17 May 2014 13:19:22 +0000 (23:19 +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>
10 years agokernel/watchdog.c: print traces for all cpus on lockup detection
Aaron Tomlin [Sat, 17 May 2014 13:19:22 +0000 (23:19 +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>
10 years agoblackfin/ptrace: call find_vma with the mmap_sem held
Davidlohr Bueso [Sat, 17 May 2014 13:19:22 +0000 (23:19 +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>
10 years agortc: s5m: consolidate two device type switch statements
Krzysztof Kozlowski [Sat, 17 May 2014 13:19:21 +0000 (23:19 +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>
10 years agortc: s5m: add support for S2MPS14 RTC
Krzysztof Kozlowski [Sat, 17 May 2014 13:19:21 +0000 (23:19 +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>
10 years agortc: s5m: support different register layout
Krzysztof Kozlowski [Sat, 17 May 2014 13:19:21 +0000 (23:19 +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>
10 years agortc: s5m: use shorter time of register update
Krzysztof Kozlowski [Sat, 17 May 2014 13:19:21 +0000 (23:19 +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>
10 years agortc: s5m: remove undocumented time init on first boot
Krzysztof Kozlowski [Sat, 17 May 2014 13:19:20 +0000 (23:19 +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>
10 years agomfd/rtc: sec/s5m: rename SEC* symbols to S5M
Krzysztof Kozlowski [Sat, 17 May 2014 13:19:20 +0000 (23:19 +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>
10 years agomm: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:20 +0000 (23:19 +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>
10 years agosysctl: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:20 +0000 (23:19 +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>
10 years agoipc: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:19 +0000 (23:19 +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>
10 years agokey: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:19 +0000 (23:19 +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>
10 years agofs: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:19 +0000 (23:19 +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>
10 years agontfs: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:19 +0000 (23:19 +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>
10 years agoinotify: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:18 +0000 (23:19 +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>
10 years agonfs: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:18 +0000 (23:19 +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>
10 years agolockd: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:18 +0000 (23:19 +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>
10 years agofscache: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:18 +0000 (23:19 +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>
10 years agocoda: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:17 +0000 (23:19 +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>
10 years agoscsi: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:17 +0000 (23:19 +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>
10 years agoparport: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:17 +0000 (23:19 +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>
10 years agorandom: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:17 +0000 (23:19 +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>
10 years agocdrom: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:16 +0000 (23:19 +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>
10 years agotile: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:16 +0000 (23:19 +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>
10 years agoia64: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:16 +0000 (23:19 +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>
10 years agoarm: convert use of typedef ctl_table to struct ctl_table
Joe Perches [Sat, 17 May 2014 13:19:16 +0000 (23:19 +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>
10 years agolib/test_bpf.c: don't use gcc union shortcut
Andrew Morton [Sat, 17 May 2014 13:19:15 +0000 (23:19 +1000)]
lib/test_bpf.c: don't use gcc union shortcut

Older gcc's (mine is gcc-4.4.4) make a mess of this.

lib/test_bpf.c:74: error: unknown field 'insns' specified in initializer
lib/test_bpf.c:75: warning: missing braces around initializer
lib/test_bpf.c:75: warning: (near initialization for 'tests[0].<anonymous>.insns[0]')
lib/test_bpf.c:76: error: extra brace group at end of initializer
lib/test_bpf.c:76: error: (near initialization for 'tests[0].<anonymous>')
lib/test_bpf.c:76: warning: excess elements in union initializer
lib/test_bpf.c:76: warning: (near initialization for 'tests[0].<anonymous>')
lib/test_bpf.c:77: error: extra brace group at end of initializer

Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
10 years agomm/page_io.c: work around gcc bug
Andrew Morton [Sat, 17 May 2014 13:19:15 +0000 (23:19 +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>
10 years agodrivers/gpio/gpio-zevio.c: fix build
Andrew Morton [Sat, 17 May 2014 13:19:15 +0000 (23:19 +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 [Mon, 19 May 2014 07:23:08 +0000 (17:23 +1000)]
Merge branch 'akpm-current/current'

Conflicts:
mm/memcontrol.c

10 years agoMerge branch 'rd-docs/master'
Stephen Rothwell [Mon, 19 May 2014 07:00:36 +0000 (17:00 +1000)]
Merge branch 'rd-docs/master'

10 years agoMerge remote-tracking branch 'llvmlinux/for-next'
Stephen Rothwell [Mon, 19 May 2014 06:59:04 +0000 (16:59 +1000)]
Merge remote-tracking branch 'llvmlinux/for-next'

10 years agoMerge remote-tracking branch 'aio/master'
Stephen Rothwell [Mon, 19 May 2014 06:57:46 +0000 (16:57 +1000)]
Merge remote-tracking branch 'aio/master'

10 years agoMerge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Mon, 19 May 2014 06:56:12 +0000 (16:56 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'

10 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Mon, 19 May 2014 06:54:53 +0000 (16:54 +1000)]
Merge remote-tracking branch 'clk/clk-next'

Conflicts:
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt

10 years agoMerge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Mon, 19 May 2014 06:53:57 +0000 (16:53 +1000)]
Merge remote-tracking branch 'ktest/for-next'

10 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Mon, 19 May 2014 06:44:26 +0000 (16:44 +1000)]
Merge remote-tracking branch 'userns/for-next'

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

10 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Mon, 19 May 2014 06:43:24 +0000 (16:43 +1000)]
Merge remote-tracking branch 'pwm/for-next'

10 years agoMerge remote-tracking branch 'dma-mapping/dma-mapping-next'
Stephen Rothwell [Mon, 19 May 2014 06:42:27 +0000 (16:42 +1000)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'

10 years agoMerge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Mon, 19 May 2014 06:40:56 +0000 (16:40 +1000)]
Merge remote-tracking branch 'gpio/for-next'

Conflicts:
Documentation/driver-model/devres.txt

10 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Mon, 19 May 2014 06:39:37 +0000 (16:39 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'

10 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Mon, 19 May 2014 06:39:26 +0000 (16:39 +1000)]
Merge remote-tracking branch 'scsi/for-next'

10 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 19 May 2014 06:33:19 +0000 (16:33 +1000)]
Merge remote-tracking branch 'cgroup/for-next'

10 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Mon, 19 May 2014 06:32:19 +0000 (16:32 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'

10 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Mon, 19 May 2014 06:22:24 +0000 (16:22 +1000)]
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/iio/adc/Kconfig
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c

10 years agoMerge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Mon, 19 May 2014 06:12:21 +0000 (16:12 +1000)]
Merge remote-tracking branch 'usb-gadget/next'

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

10 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Mon, 19 May 2014 06:01:46 +0000 (16:01 +1000)]
Merge remote-tracking branch 'usb/usb-next'

10 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Mon, 19 May 2014 06:00:03 +0000 (16:00 +1000)]
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
arch/arm64/kernel/early_printk.c

10 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Mon, 19 May 2014 05:44:55 +0000 (15:44 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'

10 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Mon, 19 May 2014 05:43:47 +0000 (15:43 +1000)]
Merge remote-tracking branch 'leds/for-next'

10 years agoMerge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Mon, 19 May 2014 05:42:31 +0000 (15:42 +1000)]
Merge remote-tracking branch 'hsi/for-next'

10 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 19 May 2014 05:41:09 +0000 (15:41 +1000)]
Merge remote-tracking branch 'regmap/for-next'

10 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Mon, 19 May 2014 05:41:01 +0000 (15:41 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'

10 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Mon, 19 May 2014 05:29:54 +0000 (15:29 +1000)]
Merge remote-tracking branch 'workqueues/for-next'

10 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Mon, 19 May 2014 05:18:47 +0000 (15:18 +1000)]
Merge remote-tracking branch 'percpu/for-next'

10 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Mon, 19 May 2014 05:09:55 +0000 (15:09 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'

10 years agoMerge remote-tracking branch 'kvm-arm/next'
Stephen Rothwell [Mon, 19 May 2014 05:08:45 +0000 (15:08 +1000)]
Merge remote-tracking branch 'kvm-arm/next'

10 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Mon, 19 May 2014 05:07:42 +0000 (15:07 +1000)]
Merge remote-tracking branch 'kvm/linux-next'

10 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Mon, 19 May 2014 04:56:34 +0000 (14:56 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

10 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Mon, 19 May 2014 04:54:00 +0000 (14:54 +1000)]
Merge remote-tracking branch 'ftrace/for-next'

10 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 19 May 2014 04:52:56 +0000 (14:52 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

10 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Mon, 19 May 2014 04:41:41 +0000 (14:41 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
drivers/block/mtip32xx/mtip32xx.c
kernel/sched/idle.c
net/ipv4/tcp_output.c

10 years agoMerge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Mon, 19 May 2014 04:40:27 +0000 (14:40 +1000)]
Merge remote-tracking branch 'spi/for-next'

10 years agoMerge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Mon, 19 May 2014 04:38:38 +0000 (14:38 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'

10 years agoMerge remote-tracking branch 'audit/master'
Stephen Rothwell [Mon, 19 May 2014 04:36:54 +0000 (14:36 +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 [Mon, 19 May 2014 04:35:07 +0000 (14:35 +1000)]
Merge remote-tracking branch 'trivial/for-next'

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

10 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 19 May 2014 04:33:49 +0000 (14:33 +1000)]
Merge remote-tracking branch 'iommu/next'

10 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 19 May 2014 04:32:56 +0000 (14:32 +1000)]
Merge remote-tracking branch 'watchdog/master'

10 years agoMerge remote-tracking branch 'selinux/next'
Stephen Rothwell [Mon, 19 May 2014 04:31:45 +0000 (14:31 +1000)]
Merge remote-tracking branch 'selinux/next'

10 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Mon, 19 May 2014 04:21:51 +0000 (14:21 +1000)]
Merge remote-tracking branch 'security/next'

10 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 19 May 2014 04:20:38 +0000 (14:20 +1000)]
Merge remote-tracking branch 'regulator/for-next'

Conflicts:
drivers/regulator/tps65090-regulator.c

10 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Mon, 19 May 2014 04:18:40 +0000 (14:18 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

10 years agoMerge remote-tracking branch 'mfd-lj/for-mfd-next'
Stephen Rothwell [Mon, 19 May 2014 04:17:21 +0000 (14:17 +1000)]
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

10 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 19 May 2014 04:16:15 +0000 (14:16 +1000)]
Merge remote-tracking branch 'md/for-next'

10 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 19 May 2014 04:15:58 +0000 (14:15 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

10 years agoMerge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Mon, 19 May 2014 04:15:02 +0000 (14:15 +1000)]
Merge remote-tracking branch 'mmc-uh/next'

10 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 19 May 2014 04:13:47 +0000 (14:13 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

10 years agoMerge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Mon, 19 May 2014 04:12:20 +0000 (14:12 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'

10 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 19 May 2014 04:09:26 +0000 (14:09 +1000)]
Merge remote-tracking branch 'block/for-next'

10 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 19 May 2014 04:08:21 +0000 (14:08 +1000)]
Merge remote-tracking branch 'input/next'

10 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Mon, 19 May 2014 04:07:17 +0000 (14:07 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'

10 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Mon, 19 May 2014 03:56:15 +0000 (13:56 +1000)]
Merge remote-tracking branch 'modules/modules-next'

10 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 19 May 2014 03:54:57 +0000 (13:54 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

10 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 19 May 2014 03:53:53 +0000 (13:53 +1000)]
Merge remote-tracking branch 'sound/for-next'

10 years agoMerge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Mon, 19 May 2014 03:52:56 +0000 (13:52 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

10 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Mon, 19 May 2014 03:51:34 +0000 (13:51 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

10 years agoMerge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Mon, 19 May 2014 03:50:37 +0000 (13:50 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'

10 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Mon, 19 May 2014 03:49:01 +0000 (13:49 +1000)]
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_gem_gtt.c

10 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 19 May 2014 03:48:00 +0000 (13:48 +1000)]
Merge remote-tracking branch 'crypto/master'

Conflicts:
crypto/crypto_user.c
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h
drivers/crypto/caam/error.c

10 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 19 May 2014 03:42:26 +0000 (13:42 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

10 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 19 May 2014 03:41:06 +0000 (13:41 +1000)]
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
drivers/bluetooth/btusb.c

10 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Mon, 19 May 2014 03:39:49 +0000 (13:39 +1000)]
Merge remote-tracking branch 'wireless-next/master'

10 years agoMerge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Mon, 19 May 2014 03:38:23 +0000 (13:38 +1000)]
Merge remote-tracking branch 'ipsec-next/master'

10 years agonext-20140516/net-next
Stephen Rothwell [Mon, 19 May 2014 03:37:02 +0000 (13:37 +1000)]
next-20140516/net-next

Conflicts:
drivers/net/ethernet/altera/altera_msgdma.c
drivers/net/ethernet/altera/altera_sgdma.c
net/ipv6/xfrm6_output.c

10 years agoMerge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Mon, 19 May 2014 02:56:20 +0000 (12:56 +1000)]
Merge remote-tracking branch 'dmaengine/next'

10 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 19 May 2014 02:55:08 +0000 (12:55 +1000)]
Merge remote-tracking branch 'slave-dma/next'

10 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Mon, 19 May 2014 02:54:12 +0000 (12:54 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'