David S. Miller
b04096ff33
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Four minor merge conflicts:
1) qca_spi.c renamed the local variable used for the SPI device
from spi_device to spi, meanwhile the spi_set_drvdata() call
got moved further up in the probe function.
2) Two changes were both adding new members to codel params
structure, and thus we had overlapping changes to the
initializer function.
3) 'net' was making a fix to sk_release_kernel() which is
completely removed in 'net-next'.
4) In net_namespace.c, the rtnl_net_fill() call for GET operations
had the command value fixed, meanwhile 'net-next' adjusted the
argument signature a bit.
This also matches example merge resolutions posted by Stephen
Rothwell over the past two days.
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-13 14:31:43 -04:00
alpha: forward declare struct pt_regs in processor.h
2015-04-17 09:03:53 -04:00
ARC changes for 4.1-rc1:
2015-04-24 07:55:54 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-05-13 14:31:43 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2015-05-11 11:05:13 -07:00
Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc
2015-04-15 13:53:55 -07:00
blackfin updates for Linux 4.1
2015-04-24 07:58:07 -07:00
C6X Fixes for v4.1
2015-04-16 18:48:55 -04:00
CRIS changes for 4.1
2015-04-26 13:31:05 -07:00
Devicetree updates for 4.1:
2015-04-24 08:46:18 -07:00
Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc
2015-04-15 13:53:55 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-04-26 17:22:07 -07:00
m32r: make flush_cpumask non-volatile.
2015-05-09 11:09:29 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
2015-04-20 10:12:29 -07:00
Metag architecture changes for v4.1
2015-04-24 07:56:50 -07:00
microblaze: use asm-generic for seccomp.h
2015-04-17 09:04:10 -04:00
MIPS: fix FP mode selection in lieu of .MIPS.abiflags data
2015-05-12 18:54:05 +02:00
Devicetree updates for 4.1:
2015-04-24 08:46:18 -07:00
nios2 update for v4.1-rc1
2015-04-24 07:59:07 -07:00
Merge branch 'akpm' (patches from Andrew)
2015-04-15 16:39:15 -07:00
parisc: Replace PT_NLEVELS with CONFIG_PGTABLE_LEVELS
2015-04-21 22:04:03 +02:00
powerpc/powernv: Restore non-volatile CRs after nap
2015-05-01 16:55:11 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2015-04-28 09:58:46 -07:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2015-04-24 09:49:37 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
2015-04-21 23:21:34 -07:00
tile: properly use node_isset() on a nodemask_t
2015-04-28 10:36:45 -04:00
Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc
2015-04-15 13:53:55 -07:00
Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc
2015-04-15 13:53:55 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-05-12 21:10:38 -07:00
Xtensa changes and fixes for 4.1
2015-04-17 15:32:30 -04:00
powerpc updates for 4.1
2015-04-16 13:53:32 -05:00
b04096ff33