DLPX-90772 Upstream merge conflict in Linux kernel #49
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.
Problem
There's a merge conflict in
debian/rules.d/4-checks.mk
in our patch set.The checks-% target had two dependencies that were removed upstream
(
abi-check-%
andretpoline-check-%
). This target conflicts because wepreviously removed a dependency -
module-check-%
.Solution
I initially tried removing the target but that caused the connstat build
to fail due to a missing build directory. Leaving the target in, with a
dependency on
module-signature-check-%
(as exists upstream) allows theconnstat build to complete.
This upstream update also caused failures due to dkms modules we don't
need. They were previously removed from
debian/dkms-versions
, butre-introduced upstream in files like
debian.aws-5.15/dkm-versions
etc. Iremoved instances of v4l2loopback and iwlwifi in these files.
Testing Done
http://selfservice.jenkins.delphix.com/job/appliance-build-orchestrator-pre-push/8288/consoleFull