From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751355AbcAACBH (ORCPT ); Thu, 31 Dec 2015 21:01:07 -0500 Received: from mail-qg0-f47.google.com ([209.85.192.47]:36833 "EHLO mail-qg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751084AbcAACBF (ORCPT ); Thu, 31 Dec 2015 21:01:05 -0500 Date: Thu, 31 Dec 2015 21:01:03 -0500 From: Tejun Heo To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jaedon Shin Subject: Re: linux-next: manual merge of the libata tree Message-ID: <20160101020103.GB29040@htj.duckdns.org> References: <20151231122915.64bc66e5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151231122915.64bc66e5@canb.auug.org.au> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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