[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20151231122915.64bc66e5@canb.auug.org.au>
Date: Thu, 31 Dec 2015 12:29:15 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Tejun Heo <tj@...nel.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Jaedon Shin <jaedon.shin@...il.com>
Subject: linux-next: manual merge of the libata tree
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@...b.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists