Hi all,
Today's linux-next merge of the mips tree got a conflict in:
arch/mips/include/asm/module.h
between commit:
62d0fd591db1 ("arch: split MODULE_ARCH_VERMAGIC definitions out to
")
from Linus' tree and commits:
ab7c01fdc3cf ("mips: Add MIPS Release 5 support")
281e3aea35e5
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
Documentation/index.rst
between several commits from Linus' tree and commit:
97689a1a3fdad101d ("doc: Add doc for the Ingenic TCU hardware")
from the mips tree.
I fixed it up (see below) and can carry the fix as
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
Documentation/index.rst
between commit:
08a69058c02f ("docs: power: add it to to the main documentation index")
from Linus' tree and commit:
97689a1a3fda ("doc: Add doc for the Ingenic TCU hardware")
from the mips
On Wed, Aug 7, 2019 at 2:25 AM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the mips tree got a conflict in:
>
> arch/mips/include/asm/vdso/vdso.h
> ( arch/mips/vdso/vdso.h in Linus' tree)
>
> between commit:
>
> ee38d94a0ad8 ("page flags: prioritize kasan bits over
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
arch/mips/include/asm/vdso/vdso.h
( arch/mips/vdso/vdso.h in Linus' tree)
between commit:
ee38d94a0ad8 ("page flags: prioritize kasan bits over last-cpuid")
from Linus' tree and commit:
6393e6064486 ("mips: fix vdso32
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
arch/mips/sgi-ip27/ip27-irq.c
between commit:
e4952b0c2c03 ("MIPS: SGI-IP27: Fix use of unchecked pointer in
shutdown_bridge_irq")
from Linus' tree and commit:
e6308b6d35ea ("MIPS: SGI-IP27: abstract chipset irq from
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
include/linux/compiler_types.h
between commit:
815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually
exclusive")
from Linus' tree and commit:
04f264d3a8b0 ("compiler.h: Allow arch-specific
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
include/linux/compiler_types.h
between commit:
815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually
exclusive")
from Linus' tree and commit:
04f264d3a8b0 ("compiler.h: Allow arch-specific
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
drivers/clk/Kconfig
between commit:
b745c0794e2f ("clk: keystone: Add sci-clk driver support")
from Linus' tree and commit:
5e2722808156 ("clk: boston: Add a driver for MIPS Boston board clocks")
from the mips tree.
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
drivers/clk/Kconfig
between commit:
b745c0794e2f ("clk: keystone: Add sci-clk driver support")
from Linus' tree and commit:
5e2722808156 ("clk: boston: Add a driver for MIPS Boston board clocks")
from the mips tree.
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in:
arch/mips/kernel/mips_ksyms.c
between commit:
7c0f6ba682b9 ("Replace with globally")
from Linus' tree and commit:
238f9fbc3244 ("MIPS: Export {copy, clear}_page functions alongside their
definitions")
from the
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in:
arch/mips/kernel/mips_ksyms.c
between commit:
7c0f6ba682b9 ("Replace with globally")
from Linus' tree and commit:
238f9fbc3244 ("MIPS: Export {copy, clear}_page functions alongside their
definitions")
from the
On Mon, Jan 25, 2016 at 09:25:10AM +1100, Stephen Rothwell wrote:
>
> Today's linux-next merge of the mips tree got conflicts in:
>
> arch/mips/kvm/tlb.c
>
> between commit:
>
> ba049e93aef7 ("kvm: rename pfn_t to kvm_pfn_t")
>
> from Linus' tree and commit:
>
> cb1b447f0c36 ("MIPS:
Hi Ralf,
Today's linux-next merge of the mips tree got conflicts in:
arch/mips/kvm/tlb.c
between commit:
ba049e93aef7 ("kvm: rename pfn_t to kvm_pfn_t")
from Linus' tree and commit:
cb1b447f0c36 ("MIPS: KVM: Convert EXPORT_SYMBOL to _GPL")
from the mips tree.
I fixed it up (see
On Mon, Jan 25, 2016 at 09:25:10AM +1100, Stephen Rothwell wrote:
>
> Today's linux-next merge of the mips tree got conflicts in:
>
> arch/mips/kvm/tlb.c
>
> between commit:
>
> ba049e93aef7 ("kvm: rename pfn_t to kvm_pfn_t")
>
> from Linus' tree and commit:
>
> cb1b447f0c36 ("MIPS:
Hi Ralf,
Today's linux-next merge of the mips tree got conflicts in:
arch/mips/kvm/tlb.c
between commit:
ba049e93aef7 ("kvm: rename pfn_t to kvm_pfn_t")
from Linus' tree and commit:
cb1b447f0c36 ("MIPS: KVM: Convert EXPORT_SYMBOL to _GPL")
from the mips tree.
I fixed it up (see
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in:
arch/mips/include/asm/mips-cm.h
between commit:
7573b94e08ae ("MIPS: CM: Provide a function to map from CPU to VP ID.")
from Linus' tree and commit:
3d04e4b34962 ("MIPS: Enable L2 prefetching for CM >= 2.5")
from
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in:
arch/mips/include/asm/mips-cm.h
between commit:
7573b94e08ae ("MIPS: CM: Provide a function to map from CPU to VP ID.")
from Linus' tree and commit:
3d04e4b34962 ("MIPS: Enable L2 prefetching for CM >= 2.5")
from
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
arch/mips/mm/tlb-r4k.c between commit 9ead8632bbf4 ("MIPS: Fix
C0_Pagegrain[IEC] support") from Linus' tree and commit a5770df09541
("MIPS: Add set/clear CP0 macros for PageGrain register") from the mips
tree.
I fixed it up
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
arch/mips/include/asm/pgtable-bits.h between commit b32da82e28ce
("mips: drop _PAGE_FILE and pte_file()-related helpers") from Linus'
tree and commit 05f9883a2899 ("MIPS: Usage and cosmetic cleanups of
page table bits.") from
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
arch/mips/mm/tlb-r4k.c between commit 9ead8632bbf4 (MIPS: Fix
C0_Pagegrain[IEC] support) from Linus' tree and commit a5770df09541
(MIPS: Add set/clear CP0 macros for PageGrain register) from the mips
tree.
I fixed it up (see
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
arch/mips/include/asm/pgtable-bits.h between commit b32da82e28ce
(mips: drop _PAGE_FILE and pte_file()-related helpers) from Linus'
tree and commit 05f9883a2899 (MIPS: Usage and cosmetic cleanups of
page table bits.) from the
On Fri, Feb 13, 2015 at 11:11:50AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the mips tree got a conflict in
> arch/mips/kernel/elf.c between commit fd75a33e0002 ("MIPS: ELF: fix
> loading o32 binaries on 64-bit kernels") from Linus' tree and commit
> d8fb6537f1d4 ("MIPS:
On Fri, Feb 13, 2015 at 11:11:50AM +1100, Stephen Rothwell wrote:
Today's linux-next merge of the mips tree got a conflict in
arch/mips/kernel/elf.c between commit fd75a33e0002 (MIPS: ELF: fix
loading o32 binaries on 64-bit kernels) from Linus' tree and commit
d8fb6537f1d4 (MIPS: kernel: elf:
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
arch/mips/kernel/elf.c between commit fd75a33e0002 ("MIPS: ELF: fix
loading o32 binaries on 64-bit kernels") from Linus' tree and commit
d8fb6537f1d4 ("MIPS: kernel: elf: Improve the overall ABI and FPU mode
checks") from the
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
arch/mips/kernel/elf.c between commit fd75a33e0002 (MIPS: ELF: fix
loading o32 binaries on 64-bit kernels) from Linus' tree and commit
d8fb6537f1d4 (MIPS: kernel: elf: Improve the overall ABI and FPU mode
checks) from the mips
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
arch/mips/mti-malta/malta-memory.c between commit 2ff89d64f23e ("MIPS:
malta: memory.c: Initialize the 'memsize' variable") from Linus' tree
and commit acd8bc1a70ff ("MIPS: malta: Remove 'maybe_unused' attribute
from ememsize{,
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
arch/mips/mti-malta/malta-memory.c between commit 2ff89d64f23e (MIPS:
malta: memory.c: Initialize the 'memsize' variable) from Linus' tree
and commit acd8bc1a70ff (MIPS: malta: Remove 'maybe_unused' attribute
from ememsize{,
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
arch/mips/include/asm/octeon/octeon-model.h between commit a1ce39288e6f
("UAPI: (Scripted) Convert #include "..." to #include in
kernel system headers") from the tree and commit 5cf02e5554a4 ("MIPS:
OCTEON: Add detection of
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
arch/mips/include/asm/octeon/octeon-model.h between commit a1ce39288e6f
(UAPI: (Scripted) Convert #include ... to #include path/... in
kernel system headers) from the tree and commit 5cf02e5554a4 (MIPS:
OCTEON: Add detection of
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
drivers/net/ethernet/octeon/octeon_mgmt.c between commit df555b665367
("netdev: octeon: fix return value check in octeon_mgmt_init_phy()") from
Linus' tree and commit eeae05aa2169 ("netdev: octeon_mgmt: Add support
for 1Gig
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
drivers/net/ethernet/octeon/octeon_mgmt.c between commit df555b665367
(netdev: octeon: fix return value check in octeon_mgmt_init_phy()) from
Linus' tree and commit eeae05aa2169 (netdev: octeon_mgmt: Add support
for 1Gig ports)
32 matches
Mail list logo
