On Sun, Aug 25, 2019 at 10:37:26AM -0400, CKI Project wrote: > > Hello, > > We ran automated tests on a patchset that was proposed for merging into this > kernel tree. The patches were applied to: > > Kernel repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git > Commit: f7d5b3dc4792 - Linux 5.2.10 > > The results of these automated tests are provided below. > > Overall result: FAILED (see details below) > Merge: FAILED > > All kernel binaries, config files, and logs are available for download here: > > https://artifacts.cki-project.org/pipelines/123306 > > > > > When we attempted to merge the patchset, we received an error: > > error: patch failed: security/keys/trusted.c:1228 > error: security/keys/trusted.c: patch does not apply > hint: Use 'git am --show-current-patch' to see the failed patch > Applying: KEYS: trusted: allow module init if TPM is inactive or deactivated > Patch failed at 0001 KEYS: trusted: allow module init if TPM is inactive or deactivated > > We hope that these logs can help you find the problem quickly. For the full > detail on our testing procedures, please scroll to the bottom of this message. > > Please reply to this email if you have any questions about the tests that we > ran or if you have any suggestions on how to make future tests more effective. > > ,-. ,-. > ( C ) ( K ) Continuous > `-',-.`-' Kernel > ( I ) Integration > `-' > ______________________________________________________________________________ > > Merge testing > ------------- > > We cloned this repository and checked out the following commit: > > Repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git > Commit: f7d5b3dc4792 - Linux 5.2.10 > > > We grabbed the cc88f4442e50 commit of the stable queue repository. > > We then merged the patchset with `git am`: > > keys-trusted-allow-module-init-if-tpm-is-inactive-or-deactivated.patch That file is not in the repo, I think your system is messed up :(
