drivers: spi: Sort CMake and Kconfig files alphabetically #79391
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
rettichschnidi
force-pushed
the
gardena/rs/upstream/sim3u-sort-lines-spi
branch
from
ab7a7aa to
8d33c90
Compare
rettichschnidi
changed the title
tbursztyka
previously approved these changes
Oct 21, 2024
rettichschnidi
force-pushed
the
gardena/rs/upstream/sim3u-sort-lines-spi
branch
from
8d33c90 to
cff80b3
Compare
Contributor
Author
|
Rebased and force pushed due to conflicts. |
tbursztyka
previously approved these changes
Oct 22, 2024
kartben
previously approved these changes
Nov 25, 2024
By sorting the lines alphabetically, merge conflicts can be reduced. Signed-off-by: Reto Schneider <[email protected]>
rettichschnidi
dismissed stale reviews from kartben and tbursztyka
via
845ca1c
rettichschnidi
force-pushed
the
gardena/rs/upstream/sim3u-sort-lines-spi
branch
from
cff80b3 to
845ca1c
Compare
Contributor
Author
|
@teburd @tbursztyka Please (re) review |
pdgendt
approved these changes
Dec 3, 2024
kartben
approved these changes
Dec 3, 2024
MaureenHelm
approved these changes
Dec 3, 2024
Contributor
|
Only change is a rebase since @tbursztyka approved as assignee |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
By sorting the lines alphabetically, conflicts can be reduced. This (partially) replaces #76674.
Background
For a while now, I am working on support for a new SoC. Often, when rebasing my WIP branch on the most recent main, conflicts happen because everyone adds new drivers at the bottom. By biting the bullet now, this kind of conflict can (most of the time) be avoided in the future.