You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 7fbb58a065 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... Pull MIPS fixes from Ralf Baechle: "A fair number of 4.2 fixes also because Markos opened the flood gates. - Patch up the math used calculate the location for the page bitmap. - The FDC (Not what you think, FDC stands for Fast Debug Channel) IRQ around was causing issues on non-Malta platforms, so move the code to a Malta specific location. - A spelling fix replicated through several files. - Fix to the emulation of an R2 instruction for R6 cores. - Fix the JR emulation for R6. - Further patching of mindless 64 bit issues. - Ensure the kernel won't crash on CPUs with L2 caches with >= 8 ways. - Use compat_sys_getsockopt for O32 ABI on 64 bit kernels. - Fix cache flushing for multithreaded cores. - A build fix" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: O32: Use compat_sys_getsockopt. MIPS: c-r4k: Extend way_string array MIPS: Pistachio: Support CDMM & Fast Debug Channel MIPS: Malta: Make GIC FDC IRQ workaround Malta specific MIPS: c-r4k: Fix cache flushing for MT cores Revert "MIPS: Kconfig: Disable SMP/CPS for 64-bit" MIPS: cps-vec: Use macros for various arithmetics and memory operations MIPS: kernel: cps-vec: Replace KSEG0 with CKSEG0 MIPS: kernel: cps-vec: Use ta0-ta3 pseudo-registers for 64-bit MIPS: kernel: cps-vec: Replace mips32r2 ISA level with mips64r2 MIPS: kernel: cps-vec: Replace 'la' macro with PTR_LA MIPS: kernel: smp-cps: Fix 64-bit compatibility errors due to pointer casting MIPS: Fix erroneous JR emulation for MIPS R6 MIPS: Fix branch emulation for BLTC and BGEC instructions MIPS: kernel: traps: Fix broken indentation MIPS: bootmem: Don't use memory holes for page bitmap MIPS: O32: Do not handle require 32 bytes from the stack to be readable. MIPS, CPUFREQ: Fix spelling of Institute. MIPS: Lemote 2F: Fix build caused by recent mass rename.		10 years ago
..
alpha	TTY/Serial driver patches for 4.2-rc1	10 years ago
arc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	10 years ago
arm	ARM: SoC: fixes for v4.2-rc2	10 years ago
arm64	ARM: SoC: fixes for v4.2-rc2	10 years ago
avr32	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	10 years ago
blackfin	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	10 years ago
c6x	Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block	10 years ago
cris	cris: Replace do_posix_clock_monotonic_gettime()	10 years ago
frv	Fix up implicit <module.h> users that will break later.	10 years ago
h8300	h8300: Always build dtb	10 years ago
hexagon	Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block	10 years ago
ia64	remove some boot noise from a now-invalid check that pages are reserved	10 years ago
m32r	Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block	10 years ago
m68k	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	10 years ago
metag	Merge branch 'akpm' (patches from Andrew)	10 years ago
microblaze	Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block	10 years ago
mips	MIPS: O32: Use compat_sys_getsockopt.	10 years ago
mn10300	Replace module_init with equivalent device_initcall in non modules.	10 years ago
nios2	nios2 update for v4.2	10 years ago
openrisc	Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block	10 years ago
parisc	parisc: Fix some PTE/TLB race conditions and optimize __flush_tlb_range based on timing results	10 years ago
powerpc	powerpc/perf/24x7: Fix lockdep warning	10 years ago
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	10 years ago
score	Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block	10 years ago
sh	Replace module_init with equivalent device_initcall in non modules.	10 years ago
sparc	Merge branch 'akpm' (patches from Andrew)	10 years ago
tile	modpost: work correctly with tile coldtext sections	10 years ago
um	Minor merge needed, due to function move.	10 years ago
unicore32	arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR	10 years ago
x86	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	10 years ago
xtensa	Replace module_init with equivalent device_initcall in non modules.	10 years ago
.gitignore	…
Kconfig	clone: support passing tls argument via C rather than pt_regs magic	10 years ago