* linux-next: manual merge of the akpm-current tree with the FIXME tree
@ 2018-12-11 6:11 Stephen Rothwell
2018-12-11 6:12 ` linux-next: manual merge of the akpm-current tree with the arm64 tree Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2018-12-11 6:11 UTC (permalink / raw)
To: Andrew Morton
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Andrey Konovalov, Steve Capper
[-- Attachment #1: Type: text/plain, Size: 1557 bytes --]
Hi Andrew,
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/mm/proc.S
between commits:
67e7fdfcc682 ("arm64: mm: introduce 52-bit userspace support")
68d23da4373a ("rm64: Kconfig: Re-jig CONFIG options for 52-bit VA")
from the FIXME tree and commit:
089dc516f651 ("kasan, arm64: enable top byte ignore for the kernel")
from the akpm-current 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/arm64/mm/proc.S
index e05b3ce1db6b,d861f208eeb1..73886a5f1f30
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@@ -449,16 -451,8 +455,16 @@@ ENTRY(__cpu_setup
*/
ldr x10, =TCR_TxSZ(VA_BITS) | TCR_CACHE_FLAGS | TCR_SMP_FLAGS | \
TCR_TG_FLAGS | TCR_KASLR_FLAGS | TCR_ASID16 | \
- TCR_TBI0 | TCR_A1
+ TCR_TBI0 | TCR_A1 | TCR_KASAN_FLAGS
- tcr_set_idmap_t0sz x10, x9
+
+#ifdef CONFIG_ARM64_USER_VA_BITS_52
+ ldr_l x9, vabits_user
+ sub x9, xzr, x9
+ add x9, x9, #64
+#else
+ ldr_l x9, idmap_t0sz
+#endif
+ tcr_set_t0sz x10, x9
/*
* Set the IPS bits in TCR_EL1.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the akpm-current tree with the arm64 tree
2018-12-11 6:11 linux-next: manual merge of the akpm-current tree with the FIXME tree Stephen Rothwell
@ 2018-12-11 6:12 ` Stephen Rothwell
2018-12-11 10:39 ` Will Deacon
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2018-12-11 6:12 UTC (permalink / raw)
To: Andrew Morton, Catalin Marinas, Will Deacon
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Andrey Konovalov, Steve Capper
[-- Attachment #1: Type: text/plain, Size: 1723 bytes --]
Hi all,
[Sent to early with people missing ...]
On Tue, 11 Dec 2018 17:11:02 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/arm64/mm/proc.S
>
> between commits:
>
> 67e7fdfcc682 ("arm64: mm: introduce 52-bit userspace support")
> 68d23da4373a ("rm64: Kconfig: Re-jig CONFIG options for 52-bit VA")
>
> from the arm64 tree and commit:
>
> 089dc516f651 ("kasan, arm64: enable top byte ignore for the kernel")
>
> from the akpm-current 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/arm64/mm/proc.S
> index e05b3ce1db6b,d861f208eeb1..73886a5f1f30
> --- a/arch/arm64/mm/proc.S
> +++ b/arch/arm64/mm/proc.S
> @@@ -449,16 -451,8 +455,16 @@@ ENTRY(__cpu_setup
> */
> ldr x10, =TCR_TxSZ(VA_BITS) | TCR_CACHE_FLAGS | TCR_SMP_FLAGS | \
> TCR_TG_FLAGS | TCR_KASLR_FLAGS | TCR_ASID16 | \
> - TCR_TBI0 | TCR_A1
> + TCR_TBI0 | TCR_A1 | TCR_KASAN_FLAGS
> - tcr_set_idmap_t0sz x10, x9
> +
> +#ifdef CONFIG_ARM64_USER_VA_BITS_52
> + ldr_l x9, vabits_user
> + sub x9, xzr, x9
> + add x9, x9, #64
> +#else
> + ldr_l x9, idmap_t0sz
> +#endif
> + tcr_set_t0sz x10, x9
>
> /*
> * Set the IPS bits in TCR_EL1.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the akpm-current tree with the arm64 tree
2018-12-11 6:12 ` linux-next: manual merge of the akpm-current tree with the arm64 tree Stephen Rothwell
@ 2018-12-11 10:39 ` Will Deacon
0 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2018-12-11 10:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, Catalin Marinas, Linux Next Mailing List,
Linux Kernel Mailing List, Andrey Konovalov, Steve Capper
On Tue, Dec 11, 2018 at 05:12:30PM +1100, Stephen Rothwell wrote:
> On Tue, 11 Dec 2018 17:11:02 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > arch/arm64/mm/proc.S
> >
> > between commits:
> >
> > 67e7fdfcc682 ("arm64: mm: introduce 52-bit userspace support")
> > 68d23da4373a ("rm64: Kconfig: Re-jig CONFIG options for 52-bit VA")
> >
> > from the arm64 tree and commit:
> >
> > 089dc516f651 ("kasan, arm64: enable top byte ignore for the kernel")
> >
> > from the akpm-current 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/arm64/mm/proc.S
> > index e05b3ce1db6b,d861f208eeb1..73886a5f1f30
> > --- a/arch/arm64/mm/proc.S
> > +++ b/arch/arm64/mm/proc.S
> > @@@ -449,16 -451,8 +455,16 @@@ ENTRY(__cpu_setup
> > */
> > ldr x10, =TCR_TxSZ(VA_BITS) | TCR_CACHE_FLAGS | TCR_SMP_FLAGS | \
> > TCR_TG_FLAGS | TCR_KASLR_FLAGS | TCR_ASID16 | \
> > - TCR_TBI0 | TCR_A1
> > + TCR_TBI0 | TCR_A1 | TCR_KASAN_FLAGS
> > - tcr_set_idmap_t0sz x10, x9
> > +
> > +#ifdef CONFIG_ARM64_USER_VA_BITS_52
> > + ldr_l x9, vabits_user
> > + sub x9, xzr, x9
> > + add x9, x9, #64
> > +#else
> > + ldr_l x9, idmap_t0sz
> > +#endif
> > + tcr_set_t0sz x10, x9
> >
> > /*
> > * Set the IPS bits in TCR_EL1.
This looks good to me. Thanks, Stephen.
Will
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the akpm-current tree with the FIXME tree
2015-07-23 6:00 linux-next: manual merge of the akpm-current tree with the FIXME tree Stephen Rothwell
2015-07-23 6:02 ` Stephen Rothwell
@ 2015-07-23 9:39 ` Jan Kara
1 sibling, 0 replies; 6+ messages in thread
From: Jan Kara @ 2015-07-23 9:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, Jan Kara, linux-next, linux-kernel, Alexey Dobriyan
On Thu 23-07-15 16:00:48, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got conflicts in:
>
> fs/ext3/super.c
>
> between commit:
>
> 106542e7987c ("fs: Remove ext3 filesystem driver")
>
> from the FIXME tree and commit:
>
> d2c05ecd59bc ("parse_integer: convert ext2, ext3, ext4")
>
> from the akpm-current tree.
>
> I fixed it up (I just removed the file) and can carry the fix as necessary
> (no action is required).
>
> Jan, I also removed the JBD section from the MAINTAINERS file ... your
> version has conflict markers left around it ...
Thanks Stephen. I have fixed up MAINTAINERS file in my tree (amended the
original commit).
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the akpm-current tree with the FIXME tree
2015-07-23 6:00 linux-next: manual merge of the akpm-current tree with the FIXME tree Stephen Rothwell
@ 2015-07-23 6:02 ` Stephen Rothwell
2015-07-23 9:39 ` Jan Kara
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2015-07-23 6:02 UTC (permalink / raw)
To: Andrew Morton, Jan Kara; +Cc: linux-next, linux-kernel, Alexey Dobriyan
Hi all,
Of course, I meant the ext3 tree (not the FIXME tree :-))
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the akpm-current tree with the FIXME tree
@ 2015-07-23 6:00 Stephen Rothwell
2015-07-23 6:02 ` Stephen Rothwell
2015-07-23 9:39 ` Jan Kara
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2015-07-23 6:00 UTC (permalink / raw)
To: Andrew Morton, Jan Kara; +Cc: linux-next, linux-kernel, Alexey Dobriyan
Hi Andrew,
Today's linux-next merge of the akpm-current tree got conflicts in:
fs/ext3/super.c
between commit:
106542e7987c ("fs: Remove ext3 filesystem driver")
from the FIXME tree and commit:
d2c05ecd59bc ("parse_integer: convert ext2, ext3, ext4")
from the akpm-current tree.
I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).
Jan, I also removed the JBD section from the MAINTAINERS file ... your
version has conflict markers left around it ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-12-11 10:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-11 6:11 linux-next: manual merge of the akpm-current tree with the FIXME tree Stephen Rothwell
2018-12-11 6:12 ` linux-next: manual merge of the akpm-current tree with the arm64 tree Stephen Rothwell
2018-12-11 10:39 ` Will Deacon
-- strict thread matches above, loose matches on Subject: below --
2015-07-23 6:00 linux-next: manual merge of the akpm-current tree with the FIXME tree Stephen Rothwell
2015-07-23 6:02 ` Stephen Rothwell
2015-07-23 9:39 ` Jan Kara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).