Skip to content

Commit 1de61d1

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 1310092 commit 1de61d1

2 files changed

Lines changed: 334 additions & 0 deletions

File tree

qcom-next/merge.log

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