Merge tag 'v5.15-rc4' into media_tree

Linux 5.15-rc4

* tag 'v5.15-rc4': (320 commits)
  Linux 5.15-rc4
  elf: don't use MAP_FIXED_NOREPLACE for elf interpreter mappings
  objtool: print out the symbol type when complaining about it
  kvm: fix objtool relocation warning
  cachefiles: Fix oops in trace_cachefiles_mark_buried due to NULL object
  drm/i915: fix blank screen booting crashes
  hwmon: (w83793) Fix NULL pointer dereference by removing unnecessary structure field
  hwmon: (w83792d) Fix NULL pointer dereference by removing unnecessary structure field
  hwmon: (w83791d) Fix NULL pointer dereference by removing unnecessary structure field
  hwmon: (pmbus/mp2975) Add missed POUT attribute for page 1 mp2975 controller
  hwmon: (pmbus/ibm-cffps) max_power_out swap changes
  hwmon: (occ) Fix P10 VRM temp sensors
  thermal: Update information in MAINTAINERS
  io_uring: kill fasync
  sched: Always inline is_percpu_thread()
  sched/fair: Null terminate buffer when updating tunable_scaling
  sched/fair: Add ancestors of unthrottled undecayed cfs_rq
  perf/core: fix userpage->time_enabled of inactive events
  perf/x86/intel: Update event constraints for ICX
  perf/x86: Reset destroy callback on event init failure
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/tuners/tuner-types.c
index 01f61ebabd5673e009aaeec8f846eac8906d9f80,01f61ebabd5673e009aaeec8f846eac8906d9f80..0ed2c5bc082e1c1ac600fc8788dcbc2acff8657d
--- 1/drivers/media/tuners/tuner-types.c
--- 2/drivers/media/tuners/tuner-types.c
+++ b/drivers/media/tuners/tuner-types.c
@@@ -1942,6 -1942,6 +1942,10 @@@ struct tunertype tuners[] = 
                .params = tuner_sony_btf_pg463z_params,
                .count  = ARRAY_SIZE(tuner_sony_btf_pg463z_params),
        },
++      [TUNER_SI2157] = {
++              .name   = "Silicon Labs Si2157 tuner",
++              /* see si2157.c for details */
++      },
  };
  EXPORT_SYMBOL(tuners);
  

diff --cc drivers/media/usb/em28xx/em28xx-cards.c
index 948e22e29b42a709300966d71f7c64411e1b0b91,c1e0dccb74088e069f536e2dd147188d8cd0c990..b207f34af5c6f724792ce6b0a6de70f5f6c774e4
--- 1/drivers/media/usb/em28xx/em28xx-cards.c
--- 2/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@@ -2508,12 -2508,12 +2508,17 @@@ const struct em28xx_board em28xx_boards
                .def_i2c_bus   = 1,
                .i2c_speed     = EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_400_KHZ,
--              .tuner_type    = TUNER_ABSENT,
++              .tuner_type    = TUNER_SI2157,
                .tuner_gpio    = hauppauge_dualhd_dvb,
                .has_dvb       = 1,
                .has_dual_ts   = 1,
                .ir_codes      = RC_MAP_HAUPPAUGE,
                .leds          = hauppauge_dualhd_leds,
++              .input         = { {
++                      .type     = EM28XX_VMUX_COMPOSITE,
++                      .vmux     = TVP5150_COMPOSITE1,
++                      .amux     = EM28XX_AMUX_LINE_IN,
++              } },
        },
        /*
         * 2040:026d Hauppauge WinTV-dualHD (model 01595 - ATSC/QAM) Isoc.

diff --cc include/media/tuner.h
index ff85d7227f9160e95d09d111d4e17cf1530f0a16,ff85d7227f9160e95d09d111d4e17cf1530f0a16..a7796e0a365929c41dd8d3dd5db8bc67b560f0fa
--- 1/include/media/tuner.h
--- 2/include/media/tuner.h
+++ b/include/media/tuner.h
@@@ -132,6 -132,6 +132,7 @@@
  #define TUNER_SONY_BTF_PG472Z         89      /* PAL+SECAM */
  #define TUNER_SONY_BTF_PK467Z         90      /* NTSC_JP */
  #define TUNER_SONY_BTF_PB463Z         91      /* NTSC */
++#define TUNER_SI2157                  92
  
  /* tv card specific */
  #define TDA9887_PRESENT                       (1<<0)