Skip to content

Commit a99b766

Browse files
committed
Add qcom-next log files for 20250606
1 parent 6d8211a commit a99b766

File tree

2 files changed

+188
-86
lines changed

2 files changed

+188
-86
lines changed

qcom-next/merge.log

Lines changed: 184 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,130 @@
11
Verified existence of local and remote repos: Success
2-
/local/mnt/workspace/automerge/kernel-topics /local/mnt/workspace/automerge/kernel-topics
2+
/local/mnt/workspace/automerge/actions-runner/_work/kernel-automation/kernel-automation/kernel-topics /local/mnt/workspace/automerge/actions-runner/_work/kernel-automation/kernel-automation/kernel-topics
33
Reuse-Recorded-Resolution: Disabled
44
Local tree is clean
55
Removing old remotes ...
6-
Done, removed 0 old remote(s).
6+
The remote origin https://github.com/sgaud-quic/kernel-topics.git is no longer tracked.
7+
Delete it [Y/n]? Done, removed 1 old remote(s).
78
Adding new remotes...
8-
Done, added 0 new remote(s).
9+
Adding remote baseline git@github.com:qualcomm-linux/kernel.git qcom-next-staging
10+
Updating baseline
11+
Adding remote tech/bsp/clk git@github.com:qualcomm-linux/kernel-topics.git tech/bsp/clk
12+
Updating tech/bsp/clk
13+
Adding remote tech/bsp/interconnect git@github.com:qualcomm-linux/kernel-topics.git tech/bsp/interconnect
14+
Updating tech/bsp/interconnect
15+
Adding remote tech/mem/secure-buffer git@github.com:qualcomm-linux/kernel-topics.git tech/mem/secure-buffer
16+
Updating tech/mem/secure-buffer
17+
Adding remote tech/security/firmware-smc git@github.com:qualcomm-linux/kernel-topics.git tech/security/firmware-smc
18+
Updating tech/security/firmware-smc
19+
Adding remote tech/bsp/soc-infra git@github.com:qualcomm-linux/kernel-topics.git tech/bsp/soc-infra
20+
Updating tech/bsp/soc-infra
21+
Adding remote tech/debug/soc git@github.com:qualcomm-linux/kernel-topics.git tech/debug/soc
22+
Updating tech/debug/soc
23+
Adding remote tech/bsp/pinctrl git@github.com:qualcomm-linux/kernel-topics.git tech/bsp/pinctrl
24+
Updating tech/bsp/pinctrl
25+
Adding remote tech/bsp/remoteproc git@github.com:qualcomm-linux/kernel-topics.git tech/bsp/remoteproc
26+
Updating tech/bsp/remoteproc
27+
Adding remote tech/bus/peripherals git@github.com:qualcomm-linux/kernel-topics.git tech/bus/peripherals
28+
Updating tech/bus/peripherals
29+
Adding remote tech/bus/pci/all git@github.com:qualcomm-linux/kernel-topics.git tech/bus/pci/all
30+
Updating tech/bus/pci/all
31+
Adding remote tech/bus/pci/mhi git@github.com:qualcomm-linux/kernel-topics.git tech/bus/pci/mhi
32+
Updating tech/bus/pci/mhi
33+
Adding remote tech/bus/pci/phy git@github.com:qualcomm-linux/kernel-topics.git tech/bus/pci/phy
34+
Updating tech/bus/pci/phy
35+
Adding remote tech/bus/pci/pwrctl git@github.com:qualcomm-linux/kernel-topics.git tech/bus/pci/pwrctl
36+
Updating tech/bus/pci/pwrctl
37+
Adding remote tech/bus/usb/dwc git@github.com:qualcomm-linux/kernel-topics.git tech/bus/usb/dwc
38+
Updating tech/bus/usb/dwc
39+
Adding remote tech/bus/usb/gadget git@github.com:qualcomm-linux/kernel-topics.git tech/bus/usb/gadget
40+
Updating tech/bus/usb/gadget
41+
Adding remote tech/bus/usb/phy git@github.com:qualcomm-linux/kernel-topics.git tech/bus/usb/phy
42+
Updating tech/bus/usb/phy
43+
Adding remote tech/debug/eud git@github.com:qualcomm-linux/kernel-topics.git tech/debug/eud
44+
Updating tech/debug/eud
45+
Adding remote tech/debug/hwtracing git@github.com:qualcomm-linux/kernel-topics.git tech/debug/hwtracing
46+
Updating tech/debug/hwtracing
47+
Adding remote tech/debug/rdbg git@github.com:qualcomm-linux/kernel-topics.git tech/debug/rdbg
48+
Updating tech/debug/rdbg
49+
Adding remote tech/pmic/backlight git@github.com:qualcomm-linux/kernel-topics.git tech/pmic/backlight
50+
Updating tech/pmic/backlight
51+
Adding remote tech/pmic/mfd git@github.com:qualcomm-linux/kernel-topics.git tech/pmic/mfd
52+
Updating tech/pmic/mfd
53+
Adding remote tech/pmic/misc git@github.com:qualcomm-linux/kernel-topics.git tech/pmic/misc
54+
Updating tech/pmic/misc
55+
Adding remote tech/pmic/regulator git@github.com:qualcomm-linux/kernel-topics.git tech/pmic/regulator
56+
Updating tech/pmic/regulator
57+
Adding remote tech/pmic/supply git@github.com:qualcomm-linux/kernel-topics.git tech/pmic/supply
58+
Updating tech/pmic/supply
59+
Adding remote tech/mem/dma-buf git@github.com:qualcomm-linux/kernel-topics.git tech/mem/dma-buf
60+
Updating tech/mem/dma-buf
61+
Adding remote tech/mem/iommu git@github.com:qualcomm-linux/kernel-topics.git tech/mem/iommu
62+
Updating tech/mem/iommu
63+
Adding remote tech/mm/audio/all git@github.com:qualcomm-linux/kernel-topics.git tech/mm/audio/all
64+
Updating tech/mm/audio/all
65+
Adding remote tech/mm/audio/soundwire git@github.com:qualcomm-linux/kernel-topics.git tech/mm/audio/soundwire
66+
Updating tech/mm/audio/soundwire
67+
Adding remote tech/mm/camss git@github.com:qualcomm-linux/kernel-topics.git tech/mm/camss
68+
Updating tech/mm/camss
69+
Adding remote tech/mm/drm git@github.com:qualcomm-linux/kernel-topics.git tech/mm/drm
70+
Updating tech/mm/drm
71+
Adding remote tech/mm/fastrpc git@github.com:qualcomm-linux/kernel-topics.git tech/mm/fastrpc
72+
Updating tech/mm/fastrpc
73+
Adding remote tech/mm/phy git@github.com:qualcomm-linux/kernel-topics.git tech/mm/phy
74+
Updating tech/mm/phy
75+
Adding remote tech/mm/video git@github.com:qualcomm-linux/kernel-topics.git tech/mm/video
76+
Updating tech/mm/video
77+
Adding remote tech/mproc/rpmsg git@github.com:qualcomm-linux/kernel-topics.git tech/mproc/rpmsg
78+
Updating tech/mproc/rpmsg
79+
Adding remote tech/mproc/qmi git@github.com:qualcomm-linux/kernel-topics.git tech/mproc/qmi
80+
Updating tech/mproc/qmi
81+
Adding remote tech/net/ath git@github.com:qualcomm-linux/kernel-topics.git tech/net/ath
82+
Updating tech/net/ath
83+
Adding remote tech/net/eth git@github.com:qualcomm-linux/kernel-topics.git tech/net/eth
84+
Updating tech/net/eth
85+
Adding remote tech/net/rmnet git@github.com:qualcomm-linux/kernel-topics.git tech/net/rmnet
86+
Updating tech/net/rmnet
87+
Adding remote tech/net/qrtr git@github.com:qualcomm-linux/kernel-topics.git tech/net/qrtr
88+
Updating tech/net/qrtr
89+
Adding remote tech/net/phy git@github.com:qualcomm-linux/kernel-topics.git tech/net/phy
90+
Updating tech/net/phy
91+
Adding remote tech/net/bluetooth git@github.com:qualcomm-linux/kernel-topics.git tech/net/bluetooth
92+
Updating tech/net/bluetooth
93+
Adding remote tech/pm/opp git@github.com:qualcomm-linux/kernel-topics.git tech/pm/opp
94+
Updating tech/pm/opp
95+
Adding remote tech/pm/pmdomain git@github.com:qualcomm-linux/kernel-topics.git tech/pm/pmdomain
96+
Updating tech/pm/pmdomain
97+
Adding remote tech/pm/power git@github.com:qualcomm-linux/kernel-topics.git tech/pm/power
98+
Updating tech/pm/power
99+
Adding remote tech/pm/thermal git@github.com:qualcomm-linux/kernel-topics.git tech/pm/thermal
100+
Updating tech/pm/thermal
101+
Adding remote tech/security/crypto git@github.com:qualcomm-linux/kernel-topics.git tech/security/crypto
102+
Updating tech/security/crypto
103+
Adding remote tech/security/fscrypt git@github.com:qualcomm-linux/kernel-topics.git tech/security/fscrypt
104+
Updating tech/security/fscrypt
105+
Adding remote tech/security/ice git@github.com:qualcomm-linux/kernel-topics.git tech/security/ice
106+
Updating tech/security/ice
107+
Adding remote tech/storage/nvmem git@github.com:qualcomm-linux/kernel-topics.git tech/storage/nvmem
108+
Updating tech/storage/nvmem
109+
Adding remote tech/storage/phy git@github.com:qualcomm-linux/kernel-topics.git tech/storage/phy
110+
Updating tech/storage/phy
111+
Adding remote tech/storage/all git@github.com:qualcomm-linux/kernel-topics.git tech/storage/all
112+
Updating tech/storage/all
113+
Adding remote tech/virt/gunyah git@github.com:qualcomm-linux/kernel-topics.git tech/virt/gunyah
114+
Updating tech/virt/gunyah
115+
Adding remote tech/all/workaround git@github.com:qualcomm-linux/kernel-topics.git tech/all/workaround
116+
Updating tech/all/workaround
117+
Adding remote tech/all/dt/qcs6490 git@github.com:qualcomm-linux/kernel-topics.git tech/all/dt/qcs6490
118+
Updating tech/all/dt/qcs6490
119+
Adding remote tech/all/dt/qcs9100 git@github.com:qualcomm-linux/kernel-topics.git tech/all/dt/qcs9100
120+
Updating tech/all/dt/qcs9100
121+
Adding remote tech/all/dt/qcs8300 git@github.com:qualcomm-linux/kernel-topics.git tech/all/dt/qcs8300
122+
Updating tech/all/dt/qcs8300
123+
Adding remote tech/all/dt/qcs615 git@github.com:qualcomm-linux/kernel-topics.git tech/all/dt/qcs615
124+
Updating tech/all/dt/qcs615
125+
Adding remote tech/all/config git@github.com:qualcomm-linux/kernel-topics.git tech/all/config
126+
Updating tech/all/config
127+
Done, added 59 new remote(s).
9128
Updating the remotes ...
10129
Updating tech/bsp/clk
11130
tech/bsp/clk has changed.
@@ -113,8 +232,6 @@ Updating tech/virt/gunyah
113232
tech/virt/gunyah has changed.
114233
Updating tech/all/workaround
115234
tech/all/workaround has changed.
116-
Updating tech/all/documentation
117-
tech/all/documentation has changed.
118235
Updating tech/all/dt/qcs6490
119236
tech/all/dt/qcs6490 has changed.
120237
Updating tech/all/dt/qcs9100
@@ -125,192 +242,187 @@ Updating tech/all/dt/qcs615
125242
tech/all/dt/qcs615 has changed.
126243
Updating tech/all/config
127244
tech/all/config has changed.
128-
Done, updated 59 remote(s).
245+
Done, updated 58 remote(s).
129246
Updating baseline ...
130247
Fetching baseline
131248
X11 forwarding request failed on channel 0
132-
latest tag/id is 37d80ac936c03003a97aa84261d63b78cf0dfc9f
249+
latest tag/id is ba87907eadf13ae78116682dab0c246737428b78
133250
Done, updated baseline.
134-
Latest tag is 37d80ac936c03003a97aa84261d63b78cf0dfc9f
135-
The integration branch (qcom-next) already exists.
136-
Rename it to qcom-next-20250604-122936-v6.15-64-g297499c7f519
137-
Create a new integration branch based on 37d80ac936c03003a97aa84261d63b78cf0dfc9f
251+
Latest tag is ba87907eadf13ae78116682dab0c246737428b78
252+
Create a new integration branch based on ba87907eadf13ae78116682dab0c246737428b78
138253
Merging topic branches...
139254
------------------------------------------
140255
** Merging topic branch: tech/bsp/clk/tech/bsp/clk
141-
Merge successful.
256+
Nothing to merge: Already up to date.
142257
------------------------------------------
143258
** Merging topic branch: tech/bsp/interconnect/tech/bsp/interconnect
144-
Nothing to merge: already up to date.
259+
Nothing to merge: Already up to date.
145260
------------------------------------------
146261
** Merging topic branch: tech/mem/secure-buffer/tech/mem/secure-buffer
147-
Nothing to merge: already up to date.
262+
Nothing to merge: Already up to date.
148263
------------------------------------------
149264
** Merging topic branch: tech/security/firmware-smc/tech/security/firmware-smc
150-
Nothing to merge: already up to date.
265+
Nothing to merge: Already up to date.
151266
------------------------------------------
152267
** Merging topic branch: tech/bsp/soc-infra/tech/bsp/soc-infra
153-
Nothing to merge: already up to date.
268+
Nothing to merge: Already up to date.
154269
------------------------------------------
155270
** Merging topic branch: tech/debug/soc/tech/debug/soc
156-
Nothing to merge: already up to date.
271+
Nothing to merge: Already up to date.
157272
------------------------------------------
158273
** Merging topic branch: tech/bsp/pinctrl/tech/bsp/pinctrl
159-
Merge successful.
274+
Nothing to merge: Already up to date.
160275
------------------------------------------
161276
** Merging topic branch: tech/bsp/remoteproc/tech/bsp/remoteproc
162-
Nothing to merge: already up to date.
277+
Nothing to merge: Already up to date.
163278
------------------------------------------
164279
** Merging topic branch: tech/bus/peripherals/tech/bus/peripherals
165-
Nothing to merge: already up to date.
280+
Nothing to merge: Already up to date.
166281
------------------------------------------
167282
** Merging topic branch: tech/bus/pci/all/tech/bus/pci/all
168-
Nothing to merge: already up to date.
283+
Nothing to merge: Already up to date.
169284
------------------------------------------
170285
** Merging topic branch: tech/bus/pci/mhi/tech/bus/pci/mhi
171-
Nothing to merge: already up to date.
286+
Nothing to merge: Already up to date.
172287
------------------------------------------
173288
** Merging topic branch: tech/bus/pci/phy/tech/bus/pci/phy
174-
Nothing to merge: already up to date.
289+
Nothing to merge: Already up to date.
175290
------------------------------------------
176291
** Merging topic branch: tech/bus/pci/pwrctl/tech/bus/pci/pwrctl
177-
Nothing to merge: already up to date.
292+
Nothing to merge: Already up to date.
178293
------------------------------------------
179294
** Merging topic branch: tech/bus/usb/dwc/tech/bus/usb/dwc
180-
Nothing to merge: already up to date.
295+
Nothing to merge: Already up to date.
181296
------------------------------------------
182297
** Merging topic branch: tech/bus/usb/gadget/tech/bus/usb/gadget
183-
Nothing to merge: already up to date.
298+
Nothing to merge: Already up to date.
184299
------------------------------------------
185300
** Merging topic branch: tech/bus/usb/phy/tech/bus/usb/phy
186-
Nothing to merge: already up to date.
301+
Nothing to merge: Already up to date.
187302
------------------------------------------
188303
** Merging topic branch: tech/debug/eud/tech/debug/eud
189-
Nothing to merge: already up to date.
304+
Nothing to merge: Already up to date.
190305
------------------------------------------
191306
** Merging topic branch: tech/debug/hwtracing/tech/debug/hwtracing
192-
Merge successful.
307+
Nothing to merge: Already up to date.
193308
------------------------------------------
194309
** Merging topic branch: tech/debug/rdbg/tech/debug/rdbg
195-
Nothing to merge: already up to date.
310+
Nothing to merge: Already up to date.
196311
------------------------------------------
197312
** Merging topic branch: tech/pmic/backlight/tech/pmic/backlight
198-
Nothing to merge: already up to date.
313+
Nothing to merge: Already up to date.
199314
------------------------------------------
200315
** Merging topic branch: tech/pmic/mfd/tech/pmic/mfd
201-
Nothing to merge: already up to date.
316+
Nothing to merge: Already up to date.
202317
------------------------------------------
203318
** Merging topic branch: tech/pmic/misc/tech/pmic/misc
204-
Nothing to merge: already up to date.
319+
Nothing to merge: Already up to date.
205320
------------------------------------------
206321
** Merging topic branch: tech/pmic/regulator/tech/pmic/regulator
207-
Nothing to merge: already up to date.
322+
Nothing to merge: Already up to date.
208323
------------------------------------------
209324
** Merging topic branch: tech/pmic/supply/tech/pmic/supply
210-
Nothing to merge: already up to date.
325+
Nothing to merge: Already up to date.
211326
------------------------------------------
212327
** Merging topic branch: tech/mem/dma-buf/tech/mem/dma-buf
213-
Nothing to merge: already up to date.
328+
Nothing to merge: Already up to date.
214329
------------------------------------------
215330
** Merging topic branch: tech/mem/iommu/tech/mem/iommu
216-
Nothing to merge: already up to date.
331+
Nothing to merge: Already up to date.
217332
------------------------------------------
218333
** Merging topic branch: tech/mm/audio/all/tech/mm/audio/all
219-
Merge successful.
334+
Nothing to merge: Already up to date.
220335
------------------------------------------
221336
** Merging topic branch: tech/mm/audio/soundwire/tech/mm/audio/soundwire
222-
Nothing to merge: already up to date.
337+
Nothing to merge: Already up to date.
223338
------------------------------------------
224339
** Merging topic branch: tech/mm/camss/tech/mm/camss
225-
Nothing to merge: already up to date.
340+
Nothing to merge: Already up to date.
226341
------------------------------------------
227342
** Merging topic branch: tech/mm/drm/tech/mm/drm
228-
Nothing to merge: already up to date.
343+
Merge successful.
229344
------------------------------------------
230345
** Merging topic branch: tech/mm/fastrpc/tech/mm/fastrpc
231-
Nothing to merge: already up to date.
346+
Nothing to merge: Already up to date.
232347
------------------------------------------
233348
** Merging topic branch: tech/mm/phy/tech/mm/phy
234-
Nothing to merge: already up to date.
349+
Nothing to merge: Already up to date.
235350
------------------------------------------
236351
** Merging topic branch: tech/mm/video/tech/mm/video
237-
Merge successful.
352+
Nothing to merge: Already up to date.
238353
------------------------------------------
239354
** Merging topic branch: tech/mproc/rpmsg/tech/mproc/rpmsg
240-
Nothing to merge: already up to date.
355+
Nothing to merge: Already up to date.
241356
------------------------------------------
242357
** Merging topic branch: tech/mproc/qmi/tech/mproc/qmi
243-
Nothing to merge: already up to date.
358+
Nothing to merge: Already up to date.
244359
------------------------------------------
245360
** Merging topic branch: tech/net/ath/tech/net/ath
246-
Merge successful.
361+
Nothing to merge: Already up to date.
247362
------------------------------------------
248363
** Merging topic branch: tech/net/eth/tech/net/eth
249-
Nothing to merge: already up to date.
364+
Nothing to merge: Already up to date.
250365
------------------------------------------
251366
** Merging topic branch: tech/net/rmnet/tech/net/rmnet
252-
Nothing to merge: already up to date.
367+
Nothing to merge: Already up to date.
253368
------------------------------------------
254369
** Merging topic branch: tech/net/qrtr/tech/net/qrtr
255-
Nothing to merge: already up to date.
370+
Nothing to merge: Already up to date.
256371
------------------------------------------
257372
** Merging topic branch: tech/net/phy/tech/net/phy
258-
Nothing to merge: already up to date.
373+
Nothing to merge: Already up to date.
259374
------------------------------------------
260375
** Merging topic branch: tech/net/bluetooth/tech/net/bluetooth
261-
Nothing to merge: already up to date.
376+
Nothing to merge: Already up to date.
262377
------------------------------------------
263378
** Merging topic branch: tech/pm/opp/tech/pm/opp
264-
Nothing to merge: already up to date.
379+
Nothing to merge: Already up to date.
265380
------------------------------------------
266381
** Merging topic branch: tech/pm/pmdomain/tech/pm/pmdomain
267-
Nothing to merge: already up to date.
382+
Nothing to merge: Already up to date.
268383
------------------------------------------
269384
** Merging topic branch: tech/pm/power/tech/pm/power
270-
Merge successful.
385+
Nothing to merge: Already up to date.
271386
------------------------------------------
272387
** Merging topic branch: tech/pm/thermal/tech/pm/thermal
273-
Nothing to merge: already up to date.
388+
Nothing to merge: Already up to date.
274389
------------------------------------------
275390
** Merging topic branch: tech/security/crypto/tech/security/crypto
276-
Nothing to merge: already up to date.
391+
Nothing to merge: Already up to date.
277392
------------------------------------------
278393
** Merging topic branch: tech/security/fscrypt/tech/security/fscrypt
279-
Nothing to merge: already up to date.
394+
Nothing to merge: Already up to date.
280395
------------------------------------------
281396
** Merging topic branch: tech/security/ice/tech/security/ice
282-
Nothing to merge: already up to date.
397+
Nothing to merge: Already up to date.
283398
------------------------------------------
284399
** Merging topic branch: tech/storage/nvmem/tech/storage/nvmem
285-
Nothing to merge: already up to date.
400+
Nothing to merge: Already up to date.
286401
------------------------------------------
287402
** Merging topic branch: tech/storage/phy/tech/storage/phy
288-
Nothing to merge: already up to date.
403+
Nothing to merge: Already up to date.
289404
------------------------------------------
290405
** Merging topic branch: tech/storage/all/tech/storage/all
291-
Nothing to merge: already up to date.
406+
Nothing to merge: Already up to date.
292407
------------------------------------------
293408
** Merging topic branch: tech/virt/gunyah/tech/virt/gunyah
294-
Nothing to merge: already up to date.
409+
Nothing to merge: Already up to date.
295410
------------------------------------------
296411
** Merging topic branch: tech/all/workaround/tech/all/workaround
297-
Nothing to merge: already up to date.
298-
------------------------------------------
299-
** Merging topic branch: tech/all/documentation/tech/all/documentation
300-
Nothing to merge: already up to date.
412+
Nothing to merge: Already up to date.
301413
------------------------------------------
302414
** Merging topic branch: tech/all/dt/qcs6490/tech/all/dt/qcs6490
303-
Merge successful.
415+
Nothing to merge: Already up to date.
304416
------------------------------------------
305417
** Merging topic branch: tech/all/dt/qcs9100/tech/all/dt/qcs9100
306-
Merge successful.
418+
Nothing to merge: Already up to date.
307419
------------------------------------------
308420
** Merging topic branch: tech/all/dt/qcs8300/tech/all/dt/qcs8300
309-
Merge successful.
421+
Nothing to merge: Already up to date.
310422
------------------------------------------
311423
** Merging topic branch: tech/all/dt/qcs615/tech/all/dt/qcs615
312424
Merge successful.
313425
------------------------------------------
314426
** Merging topic branch: tech/all/config/tech/all/config
315-
Merge successful.
316-
Done, merged 59 topic(s).
427+
Nothing to merge: Already up to date.
428+
Done, merged 58 topic(s).

0 commit comments

Comments
 (0)