From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Wed, 5 Oct 2016 19:42:36 +0000 (-0300)
Subject: Merge tag 'v4.8' into patchwork
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9fce0c226536fc36c7fb0a80000ca38a995be43e;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'v4.8' into patchwork

Linux 4.8

* tag 'v4.8': (1761 commits)
  Linux 4.8
  ARM: 8618/1: decompressor: reset ttbcr fields to use TTBR0 on ARMv7
  MIPS: CM: Fix mips_cm_max_vp_width for non-MT kernels on MT systems
  include/linux/property.h: fix typo/compile error
  ocfs2: fix deadlock on mmapped page in ocfs2_write_begin_nolock()
  mm: workingset: fix crash in shadow node shrinker caused by replace_page_cache_page()
  MAINTAINERS: Switch to kernel.org email address for Javi Merino
  x86/entry/64: Fix context tracking state warning when load_gs_index fails
  x86/boot: Initialize FPU and X86_FEATURE_ALWAYS even if we don't have CPUID
  x86/vdso: Fix building on big endian host
  x86/boot: Fix another __read_cr4() case on 486
  sctp: fix the issue sctp_diag uses lock_sock in rcu_read_lock
  sctp: change to check peer prsctp_capable when using prsctp polices
  sctp: remove prsctp_param from sctp_chunk
  sctp: move sent_count to the memory hole in sctp_chunk
  tg3: Avoid NULL pointer dereference in tg3_io_error_detected()
  x86/init: Fix cr4_init_shadow() on CR4-less machines
  MIPS: Fix detection of unsupported highmem with cache aliases
  MIPS: Malta: Fix IOCU disable switch read for MIPS64
  MIPS: Fix BUILD_ROLLBACK_PROLOGUE for microMIPS
  ...
---

9fce0c226536fc36c7fb0a80000ca38a995be43e
diff --cc Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
index 6c314c2db73e,201d4839931c..940a16d8d55e
--- a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
@@@ -206,8 -201,25 +206,27 @@@ logical address types are already defin
            give the CEC framework more information about the device type, even
            though the framework won't use it directly in the CEC message.
  
+ .. _cec-log-addrs-flags:
+ 
+ .. flat-table:: Flags for struct cec_log_addrs
+     :header-rows:  0
+     :stub-columns: 0
+     :widths:       3 1 4
+ 
+ 
+     -  .. _`CEC-LOG-ADDRS-FL-ALLOW-UNREG-FALLBACK`:
+ 
+        -  ``CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK``
+ 
+        -  1
+ 
+        -  By default if no logical address of the requested type can be claimed, then
+ 	  it will go back to the unconfigured state. If this flag is set, then it will
+ 	  fallback to the Unregistered logical address. Note that if the Unregistered
+ 	  logical address was explicitly requested, then this flag has no effect.
+ 
 +.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
 +
  .. _cec-versions:
  
  .. flat-table:: CEC Versions
diff --cc Documentation/media/uapi/cec/cec-ioc-dqevent.rst
index 060c455380ce,2e1e73928396..e283588a830b
--- a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
@@@ -73,13 -73,15 +74,16 @@@ it is guaranteed that the state did cha
  
         -  ``log_addr_mask``
  
-        -  The current set of claimed logical addresses.
+        -  The current set of claimed logical addresses. This is 0 if no logical
+           addresses are claimed or if ``phys_addr`` is ``CEC_PHYS_ADDR_INVALID``.
+ 	  If bit 15 is set (``1 << CEC_LOG_ADDR_UNREGISTERED``) then this device
+ 	  has the unregistered logical address. In that case all other bits are 0.
  
  
- .. tabularcolumns:: |p{1.0cm}|p{2.0cm}|p{14.5cm}|
- 
 +.. c:type:: cec_event_lost_msgs
  
 -.. _cec-event-lost-msgs_s:
++.. tabularcolumns:: |p{1.0cm}|p{2.0cm}|p{14.5cm}|
+ 
  .. flat-table:: struct cec_event_lost_msgs
      :header-rows:  0
      :stub-columns: 0