Merge tag 'v4.13-rc4' into patchwork

Linux 4.13-rc4

* tag 'v4.13-rc4': (863 commits)
  Linux 4.13-rc4
  Fix compat_sys_sigpending breakage
  ext4: fix copy paste error in ext4_swap_extents()
  ext4: fix overflow caused by missing cast in ext4_resize_fs()
  ext4, project: expand inode extra size if possible
  ext4: cleanup ext4_expand_extra_isize_ea()
  ext4: restructure ext4_expand_extra_isize
  ext4: fix forgetten xattr lock protection in ext4_expand_extra_isize
  ext4: make xattr inode reads faster
  ext4: inplace xattr block update fails to deduplicate blocks
  ext4: remove unused mode parameter
  ext4: fix warning about stack corruption
  ext4: fix dir_nlink behaviour
  ext4: silence array overflow warning
  ext4: fix SEEK_HOLE/SEEK_DATA for blocksize < pagesize
  platform/x86: intel-vbtn: match power button on press rather than release
  ext4: release discard bio after sending discard commands
  sparc64: Fix exception handling in UltraSPARC-III memcpy.
  arm64: avoid overflow in VA_START and PAGE_OFFSET
  arm64: Fix potential race with hardware DBM in ptep_set_access_flags()
  ...

diff --cc MAINTAINERS
index 9826a918d37af601a6aedd2f180a1f82e2714d23,44cb004c765d5bc3e9b71844b08fca7f204cae61..7a9a4a2281a6ece1c69bb09d17490b6fe980ed9f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8390,44 -8351,54 +8357,70 @@@ W:   https://linuxtv.or
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
- F:    drivers/media/dvb-frontends/horus3a*
+ F:    drivers/media/pci/netup_unidvb/*
  
- MEDIA DRIVERS FOR LNBH25
- M:    Sergey Kozlov <[email protected]>
- M:    Abylay Ospan <[email protected]>
+ MEDIA DRIVERS FOR RENESAS - DRIF
+ M:    Ramesh Shanmugasundaram <[email protected]>
  L:    [email protected]
- W:    https://linuxtv.org
- W:    http://netup.tv/
+ L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
- F:    drivers/media/dvb-frontends/lnbh25*
+ F:    Documentation/devicetree/bindings/media/renesas,drif.txt
+ F:    drivers/media/platform/rcar_drif.c
  
- MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
- M:    Sergey Kozlov <[email protected]>
- M:    Abylay Ospan <[email protected]>
+ MEDIA DRIVERS FOR RENESAS - FCP
+ M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
- W:    https://linuxtv.org
- W:    http://netup.tv/
+ L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
- F:    drivers/media/pci/netup_unidvb/*
+ F:    Documentation/devicetree/bindings/media/renesas,fcp.txt
+ F:    drivers/media/platform/rcar-fcp.c
+ F:    include/media/rcar-fcp.h
+ 
+ MEDIA DRIVERS FOR RENESAS - FDP1
+ M:    Kieran Bingham <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ T:    git git://linuxtv.org/media_tree.git
+ S:    Supported
+ F:    Documentation/devicetree/bindings/media/renesas,fdp1.txt
+ F:    drivers/media/platform/rcar_fdp1.c
+ 
+ MEDIA DRIVERS FOR RENESAS - VIN
+ M:    Niklas Söderlund <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ T:    git git://linuxtv.org/media_tree.git
+ S:    Supported
+ F:    Documentation/devicetree/bindings/media/rcar_vin.txt
+ F:    drivers/media/platform/rcar-vin/
+ 
+ MEDIA DRIVERS FOR RENESAS - VSP1
+ M:    Laurent Pinchart <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ T:    git git://linuxtv.org/media_tree.git
+ S:    Supported
+ F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
+ F:    drivers/media/platform/vsp1/
  
 +MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
 +M:    Daniel Scheller <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/stv0910*
 +
 +MEDIA DRIVERS FOR ST STV6111 TUNER ICs
 +M:    Daniel Scheller <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/stv6111*
 +
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>

diff --cc drivers/media/cec/cec-adap.c
index 1a021828c8d4294ee72462b83b419f53374d159e,d596b601ff42a6efe27d9e3aa82c0e7521ba2856..8ac39ddf892c6bd39d50cde7b8481d3a1e025a8d
--- 1/drivers/media/cec/cec-adap.c
--- 2/drivers/media/cec/cec-adap.c
+++ b/drivers/media/cec/cec-adap.c
@@@ -604,26 -555,25 +604,26 @@@ wake_thread
  unlock:
        mutex_unlock(&adap->lock);
  }
 -EXPORT_SYMBOL_GPL(cec_transmit_done);
 +EXPORT_SYMBOL_GPL(cec_transmit_done_ts);
  
 -void cec_transmit_attempt_done(struct cec_adapter *adap, u8 status)
 +void cec_transmit_attempt_done_ts(struct cec_adapter *adap,
 +                                u8 status, ktime_t ts)
  {
-       switch (status) {
+       switch (status & ~CEC_TX_STATUS_MAX_RETRIES) {
        case CEC_TX_STATUS_OK:
 -              cec_transmit_done(adap, status, 0, 0, 0, 0);
 +              cec_transmit_done_ts(adap, status, 0, 0, 0, 0, ts);
                return;
        case CEC_TX_STATUS_ARB_LOST:
 -              cec_transmit_done(adap, status, 1, 0, 0, 0);
 +              cec_transmit_done_ts(adap, status, 1, 0, 0, 0, ts);
                return;
        case CEC_TX_STATUS_NACK:
 -              cec_transmit_done(adap, status, 0, 1, 0, 0);
 +              cec_transmit_done_ts(adap, status, 0, 1, 0, 0, ts);
                return;
        case CEC_TX_STATUS_LOW_DRIVE:
 -              cec_transmit_done(adap, status, 0, 0, 1, 0);
 +              cec_transmit_done_ts(adap, status, 0, 0, 1, 0, ts);
                return;
        case CEC_TX_STATUS_ERROR:
 -              cec_transmit_done(adap, status, 0, 0, 0, 1);
 +              cec_transmit_done_ts(adap, status, 0, 0, 0, 1, ts);
                return;
        default:
                /* Should never happen */

diff --cc drivers/media/usb/pulse8-cec/pulse8-cec.c
Simple merge

diff --cc drivers/staging/media/atomisp/i2c/gc2235.h
Simple merge

diff --cc drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h
Simple merge

diff --cc include/media/cec-notifier.h
index 73bc98b90afc46c03ba4385d3d0546f6f10e2560,a4f7429c4ae533a07d9c3efdeebb62892fcab2f6..57ec319a7f44ffedd047300b432513f09c53f30e
--- 1/include/media/cec-notifier.h
--- 2/include/media/cec-notifier.h
+++ b/include/media/cec-notifier.h
@@@ -124,10 -118,19 +126,23 @@@ static inline void cec_notifier_unregis
  {
  }
  
 +static inline void cec_register_cec_notifier(struct cec_adapter *adap,
 +                                           struct cec_notifier *notifier)
 +{
 +}
  #endif
  
+ /**
+  * cec_notifier_phys_addr_invalidate() - set the physical address to INVALID
+  *
+  * @n: the CEC notifier
+  *
+  * This is a simple helper function to invalidate the physical
+  * address. Does nothing if @n == NULL.
+  */
+ static inline void cec_notifier_phys_addr_invalidate(struct cec_notifier *n)
+ {
+       cec_notifier_set_phys_addr(n, CEC_PHYS_ADDR_INVALID);
+ }
+ 
  #endif