From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the s390 tree with Linus' tree
Date: Mon, 4 Sep 2017 09:49:28 +1000 [thread overview]
Message-ID: <20170904094928.59e8594c@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the s390 tree got a conflict in:
arch/s390/include/asm/mmu_context.h
between commit:
0b89ede62963 ("s390/mm: fork vs. 5 level page tabel")
from Linus' tree and commit:
f1c1174fa099 ("s390/mm: use new mm defines instead of magic values")
from the s390 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/s390/include/asm/mmu_context.h
index 24bc41622a98,31eea6261488..000000000000
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@@ -44,12 -45,7 +45,12 @@@ static inline int init_new_context(stru
mm->context.asce = __pa(mm->pgd) | _ASCE_TABLE_LENGTH |
_ASCE_USER_BITS | _ASCE_TYPE_REGION3;
break;
+ case -PAGE_SIZE:
+ /* forked 5-level task, set new asce with new_mm->pgd */
+ mm->context.asce = __pa(mm->pgd) | _ASCE_TABLE_LENGTH |
+ _ASCE_USER_BITS | _ASCE_TYPE_REGION1;
+ break;
- case 1UL << 53:
+ case _REGION1_SIZE:
/* forked 4-level task, set new asce with new mm->pgd */
mm->context.asce = __pa(mm->pgd) | _ASCE_TABLE_LENGTH |
_ASCE_USER_BITS | _ASCE_TYPE_REGION2;
next reply other threads:[~2017-09-03 23:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-03 23:49 Stephen Rothwell [this message]
2017-09-04 12:45 ` linux-next: manual merge of the s390 tree with Linus' tree Martin Schwidefsky
-- strict thread matches above, loose matches on Subject: below --
2025-01-29 0:59 Stephen Rothwell
2020-05-29 0:10 Stephen Rothwell
2015-04-20 2:02 Stephen Rothwell
2015-02-22 0:27 Stephen Rothwell
2011-05-19 0:35 Stephen Rothwell
2011-05-20 18:43 ` Jens Axboe
Reply instructions:
You may reply publicly 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=20170904094928.59e8594c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=schwidefsky@de$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox