From: Ralf Baechle <ralf@linux-mips.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dan Williams <dan.j.williams@intel.com>,
James Hogan <james.hogan@imgtec.com>
Subject: Re: linux-next: manual merge of the mips tree with Linus' tree
Date: Mon, 25 Jan 2016 08:42:29 +0100 [thread overview]
Message-ID: <20160125074229.GA22276@linux-mips.org> (raw)
In-Reply-To: <20160125092510.50a6fb35@canb.auug.org.au>
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
next prev parent reply other threads:[~2016-01-25 7:42 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-24 22:25 linux-next: manual merge of the mips tree with Linus' tree Stephen Rothwell
2016-01-25 7:42 ` Ralf Baechle [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-25 0:05 Stephen Rothwell
2019-09-18 11:33 Mark Brown
2019-08-11 23:19 Stephen Rothwell
2019-08-07 0:25 Stephen Rothwell
2019-08-07 7:42 ` Arnd Bergmann
2019-05-12 23:47 Stephen Rothwell
2018-08-23 22:37 Stephen Rothwell
2017-07-11 0:04 Stephen Rothwell
2017-01-03 0:26 Stephen Rothwell
2015-10-01 1:13 Stephen Rothwell
2015-02-22 0:22 Stephen Rothwell
2015-02-22 0:15 Stephen Rothwell
2015-02-13 0:11 Stephen Rothwell
2015-02-13 10:28 ` Ralf Baechle
2014-06-03 0:50 Stephen Rothwell
2012-10-04 0:35 Stephen Rothwell
2012-10-01 3:58 Stephen Rothwell
2011-11-07 0:04 Stephen Rothwell
2011-11-07 0:04 Stephen Rothwell
2011-11-07 10:18 ` Ralf Baechle
2009-12-14 23:20 Stephen Rothwell
2009-12-15 7:26 ` Michal Simek
2009-12-15 19:27 ` Ralf Baechle
2009-08-18 8:23 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160125074229.GA22276@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=dan.j.williams@intel.com \
--cc=james.hogan@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.