From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751728AbdLLCNV (ORCPT ); Mon, 11 Dec 2017 21:13:21 -0500 Received: from ozlabs.org ([103.22.144.67]:51769 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750759AbdLLCNT (ORCPT ); Mon, 11 Dec 2017 21:13:19 -0500 Date: Tue, 12 Dec 2017 13:13:16 +1100 From: Stephen Rothwell To: Lee Jones Cc: Greg KH , Linux-Next Mailing List , Linux Kernel Mailing List , Rui Feng , Daniel Bristot de Oliveira , Perry Yuan Subject: Re: linux-next: build failure after merge of the mfd tree Message-ID: <20171212131316.02ead60b@canb.auug.org.au> In-Reply-To: <20171206085803.d2whwsmua3fm6ij5@dell> References: <20171204141956.5b90bc18@canb.auug.org.au> <20171204093953.iwhew4w7wgzm6b3q@dell> <20171206103258.4920acde@canb.auug.org.au> <20171206085803.d2whwsmua3fm6ij5@dell> 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 Lee, On Wed, 6 Dec 2017 08:58:03 +0000 Lee Jones wrote: > > On Wed, 06 Dec 2017, Stephen Rothwell wrote: > > > On Mon, 4 Dec 2017 09:39:53 +0000 Lee Jones wrote: > > > > > > > I added the following fix patch: > > > > > > > > From: Stephen Rothwell > > > > Date: Mon, 4 Dec 2017 14:10:34 +1100 > > > > Subject: [PATCH] misc: rtsx: fix symbol clashes > > > > > > > > Signed-off-by: Stephen Rothwell > > > > > > Although I'm not sure how to apply this manually without scissors. > > > > Just take everything from the From: line above to the end and give it > > to "git am". Yes, this may involve saving the email and editting it, > > sorry about that. > > If you use the scissors, I can ask Git to deal with all that for me. > > We like #lazymaintenance. :D So is this going to be applied to the mfd tree? -- Cheers, Stephen Rothwell