From: Mark Salter msalter@redhat.com
Use common config for NODES_SHIFT
ARK is currently has CONFIG_NODES_SHIFT=6 where Fedora is set to 9. Let's simplify things and share the Fedora config with ARK.
Signed-off-by: Mark Salter msalter@redhat.com
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_NODES_SHIFT b/redhat/configs/ark/generic/arm/aarch64/CONFIG_NODES_SHIFT deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_NODES_SHIFT +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NODES_SHIFT=6 diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NODES_SHIFT b/redhat/configs/common/generic/arm/aarch64/CONFIG_NODES_SHIFT rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_NODES_SHIFT rename to redhat/configs/common/generic/arm/aarch64/CONFIG_NODES_SHIFT index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NODES_SHIFT +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_NODES_SHIFT
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1333
From: Mark Salter on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1333#note_6629546...
Just curious. Why the need for x86 review?
From: Patrick Talbert on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1333#note_6629782...
This is due to a flaw in the logic of the updated ack_nack bot:
https://gitlab.com/cki-project/kernel-webhooks/-/merge_requests/496
The idea was that if an MR touched a redhat/configs/CONFIG file then we'd find the corresponding Kconfig file and look up the Kconfig path in owners.yaml to find relevant reviewers. But of course with something like NODES_SHIFT that matches many different arch Kconfig files 🤦.
So I need to improve the logic to determine if the CONFIG file is in an arch- specific location and then filter any found Kconfigs based on that. But until that happens (next week?) you may find yourself added as a reviewer for the odd MR that is not relevant to you. Please ignore it.
From: Jeremy Linton on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1333#note_6740604...
Wierd this thing shows me a pile of unrelated commits because the rebase isn't clean? Anway +1
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1333#note_6740802...
Yes, the source branch needs to be rebased against current os-build and force pushed. This happened when we hit 5.14.0 and did a rebase on os-build.
From: Mark Langsdorf on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1333#note_6983519...
Acked-by: Mark Langsdorf mlangsdo@redhat.com (via approve button)
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1333#note_6983695...
Acked-by: Justin M. Forbes jforbes@fedoraproject.org (via approve button)
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1333#note_6983734...
Acked-by: Justin M. Forbes jforbes@fedoraproject.org (via approve button)
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1333#note_6992686...
So, I did the rebase which will allow it to merge, but that invalidated the acks.
From: Lyude Paul on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1333#note_6993886...
Acked-by: Lyude Paul lyude@redhat.com (via approve button)
From: Jarod Wilson on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1333#note_6994026...
Acked-by: Jarod Wilson jarod@redhat.com (via approve button)
kernel@lists.fedoraproject.org