linux-next: manual merge of the powerpc tree with Linus' tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/sysdev/xive/common.c between commit: cbc06f051c52 ("powerpc/xive: Do not skip CPU-less nodes when creating the IPIs") from Linus' tree and commit: 17df41fec5b8 ("powerpc: use IRQF_NO_DEBUG for IPIs")

linux-next: manual merge of the powerpc tree with Linus' tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: Documentation/admin-guide/kernel-parameters.txt between commits: 05736e4ac13c ("cpu/hotplug: Provide knobs to control SMT") 506a66f37489 ("Revert "x86/apic: Ignore secondary threads if nosmt=force"") from Linus'

Re: linux-next: manual merge of the powerpc tree with Linus' tree

Hi all, On Mon, 30 Oct 2017 12:51:33 + Mark Brown wrote: > > Hi all, > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/powerpc/kvm/powerpc.c > > between commit: > > ac64115a66c1 ("KVM: PPC: Fix oops when checking KVM_CAP_PPC_HTM") > >

linux-next: manual merge of the powerpc tree with Linus' tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/mm/tlb-radix.c between commit: 26e53d5ebe2e ("powerpc/64s/radix: Fix preempt imbalance in TLB flush") from Linus' tree and commit: dffe8449c5dd ("powerpc/64s/radix: Improve preempt handling in TLB

linux-next: manual merge of the powerpc tree with Linus' tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/kvm/powerpc.c between commit: ac64115a66c1 ("KVM: PPC: Fix oops when checking KVM_CAP_PPC_HTM") from Linus' tree and commit: 2a3d6553cbd7 ("KVM: PPC: Tie KVM_CAP_PPC_HTM to the user-visible TM

linux-next: manual merge of the powerpc tree with Linus' tree

Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/kernel/asm-offsets.c between commit: f2574030b0e3 ("powerpc: Revert the initial stack protector support") from

Re: linux-next: manual merge of the powerpc tree with Linus' tree

On Wed, 2016-06-29 at 10:54 +0530, Naveen N. Rao wrote: > On 2016/06/29 10:35AM, Stephen Rothwell wrote: > > > > Today's linux-next merge of the powerpc tree got a conflict in: > > > > arch/powerpc/Kconfig > > > > between commit: > > > > 844e3be47693 ("powerpc/bpf/jit: Disable classic BPF

Re: linux-next: manual merge of the powerpc tree with Linus' tree

On 2016/06/29 10:35AM, Stephen Rothwell wrote: > Hi all, Hi Stephen, > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/powerpc/Kconfig > > between commit: > > 844e3be47693 ("powerpc/bpf/jit: Disable classic BPF JIT on ppc64le") Ah, I see that the above commit

linux-next: manual merge of the powerpc tree with Linus' tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/Kconfig between commit: 844e3be47693 ("powerpc/bpf/jit: Disable classic BPF JIT on ppc64le") from Linus' tree and commit: 156d0e290e96 ("powerpc/ebpf/jit: Implement JIT compiler for extended BPF")

linux-next: manual merge of the powerpc tree with Linus' tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/kernel/prom.c between commits: beff82374b25 ("powerpc: Update cpu_user_features2 in scan_features()") 4705e02498d6 ("powerpc: Update TM user feature bits in scan_features()") from Linus' tree and

linux-next: manual merge of the powerpc tree with Linus' tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in arch/powerpc/include/asm/sections.h between commit b18db0b80867 (KVM guest: Make pv trampoline code executable) from the tree and commit 07de8377f748 (powerpc: Fix ABIv2 issue with dereference_function_descriptor) from the

linux-next: manual merge of the powerpc tree with Linus' tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in include/linux/kvm.h between commit 3cfc3092f40bc37c57ba556cfd8de4218f2135ab (KVM: x86: Add KVM_GET/SET_VCPU_EVENTS) (and others) from Linus' tree and commit e15a113700324f7fdcee95589875daed2b98a2fe (powerpc/kvm: Sync guest