From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jaedon Shin <jaedon.shin@gmail•com>
Subject: linux-next: manual merge of the libata tree
Date: Thu, 31 Dec 2015 12:29:15 +1100 [thread overview]
Message-ID: <20151231122915.64bc66e5@canb.auug.org.au> (raw)
Hi Tejun,
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 :-(.
I have used the version of the libata tree from next-20151223 for today.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2015-12-31 1:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-31 1:29 Stephen Rothwell [this message]
2016-01-01 2:01 ` linux-next: manual merge of the libata tree Tejun Heo
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=20151231122915.64bc66e5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jaedon.shin@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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