Hi Kevin,
In case you are waiting for my pull request for linux-linaro-lsk-v3.1x-android for 15.10, you can pull aosp/android-3.1x directly. There are no linaro-fixes to go on top this time around.
aosp/android-3.18 pushed quiet a few backported upstream commits, which resulted in few merge conflicts. Here is my test merge commit log for reference https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/c2fab...
There is this trivial merge conflict I ran into with android-3.14 as well https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/3d1a4...
Regards, Amit Pundir
Amit Pundir amit.pundir@linaro.org writes:
Hi Kevin,
In case you are waiting for my pull request for linux-linaro-lsk-v3.1x-android for 15.10, you can pull aosp/android-3.1x directly. There are no linaro-fixes to go on top this time around.
aosp/android-3.18 pushed quiet a few backported upstream commits, which resulted in few merge conflicts. Here is my test merge commit log for reference https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/c2fab...
There is this trivial merge conflict I ran into with android-3.14 as well https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/3d1a4...
There seem to be several conflicts with the android-3.10 as well with the latest LTS.
Could you go ahead and prepare branches for me to pull since you've already resolved and documented the conflicts?
Thanks,
Kevin
On Wed, Oct 14, 2015 at 5:10 PM, Kevin Hilman khilman@linaro.org wrote:
Amit Pundir amit.pundir@linaro.org writes:
Hi Kevin,
In case you are waiting for my pull request for linux-linaro-lsk-v3.1x-android for 15.10, you can pull aosp/android-3.1x directly. There are no linaro-fixes to go on top this time around.
aosp/android-3.18 pushed quiet a few backported upstream commits, which resulted in few merge conflicts. Here is my test merge commit log for reference https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/c2fab...
There is this trivial merge conflict I ran into with android-3.14 as well https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/3d1a4...
There seem to be several conflicts with the android-3.10 as well with the latest LTS.
Could you go ahead and prepare branches for me to pull since you've already resolved and documented the conflicts?
Er, just for 3.10 and 3.18. I already did the trivial one for v3.14.
Kevin
Hi Amit,
On Wed, Oct 14, 2015 at 5:29 PM, Kevin Hilman khilman@linaro.org wrote:
On Wed, Oct 14, 2015 at 5:10 PM, Kevin Hilman khilman@linaro.org wrote:
Amit Pundir amit.pundir@linaro.org writes:
Hi Kevin,
In case you are waiting for my pull request for linux-linaro-lsk-v3.1x-android for 15.10, you can pull aosp/android-3.1x directly. There are no linaro-fixes to go on top this time around.
aosp/android-3.18 pushed quiet a few backported upstream commits, which resulted in few merge conflicts. Here is my test merge commit log for reference https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/c2fab...
There is this trivial merge conflict I ran into with android-3.14 as well https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/3d1a4...
There seem to be several conflicts with the android-3.10 as well with the latest LTS.
Could you go ahead and prepare branches for me to pull since you've already resolved and documented the conflicts?
Er, just for 3.10 and 3.18. I already did the trivial one for v3.14.
If you want these in for the release, you should get these to me ASAP.
Thanks,
Kevin
On 20 October 2015 at 04:17, Kevin Hilman khilman@linaro.org wrote:
Hi Amit,
On Wed, Oct 14, 2015 at 5:29 PM, Kevin Hilman khilman@linaro.org wrote:
On Wed, Oct 14, 2015 at 5:10 PM, Kevin Hilman khilman@linaro.org wrote:
Amit Pundir amit.pundir@linaro.org writes:
Hi Kevin,
In case you are waiting for my pull request for linux-linaro-lsk-v3.1x-android for 15.10, you can pull aosp/android-3.1x directly. There are no linaro-fixes to go on top this time around.
aosp/android-3.18 pushed quiet a few backported upstream commits, which resulted in few merge conflicts. Here is my test merge commit log for reference https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/c2fab...
There is this trivial merge conflict I ran into with android-3.14 as well https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/3d1a4...
There seem to be several conflicts with the android-3.10 as well with the latest LTS.
Could you go ahead and prepare branches for me to pull since you've already resolved and documented the conflicts?
Er, just for 3.10 and 3.18. I already did the trivial one for v3.14.
If you want these in for the release, you should get these to me ASAP.
Sent pull request for 3.18.
To be honest I was not expecting a pull request for 3.10 linaro-android topic branch. It's been a while since I last I updated my 3.10 topic branch. I was under the impression that we are not adding features in 3.10 anymore. I guess things have changed now that Android M seem to have come out with 3.10 kernel on newer devices as well. Anyway I'm working on it and should be able to send you a working pull request by EOD but there are just too many non-trivial merge conflicts to deal with backported ext4/crypto and zram/zsmalloc patches in android-3.10.
Regards, Amit Pundir
Thanks,
Kevin
Amit Pundir amit.pundir@linaro.org writes:
On 20 October 2015 at 04:17, Kevin Hilman khilman@linaro.org wrote:
Hi Amit,
On Wed, Oct 14, 2015 at 5:29 PM, Kevin Hilman khilman@linaro.org wrote:
On Wed, Oct 14, 2015 at 5:10 PM, Kevin Hilman khilman@linaro.org wrote:
Amit Pundir amit.pundir@linaro.org writes:
Hi Kevin,
In case you are waiting for my pull request for linux-linaro-lsk-v3.1x-android for 15.10, you can pull aosp/android-3.1x directly. There are no linaro-fixes to go on top this time around.
aosp/android-3.18 pushed quiet a few backported upstream commits, which resulted in few merge conflicts. Here is my test merge commit log for reference https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/c2fab...
There is this trivial merge conflict I ran into with android-3.14 as well https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/3d1a4...
There seem to be several conflicts with the android-3.10 as well with the latest LTS.
Could you go ahead and prepare branches for me to pull since you've already resolved and documented the conflicts?
Er, just for 3.10 and 3.18. I already did the trivial one for v3.14.
If you want these in for the release, you should get these to me ASAP.
Sent pull request for 3.18.
To be honest I was not expecting a pull request for 3.10 linaro-android topic branch. It's been a while since I last I updated my 3.10 topic branch. I was under the impression that we are not adding features in 3.10 anymore.
That's correct. I was only expecting pulls for fixes coming through AOSP or LMG.
I guess things have changed now that Android M seem to have come out with 3.10 kernel on newer devices as well.
Well, this should probably be a discussion we have with the TSC. As far as LSK is concerned, a new Android is a new feature, so I'm not interested in pulling that in to the LSK.
Anyway I'm working on it and should be able to send you a working pull request by EOD but there are just too many non-trivial merge conflicts to deal with backported ext4/crypto and zram/zsmalloc patches in android-3.10.
For now, don't worry about Android M as I'm not going to pull that. Just send a pull if there are any fixes I should be worried about.
Thanks,
Kevin
linaro-kernel@lists.linaro.org
-
Amit Pundir -
Kevin Hilman