On 04/24/15 14:04, Savolainen, Petri (Nokia - FI/Espoo) wrote:
-----Original Message-----
From: lng-odp [mailto:lng-odp-boun...@lists.linaro.org] On Behalf Of ext
Maxim Uvarov
Sent: Friday, April 24, 2015 1:55 PM
To: lng-odp@lists.linaro.org
Subject: Re: [lng-odp] [API-NEXT PATCHv2] api: pktio: Clarify doc on
default pool usage on odp_pktio_open
On 04/24/15 13:21, Savolainen, Petri (Nokia - FI/Espoo) wrote:
This is not a v2, since the original patch was already merged. Also my
patches change the same lines, so need to rebase this after those are
merged.
-Petri
Petri I will revert original patch and apply that v2. After merge back
to master v1 and it's revert will be removed on rebase.
Will fix your lines if there will be any reject.
Maxim.
Is revert the right thing to do? Could you merge those two/three patches together during apply to mainline? E.g. my patches changes
word "instance" -> "interface" and this text has "instance" still/again. There will be conflicts
when "v2" is not based on my patches, which are based on "v1".
-Petri
Yes, revert is ok for api-next, but it's not needed for master. In
master I prefer to have plain history without bunch of reverts and
merges from different branches. That will be usual git merge / rebase
conflict and I will fix it on final rebase. I don't think that we can
lost something.
Maxim.
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
