2013-06-17 07:36:30

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: manual merge of the arm64-hugepages tree with the arm64 tree

---

Hi Steve,

Today's linux-next merge of the arm64-hugepages tree got a conflict in
arch/arm64/Kconfig between commit aa42aa1389a5 ("arm64/xen: introduce
CONFIG_XEN and hypercall.S on ARM64") from the arm64 tree and commit
d03bb1455f3a ("ARM64: mm: Raise MAX_ORDER for 64KB pages and THP") from
the arm64-hugepages tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell [email protected]

diff --cc arch/arm64/Kconfig
index ef32eb1,308a556..0000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -181,18 -180,25 +181,35 @@@ config HW_PERF_EVENT
Enable hardware performance counter support for perf events. If
disabled, perf events will use software events only.

+ config SYS_SUPPORTS_HUGETLBFS
+ def_bool y
+
+ config ARCH_WANT_GENERAL_HUGETLB
+ def_bool y
+
+ config ARCH_WANT_HUGE_PMD_SHARE
+ def_bool y if !ARM64_64K_PAGES
+
+ config HAVE_ARCH_TRANSPARENT_HUGEPAGE
+ def_bool y
+
source "mm/Kconfig"

+ config FORCE_MAX_ZONEORDER
+ int
+ default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE)
+ default "11"
+
+config XEN_DOM0
+ def_bool y
+ depends on XEN
+
+config XEN
+ bool "Xen guest support on ARM64 (EXPERIMENTAL)"
+ depends on ARM64 && OF
+ help
+ Say Y if you want to run Linux in a Virtual Machine on Xen on ARM64.
+
endmenu

menu "Boot options"

---

Attachments:

(No filename) (1.37 kB)
(No filename) (836.00 B)
Download all attachments

2013-06-17 08:35:36

by Steve Capper

[permalink] [raw]

Subject: Re: linux-next: manual merge of the arm64-hugepages tree with the arm64 tree

---

On Mon, Jun 17, 2013 at 05:36:27PM +1000, Stephen Rothwell wrote:
> Hi Steve,

Hi Stephen,

>
> Today's linux-next merge of the arm64-hugepages tree got a conflict in
> arch/arm64/Kconfig between commit aa42aa1389a5 ("arm64/xen: introduce
> CONFIG_XEN and hypercall.S on ARM64") from the arm64 tree and commit
> d03bb1455f3a ("ARM64: mm: Raise MAX_ORDER for 64KB pages and THP") from
> the arm64-hugepages tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks this fixup looks good to me.

Cheers,
--
Steve