Skip to content

Commit 9cf98cf

Browse files
committed
Add qcom-next log files for qcom-next-6.15-20250603
Signed-off-by: Salendarsingh Gaud <sgaud@qti.qualcomm.com>
1 parent c1672db commit 9cf98cf

File tree

2 files changed

+333
-0
lines changed

2 files changed

+333
-0
lines changed

qcom-next/merge.log

Lines changed: 319 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,319 @@
1+
Verified existence of local and remote repos: Success
2+
/local/mnt/workspace/automerge/kernel-topics /local/mnt/workspace/automerge/kernel-topics
3+
Reuse-Recorded-Resolution: Disabled
4+
Local changes present
5+
M .gitattributes
6+
Clean it [Y/n]? HEAD is now at 1de61d13de8b Add qcom-next log files for qcom-next-6.15-20250603
7+
Removing old remotes ...
8+
The remote sgaud-quic git@github.com:sgaud-quic/kernel.git is no longer tracked.
9+
Delete it [Y/n]? Done, removed 1 old remote(s).
10+
Adding new remotes...
11+
Done, added 0 new remote(s).
12+
Updating the remotes ...
13+
Updating tech/bsp/clk
14+
tech/bsp/clk has changed.
15+
Updating tech/bsp/interconnect
16+
tech/bsp/interconnect has changed.
17+
Updating tech/mem/secure-buffer
18+
tech/mem/secure-buffer has changed.
19+
Updating tech/security/firmware-smc
20+
tech/security/firmware-smc has changed.
21+
Updating tech/bsp/soc-infra
22+
tech/bsp/soc-infra has changed.
23+
Updating tech/debug/soc
24+
tech/debug/soc has changed.
25+
Updating tech/bsp/pinctrl
26+
tech/bsp/pinctrl has changed.
27+
Updating tech/bsp/remoteproc
28+
tech/bsp/remoteproc has changed.
29+
Updating tech/bus/peripherals
30+
tech/bus/peripherals has changed.
31+
Updating tech/bus/pci/all
32+
tech/bus/pci/all has changed.
33+
Updating tech/bus/pci/mhi
34+
tech/bus/pci/mhi has changed.
35+
Updating tech/bus/pci/phy
36+
tech/bus/pci/phy has changed.
37+
Updating tech/bus/pci/pwrctl
38+
tech/bus/pci/pwrctl has changed.
39+
Updating tech/bus/usb/dwc
40+
tech/bus/usb/dwc has changed.
41+
Updating tech/bus/usb/gadget
42+
tech/bus/usb/gadget has changed.
43+
Updating tech/bus/usb/phy
44+
tech/bus/usb/phy has changed.
45+
Updating tech/debug/eud
46+
tech/debug/eud has changed.
47+
Updating tech/debug/hwtracing
48+
tech/debug/hwtracing has changed.
49+
Updating tech/debug/rdbg
50+
tech/debug/rdbg has changed.
51+
Updating tech/pmic/backlight
52+
tech/pmic/backlight has changed.
53+
Updating tech/pmic/mfd
54+
tech/pmic/mfd has changed.
55+
Updating tech/pmic/misc
56+
tech/pmic/misc has changed.
57+
Updating tech/pmic/regulator
58+
tech/pmic/regulator has changed.
59+
Updating tech/pmic/supply
60+
tech/pmic/supply has changed.
61+
Updating tech/mem/dma-buf
62+
tech/mem/dma-buf has changed.
63+
Updating tech/mem/iommu
64+
tech/mem/iommu has changed.
65+
Updating tech/mm/audio/all
66+
tech/mm/audio/all has changed.
67+
Updating tech/mm/audio/soundwire
68+
tech/mm/audio/soundwire has changed.
69+
Updating tech/mm/camss
70+
tech/mm/camss has changed.
71+
Updating tech/mm/drm
72+
tech/mm/drm has changed.
73+
Updating tech/mm/fastrpc
74+
tech/mm/fastrpc has changed.
75+
Updating tech/mm/phy
76+
tech/mm/phy has changed.
77+
Updating tech/mm/video
78+
tech/mm/video has changed.
79+
Updating tech/mproc/rpmsg
80+
tech/mproc/rpmsg has changed.
81+
Updating tech/mproc/qmi
82+
tech/mproc/qmi has changed.
83+
Updating tech/net/ath
84+
tech/net/ath has changed.
85+
Updating tech/net/eth
86+
tech/net/eth has changed.
87+
Updating tech/net/rmnet
88+
tech/net/rmnet has changed.
89+
Updating tech/net/qrtr
90+
tech/net/qrtr has changed.
91+
Updating tech/net/phy
92+
tech/net/phy has changed.
93+
Updating tech/net/bluetooth
94+
tech/net/bluetooth has changed.
95+
Updating tech/pm/opp
96+
tech/pm/opp has changed.
97+
Updating tech/pm/pmdomain
98+
tech/pm/pmdomain has changed.
99+
Updating tech/pm/power
100+
tech/pm/power has changed.
101+
Updating tech/pm/thermal
102+
tech/pm/thermal has changed.
103+
Updating tech/security/crypto
104+
tech/security/crypto has changed.
105+
Updating tech/security/fscrypt
106+
tech/security/fscrypt has changed.
107+
Updating tech/security/ice
108+
tech/security/ice has changed.
109+
Updating tech/storage/nvmem
110+
tech/storage/nvmem has changed.
111+
Updating tech/storage/phy
112+
tech/storage/phy has changed.
113+
Updating tech/storage/all
114+
tech/storage/all has changed.
115+
Updating tech/virt/gunyah
116+
tech/virt/gunyah has changed.
117+
Updating tech/all/workaround
118+
tech/all/workaround has changed.
119+
Updating tech/all/documentation
120+
tech/all/documentation has changed.
121+
Updating tech/all/dt/qcs6490
122+
tech/all/dt/qcs6490 has changed.
123+
Updating tech/all/dt/qcs9100
124+
tech/all/dt/qcs9100 has changed.
125+
Updating tech/all/dt/qcs8300
126+
tech/all/dt/qcs8300 has changed.
127+
Updating tech/all/dt/qcs615
128+
tech/all/dt/qcs615 has changed.
129+
Updating tech/all/config
130+
tech/all/config has changed.
131+
Done, updated 59 remote(s).
132+
Updating baseline ...
133+
Fetching baseline
134+
X11 forwarding request failed on channel 0
135+
latest tag/id is 0ff41df1cb268fc69e703a08a57ee14ae967d0ca
136+
Done, updated baseline.
137+
Latest tag is 0ff41df1cb268fc69e703a08a57ee14ae967d0ca
138+
The integration branch (qcom-next) already exists.
139+
Rename it to qcom-next-20250603-201237-v6.15-rc7-246-g1de61d13de8b
140+
Create a new integration branch based on 0ff41df1cb268fc69e703a08a57ee14ae967d0ca
141+
Merging topic branches...
142+
------------------------------------------
143+
** Merging topic branch: tech/bsp/clk/tech/bsp/clk
144+
Merge successful.
145+
------------------------------------------
146+
** Merging topic branch: tech/bsp/interconnect/tech/bsp/interconnect
147+
Nothing to merge: already up to date.
148+
------------------------------------------
149+
** Merging topic branch: tech/mem/secure-buffer/tech/mem/secure-buffer
150+
Nothing to merge: already up to date.
151+
------------------------------------------
152+
** Merging topic branch: tech/security/firmware-smc/tech/security/firmware-smc
153+
Nothing to merge: already up to date.
154+
------------------------------------------
155+
** Merging topic branch: tech/bsp/soc-infra/tech/bsp/soc-infra
156+
Nothing to merge: already up to date.
157+
------------------------------------------
158+
** Merging topic branch: tech/debug/soc/tech/debug/soc
159+
Nothing to merge: already up to date.
160+
------------------------------------------
161+
** Merging topic branch: tech/bsp/pinctrl/tech/bsp/pinctrl
162+
Merge successful.
163+
------------------------------------------
164+
** Merging topic branch: tech/bsp/remoteproc/tech/bsp/remoteproc
165+
Nothing to merge: already up to date.
166+
------------------------------------------
167+
** Merging topic branch: tech/bus/peripherals/tech/bus/peripherals
168+
Nothing to merge: already up to date.
169+
------------------------------------------
170+
** Merging topic branch: tech/bus/pci/all/tech/bus/pci/all
171+
Nothing to merge: already up to date.
172+
------------------------------------------
173+
** Merging topic branch: tech/bus/pci/mhi/tech/bus/pci/mhi
174+
Nothing to merge: already up to date.
175+
------------------------------------------
176+
** Merging topic branch: tech/bus/pci/phy/tech/bus/pci/phy
177+
Nothing to merge: already up to date.
178+
------------------------------------------
179+
** Merging topic branch: tech/bus/pci/pwrctl/tech/bus/pci/pwrctl
180+
Nothing to merge: already up to date.
181+
------------------------------------------
182+
** Merging topic branch: tech/bus/usb/dwc/tech/bus/usb/dwc
183+
Nothing to merge: already up to date.
184+
------------------------------------------
185+
** Merging topic branch: tech/bus/usb/gadget/tech/bus/usb/gadget
186+
Nothing to merge: already up to date.
187+
------------------------------------------
188+
** Merging topic branch: tech/bus/usb/phy/tech/bus/usb/phy
189+
Nothing to merge: already up to date.
190+
------------------------------------------
191+
** Merging topic branch: tech/debug/eud/tech/debug/eud
192+
Nothing to merge: already up to date.
193+
------------------------------------------
194+
** Merging topic branch: tech/debug/hwtracing/tech/debug/hwtracing
195+
Merge successful.
196+
------------------------------------------
197+
** Merging topic branch: tech/debug/rdbg/tech/debug/rdbg
198+
Nothing to merge: already up to date.
199+
------------------------------------------
200+
** Merging topic branch: tech/pmic/backlight/tech/pmic/backlight
201+
Nothing to merge: already up to date.
202+
------------------------------------------
203+
** Merging topic branch: tech/pmic/mfd/tech/pmic/mfd
204+
Nothing to merge: already up to date.
205+
------------------------------------------
206+
** Merging topic branch: tech/pmic/misc/tech/pmic/misc
207+
Nothing to merge: already up to date.
208+
------------------------------------------
209+
** Merging topic branch: tech/pmic/regulator/tech/pmic/regulator
210+
Nothing to merge: already up to date.
211+
------------------------------------------
212+
** Merging topic branch: tech/pmic/supply/tech/pmic/supply
213+
Nothing to merge: already up to date.
214+
------------------------------------------
215+
** Merging topic branch: tech/mem/dma-buf/tech/mem/dma-buf
216+
Nothing to merge: already up to date.
217+
------------------------------------------
218+
** Merging topic branch: tech/mem/iommu/tech/mem/iommu
219+
Nothing to merge: already up to date.
220+
------------------------------------------
221+
** Merging topic branch: tech/mm/audio/all/tech/mm/audio/all
222+
Merge successful.
223+
------------------------------------------
224+
** Merging topic branch: tech/mm/audio/soundwire/tech/mm/audio/soundwire
225+
Nothing to merge: already up to date.
226+
------------------------------------------
227+
** Merging topic branch: tech/mm/camss/tech/mm/camss
228+
Nothing to merge: already up to date.
229+
------------------------------------------
230+
** Merging topic branch: tech/mm/drm/tech/mm/drm
231+
Nothing to merge: already up to date.
232+
------------------------------------------
233+
** Merging topic branch: tech/mm/fastrpc/tech/mm/fastrpc
234+
Nothing to merge: already up to date.
235+
------------------------------------------
236+
** Merging topic branch: tech/mm/phy/tech/mm/phy
237+
Nothing to merge: already up to date.
238+
------------------------------------------
239+
** Merging topic branch: tech/mm/video/tech/mm/video
240+
Merge successful.
241+
------------------------------------------
242+
** Merging topic branch: tech/mproc/rpmsg/tech/mproc/rpmsg
243+
Nothing to merge: already up to date.
244+
------------------------------------------
245+
** Merging topic branch: tech/mproc/qmi/tech/mproc/qmi
246+
Nothing to merge: already up to date.
247+
------------------------------------------
248+
** Merging topic branch: tech/net/ath/tech/net/ath
249+
Merge successful.
250+
------------------------------------------
251+
** Merging topic branch: tech/net/eth/tech/net/eth
252+
Nothing to merge: already up to date.
253+
------------------------------------------
254+
** Merging topic branch: tech/net/rmnet/tech/net/rmnet
255+
Nothing to merge: already up to date.
256+
------------------------------------------
257+
** Merging topic branch: tech/net/qrtr/tech/net/qrtr
258+
Nothing to merge: already up to date.
259+
------------------------------------------
260+
** Merging topic branch: tech/net/phy/tech/net/phy
261+
Nothing to merge: already up to date.
262+
------------------------------------------
263+
** Merging topic branch: tech/net/bluetooth/tech/net/bluetooth
264+
Nothing to merge: already up to date.
265+
------------------------------------------
266+
** Merging topic branch: tech/pm/opp/tech/pm/opp
267+
Nothing to merge: already up to date.
268+
------------------------------------------
269+
** Merging topic branch: tech/pm/pmdomain/tech/pm/pmdomain
270+
Nothing to merge: already up to date.
271+
------------------------------------------
272+
** Merging topic branch: tech/pm/power/tech/pm/power
273+
Merge successful.
274+
------------------------------------------
275+
** Merging topic branch: tech/pm/thermal/tech/pm/thermal
276+
Nothing to merge: already up to date.
277+
------------------------------------------
278+
** Merging topic branch: tech/security/crypto/tech/security/crypto
279+
Nothing to merge: already up to date.
280+
------------------------------------------
281+
** Merging topic branch: tech/security/fscrypt/tech/security/fscrypt
282+
Nothing to merge: already up to date.
283+
------------------------------------------
284+
** Merging topic branch: tech/security/ice/tech/security/ice
285+
Nothing to merge: already up to date.
286+
------------------------------------------
287+
** Merging topic branch: tech/storage/nvmem/tech/storage/nvmem
288+
Nothing to merge: already up to date.
289+
------------------------------------------
290+
** Merging topic branch: tech/storage/phy/tech/storage/phy
291+
Nothing to merge: already up to date.
292+
------------------------------------------
293+
** Merging topic branch: tech/storage/all/tech/storage/all
294+
Nothing to merge: already up to date.
295+
------------------------------------------
296+
** Merging topic branch: tech/virt/gunyah/tech/virt/gunyah
297+
Nothing to merge: already up to date.
298+
------------------------------------------
299+
** Merging topic branch: tech/all/workaround/tech/all/workaround
300+
Nothing to merge: already up to date.
301+
------------------------------------------
302+
** Merging topic branch: tech/all/documentation/tech/all/documentation
303+
Nothing to merge: already up to date.
304+
------------------------------------------
305+
** Merging topic branch: tech/all/dt/qcs6490/tech/all/dt/qcs6490
306+
Merge successful.
307+
------------------------------------------
308+
** Merging topic branch: tech/all/dt/qcs9100/tech/all/dt/qcs9100
309+
Merge successful.
310+
------------------------------------------
311+
** Merging topic branch: tech/all/dt/qcs8300/tech/all/dt/qcs8300
312+
Merge successful.
313+
------------------------------------------
314+
** Merging topic branch: tech/all/dt/qcs615/tech/all/dt/qcs615
315+
Merge successful.
316+
------------------------------------------
317+
** Merging topic branch: tech/all/config/tech/all/config
318+
Merge successful.
319+
Done, merged 59 topic(s).

qcom-next/topic_SHA1

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Name SHA1
2+
----------------- -----------------------------
3+
tech/bsp/clk 8310781737079f87c05e06bade01b6414aa1bbf3
4+
tech/bsp/pinctrl d7e196ce6363aa1c754397c9f7d30ee9ff95e5d6
5+
tech/debug/hwtracing 9982cba32d073aa44c973121412593318fed731d
6+
tech/mm/audio/all a0a1b5c635f34b8094f1483b1808dcc33ef5ac53
7+
tech/mm/video 2705b45311f5eda1efa7f9db8d0e134c6f04fe07
8+
tech/net/ath 5bc89ad719f0a14ee1e2d7b4c3f26774322e097b
9+
tech/pm/power 1eeed9b4e31525fcaa3b16365aa32c5d0ecb5010
10+
tech/all/dt/qcs6490 f08a96de452c9c16413809118ccb40f2530ee0d5
11+
tech/all/dt/qcs9100 de711b007dd9c6bc248eebeb9c581900308e91da
12+
tech/all/dt/qcs8300 a7787e12b276ce29a74bececa888a39cfd43039a
13+
tech/all/dt/qcs615 020996936f2aaa4d56a186b86c875ccd78e5ed70
14+
tech/all/config a58db88d1b7e50e9aeec53a351800f414420e8f3

0 commit comments

Comments
 (0)