commit fc3ffeea4cb1f8794ed794264927a12e8c0145b3 Merge: 495235a a68e56e Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Sun Dec 11 18:32:20 2022 +0100 Merge remote-tracking branch 'origin/master' into el9 Resolved conflict: xorg-x11-drv-nvidia.spec .gitignore | 1 + sources | 3 +- xorg-x11-drv-nvidia.spec | 105 ++++++++++++++++++++++++++++++++++++----------- 3 files changed, 83 insertions(+), 26 deletions(-) ---