Merge tag 'br-v6.2i' of git://linuxtv.org/hverkuil/media_tree into media_stage

Tag branch

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
* tag 'br-v6.2i' of git://linuxtv.org/hverkuil/media_tree: (31 commits)
  media: s5c73m3: Switch to GPIO descriptors
  media: i2c: s5k5baf: switch to using gpiod API
  media: i2c: s5k6a3: switch to using gpiod API
  media: imx: remove code for non-existing config IMX_GPT_ICAP
  media: si470x: Fix use-after-free in si470x_int_in_callback()
  media: staging: stkwebcam: Restore MEDIA_{USB,CAMERA}_SUPPORT dependencies
  media: coda: Add check for kmalloc
  media: coda: Add check for dcoda_iram_alloc
  dt-bindings: media: s5c73m3: Fix reset-gpio descriptor
  media: dt-bindings: allwinner: h6-vpu-g2: Add IOMMU reference property
  media: s5k4ecgx: Delete driver
  media: s5k4ecgx: Switch to GPIO descriptors
  media: Switch to use dev_err_probe() helper
  headers: Remove some left-over license text in include/uapi/linux/v4l2-*
  headers: Remove some left-over license text in include/uapi/linux/dvb/
  media: usb: pwc-uncompress: Use flex array destination for memcpy()
  media: s5p-mfc: Fix to handle reference queue during finishing
  media: s5p-mfc: Clear workbit to handle error condition
  media: s5p-mfc: Fix in register read and write for H264
  media: imx: Use get_mbus_config instead of parsing upstream DT endpoints
  ...

diff --combined include/uapi/linux/dvb/frontend.h
index 022a787815e07f2f11d1795621ac946e287beaba,53f4fb8043e34a9330b28913a6a73a549e74ef50..326f6a53f1f2492b5e634ad530ef92458a70ea80
--- 1/include/uapi/linux/dvb/frontend.h
--- 2/include/uapi/linux/dvb/frontend.h
+++ b/include/uapi/linux/dvb/frontend.h
@@@ -7,21 -7,6 +7,6 @@@
   *                Holger Waechtler <holger@convergence.de>
   *                Andre Draszik <ad@convergence.de>
   *                for convergence integrated media GmbH
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public License
-  * as published by the Free Software Foundation; either version 2.1
-  * of the License, or (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public License
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  *
   */
  
  #ifndef _DVBFRONTEND_H_
@@@ -282,6 -267,7 +267,6 @@@ enum fe_spectral_inversion 
  /**
   * enum fe_code_rate - Type of Forward Error Correction (FEC)
   *
 - *
   * @FEC_NONE: No Forward Error Correction Code
   * @FEC_1_2:  Forward Error Correction Code 1/2
   * @FEC_2_3:  Forward Error Correction Code 2/3
@@@ -362,8 -348,8 +347,8 @@@ enum fe_code_rate 
   * @APSK_32:  32-APSK modulation
   * @DQPSK:    DQPSK modulation
   * @QAM_4_NR: 4-QAM-NR modulation
 - * @QAM-1024: 1024-QAM modulation
 - * @QAM-4096: 4096-QAM modulation
 + * @QAM_1024: 1024-QAM modulation
 + * @QAM_4096: 4096-QAM modulation
   * @APSK_8_L: 8APSK-L modulation
   * @APSK_16_L:        16APSK-L modulation
   * @APSK_32_L:        32APSK-L modulation
@@@ -776,7 -762,7 +761,7 @@@ enum atscmh_rs_frame_mode 
  };
  
  /**
 - * enum atscmh_rs_code_mode
 + * enum atscmh_rs_code_mode - ATSC-M/H Reed Solomon modes
   * @ATSCMH_RSCODE_211_187:    Reed Solomon code (211,187).
   * @ATSCMH_RSCODE_223_187:    Reed Solomon code (223,187).
   * @ATSCMH_RSCODE_235_187:    Reed Solomon code (235,187).