From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <thomas.monjalon@6wind.com>
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)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:organization
 :user-agent:in-reply-to:references:mime-version
 :content-transfer-encoding:content-type;
 bh=g6WivgwSQ9BHCJy8k1kV7Lo1rCpKlv2EQheaaZQ8diY=;
 b=bBPYcRZ3T6BdPGleoed6DdG/A81bW2BoGAEVnUBfwFEkhbw2Zr/dNpRjUe+8u5/k8+
 MT5iiSDfSzxWBcvkj+5c3rc5RcjZ60vwIfBtx9loDRN+NuFykQQ2sLhgvvw4fIfxAxYz
 kIB5il9ge1QEBcGVuWOqAodxsRb8ixEmsT2pvTPWLmMINBB35Y7z+K7deKsJ57gwSQpF
 FtLQWkHm7gLit3XI3YJXlD7LnoJvVR2Q4Zd23UqCPKiVBRcQ9c956hnjCTPGGNrEkkO0
 a2jAKtsTIPhuLFZDhqEpoMceFU/eWIRc6GN0rA//1DMstcNUvoa+cvONuZv8X2YfaJcL
 Lr3A==
X-Gm-Message-State: ALoCoQmyqe0VhCsFgGA6ZmmXCQRJU4ZyHsdiX24Vz78g4OK9nfa2sPhQ5+nY/HN+G8neTq/R6qVh
X-Received: by 10.180.198.166 with SMTP id jd6mr31813541wic.48.1434381502330; 
 Mon, 15 Jun 2015 08:18:22 -0700 (PDT)
Received: from xps13.localnet (136-92-190-109.dsl.ovh.fr. [109.190.92.136])
 by mx.google.com with ESMTPSA id bh7sm19385411wjb.8.2015.06.15.08.18.20
 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Mon, 15 Jun 2015 08:18:21 -0700 (PDT)
From: Thomas Monjalon <thomas.monjalon@6wind.com>
To: "Iremonger, Bernard" <bernard.iremonger@intel.com>
Date: Mon, 15 Jun 2015 17:17:24 +0200
Message-ID: <4925482.ALYPNvzUmi@xps13>
Organization: 6WIND
User-Agent: KMail/4.14.8 (Linux/4.0.4-2-ARCH; KDE/4.14.8; x86_64; ; )
In-Reply-To: <8CEF83825BEC744B83065625E567D7C204A2EED3@IRSMSX108.ger.corp.intel.com>
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-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v4 5/5] eal: Fix uio mapping differences
	between linuxapp and bsdapp
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
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>
X-List-Received-Date: Mon, 15 Jun 2015 15:18:22 -0000

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.