linux-next: manual merge of the x86 tree

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 505 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a trivial context conflict
in arch/x86/kernel/entry_32.S between commit
9b7dc567d03d74a1fbae84e88949b6a60d922d82 ("x86: unify interrupt vector
defines") from the x86 tree and commit
395a59d0f8e86bb39cd700c3d185d30c670bb958 ("ftrace: store mcount address
in rec->ip") from the ftrace tree.

I just took both changes to the includes.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 818 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
arch/x86/mm/init_64.c between commit
b27a43c1e90582facad44de67d02bc9e9f900289 ("x86, cpa: make the kernel
physical mapping initialization a two pass sequence") from Linus' tree
and commit 065ae73c5462d42e9761afb76f2b52965ff45bd6 ("x86, cpa: make the
kernel physical mapping initialization a two pass sequence") from the x86
tree.

The former is clearly a fixed version of the latter, but I cannot easily
see how to resolve them given other changes to this file in both trees.
I think my only option (given time constraints) is to drop the x86 tree
for today in the hope that it will be fixed by those who understand the
code.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 390 bytes --]

Hi Ingo,

On Sun, 14 Sep 2008 17:18:07 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> right, that's the correct resolution - as there are more changes in the 
> latter that are needed. Should also be resolved in today's 
> tip/auto-x86-next. Thanks Stephen,

Thanks, again.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

Hi Ingo,

On Sun, 14 Sep 2008 17:16:50 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> yep, i've done a more intelligent merge (keeping the pci tree changes) 
> and pushed the result out into tip/auto-x86-next.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the x86 tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the x86 tree got a conflict in 
> lib/swiotlb.c between commit 36223a399f639b13b7a454349565934e6d3e2db0 
> ("swiotlb: fix back-off path when memory allocation fails") from 
> Linus' tree and commit 9dfda12b8b769e224ca4efbc35ace4524b9c017b 
> ("swiotlb: use map_single instead of swiotlb_map_single in 
> swiotlb_alloc_coherent") from the x86 tree.
> 
> It looks like the bug fixed by the former is also fixed in the latter, so
> I used the latter version.

right, that's the correct resolution - as there are more changes in the 
latter that are needed. Should also be resolved in today's 
tip/auto-x86-next. Thanks Stephen,

	Ingo

Re: linux-next: manual merge of the x86 tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the x86 tree got a conflict in
> drivers/pci/intel-iommu.c between commit
> cbda1ba898647aeb4ee770b803c922f595e97731 ("PCI/iommu: blacklist DMAR on
> Intel G31/G33 chipsets") from the pci-current tree and commit
> 2ae21010694e56461a63bfc80e960090ce0a5ed9 ("x64, x2apic/intr-remap:
> Interrupt remapping infrastructure") from the x86 tree.
> 
> It was a bit difficult to see how to easily fix this up, so I have
> effectively reverted the pci-current commit for now (by using the x86
> version of the file) but, I assume, that commit will end up in Linus'
> tree soon so that the x86 guys can fix the conflict in their tree.

yep, i've done a more intelligent merge (keeping the pci tree changes) 
and pushed the result out into tip/auto-x86-next.

	Ingo

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 761 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
drivers/pci/intel-iommu.c between commit
cbda1ba898647aeb4ee770b803c922f595e97731 ("PCI/iommu: blacklist DMAR on
Intel G31/G33 chipsets") from the pci-current tree and commit
2ae21010694e56461a63bfc80e960090ce0a5ed9 ("x64, x2apic/intr-remap:
Interrupt remapping infrastructure") from the x86 tree.

It was a bit difficult to see how to easily fix this up, so I have
effectively reverted the pci-current commit for now (by using the x86
version of the file) but, I assume, that commit will end up in Linus'
tree soon so that the x86 guys can fix the conflict in their tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 590 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in lib/swiotlb.c
between commit 36223a399f639b13b7a454349565934e6d3e2db0 ("swiotlb: fix
back-off path when memory allocation fails") from Linus' tree and commit
9dfda12b8b769e224ca4efbc35ace4524b9c017b ("swiotlb: use map_single
instead of swiotlb_map_single in swiotlb_alloc_coherent") from the x86
tree.

It looks like the bug fixed by the former is also fixed in the latter, so
I used the latter version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the x86 tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the x86 tree got a conflict in
> drivers/pci/intel-iommu.c between commit
> 213f841f903ed16fc1dd29885560cdd159630ed6 ("intel-iommu.c: Blacklist Intel
> DG33BU motherboard") from the dwmw2 tree and commit
> 2ae21010694e56461a63bfc80e960090ce0a5ed9 ("x64, x2apic/intr-remap:
> Interrupt remapping infrastructure") from the x86 tree.
> 
> I think the easiest thing to do for today is just to revert the change in
> the dwmw2 tree and see if you guys can come up with a better patch for
> tomorrow.

i suspect that commit shouldnt be in the dwmw2 tree - David, agreed?

	Ingo

Re: linux-next: manual merge of the x86 tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the x86 tree got a conflict in
> include/asm-x86/statfs.h between commit
> e4e2079e475520e02f55f0b225fc044e39a357e0 ("x86_64: Use
> <asm-generic/statfs.h>") from the dwmw2 tree and commit
> 77ef50a522717fa040636ee1017179ceba12ff62 ("x86: consolidate header
> guards") from the x86 tree.
> 
> Trivial fix (see below).  I can carry it.

thanks Stephen!

Since e4e2079e is part of the multi-platform statfs.h cleanups in 
David's tree i guess we'll have to carry the conflict along for a while.

	Ingo

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
include/asm-x86/statfs.h between commit
e4e2079e475520e02f55f0b225fc044e39a357e0 ("x86_64: Use
<asm-generic/statfs.h>") from the dwmw2 tree and commit
77ef50a522717fa040636ee1017179ceba12ff62 ("x86: consolidate header
guards") from the x86 tree.

Trivial fix (see below).  I can carry it.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc include/asm-x86/statfs.h
index 4c935ca,3f005bc..0000000
--- a/include/asm-x86/statfs.h
+++ b/include/asm-x86/statfs.h
@@@ -1,12 -1,63 +1,12 @@@
- #ifndef _ASM_X86_STATFS_H
- #define _ASM_X86_STATFS_H
+ #ifndef ASM_X86__STATFS_H
+ #define ASM_X86__STATFS_H
  
 -#ifdef __i386__
 -#include <asm-generic/statfs.h>
 -#else
 -
 -#ifndef __KERNEL_STRICT_NAMES
 -
 -#include <linux/types.h>
 -
 -typedef __kernel_fsid_t	fsid_t;
 -
 -#endif
 -
  /*
 - * This is ugly -- we're already 64-bit clean, so just duplicate the
 - * definitions.
 + * We need compat_statfs64 to be packed, because the i386 ABI won't
 + * add padding at the end to bring it to a multiple of 8 bytes, but
 + * the x86_64 ABI will.
   */
 -struct statfs {
 -	long f_type;
 -	long f_bsize;
 -	long f_blocks;
 -	long f_bfree;
 -	long f_bavail;
 -	long f_files;
 -	long f_ffree;
 -	__kernel_fsid_t f_fsid;
 -	long f_namelen;
 -	long f_frsize;
 -	long f_spare[5];
 -};
 -
 -struct statfs64 {
 -	long f_type;
 -	long f_bsize;
 -	long f_blocks;
 -	long f_bfree;
 -	long f_bavail;
 -	long f_files;
 -	long f_ffree;
 -	__kernel_fsid_t f_fsid;
 -	long f_namelen;
 -	long f_frsize;
 -	long f_spare[5];
 -};
 +#define ARCH_PACK_COMPAT_STATFS64 __attribute__((packed,aligned(4)))
  
 -struct compat_statfs64 {
 -	__u32 f_type;
 -	__u32 f_bsize;
 -	__u64 f_blocks;
 -	__u64 f_bfree;
 -	__u64 f_bavail;
 -	__u64 f_files;
 -	__u64 f_ffree;
 -	__kernel_fsid_t f_fsid;
 -	__u32 f_namelen;
 -	__u32 f_frsize;
 -	__u32 f_spare[5];
 -} __attribute__((packed));
 -
 -#endif /* !__i386__ */
 +#include <asm-generic/statfs.h>
- #endif
+ #endif /* ASM_X86__STATFS_H */

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 633 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
drivers/pci/intel-iommu.c between commit
213f841f903ed16fc1dd29885560cdd159630ed6 ("intel-iommu.c: Blacklist Intel
DG33BU motherboard") from the dwmw2 tree and commit
2ae21010694e56461a63bfc80e960090ce0a5ed9 ("x64, x2apic/intr-remap:
Interrupt remapping infrastructure") from the x86 tree.

I think the easiest thing to do for today is just to revert the change in
the dwmw2 tree and see if you guys can come up with a better patch for
tomorrow.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a trivial conflict in
include/asm-x86/pda.h between commit
af9ff7868f0f76d3364351b1641b9dfa99588e77 ("x86: simplify stackprotector
self-check") from the stackprotector tree and commit
77ef50a522717fa040636ee1017179ceba12ff62 ("x86: consolidate header
guards") from the x86 tree.

I fixed it up.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 585 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
arch/x86/kernel/genapic_64.c between commit
0d39741a27d86d305cc75ba626392be410dcbab9 ("GRU Driver: export is_uv_system
(), zap_page_range() & follow_page()") from Linus' tree and commit
1b9b89e7f163336ad84200b66a17284dbf26aced ("x86: add apic probe for
genapic 64bit, v2") from the x86 tree.

The former exported a function (is_uv_system) that the latter moved.  I
did the export in the new file.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 590 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
drivers/pci/dmar.c between commit
f42e86d95fa53d3a62b2795515da18b4f41b0480 ("PCI/DMAR: don't assume
presence of RMRRs") from the pcu-current tree (the qeuivalent of which is
in the x86 tree) and commit aaa9d1dd63bf89b62f4ea9f46de376ab1a3fbc6c
("x64, x2apic/intr-remap: use CONFIG_DMAR for DMA-remapping specific
code") from the x86 tree.

I did the obvious fixup (which is to take the x86 tree version).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 478 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a trivial conflict in
include/asm-x86/pci-direct.h between commit
e3f2baebf4209b5927e23fa65d5977d31db936b3 ("PCI/x86: early dump pci conf
space v2") from Linus' tree and commit
aa27f95867447916d97c7aa6e5422ff6518630dd ("x86: consolidate header
guards") from the x86 tree.

Just a simple add/modify overlap.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
arch/x86/kernel/Makefile between commit
db104c724b370804d3ad736f0ef1cda46825d058 ("Merge branch 'linus' into
stackprotector") from the stackprotector tree and commit
34646bca474142e1424e5f6c4a33cb2ba0930ea1 ("x86, paravirt-spinlocks: fix
boot hang") from the x86 tree.

I fixed it up as Ingo suggested.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflicts in
arch/x86/kernel/cpu/amd_64.c, arch/x86/mm/pageattr.c, arch/x86/mm/pat.c
and arch/x86/pci/i386.c between commit
965194c15dc9e4f3bc44432b39c441c86af7f11d ("x86: max_low_pfn_mapped fix,
#2") from Linus' tree and commit ea3abad8a2dd30263c3b7b4c8ae9ccdc35c86244
("Revert "x86: introduce max_low_pfn_mapped for 64-bit"") from the x86
tree.

I reverted the x86 tree commit which may not be correct.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a trivial conflict in
arch/x86/kernel/Makefile between commit
4c7f8900f1d8a0e464e7092f132a7e93f7c20f2f ("x86: stackprotector & PARAVIRT
fix") from the stackprotector tree and commit
3d0decc4f49e8645cd6369b02ed076bebd3d61ad ("x86: fix tsc unification
buglet with ftrace and stackprotector") from the x86 tree.

Just a addition next to a modification.  I can carry the simple fixup.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 745 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got conflicts in
arch/x86/kernel/traps_32.c and arch/x86/kernel/traps_64.c between commit
db47946e32824309a7815eddb78e838a5c276fb1 ("sysfs: crash debugging") from
the driver-core tree and commits e423f49fc8ccd761618748d7139638d8ddc1d16f
("x86: traps_xx: modify __die"), badc76527f7e29302f0bde3d366c59101fb2ab87
("x86: traps_xx: shuffle headers and globals") and
a8c1be9d2e78d8608892c86791837acf12da4bf6 ("x86: initial changes to unify
traps_32.c and traps_64.c") from the x86 tree.

I just applied the driver-core addition (one line in each case) to the
x86 tree versions.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 457 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
arch/x86/lib/Makefile between commit
81d68a96a39844853b37f20cc8282d9b65b78ef3 ("ftrace: trace irq disabled
critical timings") from the ftrace tree and a couple of commits from the
x86 tree.

Just an overlapping addition (from the former) with changes (from the
latter).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the x86 tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jeremy,
> 
> On Mon, 07 Jul 2008 20:22:10 -0700 Jeremy Fitzhardinge <jeremy@goop.org> wrote:
> >
> > I must be missing something.  Don't all those already come from 
> > tip.git pre-merged?  Or are you merging various tip.git topic 
> > branches yourself?  Or are some of these coming from elsewhere?
> 
> I merge a set of branches that are specially maintained for linux-next 
> (see the Next/Trees file in the linux-next tree). I assume that Linus 
> is probably not going to just merge in tip.get in one enormous merge 
> ...

correct, but he wont have to do merge conflict resolutions either - i'll 
do them when i prepare the pulls for Linus.

	Ingo

Re: linux-next: manual merge of the x86 tree

[Jeremy Fitzhardinge]

Stephen Rothwell wrote:
> I merge a set of branches that are specially maintained for linux-next
> (see the Next/Trees file in the linux-next tree). I assume that Linus is
> probably not going to just merge in tip.get in one enormous merge ...
>   

Yes, fair enough.

    J

Re: linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 627 bytes --]

Hi Jeremy,

On Mon, 07 Jul 2008 20:22:10 -0700 Jeremy Fitzhardinge <jeremy@goop.org> wrote:
>
> I must be missing something.  Don't all those already come from tip.git 
> pre-merged?  Or are you merging various tip.git topic branches 
> yourself?  Or are some of these coming from elsewhere?

I merge a set of branches that are specially maintained for linux-next
(see the Next/Trees file in the linux-next tree). I assume that Linus is
probably not going to just merge in tip.get in one enormous merge ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the x86 tree

[Jeremy Fitzhardinge]

Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the x86 tree got a conflict in
> include/asm-x86/irqflags.h between commit
> 81d68a96a39844853b37f20cc8282d9b65b78ef3 ("ftrace: trace irq disabled
> critical timings") from the ftrace tree and commits
> f56c208ae2a6705a40c0f7d43bfc4ede7eb20a83 ("x86, 64-bit: swapgs pvop with
> a user-stack can never be called") and
> 6d2a6e57be1582b017a39f52385adf49d7cc4b0f ("x86_64: fix non-paravirt
> compilation") from the x86 tree.
>   

I must be missing something.  Don't all those already come from tip.git 
pre-merged?  Or are you merging various tip.git topic branches 
yourself?  Or are some of these coming from elsewhere?

> Just contextual remove/move of code.  I can carry the fixup.
>   

Thanks,
    J

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
include/asm-x86/irqflags.h between commit
81d68a96a39844853b37f20cc8282d9b65b78ef3 ("ftrace: trace irq disabled
critical timings") from the ftrace tree and commits
f56c208ae2a6705a40c0f7d43bfc4ede7eb20a83 ("x86, 64-bit: swapgs pvop with
a user-stack can never be called") and
6d2a6e57be1582b017a39f52385adf49d7cc4b0f ("x86_64: fix non-paravirt
compilation") from the x86 tree.

Just contextual remove/move of code.  I can carry the fixup.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 723 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
arch/x86/kernel/entry_64.S between commits
16444a8a40d4c7b4f6de34af0cae1f76a4f6c901 ("ftrace: add basic support for
gcc profiler instrumentation"), d61f82d06672f57fca410da6f7fffd15867db622
("ftrace: use dynamic patching for updating mcount calls") and
395a59d0f8e86bb39cd700c3d185d30c670bb958 ("ftrace: store mcount address
in rec->ip") from the ftrace tree and commit
5cc8bd8f5d31bc08341deb666cdf2404262fc3e5 ("x86 NMI-safe INT3 and Page
Fault") from the x86 tree.

Just overlapping additions.  I took both and can carry the fixup.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the x86 tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the x86 tree got a conflict in 
> arch/x86/Kconfig between commit 
> efac41894df57d32b483ac622d03541b5b2692c0 ("x86: fix NODES_SHIFT 
> Kconfig range") from Linus' tree and commit 
> dfdf1d75efee39e9396f8384c6f3bf555349ed60 ("x86: modify Kconfig to 
> allow up to 4096 cpus") from the x86 tree.
> 
> I took the version from the x86 tree.

that's the correct resolution i took too - thanks Stephen.

	Ingo

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 627 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
drivers/base/topology.c between commit
5b01a6a61c48d8e6ab4679d6e6208f5962d07b85 ("sysdev: Pass the attribute to
the low level sysdev show/store function") from the driver-core tree and
commit 29657a44f8660acd8751d7e9f5aac06ec8633481 ("x86: cleanup early per
cpu variables/accesses v4") from the x86 tree.

I took the driver-core versions but uninlined them (as was done in the
x86 tree version).  Someone should probably check the result.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 472 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
arch/x86/Kconfig between commit efac41894df57d32b483ac622d03541b5b2692c0
("x86: fix NODES_SHIFT Kconfig range") from Linus' tree and commit
dfdf1d75efee39e9396f8384c6f3bf555349ed60 ("x86: modify Kconfig to allow
up to 4096 cpus") from the x86 tree.

I took the version from the x86 tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]