elxr/6.12/bianca-nxp: Upgrade to 6.12.95
Steps:
$git checkout elxr/6.12/bianca-nxp
$git merge elxr/6.12/bianca-base
Merge conflicts for the following files have been done manually:
Documentation/userspace-api/ioctl/ioctl-number.rst
arch/arm64/boot/dts/freescale/imx8qm-mek.dts
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
arch/arm64/include/asm/io.h
arch/arm64/include/asm/tlbflush.h
debian/changelog
debian/patches/series
drivers/ptp/ptp_vclock.c
drivers/spi/spi-nxp-fspi.c
sound/soc/sof/compress.c
Intel oot patches do not work cleanly due to the changes in bianca-nxp branch, so they have to be updated as well:
debian/patches/features/x86/intel-oot/0001-net-pcs-xpcs-enable-xpcs-reset-skipping.tsn
debian/patches/features/x86/intel-oot/0003-ethtool-Add-support-for-configuring-frame-preemption.tsn
debian/patches/features/x86/intel-oot/0006-kernel-enable-VC-support-in-v4l2.camera
debian/patches/features/x86/intel-oot/0011-drivers-ptp-Add-PEROUT2-ioctl-frequency-adjustment-i.tgpio
debian/patches/features/x86/intel-oot/0012-drivers-ptp-Add-user-space-input-polling-interface.tgpio
debian/patches/features/x86/intel-oot/0012-net-stmmac-fix-MAC-and-phylink-mismatch-issue-after-re.tsn
debian/patches/features/x86/intel-oot/0014-drivers-ptp-Add-support-for-PMC-Time-Aware-GPIO-Driv.tgpio
debian/patches/features/x86/intel-oot/0014-media-i2c-add-gmsl-isx031-support.camera
debian/patches/features/x86/intel-oot/0016-mfd-intel-ehl-gpio-Introduce-MFD-framework-to-PSE-GP.tgpio
debian/patches/features/x86/intel-oot/0017-net-stmmac-select-PCS-negotiation-mode-according-to-th.tsn
Following files have also been modified to to the resultant compilation issues:
drivers/gpu/drm/imx/sec_mipi_dsim-imx.c
drivers/gpu/imx/lcdif/lcdif-common.c
Output:
[?2004hroot@localhost:~# uname -r
[?2004l
6.12.95+deb13-imx-arm64
Sending with 5 millisecond of delay
Sending line: 'cat /etc/os-release'
cat /etc/os-release
[?2004hroot@localhost:~# cat /etc/os-release
[?2004l
PRETTY_NAME="eLxr 26.04.01"
NAME="eLxr"
VARIANT="Edge Edition"
VARIANT_ID=edge
VERSION_ID="26.04"
VERSION="26.04.01 (Bianca)"
VERSION_CODENAME=bianca
ID=elxr
ID_LIKE=debian
HOME_URL="https://elxr.org"
SUPPORT_URL="https://elxr.org"
BUG_REPORT_URL="https://gitlab.com/groups/elxr/-/issues"Edited by Deepak Hosamane