From 3a17d97bdbd6ebaf716e86e9680d4e1a2e0b336d Mon Sep 17 00:00:00 2001
From: Ivan T. Ivanov <iivanov@suse.de>
Date: May 26 2023 08:30:41 +0000
Subject: Merge branch 'users/tzimmermann/SLE12-SP5/for-next' into SLE12-SP5


Resolve conflict in blacklist.conf

---

diff --git a/blacklist.conf b/blacklist.conf
index 0c97d97..a106670 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -2816,3 +2816,35 @@ a494398bde273143c2352dd373cad8211f7d94b2 # not needed with downstream version of
 7856e8616273098dc6c09a6e084afd98a283ff0d # already applied
 633e2b2ded739a34bd0fb1d8b5b871f7e489ea29 # breaks existing user space
 3670de80678961eda7fa2220883fc77c16868951 # potential of breaking API
+98a65439172dc69cb16834e62e852afc2adb83ed # driver not enabled: video: fbdev: kyro: fix a DoS bug by restricting user input
+b36b242d4b8ea178f7fd038965e3cac7f30c3f09 # driver not enabled: video: fbdev: asiliantfb: Error out if 'pixclock' equals zero
+1520b4b7ba964f8eec2e7dd14c571d50de3e5191 # driver not enabled: video: fbdev: kyro: Error out if 'pixclock' equals zero
+f92763cb0feba247e0939ed137b495601fd072a5 # driver not enabled: video: fbdev: riva: Error out if 'pixclock' equals zero
+37a1a2e6eeeb101285cd34e12e48a881524701aa # driver not enabled: video: fbdev: nvidiafb: Use strscpy() to prevent buffer overflow
+8738ddcac644964ae128ccd3d80d48773c8d528e # driver not enabled: video: fbdev: w100fb: Reset global state
+5c6f402bdcf9e7239c6bc7087eda71ac99b31379 # driver not enabled: video: fbdev: cirrusfb: check pixclock to avoid divide by zero
+24565bc4115961db7ee64fcc7ad2a7437c0d0a49 # driver not enabled: video: fbdev: omapfb: acx565akm: replace snprintf with sysfs_emit
+f63658a59c3d439c8ad7b290f8ec270980e0f384 # driver not enabled: video: fbdev: omapfb: panel-dsi-cm: Use sysfs_emit() instead of snprintf()
+c07a039cbb96748f54c02995bae8131cc9a73b0a # driver not enabled: video: fbdev: omapfb: panel-tpo-td043mtea1: Use sysfs_emit() instead of snprintf()
+4f01d09b2bbfbcb47b3eb305560a7f4857a32260 # driver not enabled: video: fbdev: sm712fb: Fix crash in smtcfb_write()
+d87ad457f7e1b8d2492ca5b1531eb35030a1cc8f # driver not enabled: video: fbdev: pxa3xx-gcu: release the resources correctly in pxa3xx_gcu_probe/remove()
+a09d2d00af53b43c6f11e6ab3cb58443c2cac8a7 # driver not enabled: video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write
+40bf722f8064f50200b8c4f8946cd625b441dda9 # driver not enabled: video: fbdev: i740fb: Check the argument of i740_calc_vclk()
+07c55c9803dea748d17a054000cbf1913ce06399 # driver not enabled: fbdev: chipsfb: Add missing pci_disable_device() in chipsfb_pci_init()
+5610bcfe8693c02e2e4c8b31427f1bdbdecc839c # driver not enabled: fbdev: smscufx: Fix use-after-free in ufx_ops_open()
+aca7c13d3bee81a968337a5515411409ae9d095d # driver not enabled: parisc: fbdev/stifb: Align graphics memory size to 4MB
+cc67482c9e5f2c80d62f623bcc347c29f9f648e1 # driver not enabled: fbdev: smscufx: Fix several use-after-free bugs
+3c6bf6bddc84888c0ce163b09dee0ddd23b5172a # driver not enabled: fbdev: cyber2000fb: fix missing pci_disable_device()
+025e3b507a3a8e1ee96a3112bb67495c77d6cdb6 # driver not enabled: fbdev: ssd1307fb: Drop optional dependency
+ed359a464846b48f76ea6cc5cd8257e545ac97f4 # driver not enabled: fbdev: pm2fb: fix missing pci_disable_device()
+5886b130de953cfb8826f7771ec8640a79934a7f # driver not enabled: fbdev: via: Fix error in via_core_init()
+001f2cdb952a9566c77fb4b5470cc361db5601bb # driver not enabled: fbdev: vermilion: decrease reference count in error path
+7f501aa71da9dc2eaae2b0118a151cad018d33b0 # driver not enabled: fbdev: omapfb: cleanup inconsistent indentation
+f90bd245de82c095187d8c2cabb8b488a39eaecc # driver not enabled: fbdev: tgafb: Fix potential divide by zero
+203873a535d627c668f293be0cb73e26c30f9cc7 # driver not enabled: fbdev: stifb: Provide valid pixelclock and add fb_check_var() checks
+92e2a00f2987483e1f9253625828622edd442e61 # driver not enabled: fbdev: nvidia: Fix potential divide by zero
+d823685486a3446d061fed7c7d2f80af984f119a # driver not enabled: fbdev: intelfb: Fix potential divide by zero
+61ac4b86a4c047c20d5cb423ddd87496f14d9868 # driver not enabled: fbdev: lxfb: Fix potential divide by zero
+44a3b36b42acfc433aaaf526191dd12fbb919fdb # driver not enabled: fbdev: au1200fb: Fix potential divide by zero
+5a6bef734247c7a8c19511664ff77634ab86f45b # driver not enabled: fbdev: arcfb: Fix error handling in arcfb_probe()
+ed9de4ed39875706607fb08118a58344ae6c5f42 # driver not enabled: fbdev: udlfb: Fix endpoint check