Merge 6.13-rc7 into staging next

We need the gpib changes in here as well to build on top of.

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

diff --cc drivers/staging/gpib/agilent_82350b/agilent_82350b.c
Simple merge

diff --cc drivers/staging/gpib/cb7210/cb7210.c
Simple merge

diff --cc drivers/staging/gpib/cec/cec_gpib.c
Simple merge

diff --cc drivers/staging/gpib/common/gpib_os.c
Simple merge

diff --cc drivers/staging/gpib/eastwood/fluke_gpib.c
Simple merge

diff --cc drivers/staging/gpib/fmh_gpib/fmh_gpib.c
Simple merge

diff --cc drivers/staging/gpib/gpio/gpib_bitbang.c
Simple merge

diff --cc drivers/staging/gpib/hp_82335/hp82335.c
Simple merge

diff --cc drivers/staging/gpib/hp_82341/hp_82341.c
Simple merge

diff --cc drivers/staging/gpib/include/gpibP.h
index d0cd42c1a0ad65fc76b97149bf868859768fb41a,b97da577ba332fcfe823662690ea44f117c2aff2..d35fdd391f7e1f6b628b9d64097e77529bbe80d4
--- 1/drivers/staging/gpib/include/gpibP.h
--- 2/drivers/staging/gpib/include/gpibP.h
+++ b/drivers/staging/gpib/include/gpibP.h
@@@ -16,8 -16,9 +16,9 @@@
  
  #include <linux/fs.h>
  #include <linux/interrupt.h>
+ #include <linux/io.h>
  
 -void gpib_register_driver(gpib_interface_t *interface, struct module *mod);
 +int gpib_register_driver(gpib_interface_t *interface, struct module *mod);
  void gpib_unregister_driver(gpib_interface_t *interface);
  struct pci_dev *gpib_pci_get_device(const gpib_board_config_t *config, unsigned int vendor_id,
                                    unsigned int device_id, struct pci_dev *from);

diff --cc drivers/staging/gpib/ines/ines_gpib.c
Simple merge

diff --cc drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
Simple merge

diff --cc drivers/staging/gpib/pc2/pc2_gpib.c
Simple merge

diff --cc drivers/staging/gpib/tnt4882/mite.c
Simple merge

diff --cc drivers/staging/gpib/tnt4882/mite.h
Simple merge

diff --cc drivers/staging/gpib/tnt4882/tnt4882_gpib.c
Simple merge