Merge ~binli/pc-enablement/+git/oem-gap-allow-list:proposed-kernel into ~binli/pc-enablement/+git/oem-gap-allow-list:master

Proposed by Bin Li
Status: Superseded
Proposed branch: ~binli/pc-enablement/+git/oem-gap-allow-list:proposed-kernel
Merge into: ~binli/pc-enablement/+git/oem-gap-allow-list:master
Diff against target: 254 lines (+106/-10)
19 files modified
dev/null (+0/-8)
somerville/common (+1/-0)
somerville/fossa-aipom-adl (+1/-0)
somerville/fossa-common (+1/-0)
somerville/fossa-delibird (+1/-0)
somerville/fossa-psyduck (+9/-0)
somerville/fossa-pypar-adl (+1/-0)
somerville/jellyfish-tentacool (+10/-0)
stella.cmit/marowak (+1/-0)
stella.cmit/vanillite (+1/-0)
sutton.bachman/baker (+2/-0)
sutton.bachman/baldhere (+2/-0)
sutton.bachman/bale (+2/-0)
sutton.bachman/common (+1/-0)
sutton.newell/common (+14/-0)
sutton.simon/common (+7/-0)
sutton/common (+25/-0)
sutton/proposed-5.17.0-1019.20 (+25/-0)
testtools (+2/-2)
Reviewer Review Type Date Requested Status
Rex Tsai Pending
Review via email: mp+430800@code.launchpad.net

This proposal has been superseded by a proposal from 2022-09-30.

Description of the change

      * Fix resume on AMD platforms when TBT monitor is plugged (LP:
        #1990920)
        - drm/amd/display: Detect dpcd_rev when hotplug mst monitor
        - drm/amd/display: Release remote dc_sink under mst scenario

      * pcieport 0000:00:1b.0: PCIe Bus Error: severity=Uncorrected
        (Non-Fatal),
        type=Transaction Layer, (Requester ID) (LP: #1988797)
        - SAUCE: PCI/PTM: Cache PTM Capability offset
        - SAUCE: PCI/PTM: Add pci_upstream_ptm() helper
        - SAUCE: PCI/PTM: Separate configuration and enable
        - SAUCE: PCI/PTM: Add pci_suspend_ptm() and pci_resume_ptm()
        - SAUCE: PCI/PTM: Move pci_ptm_info() body into its only caller
        - SAUCE: PCI/PTM: Preserve RsvdP bits in PTM Control register
        - SAUCE: PCI/PTM: Reorder functions in logical order
        - SAUCE: PCI/PTM: Consolidate PTM interface declarations
        - SAUCE: PCI/PM: Always disable PTM for all devices during suspend
        - SAUCE: PCI/PM: Simplify pci_pm_suspend_noirq()

      * Fix AMDGPU: No video output and system hangs with two monitor (dGPU:
        W6400)
        (LP: #1989647)
        - drm/amd/display: Ignore First MST Sideband Message Return Error

      * System hang during S3 test (LP: #1990330)
        - memcg: add per-memcg total kernel memory stat
        - mm/memcg: revert ("mm/memcg: optimize user context object stock
          access")
        - mm/memcg: disable threshold event handlers on PREEMPT_RT
        - mm/memcg: protect per-CPU counter by disabling preemption on
          PREEMPT_RT
          where needed.
        - mm/memcg: opencode the inner part of obj_cgroup_uncharge_pages()
          in
          drain_obj_stock()
        - mm/memcg: protect memcg_stock with a local_lock_t
        - mm/memcg: disable migration instead of preemption in
          drain_all_stock().
        - mm/memremap: avoid calling kasan_remove_zero_shadow() for device
          private
          memory

      * To support Intel Maple Ridge Thunderbolt [8086:1134] (LP: #1990240)
        - thunderbolt: Add support for Intel Maple Ridge single port
          controller

      * Intel graphic driver is not probing[8086:468b] (LP: #1990242)
        - drm/i915: Add new ADL-S pci id

      * support independent clock and LED GPIOs for Intel IPU6 platforms
        (LP: #1989046)
        - SAUCE: platform/x86: int3472: support independent clock and LED
          GPIOs

      For nvidia-graphics-drivers-515.
      * debian/templates/dkms_nvidia.conf.in,
        debian/dkms_nvidia/patches/buildfix_kernel_6.0.patch:
        - Add support for Linux 6.0 (LP: #1988429).

To post a comment you must log in.

Unmerged commits

b6a75ca... by Bin Li

  * Fix resume on AMD platforms when TBT monitor is plugged (LP:
    #1990920)
    - drm/amd/display: Detect dpcd_rev when hotplug mst monitor
    - drm/amd/display: Release remote dc_sink under mst scenario

  * pcieport 0000:00:1b.0: PCIe Bus Error: severity=Uncorrected
    (Non-Fatal),
    type=Transaction Layer, (Requester ID) (LP: #1988797)
    - SAUCE: PCI/PTM: Cache PTM Capability offset
    - SAUCE: PCI/PTM: Add pci_upstream_ptm() helper
    - SAUCE: PCI/PTM: Separate configuration and enable
    - SAUCE: PCI/PTM: Add pci_suspend_ptm() and pci_resume_ptm()
    - SAUCE: PCI/PTM: Move pci_ptm_info() body into its only caller
    - SAUCE: PCI/PTM: Preserve RsvdP bits in PTM Control register
    - SAUCE: PCI/PTM: Reorder functions in logical order
    - SAUCE: PCI/PTM: Consolidate PTM interface declarations
    - SAUCE: PCI/PM: Always disable PTM for all devices during suspend
    - SAUCE: PCI/PM: Simplify pci_pm_suspend_noirq()

  * Fix AMDGPU: No video output and system hangs with two monitor (dGPU:
    W6400)
    (LP: #1989647)
    - drm/amd/display: Ignore First MST Sideband Message Return Error

  * System hang during S3 test (LP: #1990330)
    - memcg: add per-memcg total kernel memory stat
    - mm/memcg: revert ("mm/memcg: optimize user context object stock
      access")
    - mm/memcg: disable threshold event handlers on PREEMPT_RT
    - mm/memcg: protect per-CPU counter by disabling preemption on
      PREEMPT_RT
      where needed.
    - mm/memcg: opencode the inner part of obj_cgroup_uncharge_pages()
      in
      drain_obj_stock()
    - mm/memcg: protect memcg_stock with a local_lock_t
    - mm/memcg: disable migration instead of preemption in
      drain_all_stock().
    - mm/memremap: avoid calling kasan_remove_zero_shadow() for device
      private
      memory

  * To support Intel Maple Ridge Thunderbolt [8086:1134] (LP: #1990240)
    - thunderbolt: Add support for Intel Maple Ridge single port
      controller

  * Intel graphic driver is not probing[8086:468b] (LP: #1990242)
    - drm/i915: Add new ADL-S pci id

  * support independent clock and LED GPIOs for Intel IPU6 platforms
    (LP: #1989046)
    - SAUCE: platform/x86: int3472: support independent clock and LED
      GPIOs

  For nvidia-graphics-drivers-515.
  * debian/templates/dkms_nvidia.conf.in,
    debian/dkms_nvidia/patches/buildfix_kernel_6.0.patch:
    - Add support for Linux 6.0 (LP: #1988429).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/somerville/common b/somerville/common
2index a8a51ba..3e76fe8 100644
3--- a/somerville/common
4+++ b/somerville/common
5@@ -14,3 +14,4 @@ oem-somerville-factory-meta
6 libfprint-2-tod1-goodix
7 libfprint-2-tod1-broadcom
8 oem-fix-fpr-goodix-deletestoredfp
9+oem-jiayi-meta
10diff --git a/somerville/fossa-aipom-adl b/somerville/fossa-aipom-adl
11new file mode 100644
12index 0000000..01982be
13--- /dev/null
14+++ b/somerville/fossa-aipom-adl
15@@ -0,0 +1 @@
16+oem-fix-misc-cnl-backport-iwlwifi-helper
17diff --git a/somerville/fossa-common b/somerville/fossa-common
18new file mode 100644
19index 0000000..e71ee88
20--- /dev/null
21+++ b/somerville/fossa-common
22@@ -0,0 +1 @@
23+ubiquity-ubuntu-artwork 20.04.15.19somerville1_all # LP#1979187
24diff --git a/somerville/fossa-delibird b/somerville/fossa-delibird
25new file mode 100644
26index 0000000..5fe3f74
27--- /dev/null
28+++ b/somerville/fossa-delibird
29@@ -0,0 +1 @@
30+oem-fix-eth-rtl-mac-pass-through
31diff --git a/somerville/fossa-psyduck b/somerville/fossa-psyduck
32new file mode 100644
33index 0000000..055097e
34--- /dev/null
35+++ b/somerville/fossa-psyduck
36@@ -0,0 +1,9 @@
37+gstreamer1.0-icamera
38+libcamhal-ipu6ep-common
39+libcamhal-ipu6ep0
40+libgsticamerainterface-1.0-1
41+libipu6ep
42+oem-fix-cam-intel-mipi-ipu6-common
43+oem-fix-cam-intel-mipi-ipu6ep
44+v4l2-relayd
45+v4l2loopback-dkms
46diff --git a/somerville/fossa-pypar-adl b/somerville/fossa-pypar-adl
47new file mode 100644
48index 0000000..2f0607b
49--- /dev/null
50+++ b/somerville/fossa-pypar-adl
51@@ -0,0 +1 @@
52+ubiquity-ubuntu-artwork
53diff --git a/somerville/jellyfish-tentacool b/somerville/jellyfish-tentacool
54new file mode 100644
55index 0000000..8f531f8
56--- /dev/null
57+++ b/somerville/jellyfish-tentacool
58@@ -0,0 +1,10 @@
59+gstreamer1.0-icamera
60+libcamhal-ipu6ep-common
61+libcamhal-ipu6ep0
62+libgsticamerainterface-1.0-1
63+libipu6ep
64+linux-headers-5.15.0-36
65+linux-headers-5.15.0-36-generic
66+linux-image-5.15.0-36-generic
67+linux-modules-5.15.0-36-generic
68+linux-modules-extra-5.15.0-36-generic
69diff --git a/stella.cmit/marowak b/stella.cmit/marowak
70new file mode 100644
71index 0000000..bbff487
72--- /dev/null
73+++ b/stella.cmit/marowak
74@@ -0,0 +1 @@
75+oem-fix-hotkey-misc-lp1955997
76diff --git a/stella.cmit/vanillite b/stella.cmit/vanillite
77new file mode 100644
78index 0000000..bbff487
79--- /dev/null
80+++ b/stella.cmit/vanillite
81@@ -0,0 +1 @@
82+oem-fix-hotkey-misc-lp1955997
83diff --git a/sutton.bachman/baker b/sutton.bachman/baker
84new file mode 100644
85index 0000000..04fdcda
86--- /dev/null
87+++ b/sutton.bachman/baker
88@@ -0,0 +1,2 @@
89+oem-fix-misc-cnl-grub-boothole
90+oem-fix-misc-cnl-kernel-signature
91diff --git a/sutton.bachman/baldhere b/sutton.bachman/baldhere
92new file mode 100644
93index 0000000..04fdcda
94--- /dev/null
95+++ b/sutton.bachman/baldhere
96@@ -0,0 +1,2 @@
97+oem-fix-misc-cnl-grub-boothole
98+oem-fix-misc-cnl-kernel-signature
99diff --git a/sutton.bachman/bale b/sutton.bachman/bale
100new file mode 100644
101index 0000000..04fdcda
102--- /dev/null
103+++ b/sutton.bachman/bale
104@@ -0,0 +1,2 @@
105+oem-fix-misc-cnl-grub-boothole
106+oem-fix-misc-cnl-kernel-signature
107diff --git a/sutton.bachman/banner b/sutton.bachman/banner
108deleted file mode 100644
109index 1f9403b..0000000
110--- a/sutton.bachman/banner
111+++ /dev/null
112@@ -1,8 +0,0 @@
113-alsa-ucm-conf
114-
115-libpulse-mainloop-glib0:amd64
116-libpulse0:amd64
117-libpulsedsp:amd64
118-pulseaudio
119-pulseaudio-module-bluetooth
120-pulseaudio-utils
121diff --git a/sutton.bachman/common b/sutton.bachman/common
122index 139a243..bc69228 100644
123--- a/sutton.bachman/common
124+++ b/sutton.bachman/common
125@@ -12,3 +12,4 @@ oem-sutton.bachman-baker-doc
126 oem-sutton.bachman-baldhere-doc
127 oem-sutton.bachman-bale-doc
128 oem-sutton.bachman-banner-doc
129+oem-sutton.bachman-balesego-doc
130diff --git a/sutton.newell/common b/sutton.newell/common
131index ed53b7c..ae37bfa 100644
132--- a/sutton.newell/common
133+++ b/sutton.newell/common
134@@ -6,3 +6,17 @@ lenovo-doc-common.thinkcentre
135 lenovo-doc-common.lenovo
136 oem-sutton.newell-meta
137 oem-sutton.newell-factory-meta
138+lenovo-doc-abdalah
139+lenovo-doc-abdiel
140+lenovo-doc-abdon
141+lenovo-doc-abdulkareem
142+lenovo-doc-abe
143+lenovo-doc-abedabun
144+lenovo-doc-abeeku
145+lenovo-doc-abeje
146+lenovo-doc-caesarea
147+lenovo-doc-cagatay
148+lenovo-doc-cage
149+lenovo-doc-cagney
150+lenovo-doc-cahya
151+lenovo-doc-caia
152diff --git a/sutton.simon/common b/sutton.simon/common
153index 0e4d122..3fe698f 100644
154--- a/sutton.simon/common
155+++ b/sutton.simon/common
156@@ -7,3 +7,10 @@ lenovo-doc-common.thinkstation
157 lenovo-doc-common.lenovo
158 oem-sutton.simon-meta
159 oem-sutton.simon-factory-meta
160+lenovo-doc-abdiel
161+lenovo-doc-abedabun
162+lenovo-doc-abednego
163+lenovo-doc-balin
164+lenovo-doc-balint
165+lenovo-doc-ballard
166+lenovo-doc-cais
167diff --git a/sutton/common b/sutton/common
168new file mode 100644
169index 0000000..af5bf0b
170--- /dev/null
171+++ b/sutton/common
172@@ -0,0 +1,25 @@
173+oem-volatile-task-ouagadougou
174+oem-volatile-task-sutton
175+ubuntu-recovery
176+lenovo-doc-common.thinkpad
177+lenovo-doc-common.thinkcentre
178+lenovo-doc-common.thinkstation
179+lenovo-doc-common.lenovo
180+oem-sutton.newell-meta
181+oem-sutton.newell-factory-meta
182+oem-sutton.simon-meta
183+oem-sutton.simon-factory-meta
184+lenovo-doc-abednego
185+oem-jiayi-meta
186+oem-sutton-meta
187+oem-sutton-factory-meta
188+oem-volatile-task
189+lenovo-doc-balesego
190+lenovo-doc-balin
191+lenovo-doc-balint
192+lenovo-doc-ballard
193+lenovo-doc-balwina
194+lenovo-doc-bambina
195+lenovo-doc-cailean
196+lenovo-doc-cailyn
197+lenovo-doc-cais
198diff --git a/sutton/proposed-5.17.0-1019.20 b/sutton/proposed-5.17.0-1019.20
199new file mode 100644
200index 0000000..82ddf18
201--- /dev/null
202+++ b/sutton/proposed-5.17.0-1019.20
203@@ -0,0 +1,25 @@
204+libnvidia-cfg1-515
205+libnvidia-common-515
206+libnvidia-compute-515
207+libnvidia-decode-515
208+libnvidia-encode-515
209+libnvidia-extra-515
210+libnvidia-fbc1-515
211+libnvidia-gl-515
212+linux-headers-5.17.0-1019-oem
213+linux-headers-oem-22.04a
214+linux-image-5.17.0-1019-oem
215+linux-image-oem-22.04a
216+linux-modules-5.17.0-1019-oem
217+linux-modules-nvidia-515-5.17.0-1019-oem
218+linux-modules-nvidia-515-oem-22.04a
219+linux-objects-nvidia-515-5.17.0-1019-oem
220+linux-oem-22.04a
221+linux-oem-5.17-headers-5.17.0-1019
222+linux-signatures-nvidia-5.17.0-1019-oem
223+nvidia-compute-utils-515
224+nvidia-driver-515
225+nvidia-kernel-common-515
226+nvidia-kernel-source-515
227+nvidia-utils-515
228+xserver-xorg-video-nvidia-515
229diff --git a/testtools b/testtools
230index b21e606..5cce67b 100644
231--- a/testtools
232+++ b/testtools
233@@ -8,7 +8,6 @@ plainbox-provider-certification-client
234 plainbox-provider-checkbox
235 plainbox-provider-pc-sanity
236 plainbox-provider-resource-generic
237-plainbox-provider-sru
238 plainbox-provider-tpm2
239 pm-graph
240 prepare-checkbox-sanity
241@@ -16,7 +15,6 @@ python3-checkbox-ng
242 python3-checkbox-support
243 python3-guacamole
244 checkbox-ng
245-checkbox-provider-phoronix
246 fwts
247 fwts-efi-runtime-dkms
248 libfwts1
249@@ -30,3 +28,5 @@ oem-scripts-ext
250 phm
251 nodejs
252 bughamsterc
253+python3-bluez
254+gnome-randr

Subscribers

People subscribed via source and target branches

to all changes: