From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1754484AbdLFI6K (ORCPT <rfc822;w@1wt.eu>);
        Wed, 6 Dec 2017 03:58:10 -0500
Received: from mail-wr0-f175.google.com ([209.85.128.175]:39621 "EHLO
        mail-wr0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1754143AbdLFI6H (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 6 Dec 2017 03:58:07 -0500
X-Google-Smtp-Source: AGs4zMYXlh+jhWR81HzHm/L28pZk3x9mXYmCu02XBYuud9UkGg+Ohh3PpYnIz4Us/hP8aIN9EwzJyQ==
Date: Wed, 6 Dec 2017 08:58:03 +0000
From: Lee Jones <lee.jones@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Rui Feng <rui_feng@realsil.com.cn>,
        Daniel Bristot de Oliveira <bristot@redhat.com>,
        Perry Yuan <perry_yuan@dell.com>
Subject: Re: linux-next: build failure after merge of the mfd tree
Message-ID: <20171206085803.d2whwsmua3fm6ij5@dell>
References: <20171204141956.5b90bc18@canb.auug.org.au>
 <20171204093953.iwhew4w7wgzm6b3q@dell>
 <20171206103258.4920acde@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20171206103258.4920acde@canb.auug.org.au>
User-Agent: NeoMutt/20170113 (1.7.2)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, 06 Dec 2017, Stephen Rothwell wrote:

> Hi Lee,
> 
> On Mon, 4 Dec 2017 09:39:53 +0000 Lee Jones <lee.jones@linaro.org> wrote:
> >
> > > I added the following fix patch:
> > > 
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Mon, 4 Dec 2017 14:10:34 +1100
> > > Subject: [PATCH] misc: rtsx: fix symbol clashes
> > > 
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>  
> > 
> > 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

-- 
Lee Jones
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog