From: Cyrill G. <gor...@gm...> - 2013-11-24 21:10:17
|
On Sun, Nov 24, 2013 at 01:05:46PM -0800, H. Peter Anvin wrote: > On 11/24/2013 11:31 AM, Cyrill Gorcunov wrote: > > > > Hi Peter, sorry for delay, was out. Look, I can rollback my commits > > restoring former master and move flags patches out of mainline to > > a separate tree (just one revert for all commits, it'll be easy). > > The reason I merged it into master was that -- without rebase I've > > got a number of merge problems because of new IF_ flags introduced > > into master, so the longer I stay out of mainline the harder it will > > be to port back. But again, Peter, it's not a problem to revert, just > > say a word ;) > > There is no reason to revert. If it turns out to be a problem we can > just fork a new branch off 305f3cee04d1adf3f4e335c5645814f2b67e8a69 and > then re-merge later. OK, great. As far as I remember, Jin said the new engine is pretty fine for him, still better to double check this moment. |