On 04/30/2015 14:24, Savolainen, Petri (Nokia - FI/Espoo) wrote:
.. are not user friendly.
1) git pull (in master)
2) git checkout api-next
3) git pull
Results conflict in packet_io.h:
<<<<<<< HEAD
* @note dev name loop is specially pktio reserved name for device used for
* testing. Usually it's loop back interface.
=======
* @note The device name "loop" is a reserved name for a loopback device used
* for testing purposes.
0162f9e00e2b55a45aa391be512672a06ac03c30
.. and now *every* user need to fix this. This is an easy fix, but that may not
be always the case.
No, it's because you have that local change. Others will not see this.
Maxim.
NO CONFLICTING REVERTS in the repo, please.
-Petri
-----Original Message-----
From: Savolainen, Petri (Nokia - FI/Espoo)
Sent: Thursday, April 30, 2015 11:12 AM
To: 'ext Zoltan Kiss'; [email protected]
Subject: RE: [lng-odp] [PATCH API-NEXT 4/5] api: packet_io: added parse
mode
I guess it does not apply anymore because Maxim reverted Bill's v1 patch
with v2. This is based on stuff that was in the repo (Bill's v1)... not
user friendly to revert commits that are already in the repo.
-Petri
_______________________________________________
lng-odp mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/lng-odp
