From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jaedon Shin <jaedon.shin@gmail.com>
Subject: Re: linux-next: manual merge of the libata tree
Date: Thu, 31 Dec 2015 21:01:03 -0500 [thread overview]
Message-ID: <20160101020103.GB29040@htj.duckdns.org> (raw)
In-Reply-To: <20151231122915.64bc66e5@canb.auug.org.au>
Hello, Stephen.
On Thu, Dec 31, 2015 at 12:29:15PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the libata tree got conflicts all over teh
> place due to commit:
>
> 53fab927a8fc ("ata: ahci_brcmstb: add support for MIPS-based platforms")
>
> from the libata tree which seem to contain most (if not all) of Linus'
> tree :-(.
That's me messing up the branch. Will rebase the tree. Sorry about
the mess.
Thanks.
--
tejun
prev parent reply other threads:[~2016-01-01 2:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-31 1:29 linux-next: manual merge of the libata tree Stephen Rothwell
2016-01-01 2:01 ` Tejun Heo [this message]
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=20160101020103.GB29040@htj.duckdns.org \
--to=tj@kernel.org \
--cc=jaedon.shin@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).