From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 Jul 2021 20:42:16 +0000 (-0700)
Subject: Merge tag 'char-misc-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~6891
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eed0218e8cae9fcd186c30e9fcf5fe46a87e056e;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'char-misc-5.14-rc1' of git://git./linux/kernel/git/gregkh/char-misc

Pull char / misc driver updates from Greg KH:
 "Here is the big set of char / misc and other driver subsystem updates
  for 5.14-rc1. Included in here are:

   - habanalabs driver updates

   - fsl-mc driver updates

   - comedi driver updates

   - fpga driver updates

   - extcon driver updates

   - interconnect driver updates

   - mei driver updates

   - nvmem driver updates

   - phy driver updates

   - pnp driver updates

   - soundwire driver updates

   - lots of other tiny driver updates for char and misc drivers

  This is looking more and more like the "various driver subsystems
  mushed together" tree...

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

* tag 'char-misc-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (292 commits)
  mcb: Use DEFINE_RES_MEM() helper macro and fix the end address
  PNP: moved EXPORT_SYMBOL so that it immediately followed its function/variable
  bus: mhi: pci-generic: Add missing 'pci_disable_pcie_error_reporting()' calls
  bus: mhi: Wait for M2 state during system resume
  bus: mhi: core: Fix power down latency
  intel_th: Wait until port is in reset before programming it
  intel_th: msu: Make contiguous buffers uncached
  intel_th: Remove an unused exit point from intel_th_remove()
  stm class: Spelling fix
  nitro_enclaves: Set Bus Master for the NE PCI device
  misc: ibmasm: Modify matricies to matrices
  misc: vmw_vmci: return the correct errno code
  siox: Simplify error handling via dev_err_probe()
  fpga: machxo2-spi: Address warning about unused variable
  lkdtm/heap: Add init_on_alloc tests
  selftests/lkdtm: Enable various testable CONFIGs
  lkdtm: Add CONFIG hints in errors where possible
  lkdtm: Enable DOUBLE_FAULT on all architectures
  lkdtm/heap: Add vmalloc linear overflow test
  lkdtm/bugs: XFAIL UNALIGNED_LOAD_STORE_WRITE
  ...
---

eed0218e8cae9fcd186c30e9fcf5fe46a87e056e
diff --cc fs/block_dev.c
index 7e83c3e,15c448e..0c424a0
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@@ -1671,8 -1730,21 +1670,7 @@@ static ssize_t blkdev_read_iter(struct 
  	iov_iter_reexpand(to, iov_iter_count(to) + shorted);
  	return ret;
  }
- EXPORT_SYMBOL_GPL(blkdev_read_iter);
  
 -/*
 - * Try to release a page associated with block device when the system
 - * is under memory pressure.
 - */
 -static int blkdev_releasepage(struct page *page, gfp_t wait)
 -{
 -	struct super_block *super = BDEV_I(page->mapping->host)->bdev.bd_super;
 -
 -	if (super && super->s_op->bdev_try_to_free_page)
 -		return super->s_op->bdev_try_to_free_page(super, page, wait);
 -
 -	return try_to_free_buffers(page);
 -}
 -
  static int blkdev_writepages(struct address_space *mapping,
  			     struct writeback_control *wbc)
  {
diff --cc include/linux/soundwire/sdw.h
index de9802a,ddbeb00..a48ac3e
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@@ -1040,10 -1039,7 +1039,10 @@@ int sdw_write(struct sdw_slave *slave, 
  int sdw_write_no_pm(struct sdw_slave *slave, u32 addr, u8 value);
  int sdw_read_no_pm(struct sdw_slave *slave, u32 addr);
  int sdw_nread(struct sdw_slave *slave, u32 addr, size_t count, u8 *val);
- int sdw_nwrite(struct sdw_slave *slave, u32 addr, size_t count, u8 *val);
+ int sdw_nwrite(struct sdw_slave *slave, u32 addr, size_t count, const u8 *val);
 +int sdw_update(struct sdw_slave *slave, u32 addr, u8 mask, u8 val);
 +int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u8 val);
 +
  int sdw_compare_devid(struct sdw_slave *slave, struct sdw_slave_id id);
  void sdw_extract_slave_id(struct sdw_bus *bus, u64 addr, struct sdw_slave_id *id);