Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle: "These are four patches for three construction sites: - Fix register decoding for the combination of multi-core processors and multi-threading. - Two more fixes that are part of the ongoing DECstation resurrection work. One of these touches a DECstation-only network driver. - Finally Markos' trivial build fix for the AP/SP support. (With this applied now all MIPS defconfigs are building again)" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: kernel: vpe: Make vpe_attrs an array of pointers. MIPS: Fix SMP core calculations when using MT support. MIPS: DECstation I/O ASIC DMA interrupt handling fix MIPS: DECstation HRT initialization rearrangement
No related branches found
No related tags found
Showing
- arch/mips/dec/ioasic-irq.c 8 additions, 0 deletionsarch/mips/dec/ioasic-irq.c
- arch/mips/dec/time.c 19 additions, 3 deletionsarch/mips/dec/time.c
- arch/mips/include/asm/dec/ioasic.h 3 additions, 1 deletionarch/mips/include/asm/dec/ioasic.h
- arch/mips/kernel/csrc-ioasic.c 7 additions, 1 deletionarch/mips/kernel/csrc-ioasic.c
- arch/mips/kernel/smp-cmp.c 11 additions, 2 deletionsarch/mips/kernel/smp-cmp.c
- arch/mips/kernel/vpe.c 1 addition, 1 deletionarch/mips/kernel/vpe.c
- drivers/net/ethernet/amd/declance.c 1 addition, 0 deletionsdrivers/net/ethernet/amd/declance.c
Loading
Please register or sign in to comment