Re: lsk 4.1-android merge conflict review on

On 06/20/2016 02:01 PM, Amit Pundir wrote:

Hi Alex,

On 17 June 2016 at 14:29, Alex Shi alex.shi@linaro.org wrote:

...

...

Hi Amit,

I fixed some conflicts when merge lsk 4.1 to lsk 4.1-android. Would you like to review the solutions?

After merge solution I also picked your fix patch: 703920 'cgroup: refactor allow_attach handler for 4.4' for allow_attach compiler issue.

Here is the merge conflicts solution:

Conflict resolutions look good to me.

pushed. thanks!