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

From	Ralf Baechle <ralf@linux-mips.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the mips tree with Linus' tree
Date	2016-01-25 08:50 +0100
Message-ID	<qUK4q-D0-1@gated-at.bofh.it> (permalink)
References	<qUBkt-2UA-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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: KVM: Convert EXPORT_SYMBOL to _GPL")
> 
> from the mips tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Linus has pulled so I'm reseting my branch for you back to v4.5-rc1.

Thanks,

  Ralf

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the mips tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-24 23:30 +0100
  Re: linux-next: manual merge of the mips tree with Linus' tree Ralf Baechle <ralf@linux-mips.org> - 2016-01-25 08:50 +0100

csiph-web