Skip to content

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

palash-gandhi
Copy link
Contributor

@palash-gandhi palash-gandhi commented Sep 15, 2023

Problem

delphix/linux-kernel-aws#46 and it's side ports introduced a potential for merge conflicts in the base annotations file. If upstream changes that file, we are bound to hit a merge conflict when updating our repos because the include line is at the end of the file. Moving it to the top result in an unwanted configuration - where upstream's annotations overrides Delphix's annotations. We want Delphix's annotations to be processed at the very end.

Solution

delphix/linux-pkg#300 moves Delphix's custom annotations file into the linux-pkg repo. This change modifies the kernel repo to remove it.

Testing Done

See delphix/linux-pkg#300 for testing.

@palash-gandhi palash-gandhi force-pushed the dlpx/pr/palash-delphix/9a67e0a1-6557-4d88-a372-be493a23929a branch from 6322b3e to bc916c0 Compare September 15, 2023 01:13
@palash-gandhi palash-gandhi marked this pull request as ready for review September 15, 2023 01:16
@palash-gandhi palash-gandhi merged commit f3bc9e5 into develop Sep 19, 2023
@palash-gandhi palash-gandhi deleted the dlpx/pr/palash-delphix/9a67e0a1-6557-4d88-a372-be493a23929a branch September 19, 2023 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants