search

ni / linux

Linux kernel source for NI Linux Real-Time
Other
80 stars 77 forks source link

Merge tag 'v6.1.96-rt35' into nilrt/master/6.1 #164

Closed rajendra-desai-ni closed 2 months ago

rajendra-desai-ni commented 2 months ago

This is a regular x64 stable-rt kernel upgrade on v6.1. Latest stable release available was v6.1.96-rt35.

AB#2755003

There was a merge conflict between 13dc7b7 ("mmc: sdhci: Handle tuning error interrupts") and b385566 ("mmc: sdhci: Add support for "Tuning Error" interrupts").

drivers/mmc/host/sdhci.h

image

Reverted 13dc7b7 ("mmc: sdhci: Handle tuning error interrupts") and then did git merge to include upstream changes and there were no merge conflicts.

Testing

Rebuilt the kernel with new changes and installed on a VM and found no issues.

gratian commented 2 months ago

A minor nitpick I've noticed - when you use tags in commit messages like this:

[rajendra-desai-ni: fix conflict https://github.com/ni/linux/commit/13dc7b7f158917dec94d79bdd4abea66f4f7e6ae with upstream commit https://github.com/torvalds/linux/commit/b3855668d98cf9c6aec2db999dd27d872f8ba878
by updating existing MACRO_NAME SDHCI_INT_TUNING_ERR
to upstream MACRO_NAME SDHCI_INT_TUNING_ERROR]

the usual convention is to refer to commits using the first 12 characters of the SHA-1 commit ID and the commit subject line enclosed in ("...") instead of http links.

So for example referring to this commit:

[rajendra-desai-ni: fix conflict https://github.com/ni/linux/commit/13dc7b7f158917dec94d79bdd4abea66f4f7e6ae ...

should be:

[rajendra: fix conflict with 13dc7b7f1589 ("mmc: sdhci: Handle tuning error interrupts") ...

Also it's fine to use just your first name instead of the full github username to make the tag shorter. Your full name is contained in the 'Signed-off-by' line right below that tag anyway. The goal is to be as concise as possible and ideally keep it to one line that very briefly describes what you've fixed.

gratian commented 2 months ago

Closing this PR for now until we work out a fix for the SDHCI conflict which would be acceptable upstream. Also v6.1.99-rt36 has since become available upstream so we'll want an updated PR anyway.