linux-next: manual merge of the mips tree with the mm-nonmm-stable tree

linux-next: manual merge of the mips tree with the mm-nonmm-stable tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1174 bytes --]

Hi all,

Today's linux-next merge of the mips tree got a conflict in:

  arch/mips/kernel/traps.c

between commit:

  ec47b986e53e ("mips: fix tlb_init() prototype")

from the mm-nonmm-stable tree and commit:

  8e1803900ef1 ("MIPS: Remove unused shadow GPR support from vector irq setup")

from the mips tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/mips/kernel/traps.c
index c58c0c3c5b40,c1b2b18b0505..000000000000
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@@ -2152,11 -2120,8 +2120,6 @@@ void *set_vi_handler(int n, vi_handler_
  	return (void *)old_handler;
  }
  
- void *set_vi_handler(int n, vi_handler_t addr)
- {
- 	return set_vi_srs_handler(n, addr, 0);
- }
 -extern void tlb_init(void);
--
  /*
   * Timer interrupt
   */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]