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 S1752061AbdJJFyq convert rfc822-to-8bit (ORCPT <rfc822;w@1wt.eu>);
        Tue, 10 Oct 2017 01:54:46 -0400
Received: from ozlabs.org ([103.22.144.67]:53121 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751809AbdJJFyp (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 10 Oct 2017 01:54:45 -0400
From: Michael Ellerman <mpe@ellerman.id.au>
To: Michael Neuling <mikey@neuling.org>,
        Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>, hbabu@us.ibm.com,
        nicholas.piggin@gmail.com, linuxppc-dev@ozlabs.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 15/18] powerpc: Emulate paste instruction
In-Reply-To: <1507543253.16703.6.camel@neuling.org>
References: <1507343298-27496-1-git-send-email-sukadev@linux.vnet.ibm.com> <1507343298-27496-16-git-send-email-sukadev@linux.vnet.ibm.com> <1507543253.16703.6.camel@neuling.org>
Date: Tue, 10 Oct 2017 16:54:44 +1100
Message-ID: <87376ry2cb.fsf@concordia.ellerman.id.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Michael Neuling <mikey@neuling.org> writes:

> @ -1924,6 +1987,7 @@ struct ppc_emulated ppc_emulated = {
>>  	WARN_EMULATED_SETUP(mfdscr),
>>  	WARN_EMULATED_SETUP(mtdscr),
>>  	WARN_EMULATED_SETUP(lq_stq),
>> +	WARN_EMULATED_SETUP(paste),
>
> You'll need to rebase this on powerpc/next as this has changed upstream.

I can handle that, it should be a trivial conflict.

cheers

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <mpe@ellerman.id.au>
Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2])
 (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by lists.ozlabs.org (Postfix) with ESMTPS id 3yB5sw3lWmzDr4x
 for <linuxppc-dev@lists.ozlabs.org>; Tue, 10 Oct 2017 16:54:44 +1100 (AEDT)
From: Michael Ellerman <mpe@ellerman.id.au>
To: Michael Neuling <mikey@neuling.org>,
 Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>, hbabu@us.ibm.com,
 nicholas.piggin@gmail.com, linuxppc-dev@ozlabs.org,
 linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 15/18] powerpc: Emulate paste instruction
In-Reply-To: <1507543253.16703.6.camel@neuling.org>
References: <1507343298-27496-1-git-send-email-sukadev@linux.vnet.ibm.com>
 <1507343298-27496-16-git-send-email-sukadev@linux.vnet.ibm.com>
 <1507543253.16703.6.camel@neuling.org>
Date: Tue, 10 Oct 2017 16:54:44 +1100
Message-ID: <87376ry2cb.fsf@concordia.ellerman.id.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org>
List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>,
 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>
List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev/>
List-Post: <mailto:linuxppc-dev@lists.ozlabs.org>
List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>
List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>,
 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>

Michael Neuling <mikey@neuling.org> writes:

> @ -1924,6 +1987,7 @@ struct ppc_emulated ppc_emulated =3D {
>> =C2=A0	WARN_EMULATED_SETUP(mfdscr),
>> =C2=A0	WARN_EMULATED_SETUP(mtdscr),
>> =C2=A0	WARN_EMULATED_SETUP(lq_stq),
>> +	WARN_EMULATED_SETUP(paste),
>
> You'll need to rebase this on powerpc/next as this has changed upstream.

I can handle that, it should be a trivial conflict.

cheers