linux-next: manual merge of the libata tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the libata tree
Date	2015-12-31 02:30 +0100
Message-ID	<qLAdY-64Z-11@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

Thread

linux-next: manual merge of the libata tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-31 02:30 +0100
  Re: linux-next: manual merge of the libata tree Tejun Heo <tj@kernel.org> - 2016-01-01 03:10 +0100

csiph-web