From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754745AbbLaB3T (ORCPT ); Wed, 30 Dec 2015 20:29:19 -0500 Received: from ozlabs.org ([103.22.144.67]:38181 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126AbbLaB3R (ORCPT ); Wed, 30 Dec 2015 20:29:17 -0500 Date: Thu, 31 Dec 2015 12:29:15 +1100 From: Stephen Rothwell To: Tejun Heo Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jaedon Shin Subject: linux-next: manual merge of the libata tree Message-ID: <20151231122915.64bc66e5@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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