2020-12-10 13:58:19

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: manual merge of the tip tree with the microblaze tree

---

Hi all,

Today's linux-next merge of the tip tree got conflicts in:

arch/microblaze/Kconfig
arch/microblaze/mm/Makefile

between commit:

05cdf457477d ("microblaze: Remove noMMU code")

from the microblaze tree and commit:

7ac1b26b0a72 ("microblaze/mm/highmem: Switch to generic kmap atomic")

from the tip 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/microblaze/Kconfig
index 6acbb4571b0f,7f6ca0ab4f81..000000000000
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@@ -139,8 -143,19 +139,9 @@@ config ADVANCED_OPTION
comment "Default settings for advanced configuration options are used"
depends on !ADVANCED_OPTIONS

-config XILINX_UNCACHED_SHADOW
- bool "Are you using uncached shadow for RAM ?"
- depends on ADVANCED_OPTIONS && !MMU
- default n
- help
- This is needed to be able to allocate uncachable memory regions.
- The feature requires the design to define the RAM memory controller
- window to be twice as large as the actual physical memory.
-
config HIGHMEM
bool "High memory support"
- depends on MMU
+ select KMAP_LOCAL
help
The address space of Microblaze processors is only 4 Gigabytes large
and it has to accommodate user address space, kernel address
diff --cc arch/microblaze/mm/Makefile
index cd8a844bf29e,8ced71100047..000000000000
--- a/arch/microblaze/mm/Makefile
+++ b/arch/microblaze/mm/Makefile
@@@ -5,5 -5,4 +5,4 @@@

obj-y := consistent.o init.o

-obj-$(CONFIG_MMU) += pgtable.o mmu_context.o fault.o
+obj-y += pgtable.o mmu_context.o fault.o
- obj-$(CONFIG_HIGHMEM) += highmem.o

---

Attachments:

(No filename) (499.00 B)
OpenPGP digital signature

2020-12-10 14:52:56

by Michal Simek

[permalink] [raw]

Subject: Re: linux-next: manual merge of the tip tree with the microblaze tree

---

Hi Stephen,

On 10. 12. 20 5:58, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got conflicts in:
>
> arch/microblaze/Kconfig
> arch/microblaze/mm/Makefile
>
> between commit:
>
> 05cdf457477d ("microblaze: Remove noMMU code")
>
> from the microblaze tree and commit:
>
> 7ac1b26b0a72 ("microblaze/mm/highmem: Switch to generic kmap atomic")
>
> from the tip 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.
>

Thanks for letting me know. I will mentioned it to Linus.
Your resolution is correct.

Thanks,
Michal


--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs