Commit a6525b99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_5.12_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull more MIPS updates from Thomas Bogendoerfer:

 - added n64 block driver

 - fix for ubsan warnings

 - fix for bcm63xx platform

 - update of linux-mips mailinglist

* tag 'mips_5.12_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  arch: mips: update references to current linux-mips list
  mips: bmips: init clocks earlier
  vmlinux.lds.h: catch even more instrumentation symbols into .data
  n64: store dev instance into disk private data
  n64: cleanup n64cart_probe()
  n64: cosmetics changes
  n64: remove curly brackets
  n64: use sector SECTOR_SHIFT instead 512
  n64: use enums for reg
  n64: move module param at the top
  n64: move module info at the end
  n64: use pr_fmt to avoid duplicate string
  block: Add n64 cart driver
parents fdce2960 057a14d6

arch/mips/bmips/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -196,4 +196,4 @@ static int __init plat_dev_init(void) 
	return 0;

}



device_initcall(plat_dev_init);
 
arch_initcall(plat_dev_init);

arch/mips/kernel/r4k-bugs64.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
static char bug64hit[] __initdata =

	"reliable operation impossible!\n%s";

static char nowar[] __initdata =

	"Please report to <linux-mips@linux-mips.org>.";

	"Please report to <linux-mips@vger.kernel.org>.";

static char r4kwar[] __initdata =

	"Enable CPU_R4000_WORKAROUNDS to rectify.";

static char daddiwar[] __initdata =

arch/mips/lib/iomap-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ void __iomem *__pci_ioport_map(struct pci_dev *dev, 
		sprintf(name, "%04x:%02x", pci_domain_nr(bus), bus->number);

		printk(KERN_WARNING "io_map_base of root PCI bus %s unset.  "

		       "Trying to continue but you better\nfix this issue or "

		       "report it to linux-mips@linux-mips.org or your "

		       "report it to linux-mips@vger.kernel.org or your "

		       "vendor.\n", name);

#ifdef CONFIG_PCI_DOMAINS

		panic("To avoid data corruption io_map_base MUST be set with "

arch/mips/sgi-ip32/ip32-irq.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static void ip32_unknown_interrupt(void) 
	printk("Register dump:\n");

	show_regs(get_irq_regs());



	printk("Please mail this report to linux-mips@linux-mips.org\n");

	printk("Please mail this report to linux-mips@vger.kernel.org\n");

	printk("Spinning...");

	while(1) ;

}

drivers/block/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -66,6 +66,12 @@ config AMIGA_Z2RAM 
	  To compile this driver as a module, choose M here: the

	  module will be called z2ram.



config N64CART

	bool "N64 cart support"

	depends on MACH_NINTENDO64

	help

	  Support for the N64 cart.



config CDROM

	tristate

	select BLK_SCSI_REQUEST