From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 May 2024 18:53:02 +0000 (-0700)
Subject: Merge tag 'tty-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v6.10-rc1~47
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f6b8e86b7a65495d3947a1d1fc22183c52f786f6;p=linux-block.git

Merge tag 'tty-6.10-rc1' of git://git./linux/kernel/git/gregkh/tty

Pull tty / serial updates from Greg KH:
 "Here is the big set of tty/serial driver changes for 6.10-rc1.
  Included in here are:

   - Usual good set of api cleanups and evolution by Jiri Slaby to make
     the serial interfaces move out of the 1990's by using kfifos
     instead of hand-rolling their own logic.

   - 8250_exar driver updates

   - max3100 driver updates

   - sc16is7xx driver updates

   - exar driver updates

   - sh-sci driver updates

   - tty ldisc api addition to help refuse bindings

   - other smaller serial driver updates

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'tty-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (113 commits)
  serial: Clear UPF_DEAD before calling tty_port_register_device_attr_serdev()
  serial: imx: Raise TX trigger level to 8
  serial: 8250_pnp: Simplify "line" related code
  serial: sh-sci: simplify locking when re-issuing RXDMA fails
  serial: sh-sci: let timeout timer only run when DMA is scheduled
  serial: sh-sci: describe locking requirements for invalidating RXDMA
  serial: sh-sci: protect invalidating RXDMA on shutdown
  tty: add the option to have a tty reject a new ldisc
  serial: core: Call device_set_awake_path() for console port
  dt-bindings: serial: brcm,bcm2835-aux-uart: convert to dtschema
  tty: serial: uartps: Add support for uartps controller reset
  arm64: zynqmp: Add resets property for UART nodes
  dt-bindings: serial: cdns,uart: Add optional reset property
  serial: 8250_pnp: Switch to DEFINE_SIMPLE_DEV_PM_OPS()
  serial: 8250_exar: Keep the includes sorted
  serial: 8250_exar: Make type of bit the same in exar_ee_*_bit()
  serial: 8250_exar: Use BIT() in exar_ee_read()
  serial: 8250_exar: Switch to use dev_err_probe()
  serial: 8250_exar: Return directly from switch-cases
  serial: 8250_exar: Decrease indentation level
  ...
---

f6b8e86b7a65495d3947a1d1fc22183c52f786f6
diff --cc include/linux/kfifo.h
index 6b28d642f332,d613748de7ff..564868bdce89
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
@@@ -36,15 -36,11 +36,16 @@@
   * to lock the reader.
   */
  
 +#include <linux/array_size.h>
+ #include <linux/dma-mapping.h>
 -#include <linux/kernel.h>
  #include <linux/spinlock.h>
  #include <linux/stddef.h>
 -#include <linux/scatterlist.h>
 +#include <linux/types.h>
 +
 +#include <asm/barrier.h>
 +#include <asm/errno.h>
 +
 +struct scatterlist;
  
  struct __kfifo {
  	unsigned int	in;
diff --cc lib/kfifo.c
index 15acdee4a8f3,75ce9225548a..a8b2eed90599
--- a/lib/kfifo.c
+++ b/lib/kfifo.c
@@@ -5,13 -5,14 +5,14 @@@
   * Copyright (C) 2009/2010 Stefani Seibold <stefani@seibold.net>
   */
  
 -#include <linux/kernel.h>
+ #include <linux/dma-mapping.h>
 -#include <linux/export.h>
 -#include <linux/slab.h>
  #include <linux/err.h>
 +#include <linux/export.h>
 +#include <linux/kfifo.h>
  #include <linux/log2.h>
 +#include <linux/scatterlist.h>
 +#include <linux/slab.h>
  #include <linux/uaccess.h>
 -#include <linux/kfifo.h>
  
  /*
   * internal helper to calculate the unused elements in a fifo