From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mel Gorman <mgorman@suse.de>,
Josh Triplett <josh@joshtriplett.org>
Subject: linux-next: manual merge of the akpm-current tree with the tip tree
Date: Thu, 4 Jun 2015 22:07:21 +1000 [thread overview]
Message-ID: <20150604220721.2a42246a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 6074 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/x86/Kconfig between commit 6471b825c41e ("x86/kconfig: Reorganize
arch feature Kconfig select's") from the tip tree and commits
be853e68c4b2 ("x86: mm: enable deferred struct page initialisation on
x86-64") and 84ebc29f19b2 ("x86: opt into HAVE_COPY_THREAD_TLS, for
both 32-bit and 64-bit") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/Kconfig
index fc1fd8a41540,0dd372f3111e..000000000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -17,113 -23,61 +17,115 @@@ config X86_6
### Arch settings
config X86
def_bool y
- select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
- select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
+ select ACPI_LEGACY_TABLES_LOOKUP if ACPI
+ select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
+ select ANON_INODES
+ select ARCH_CLOCKSOURCE_DATA
+ select ARCH_DISCARD_MEMBLOCK
+ select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+ select ARCH_HAS_ELF_RANDOMIZE
select ARCH_HAS_FAST_MULTIPLIER
select ARCH_HAS_GCOV_PROFILE_ALL
+ select ARCH_HAS_SG_CHAIN
+ select ARCH_HAVE_NMI_SAFE_CMPXCHG
+ select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
select ARCH_MIGHT_HAVE_PC_PARPORT
select ARCH_MIGHT_HAVE_PC_SERIO
- select HAVE_AOUT if X86_32
- select HAVE_UNSTABLE_SCHED_CLOCK
- select ARCH_SUPPORTS_NUMA_BALANCING if X86_64
- select ARCH_SUPPORTS_INT128 if X86_64
- select HAVE_IDE
- select HAVE_OPROFILE
- select HAVE_PCSPKR_PLATFORM
- select HAVE_PERF_EVENTS
- select HAVE_IOREMAP_PROT
- select HAVE_KPROBES
- select HAVE_MEMBLOCK
- select HAVE_MEMBLOCK_NODE_MAP
- select ARCH_DISCARD_MEMBLOCK
- select ARCH_WANT_OPTIONAL_GPIOLIB
+ select ARCH_SUPPORTS_ATOMIC_RMW
++ select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT if X86_64
+ select ARCH_SUPPORTS_INT128 if X86_64
+ select ARCH_SUPPORTS_NUMA_BALANCING if X86_64
+ select ARCH_USE_BUILTIN_BSWAP
+ select ARCH_USE_CMPXCHG_LOCKREF if X86_64
+ select ARCH_USE_QUEUED_RWLOCKS
+ select ARCH_USE_QUEUED_SPINLOCKS
select ARCH_WANT_FRAME_POINTERS
- select HAVE_DMA_ATTRS
- select HAVE_DMA_CONTIGUOUS
- select HAVE_KRETPROBES
+ select ARCH_WANT_IPC_PARSE_VERSION if X86_32
+ select ARCH_WANT_OPTIONAL_GPIOLIB
+ select BUILDTIME_EXTABLE_SORT
+ select CLKEVT_I8253
+ select CLKSRC_I8253 if X86_32
+ select CLOCKSOURCE_VALIDATE_LAST_CYCLE
+ select CLOCKSOURCE_WATCHDOG
+ select CLONE_BACKWARDS if X86_32
+ select COMPAT_OLD_SIGACTION if IA32_EMULATION
+ select DCACHE_WORD_ACCESS
+ select EDAC_ATOMIC_SCRUB
+ select EDAC_SUPPORT
+ select GENERIC_CLOCKEVENTS
+ select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC)
+ select GENERIC_CLOCKEVENTS_MIN_ADJUST
+ select GENERIC_CMOS_UPDATE
+ select GENERIC_CPU_AUTOPROBE
select GENERIC_EARLY_IOREMAP
- select HAVE_OPTPROBES
- select HAVE_KPROBES_ON_FTRACE
- select HAVE_FTRACE_MCOUNT_RECORD
- select HAVE_FENTRY if X86_64
+ select GENERIC_FIND_FIRST_BIT
+ select GENERIC_IOMAP
+ select GENERIC_IRQ_PROBE
+ select GENERIC_IRQ_SHOW
+ select GENERIC_PENDING_IRQ if SMP
+ select GENERIC_SMP_IDLE_THREAD
+ select GENERIC_STRNCPY_FROM_USER
+ select GENERIC_STRNLEN_USER
+ select GENERIC_TIME_VSYSCALL
+ select HAVE_ACPI_APEI if ACPI
+ select HAVE_ACPI_APEI_NMI if ACPI
+ select HAVE_ALIGNED_STRUCT_PAGE if SLUB
+ select HAVE_AOUT if X86_32
+ select HAVE_ARCH_AUDITSYSCALL
+ select HAVE_ARCH_HUGE_VMAP if X86_64 || X86_PAE
+ select HAVE_ARCH_JUMP_LABEL
+ select HAVE_ARCH_KASAN if X86_64 && SPARSEMEM_VMEMMAP
+ select HAVE_ARCH_KGDB
+ select HAVE_ARCH_KMEMCHECK
+ select HAVE_ARCH_SECCOMP_FILTER
+ select HAVE_ARCH_SOFT_DIRTY if X86_64
+ select HAVE_ARCH_TRACEHOOK
+ select HAVE_ARCH_TRANSPARENT_HUGEPAGE
+ select HAVE_BPF_JIT if X86_64
+ select HAVE_CC_STACKPROTECTOR
+ select HAVE_CMPXCHG_DOUBLE
+ select HAVE_CMPXCHG_LOCAL
+ select HAVE_CONTEXT_TRACKING if X86_64
++ select HAVE_COPY_THREAD_TLS
select HAVE_C_RECORDMCOUNT
+ select HAVE_DEBUG_KMEMLEAK
+ select HAVE_DEBUG_STACKOVERFLOW
+ select HAVE_DMA_API_DEBUG
+ select HAVE_DMA_ATTRS
+ select HAVE_DMA_CONTIGUOUS
select HAVE_DYNAMIC_FTRACE
select HAVE_DYNAMIC_FTRACE_WITH_REGS
- select HAVE_FUNCTION_TRACER
- select HAVE_FUNCTION_GRAPH_TRACER
- select HAVE_FUNCTION_GRAPH_FP_TEST
- select HAVE_SYSCALL_TRACEPOINTS
- select SYSCTL_EXCEPTION_TRACE
- select HAVE_KVM
- select HAVE_ARCH_KGDB
- select HAVE_ARCH_TRACEHOOK
- select HAVE_GENERIC_DMA_COHERENT if X86_32
select HAVE_EFFICIENT_UNALIGNED_ACCESS
- select USER_STACKTRACE_SUPPORT
- select HAVE_REGS_AND_STACK_ACCESS_API
- select HAVE_DMA_API_DEBUG
- select HAVE_KERNEL_GZIP
+ select HAVE_FENTRY if X86_64
+ select HAVE_FTRACE_MCOUNT_RECORD
+ select HAVE_FUNCTION_GRAPH_FP_TEST
+ select HAVE_FUNCTION_GRAPH_TRACER
+ select HAVE_FUNCTION_TRACER
+ select HAVE_GENERIC_DMA_COHERENT if X86_32
+ select HAVE_HW_BREAKPOINT
+ select HAVE_IDE
+ select HAVE_IOREMAP_PROT
+ select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
+ select HAVE_IRQ_TIME_ACCOUNTING
select HAVE_KERNEL_BZIP2
+ select HAVE_KERNEL_GZIP
+ select HAVE_KERNEL_LZ4
select HAVE_KERNEL_LZMA
- select HAVE_KERNEL_XZ
select HAVE_KERNEL_LZO
- select HAVE_KERNEL_LZ4
- select HAVE_HW_BREAKPOINT
+ select HAVE_KERNEL_XZ
+ select HAVE_KPROBES
+ select HAVE_KPROBES_ON_FTRACE
+ select HAVE_KRETPROBES
+ select HAVE_KVM
+ select HAVE_LIVEPATCH if X86_64
+ select HAVE_MEMBLOCK
+ select HAVE_MEMBLOCK_NODE_MAP
select HAVE_MIXED_BREAKPOINTS_REGS
- select PERF_EVENTS
+ select HAVE_OPROFILE
+ select HAVE_OPTPROBES
+ select HAVE_PCSPKR_PLATFORM
+ select HAVE_PERF_EVENTS
select HAVE_PERF_EVENTS_NMI
select HAVE_PERF_REGS
select HAVE_PERF_USER_STACK_DUMP
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-06-04 12:07 UTC|newest]
Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-04 12:07 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-16 5:38 linux-next: manual merge of the akpm-current tree with the tip tree Stephen Rothwell
2021-10-07 6:27 Stephen Rothwell
2021-03-22 6:12 Stephen Rothwell
2020-12-11 8:56 Stephen Rothwell
2020-12-11 12:47 ` Jason Gunthorpe
2020-11-27 7:48 Stephen Rothwell
2020-11-27 7:39 Stephen Rothwell
2020-11-27 11:54 ` Andy Shevchenko
2020-11-30 9:27 ` Thomas Gleixner
2020-11-23 8:05 Stephen Rothwell
2020-11-09 6:00 Stephen Rothwell
2020-10-13 6:59 Stephen Rothwell
2020-07-17 10:19 Stephen Rothwell
2020-05-29 11:05 Stephen Rothwell
2020-05-29 10:18 Stephen Rothwell
2020-05-29 10:05 Stephen Rothwell
2020-05-29 9:58 Stephen Rothwell
2020-05-25 11:04 Stephen Rothwell
2020-05-26 4:41 ` Singh, Balbir
2020-06-03 4:43 ` Stephen Rothwell
2020-05-19 16:18 Stephen Rothwell
2020-03-25 7:48 Stephen Rothwell
2020-03-19 6:42 Stephen Rothwell
2020-01-20 6:37 Stephen Rothwell
2020-01-20 6:30 Stephen Rothwell
2019-10-31 5:43 Stephen Rothwell
2019-06-24 10:24 Stephen Rothwell
2019-05-01 11:10 Stephen Rothwell
2019-01-31 4:31 Stephen Rothwell
2018-08-20 4:32 Stephen Rothwell
2018-08-20 19:52 ` Andrew Morton
2018-03-23 5:59 Stephen Rothwell
2017-12-18 5:04 Stephen Rothwell
2017-11-10 4:33 Stephen Rothwell
2017-11-02 7:19 Stephen Rothwell
2017-08-22 6:57 Stephen Rothwell
2017-08-23 6:39 ` Vlastimil Babka
2017-08-11 7:53 Stephen Rothwell
2017-08-11 9:34 ` Peter Zijlstra
2017-08-11 10:48 ` Peter Zijlstra
2017-08-11 11:45 ` Stephen Rothwell
2017-08-11 11:56 ` Ingo Molnar
2017-08-11 12:17 ` Peter Zijlstra
2017-08-11 12:44 ` Ingo Molnar
2017-08-11 13:49 ` Stephen Rothwell
2017-08-11 14:04 ` Peter Zijlstra
2017-08-13 6:06 ` Nadav Amit
2017-08-13 12:50 ` Peter Zijlstra
2017-08-14 3:16 ` Minchan Kim
2017-08-14 5:07 ` Nadav Amit
2017-08-14 5:23 ` Minchan Kim
2017-08-14 8:38 ` Minchan Kim
2017-08-14 19:57 ` Peter Zijlstra
2017-08-16 4:14 ` Minchan Kim
2017-08-14 19:38 ` Peter Zijlstra
2017-08-15 7:51 ` Nadav Amit
2017-08-14 3:09 ` Minchan Kim
2017-08-14 18:54 ` Peter Zijlstra
2017-04-12 6:46 Stephen Rothwell
2017-04-12 20:53 ` Vlastimil Babka
2017-04-20 2:17 ` NeilBrown
2017-03-24 5:25 Stephen Rothwell
2017-02-17 4:40 Stephen Rothwell
2016-11-14 6:08 Stephen Rothwell
2016-07-29 4:14 Stephen Rothwell
2016-06-15 5:23 Stephen Rothwell
2016-06-18 19:39 ` Manfred Spraul
2016-04-29 6:12 Stephen Rothwell
2016-04-29 6:26 ` Ingo Molnar
2016-03-02 5:40 Stephen Rothwell
2016-02-26 5:07 Stephen Rothwell
2016-02-26 21:35 ` Andrew Morton
2016-02-19 4:09 Stephen Rothwell
2016-02-19 15:26 ` Ard Biesheuvel
2015-12-07 8:06 Stephen Rothwell
2015-10-02 4:21 Stephen Rothwell
2015-07-28 6:00 Stephen Rothwell
2015-07-29 17:12 ` Andrea Arcangeli
2015-07-29 17:47 ` Andy Lutomirski
2015-07-29 18:46 ` Thomas Gleixner
2015-07-30 15:38 ` Andrea Arcangeli
2015-07-29 23:06 ` Stephen Rothwell
2015-07-29 23:07 ` Thomas Gleixner
2015-09-07 23:35 ` Stephen Rothwell
2015-09-08 18:11 ` Linus Torvalds
2015-09-08 22:56 ` Stephen Rothwell
2015-09-08 23:03 ` Linus Torvalds
2015-09-08 23:21 ` Andrew Morton
2015-09-16 6:58 ` Geert Uytterhoeven
2015-04-08 8:28 Stephen Rothwell
2015-04-08 8:25 Stephen Rothwell
2014-03-17 9:31 Stephen Rothwell
2014-03-17 9:36 ` Peter Zijlstra
2014-03-19 23:27 ` Andrew Morton
2014-01-14 4:53 Stephen Rothwell
2014-01-14 5:04 ` Davidlohr Bueso
2014-01-14 12:51 ` Peter Zijlstra
2014-01-14 13:17 ` Geert Uytterhoeven
2014-01-14 13:33 ` Peter Zijlstra
2014-01-14 16:19 ` H. Peter Anvin
2014-01-14 15:15 ` H. Peter Anvin
2014-01-14 15:20 ` Geert Uytterhoeven
2014-01-14 15:41 ` Peter Zijlstra
2014-01-14 15:48 ` H. Peter Anvin
2014-01-07 6:00 Stephen Rothwell
2014-01-07 6:34 ` Tang Chen
2013-11-08 7:48 Stephen Rothwell
2013-11-08 18:58 ` Josh Triplett
2013-11-08 23:20 ` Stephen Rothwell
2013-11-09 0:19 ` Josh Triplett
2013-10-30 6:40 Stephen Rothwell
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=20150604220721.2a42246a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mgorman@suse.de \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.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
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;
as well as URLs for NNTP newsgroup(s).