Skip to content

kpatch-build: remove duplicated use_klp_arch#1264

Merged
joe-lawrence merged 1 commit intodynup:masterfrom
liu-song-6:fix-01
May 2, 2022
Merged

kpatch-build: remove duplicated use_klp_arch#1264
joe-lawrence merged 1 commit intodynup:masterfrom
liu-song-6:fix-01

Conversation

@liu-song-6
Copy link
Contributor

The two versions are not the same (4.18.0-240.el8 vs. 4.18.0-284.el8).
But I am not quite sure which one is accurate. Remove the first one as the
second one is being used before this change.

Signed-off-by: Song Liu [email protected]

The two versions are not the same (4.18.0-240.el8 vs. 4.18.0-284.el8).
But I am not quite sure which one is accurate. Remove the first one as the
second one is being used before this change.

Signed-off-by: Song Liu <[email protected]>
Copy link
Member

@jpoimboe jpoimboe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, good catch. It looks like #1163 and #1174 had two different versions of
the same patch. When they were merged, git silently did the wrong thing. Then
I guess shellcheck doesn't detect duplicate functions.

Luckily the 2nd function was correct, which I assume takes precedence since it overrides the first.

@joe-lawrence
Copy link
Contributor

Yeah, oops. kernel-4.18.0-284.el8 was when we backported the klp.arch removal code, so that is correct.

@joe-lawrence joe-lawrence merged commit dd11b08 into dynup:master May 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants