From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Monjalon <thomas.monjalon@6wind.com>
Subject: Re: [PATCH v4 5/5] eal: Fix uio mapping differences
	between linuxapp and bsdapp
Date: Mon, 15 Jun 2015 17:17:24 +0200
Message-ID: <4925482.ALYPNvzUmi@xps13>
References: <1432014898-3543-1-git-send-email-mukawa@igel.co.jp>
 <8CEF83825BEC744B83065625E567D7C204A2EE7F@IRSMSX108.ger.corp.intel.com>
 <8CEF83825BEC744B83065625E567D7C204A2EED3@IRSMSX108.ger.corp.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7Bit
Cc: dev@dpdk.org
To: "Iremonger, Bernard" <bernard.iremonger@intel.com>
Return-path: <dev-bounces@dpdk.org>
Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com
 [209.85.212.180]) by dpdk.org (Postfix) with ESMTP id 804C25A8B
 for <dev@dpdk.org>; Mon, 15 Jun 2015 17:18:22 +0200 (CEST)
Received: by wicnd19 with SMTP id nd19so28086078wic.1
 for <dev@dpdk.org>; Mon, 15 Jun 2015 08:18:22 -0700 (PDT)
In-Reply-To: <8CEF83825BEC744B83065625E567D7C204A2EED3@IRSMSX108.ger.corp.intel.com>
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

Hi Bernard,

2015-06-15 15:08, Iremonger, Bernard:
[snip]

In order to avoid filling too much the patchwork page of the patch,
it's better to remove useless lines while keeping only the lines needed
to understand the history.

> > Hi Tetsuya,
> > 
> > This patch fails to apply to the latest code.
> > 
> > Applying: eal: Fix uio mapping differences between linuxapp and bsdapp
> > error: patch failed: lib/librte_eal/bsdapp/eal/eal_pci.c:238
> > error: lib/librte_eal/bsdapp/eal/eal_pci.c: patch does not apply
> > error: patch failed: lib/librte_eal/linuxapp/eal/eal_pci_uio.c:326
> > error: lib/librte_eal/linuxapp/eal/eal_pci_uio.c: patch does not apply
> > 
> > It looks like another rebase is needed.

About patch rebasing, in general, you can do it yourself by forking a
temporary branch before the conflicting commit, and rebasing it after.

> > 
> > Regards,
> > 
> > Bernard.
> 
> Hi Tetsuya,
> 
> Please ignore the previous email.
> This patch applies ok to the latest code (I applied the v3 patch by mistake).
> 
> Regards,
> 
> Bernard.