Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/Kconfig
between commit:
c0c3319917db ("mm: remove devmap related functions and page table bits")
from the mm-unstable branch of the mm tree and commit:
00199ed6f2ca ("powerpc: Add preempt lazy support")
Hi all,
On Wed, 13 Nov 2024 09:52:28 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/Makefile
>
> between commit:
>
> de51342c5157 ("kbuild: add $(objtree)/ prefix to some in-kernel build
> artifacts")
>
> from the kbuil
Stephen Rothwell writes:
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/Makefile
>
> between commit:
>
> de51342c5157 ("kbuild: add $(objtree)/ prefix to some in-kernel build
> artifacts")
>
> from the kbuild tree and commit:
>
> bee08a9e6ab0
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/Makefile
between commit:
de51342c5157 ("kbuild: add $(objtree)/ prefix to some in-kernel build
artifacts")
from the kbuild tree and commit:
bee08a9e6ab0 ("powerpc: Adjust adding stack protector flags t
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
MAINTAINERS
between commit:
c638b130e83e ("MAINTAINERS: Update powerpc BPF JIT maintainers")
from the bpf tree and commit:
e8061392ee09 ("MAINTAINERS: Update powerpc BPF JIT maintainers")
from the powerpc tree.
I
Stephen Rothwell writes:
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/mm/nohash/Makefile
>
...
> diff --cc arch/powerpc/mm/nohash/Makefile
> index 90e846f0c46c,86d0fe434824..
> --- a/arch/powerpc/mm/nohash/Makefile
> +++ b/arch/powerp
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/mm/nohash/Makefile
between commit:
9e49846e4d65 ("powerpc/64e: split out nohash Book3E 64-bit code")
from the mm-unstable branch of the mm tree and commit:
732b32daef80 ("powerpc: Remove core support fo
Christophe Leroy writes:
> Le 29/02/2024 à 07:37, Michael Ellerman a écrit :
>> Stephen Rothwell writes:
>>> Hi all,
>>>
>>> Today's linux-next merge of the powerpc tree got a conflict in:
>>>
>>>arch/powerpc/mm/pgtable_32.c
>>>
>>> between commit:
>>>
>>>a5e8131a0329 ("arm64, powerpc, ri
Le 29/02/2024 à 07:37, Michael Ellerman a écrit :
> Stephen Rothwell writes:
>> Hi all,
>>
>> Today's linux-next merge of the powerpc tree got a conflict in:
>>
>>arch/powerpc/mm/pgtable_32.c
>>
>> between commit:
>>
>>a5e8131a0329 ("arm64, powerpc, riscv, s390, x86: ptdump: refactor
>>
Stephen Rothwell writes:
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/mm/pgtable_32.c
>
> between commit:
>
> a5e8131a0329 ("arm64, powerpc, riscv, s390, x86: ptdump: refactor
> CONFIG_DEBUG_WX")
>
> from the mm-stable tree and commit:
>
> 8
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/mm/pgtable_32.c
between commit:
a5e8131a0329 ("arm64, powerpc, riscv, s390, x86: ptdump: refactor
CONFIG_DEBUG_WX")
from the mm-stable tree and commit:
8f17bd2f4196 ("powerpc: Handle error in mark_roda
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/Kconfig
between commit:
8d05554dca2a ("powerpc: mm: convert to GENERIC_IOREMAP")
from the mm-stable tree and commit:
0ceef6e99cc3 ("powerpc/idle: Add support for nohlt")
from the powerpc tree.
I fixed
Hi all,
On Tue, 4 Oct 2022 09:16:06 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/Makefile
>
> between commit:
>
> ce697ccee1a8 ("kbuild: remove head-y syntax")
>
> from the kbuild tree and commit:
>
> dfc3095cec27
Hi all,
On Tue, 4 Oct 2022 09:12:05 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/kernel/Makefile
>
> between commit:
>
> 321648455061 ("kbuild: use obj-y instead extra-y for objects placed at the
> head")
>
> from th
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/Makefile
between commit:
ce697ccee1a8 ("kbuild: remove head-y syntax")
from the kbuild tree and commit:
dfc3095cec27 ("powerpc: Remove CONFIG_FSL_BOOKE")
from the powerpc tree.
I fixed it up (I used t
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/kernel/Makefile
between commit:
321648455061 ("kbuild: use obj-y instead extra-y for objects placed at the
head")
from the kbuild tree and commit:
dfc3095cec27 ("powerpc: Remove CONFIG_FSL_BOOKE")
fro
Hi all,
Today's linux-next merge of the powerpc tree got conflicts in:
arch/powerpc/Makefile
arch/powerpc/kernel/Makefile
between commits:
4f62512adbe9a ("kbuild: use obj-y instead extra-y for objects placed at the
head")
0f17eda6118db ("kbuild: remove head-y syntax")
from the kbuild
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")
Catalin Marinas writes:
> On Mon, Sep 02, 2019 at 11:44:43AM +1000, Michael Ellerman wrote:
>> Stephen Rothwell writes:
>> > Hi all,
>> >
>> > Today's linux-next merge of the powerpc tree got a conflict in:
>> >
>> > arch/Kconfig
>> >
>> > between commit:
>> >
>> > 5cf896fb6be3 ("arm64: Add s
On Mon, Sep 02, 2019 at 10:08:46AM +0100, Catalin Marinas wrote:
> On Mon, Sep 02, 2019 at 11:44:43AM +1000, Michael Ellerman wrote:
> > Stephen Rothwell writes:
> > > Hi all,
> > >
> > > Today's linux-next merge of the powerpc tree got a conflict in:
> > >
> > > arch/Kconfig
> > >
> > > between
On Mon, Sep 02, 2019 at 11:44:43AM +1000, Michael Ellerman wrote:
> Stephen Rothwell writes:
> > Hi all,
> >
> > Today's linux-next merge of the powerpc tree got a conflict in:
> >
> > arch/Kconfig
> >
> > between commit:
> >
> > 5cf896fb6be3 ("arm64: Add support for relocating the kernel with
Stephen Rothwell writes:
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/Kconfig
>
> between commit:
>
> 5cf896fb6be3 ("arm64: Add support for relocating the kernel with RELR
> relocations")
>
> from the arm64 tree and commit:
>
> 0c9c1d563975 ("x86, s
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/Kconfig
between commit:
5cf896fb6be3 ("arm64: Add support for relocating the kernel with RELR
relocations")
from the arm64 tree and commit:
0c9c1d563975 ("x86, s390: Move ARCH_HAS_MEM_ENCRYPT definition to
ar
On Fri, Feb 22, 2019 at 02:43:41PM +1100, Michael Ellerman wrote:
> Stephen Rothwell writes:
>
> > Hi all,
> >
> > Today's linux-next merge of the powerpc tree got a conflict in:
> >
> > arch/powerpc/kernel/dma-swiotlb.c
> >
> > between commit:
> >
> > cfced786969c ("dma-mapping: remove the d
Stephen Rothwell writes:
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/kernel/dma-swiotlb.c
>
> between commit:
>
> cfced786969c ("dma-mapping: remove the default map_resource implementation")
>
> from the dma-mapping tree and commit:
>
> 680
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
kernel/dma/Kconfig
between commits:
ff4c25f26a71 ("dma-mapping: improve selection of dma_declare_coherent
availability")
from the dma-mapping tree and commit:
11ddce15451e ("dma-mapping, powerpc: simplify the arch
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/kernel/dma.c
between commit:
cfced786969c ("dma-mapping: remove the default map_resource implementation")
from the dma-mapping tree and commit:
68005b67d15a ("powerpc/dma: use the generic direct mapping
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/kernel/dma-swiotlb.c
between commit:
cfced786969c ("dma-mapping: remove the default map_resource implementation")
from the dma-mapping tree and commit:
68005b67d15a ("powerpc/dma: use the generic direct
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' tree
On Thu, 2 Aug 2018, Geert Uytterhoeven wrote:
> Hi Stephen,
>
> On Thu, Aug 2, 2018 at 1:42 AM Stephen Rothwell wrote:
> > [forgot the conflict resolution ...]
> >
> > On Thu, 2 Aug 2018 09:27:20 +1000 Stephen Rothwell
> > wrote:
> > >
> > > Today's linux-next merge of the powerpc tree got a c
Hi Stephen,
On Thu, Aug 2, 2018 at 1:42 AM Stephen Rothwell wrote:
> [forgot the conflict resolution ...]
>
> On Thu, 2 Aug 2018 09:27:20 +1000 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the powerpc tree got a conflict in:
> >
> > arch/m68k/mac/misc.c
> >
> > between commit
Hi all,
[forgot the conflict resolution ...]
On Thu, 2 Aug 2018 09:27:20 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/m68k/mac/misc.c
>
> between commit:
>
> 5b9bfb8ec467 ("m68k: mac: Use time64_t in RTC handling")
>
> from t
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/m68k/mac/misc.c
between commit:
5b9bfb8ec467 ("m68k: mac: Use time64_t in RTC handling")
from the m68k tree and commit:
ebd722275f9c ("macintosh/via-pmu: Replace via-pmu68k driver with via-pmu
driver")
from t
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
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
Hi all,
On Thu, 31 May 2018 09:32:16 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/kernel/module_64.c
>
> between commit:
>
> 06aeb9e3f2bc ("powerpc/kbuild: move -mprofile-kernel check to Kconfig")
>
> from the kbuild t
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/kernel/module_64.c
between commit:
06aeb9e3f2bc ("powerpc/kbuild: move -mprofile-kernel check to Kconfig")
from the kbuild tree and commit:
250122baed29 ("powerpc64/module: Tighten detection of mcount c
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
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
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
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
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
lib/raid6/test/Makefile
between commit:
fa523d54a7eb ("raid: remove tile specific raid6 implementation")
from the asm-generic tree and commit:
751ba79cc552 ("lib/raid6/altivec: Add vpermxor implementation for raid6
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
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
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")
>
> from Linus' tree and c
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 code"
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")
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 feature")
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 Linus
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
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
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
Hi all,
Today's linux-next merge of the powerpc tree got conflicts in:
arch/powerpc/kernel/misc_32.S
arch/powerpc/kernel/misc_64.S
between commit:
9445aa1a3062 ("ppc: move exports to definitions")
from the kbuild tree and commit:
6f698df10cb2 ("powerpc/kernel: Use kprobe blacklist for
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 J
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 i
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")
from
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 commit:
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
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/kernel/exceptions-64s.S between commit 0be9d8b61c0c
("powerpc/ppc64: Allow allmodconfig to build (finally !)") from the
fixes tree and commits b1576fec7f4d ("powerpc: No need to use dot
symbols when branching to a
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/kernel/entry_64.S between commits 40792104b255 ("powerpc:
don't mess with r2 in copy_thread() and friends") and 53b50f9483cc
("powerpc: take dereferencing to ret_from_kernel_thread()") from the
signal tree and comm
On Fri, Mar 09, 2012 at 10:51:27AM -0600, Rob Herring wrote:
> On 03/08/2012 09:13 PM, Benjamin Herrenschmidt wrote:
> > On Fri, 2012-03-09 at 00:39 +, Russell King wrote:
> >> On Fri, Mar 09, 2012 at 10:35:46AM +1100, Benjamin Herrenschmidt wrote:
> >>> Actually, I didn't keep MAY_HAVE_SPARSE_
On 03/08/2012 09:13 PM, Benjamin Herrenschmidt wrote:
> On Fri, 2012-03-09 at 00:39 +, Russell King wrote:
>> On Fri, Mar 09, 2012 at 10:35:46AM +1100, Benjamin Herrenschmidt wrote:
>>> Actually, I didn't keep MAY_HAVE_SPARSE_IRQ, I kept HAVE_SPARSE_IRQ. If
>>> I remove it, then I get Kconfig w
On Fri, 2012-03-09 at 00:39 +, Russell King wrote:
> On Fri, Mar 09, 2012 at 10:35:46AM +1100, Benjamin Herrenschmidt wrote:
> > Actually, I didn't keep MAY_HAVE_SPARSE_IRQ, I kept HAVE_SPARSE_IRQ. If
> > I remove it, then I get Kconfig warnings:
> >
> > warning: (PPC) selects SPARSE_IRQ which
On Fri, Mar 09, 2012 at 10:35:46AM +1100, Benjamin Herrenschmidt wrote:
> Actually, I didn't keep MAY_HAVE_SPARSE_IRQ, I kept HAVE_SPARSE_IRQ. If
> I remove it, then I get Kconfig warnings:
>
> warning: (PPC) selects SPARSE_IRQ which has unmet direct dependencies
> (HAVE_GENERIC_HARDIRQS && HAVE_S
On Thu, 2012-03-08 at 16:52 +1100, Benjamin Herrenschmidt wrote:
> On Thu, 2012-03-08 at 14:51 +1100, Stephen Rothwell wrote:
> > Hi Mikey,
> >
> > On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling
> > wrote:
> > >
> > > Surely we only need SPARSE_IRQ now and not MAY_HAVE_SPARSE_IRQ.
> > >
>
On Thu, 2012-03-08 at 14:51 +1100, Stephen Rothwell wrote:
> Hi Mikey,
>
> On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling wrote:
> >
> > Surely we only need SPARSE_IRQ now and not MAY_HAVE_SPARSE_IRQ.
> >
> > In fact, keeping MAY_HAVE_SPARSE_IRQ seems to make SPARSE_IRQ user
> > selectable
Hi Mikey,
On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling wrote:
>
> Surely we only need SPARSE_IRQ now and not MAY_HAVE_SPARSE_IRQ.
>
> In fact, keeping MAY_HAVE_SPARSE_IRQ seems to make SPARSE_IRQ user
> selectable, which we don't want anymore since ad5b7f1350c2.
Yes, indeed. I will fix
> Today's linux-next merge of the powerpc tree got a conflict in
> arch/powerpc/Kconfig between commit 2ed86b16eabe ("irq: make SPARSE_IRQ
> an optionally hidden option") from the arm tree and commit ad5b7f1350c2
> ("powerpc: Make SPARSE_IRQ required") from the powerpc tree.
>
> I fixed it up (see
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/Kconfig between commit 2ed86b16eabe ("irq: make SPARSE_IRQ
an optionally hidden option") from the arm tree and commit ad5b7f1350c2
("powerpc: Make SPARSE_IRQ required") from the powerpc tree.
I fixed it up (see be
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
v
Hi Paul, Ben,
Today's linux-next merge of the powerpc tree got a conflict in
drivers/net/ibm_newemac/core.h between commit
6fbc779c03591ee536fef9efb7d7e20f281d0b5c ("ibm_newemac: Fix EMAC soft
reset on 460EX/GT") from Linus' tree and commit
b68d185ab12b1fc8000432c5d5ab5404d4788b4c ("ibm_newemac: A
Hi Paul, Ben,
Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/include/asm/dcr-regs.h between commit
6fbc779c03591ee536fef9efb7d7e20f281d0b5c ("ibm_newemac: Fix EMAC soft
reset on 460EX/GT") from Linus' tree and commit
fbcc4bacee30cad4e4a13d05492a9ed0c9c3e8c7 ("ibm_newem
On Mon, 14 Jul 2008, Stephen Rothwell wrote:
> Hi Paul, Ben,
>
> Today's linux-next merge of the powerpc tree got a conflict in
> arch/powerpc/Kconfig between commit
> 4e491d14f2506b218d678935c25a7027b79178b1 ("ftrace: support for PowerPC")
> from the ftrace tree and commit 3affedc4e1ce837033b6c
Hi Paul, Ben,
Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/Kconfig between commit
4e491d14f2506b218d678935c25a7027b79178b1 ("ftrace: support for PowerPC")
from the ftrace tree and commit 3affedc4e1ce837033b6c5e9289d2ce2f5a62d31
("powerpc/dma: implement new dma_*map*_
On Fri, 2008-07-11 at 21:01 +0200, Bartlomiej Zolnierkiewicz wrote:
>
> Since I haven't heard back from Ben [1] on ide-pmac/media-bay IRQ issue
> I took another look at ide-pmac patches and I think that it should be
> possible to rework them in such way that consecutive ide patches (> 100)
> won't
Hi,
On Monday 07 July 2008, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in
> drivers/macintosh/mediabay.c between commit
> 7ad963b103d3863b1161c59f3e65a435979804ed ("ide-pmac: media-bay support
> fixes (take 4)") from the ide tree and commit
On Mon, 2008-07-07 at 23:07 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in
> drivers/macintosh/mediabay.c between commit
> 7ad963b103d3863b1161c59f3e65a435979804ed ("ide-pmac: media-bay support
> fixes (take 4)") from the ide tree and c
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in
drivers/macintosh/mediabay.c between commit
7ad963b103d3863b1161c59f3e65a435979804ed ("ide-pmac: media-bay support
fixes (take 4)") from the ide tree and commit
9a24729d8aeef967eac7af71c6a69edc83d06558 ("macintosh/media bay: Co
On Thu, 3 Jul 2008 23:54:26 -0600, Grant Likely wrote:
> On Thu, Jul 3, 2008 at 9:24 AM, Grant Likely <[EMAIL PROTECTED]> wrote:
> > On Thu, Jul 03, 2008 at 08:22:18AM -0400, Jon Smirl wrote:
> >> Testing was good when the patch was initially posted in January. In
> >> the last six months the initi
On Thu, Jul 3, 2008 at 9:24 AM, Grant Likely <[EMAIL PROTECTED]> wrote:
> On Thu, Jul 03, 2008 at 08:22:18AM -0400, Jon Smirl wrote:
>> Testing was good when the patch was initially posted in January. In
>> the last six months the initial patch set has been sliced and diced
>> into a bunch of diffe
On Thu, Jul 03, 2008 at 08:22:18AM -0400, Jon Smirl wrote:
> Testing was good when the patch was initially posted in January. In
> the last six months the initial patch set has been sliced and diced
> into a bunch of different pieces but the contents of this patch are
> essentially unchanged.
>
>
On 7/3/08, Grant Likely <[EMAIL PROTECTED]> wrote:
> On Thu, Jul 03, 2008 at 01:39:05PM +1000, Stephen Rothwell wrote:
> > Hi Paul,
> >
> > Today's linux-next merge of the powerpc tree got a conflict in
> > arch/powerpc/sysdev/fsl_soc.c between commit
> > 4eac6a8b17ce5ebe66eb94b6a0b43aa3a2bf7e
On Thu, Jul 03, 2008 at 01:39:05PM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the powerpc tree got a conflict in
> arch/powerpc/sysdev/fsl_soc.c between commit
> 4eac6a8b17ce5ebe66eb94b6a0b43aa3a2bf7ea6 ("i2c-mpc: Convert to an
> of_platform driver") from the i2c tre
Hi Paul,
Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/sysdev/fsl_soc.c between commit
4eac6a8b17ce5ebe66eb94b6a0b43aa3a2bf7ea6 ("i2c-mpc: Convert to an
of_platform driver") from the i2c tree and commits
22fb7d9be593181e2f779cf7a8421703a6be713b ("[POWERPC] fsl: Add wa
Hi Paul,
Today's linux-next merge of the powerpc tree got a conflict in
drivers/macintosh/mediabay.c between commit
3fdba626506365e3aaf49140632120cd9156c2e8 ("ide-pmac: media-bay support
fixes (take 3)") from the ide tree and commit
9a24729d8aeef967eac7af71c6a69edc83d06558 ("macintosh/media bay: C
85 matches
Mail list logo
