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.
