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

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the powerpc tree got a conflict in: > > drivers/vfio/vfio_iommu_spapr_tce.c > > between commit: > > 1463edca6734 ("vfio/spapr: Use IOMMU pageshift rather than pagesize") > > from the powerpc-fixes tree and commit: > > 00a5c5

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: drivers/vfio/vfio_iommu_spapr_tce.c between commit: 1463edca6734 ("vfio/spapr: Use IOMMU pageshift rather than pagesize") from the powerpc-fixes tree and commit: 00a5c58d9499 ("KVM: PPC: Make iommu_table::it_userspa

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

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/powerpc/include/asm/ftrace.h > > between commit: > > edf6a2dfe388 ("powerpc/trace/syscalls: Update syscall name matching logic > to account for ppc_ prefix") > > from the powerpc-f

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/include/asm/ftrace.h between commit: edf6a2dfe388 ("powerpc/trace/syscalls: Update syscall name matching logic to account for ppc_ prefix") from the powerpc-fixes tree and commit: c3e59d778403 ("powerp

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

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/powerpc/include/asm/cputable.h > arch/powerpc/kernel/dt_cpu_ftrs.c > > between commit: > > a5d4b5891c2f ("powerpc/mm: Fixup tlbie vs store ordering issue on POWER9") > > from the

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/include/asm/cputable.h arch/powerpc/kernel/dt_cpu_ftrs.c between commit: a5d4b5891c2f ("powerpc/mm: Fixup tlbie vs store ordering issue on POWER9") from the powerpc-fixes tree and commits: 9bbf0b576d3

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

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/powerpc/kernel/setup-common.c > > between commit: > > 349524bc0da6 ("powerpc: Don't preempt_disable() in show_cpuinfo()") > > from the powerpc-fixes tree and commit: > > f5f563012

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/kernel/setup-common.c between commit: 349524bc0da6 ("powerpc: Don't preempt_disable() in show_cpuinfo()") from the powerpc-fixes tree and commit: f5f563012a70 ("powerpc: Make newline in cpuinfo uncondit

linux-next: manual merge of the powerpc tree with the powerpc-fixes 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 the powerpc-fixes tree and commit: 6773027205ea ("powerpc/mm/radix: Drop unneeded NULL check")

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/Kconfig between commit: f2574030b0e3 ("powerpc: Revert the initial stack protector support") from the powerpc-fixes tree and commit: d6c569b99558 ("powerpc/64: Move HAVE_CONTEXT_TRACKING from pseries to

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

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/powerpc/include/asm/asm-prototypes.h > > between commit: > > 9e5f68842276 ("powerpc: Fix missing CRCs, add more asm-prototypes.h > declarations") > > from the powerpc-fixes tree an

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/include/asm/asm-prototypes.h between commit: 9e5f68842276 ("powerpc: Fix missing CRCs, add more asm-prototypes.h declarations") from the powerpc-fixes tree and commit: 82de5797a260 ("powerpc: Remove ex