Merge 6.8-rc3 into tty-next

We need the tty/serial fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/tty/serial/8250/8250_pci1xxxx.c
Simple merge

diff --cc drivers/tty/serial/max310x.c
index 0065e17,10bf6d7..14dd9cf
--- 1/drivers/tty/serial/max310x.c
--- 2/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@@ -237,9 -234,17 +237,17 @@@
  
  /* Misc definitions */
  #define MAX310X_FIFO_SIZE             (128)
 -#define MAX310x_REV_MASK              (0xf8)
 +#define MAX310x_REV_MASK              GENMASK(7, 3)
  #define MAX310X_WRITE_BIT             0x80
  
+ /* Port startup definitions */
+ #define MAX310X_PORT_STARTUP_WAIT_RETRIES     20 /* Number of retries */
+ #define MAX310X_PORT_STARTUP_WAIT_DELAY_MS    10 /* Delay between retries */
+ 
+ /* Crystal-related definitions */
+ #define MAX310X_XTAL_WAIT_RETRIES     20 /* Number of retries */
+ #define MAX310X_XTAL_WAIT_DELAY_MS    10 /* Delay between retries */
+ 
  /* MAX3107 specific */
  #define MAX3107_REV_ID                        (0xa0)
  

diff --cc drivers/video/fbdev/core/fbcon.c
Simple merge