leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
028f43bc64
linux/arch/powerpc
History
David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts were simply overlapping changes.  In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.

In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-04-15 21:16:30 -04:00
..
boot powerpc/boot: Fix zImage TOC alignment 2017-03-08 10:39:32 +11:00
configs powerpc updates for 4.11 part 2 2017-03-01 10:10:16 -08:00
crypto powerpc/crypto/crc32c-vpmsum: Fix missing preempt_disable() 2017-04-07 21:12:58 +10:00
include New getsockopt option to get socket cookie 2017-04-08 08:07:01 -07:00
kernel powerpc/64: Fix flush_(d|i)cache_range() called from modules 2017-04-05 21:40:21 +10:00
kvm KVM: PPC: Book3S HV: Check for kmalloc errors in ioctl 2017-04-06 15:50:43 +10:00
lib powerpc fixes for 4.11 #3 2017-03-07 10:46:10 -08:00
math-emu Replace <asm/uaccess.h> with <linux/uaccess.h> globally 2016-12-24 11:46:01 -08:00
mm powerpc/mm: Add missing global TLB invalidate if cxl is active 2017-04-05 22:13:37 +10:00
net powerpc updates for 4.11 part 1. 2017-02-22 10:30:38 -08:00
oprofile ktime: Cleanup ktime_set() usage 2016-12-25 17:21:22 +01:00
perf powerpc/perf: Handle sdar_mode for marked event in power9 2017-03-09 13:34:54 +11:00
platforms powerpc/pseries: Don't give a warning when HPT resizing isn't available 2017-03-17 16:10:58 +11:00
purgatory kexec, x86/purgatory: Unbreak it and clean it up 2017-03-10 20:55:09 +01:00
scripts
sysdev axonram: Fix gendisk handling 2017-03-08 10:55:40 -07:00
xmon sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h> 2017-03-02 08:42:29 +01:00
Kconfig powerpc: Sort the selects under CONFIG_PPC 2017-03-06 23:05:42 +11:00
Kconfig.debug powerpc/xmon: Enable disassembly files (compilation changes) 2017-02-15 20:02:42 +11:00
Makefile powerpc: Fix compiling a BE kernel with a powerpc64le toolchain 2017-03-03 11:24:50 +11:00
relocs_check.sh powerpc/64: whitelist unresolved modversions CRCs 2016-09-22 14:46:31 +02:00