[7.1.r1] Linux 4.14.197 #2340
Merged
[7.1.r1] Linux 4.14.197 #2340
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Author
|
I think there is something wrong with 4.14.197 don't merge, needs further investigation. |
Collaborator
|
@stefanhh0 updates? |
Author
|
@jerpelea no updates, since my sony phone is broken, I can't test any more and another one has to take over. |
source kernel.org https://cdn.kernel.org/pub/linux/kernel/v4.x/incr/patch-4.14.196-197.xz Signed-off-by: Stefan Rücker <s.ruecker@gmx.de>
Collaborator
|
@stefanhh0 updates? |
Author
|
I have tested it again on lilac, a vanilla build it is now booting fine. Not so sure why I saw the problems, maybe related to: PR #2330, which I haven't included this time or something different that has been merged back meanwhile. |
Author
|
Tested successfully on bahamut |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following files required manual conflict resolutions resp. investigations:
drivers/gpu/drm/msm/msm_drv.c: The commit https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-4.14.y&id=3d516e369e3a563e7da39c72b06d78c7f1b09b1e was not applied since the commit with ID 5d17c1a from CAF already provides the function #msm_pdev_shutdown with a different implementation. Switching to the kernel upstream implementation may break things, thus I favoured keeping the CAF implementation as is.Please review and test.
The kernel already runs fine on Yoshino/Lilac.