Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ralf Baechle <ralf@linux-mips.org>, James Hogan <jhogan@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Thomas Bogendoerfer <tbogendoerfer@suse.de>,
	Paul Burton <paulburton@kernel.org>
Subject: linux-next: manual merge of the mips tree with the mips-fixes tree
Date: Tue, 5 Nov 2019 10:05:56 +1100
Message-ID: <20191105100556.52f266a2@canb.auug.org.au> (raw)

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

Hi all,

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

  arch/mips/sgi-ip27/ip27-init.c

between commit:

  637346748245 ("MIPS: SGI-IP27: fix exception handler replication")

from the mips-fixes tree and commit:

  4bf841ebf17a ("MIPS: SGI-IP27: get rid of compact node ids")

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/sgi-ip27/ip27-init.c
index 79a52c472782,8fd3505e2b9c..000000000000
--- a/arch/mips/sgi-ip27/ip27-init.c
+++ b/arch/mips/sgi-ip27/ip27-init.c
@@@ -67,16 -62,25 +62,16 @@@ static void per_hub_init(nasid_t nasid
  	REMOTE_HUB_S(nasid, IIO_ICTP, 0x800);
  	REMOTE_HUB_S(nasid, IIO_ICTO, 0xff);
  
- 	hub_rtc_init(cnode);
+ 	hub_rtc_init(nasid);
  
 -#ifdef CONFIG_REPLICATE_EXHANDLERS
 -	/*
 -	 * If this is not a headless node initialization,
 -	 * copy over the caliased exception handlers.
 -	 */
 -	if (get_nasid() == nasid) {
 -		extern char except_vec2_generic, except_vec3_generic;
 -		extern void build_tlb_refill_handler(void);
 -
 -		memcpy((void *)(CKSEG0 + 0x100), &except_vec2_generic, 0x80);
 -		memcpy((void *)(CKSEG0 + 0x180), &except_vec3_generic, 0x80);
 -		build_tlb_refill_handler();
 -		memcpy((void *)(CKSEG0 + 0x100), (void *) CKSEG0, 0x80);
 -		memcpy((void *)(CKSEG0 + 0x180), &except_vec3_generic, 0x100);
 +	if (nasid) {
 +		/* copy exception handlers from first node to current node */
 +		memcpy((void *)NODE_OFFSET_TO_K0(nasid, 0),
 +		       (void *)CKSEG0, 0x200);
  		__flush_cache_all();
 +		/* switch to node local exception handlers */
 +		REMOTE_HUB_S(nasid, PI_CALIAS_SIZE, PI_CALIAS_SIZE_8K);
  	}
 -#endif
  }
  
  void per_cpu_init(void)

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

             reply index

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-04 23:05 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-02-07 22:22 Stephen Rothwell
2019-02-05 22:17 Stephen Rothwell
2019-02-05 23:35 ` Paul Burton
2019-02-05 23:44   ` Stephen Rothwell
2018-06-28 23:46 Stephen Rothwell

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191105100556.52f266a2@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=jhogan@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=paulburton@kernel.org \
    --cc=ralf@linux-mips.org \
    --cc=tbogendoerfer@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git