search

ClangBuiltLinux / continuous-integration

Continuous integration of latest Linux kernel with daily build of Clang & LLVM tools
https://travis-ci.com/ClangBuiltLinux/continuous-integration
Apache License 2.0
44 stars 18 forks source link

patches: llvm-8: arm: Fix conflicts in common-page-size patch #180

Closed nathanchance closed 5 years ago

nathanchance commented 5 years ago

Conflicts occur because of https://git.kernel.org/torvalds/c/c5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27d.

Use the patch information and resolution from Russell King's tree:

http://git.armlinux.org.uk/cgit/linux-arm.git/commit/?id=b777a981d504678d7d90e7449a3da0b2924a2a76

http://git.armlinux.org.uk/cgit/linux-arm.git/commit/?id=60577ebf7718cf233bc67dc2a0c4089348da5c6b

Fixes builds 34 to 36: https://travis-ci.com/ClangBuiltLinux/continuous-integration/builds/116515113

nathanchance commented 5 years ago

The following build failures are not clang related and have already been reported/dealt with:

https://travis-ci.com/ClangBuiltLinux/continuous-integration/jobs/210165149

https://travis-ci.com/ClangBuiltLinux/continuous-integration/jobs/210165150

https://lore.kernel.org/lkml/20190621075730.nubg7657nwlkmmmk@shell.armlinux.org.uk/

nathanchance commented 5 years ago

Yeah, they are on the for-next branch, they're buried on page two or three, I forget. I merely took the commit message and the merge resolution and stitched them together using git am, git show, and git apply.