From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932315AbcELNfb (ORCPT ); Thu, 12 May 2016 09:35:31 -0400 Received: from mail-oi0-f44.google.com ([209.85.218.44]:34402 "EHLO mail-oi0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932228AbcELNf3 (ORCPT ); Thu, 12 May 2016 09:35:29 -0400 MIME-Version: 1.0 In-Reply-To: <20160512141746.11db6bd3@canb.auug.org.au> References: <20160512141746.11db6bd3@canb.auug.org.au> Date: Thu, 12 May 2016 15:35:28 +0200 Message-ID: Subject: Re: linux-next: manual merge of the gpio tree with the mips tree From: Linus Walleij To: Stephen Rothwell Cc: Ralf Baechle , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Huacai Chen Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 12, 2016 at 6:17 AM, Stephen Rothwell wrote: > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Yeah this is trivial and ACKed by the MIPS mainatainer so should be safe, thanks! Yours, Linus Walleij