Message-ID: <667e09c1.170a0220.e08eb.22b6@mx.google.com> Date: Thu, 27 Jun 2024 17:54:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Kernelci-Kernel: next-20240627 X-Kernelci-Report-Type: test X-Kernelci-Branch: master X-Kernelci-Tree: next Subject: next/master baseline: 312 runs, 12 regressions (next-20240627) To: linux-next@vger.kernel.org, kernel-build-reports@lists.linaro.org, kernelci-results@groups.io From: "kernelci.org bot" Xref: photonic.trudheim.com org.kernel.vger.linux-next:61959 Newsgroups: org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail next/master baseline: 312 runs, 12 regressions (next-20240627) Regressions Summary ------------------- platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ acer-cp514-3wh-r0qs-guybrush | x86_64 | lab-collabora | gcc-10 | x86_64_d= efconfig+x86-board | 1 = at91-sama5d4_xplained | arm | lab-baylibre | gcc-10 | sama5_de= fconfig | 1 = bcm2836-rpi-2-b | arm | lab-collabora | gcc-10 | bcm2835_= defconfig | 1 = bcm2836-rpi-2-b | arm | lab-collabora | gcc-10 | multi_v7= _defc...MB2_KERNEL=3Dy | 1 = beagle-xm | arm | lab-baylibre | gcc-10 | multi_v7= _defc...MB2_KERNEL=3Dy | 1 = beaglebone-black | arm | lab-cip | gcc-10 | multi_v7= _defconfig | 1 = beaglebone-black | arm | lab-cip | gcc-10 | omap2plu= s_defconfig | 1 = jetson-tk1 | arm | lab-baylibre | gcc-10 | multi_v7= _defconfig | 1 = jetson-tk1 | arm | lab-baylibre | gcc-10 | multi_v7= _defc...G_ARM_LPAE=3Dy | 1 = r8a774c0-ek874 | arm64 | lab-cip | gcc-10 | defconfi= g+CON..._64K_PAGES=3Dy | 1 = rk3288-rock2-square | arm | lab-collabora | gcc-10 | multi_v7= _defc...G_ARM_LPAE=3Dy | 1 = rk3288-veyron-jaq | arm | lab-collabora | gcc-10 | multi_v7= _defc...G_ARM_LPAE=3Dy | 1 = Details: https://kernelci.org/test/job/next/branch/master/kernel/next-20= 240627/plan/baseline/ Test: baseline Tree: next Branch: master Describe: next-20240627 URL: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next= .git SHA: 642a16ca7994a50d7de85715996a8ce171a5bdfb = Test Regressions ---------------- = platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ acer-cp514-3wh-r0qs-guybrush | x86_64 | lab-collabora | gcc-10 | x86_64_d= efconfig+x86-board | 1 = Details: https://kernelci.org/test/plan/id/667dce37734bfeeacc7e7084 Results: 3 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-board Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//next/master/next-20240627/x86_= 64/x86_64_defconfig+x86-board/gcc-10/lab-collabora/baseline-acer-cp514-3wh-= r0qs-guybrush.txt HTML log: https://storage.kernelci.org//next/master/next-20240627/x86_= 64/x86_64_defconfig+x86-board/gcc-10/lab-collabora/baseline-acer-cp514-3wh-= r0qs-guybrush.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/x86/rootfs.cpio.gz = * baseline.dmesg.crit: https://kernelci.org/test/case/id/667dce37734bfeea= cc7e7089 failing since 2 days (last pass: next-20240621, first fail: next-20= 240624) 4 lines 2024-06-27T20:40:05.509113 / # 2024-06-27T20:40:05.513452 = 2024-06-27T20:40:05.614663 / # # 2024-06-27T20:40:05.618887 # 2024-06-27T20:40:05.719491 / # export SHELL=3D/bin/sh 2024-06-27T20:40:05.724226 export SHELL=3D/bin/sh 2024-06-27T20:40:05.824739 / # . /lava-14633217/environment 2024-06-27T20:40:05.829233 . /lava-14633217/environment 2024-06-27T20:40:05.929752 / # /lava-14633217/bin/lava-test-runner /la= va-14633217/0 2024-06-27T20:40:05.934783 /lava-14633217/bin/lava-test-runner /lava-1= 4633217/0 = ... (9 line(s) more) = = platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ at91-sama5d4_xplained | arm | lab-baylibre | gcc-10 | sama5_de= fconfig | 1 = Details: https://kernelci.org/test/plan/id/667dd18ca62ab24aa57e71b1 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: sama5_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/master/next-20240627/arm/= sama5_defconfig/gcc-10/lab-baylibre/baseline-at91-sama5d4_xplained.txt HTML log: https://storage.kernelci.org//next/master/next-20240627/arm/= sama5_defconfig/gcc-10/lab-baylibre/baseline-at91-sama5d4_xplained.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.login: https://kernelci.org/test/case/id/667dd18ca62ab24aa57e7= 1b2 failing since 512 days (last pass: next-20230125, first fail: next-= 20230131) = = platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ bcm2836-rpi-2-b | arm | lab-collabora | gcc-10 | bcm2835_= defconfig | 1 = Details: https://kernelci.org/test/plan/id/667dca2bdc6f0d60bf7e7083 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: bcm2835_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/master/next-20240627/arm/= bcm2835_defconfig/gcc-10/lab-collabora/baseline-bcm2836-rpi-2-b.txt HTML log: https://storage.kernelci.org//next/master/next-20240627/arm/= bcm2835_defconfig/gcc-10/lab-collabora/baseline-bcm2836-rpi-2-b.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.login: https://kernelci.org/test/case/id/667dca2bdc6f0d60bf7e7= 084 failing since 388 days (last pass: next-20230601, first fail: next-= 20230605) = = platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ bcm2836-rpi-2-b | arm | lab-collabora | gcc-10 | multi_v7= _defc...MB2_KERNEL=3Dy | 1 = Details: https://kernelci.org/test/plan/id/667dd7255b235d9ee07e7090 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig+CONFIG_THUMB2_KERNEL=3Dy Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig+CONFIG_THUMB2_KERNEL=3Dy/gcc-10/lab-collabora/baseline-b= cm2836-rpi-2-b.txt HTML log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig+CONFIG_THUMB2_KERNEL=3Dy/gcc-10/lab-collabora/baseline-b= cm2836-rpi-2-b.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.login: https://kernelci.org/test/case/id/667dd7255b235d9ee07e7= 091 failing since 457 days (last pass: next-20230327, first fail: next-= 20230328) = = platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ beagle-xm | arm | lab-baylibre | gcc-10 | multi_v7= _defc...MB2_KERNEL=3Dy | 1 = Details: https://kernelci.org/test/plan/id/667dd75f20b8f51ac87e708f Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig+CONFIG_THUMB2_KERNEL=3Dy Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig+CONFIG_THUMB2_KERNEL=3Dy/gcc-10/lab-baylibre/baseline-be= agle-xm.txt HTML log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig+CONFIG_THUMB2_KERNEL=3Dy/gcc-10/lab-baylibre/baseline-be= agle-xm.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.login: https://kernelci.org/test/case/id/667dd75f20b8f51ac87e7= 090 failing since 454 days (last pass: next-20230330, first fail: next-= 20230331) = = platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ beaglebone-black | arm | lab-cip | gcc-10 | multi_v7= _defconfig | 1 = Details: https://kernelci.org/test/plan/id/667dd6e5b3c3ea124f7e7097 Results: 3 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig/gcc-10/lab-cip/baseline-beaglebone-black.txt HTML log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig/gcc-10/lab-cip/baseline-beaglebone-black.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.dmesg.crit: https://kernelci.org/test/case/id/667dd6e5b3c3ea12= 4f7e709c failing since 2 days (last pass: next-20240621, first fail: next-20= 240624) 1 lines 2024-06-27T21:17:03.246354 / # = 2024-06-27T21:17:03.255075 = 2024-06-27T21:17:03.360192 / # # 2024-06-27T21:17:03.366949 # 2024-06-27T21:17:03.509498 / # export SHELL=3D/bin/sh 2024-06-27T21:17:03.526880 export SHELL=3D/bin/sh 2024-06-27T21:17:03.628678 / # . /lava-1157910/environment 2024-06-27T21:17:03.638812 . /lava-1157910/environment 2024-06-27T21:17:03.740763 / # /lava-1157910/bin/lava-test-runner /lav= a-1157910/0 2024-06-27T21:17:03.750529 /lava-1157910/bin/lava-test-runner /lava-11= 57910/0 = ... (9 line(s) more) = = platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ beaglebone-black | arm | lab-cip | gcc-10 | omap2plu= s_defconfig | 1 = Details: https://kernelci.org/test/plan/id/667dd9b572c6272e127e7070 Results: 3 PASS, 1 FAIL, 0 SKIP Full config: omap2plus_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/master/next-20240627/arm/= omap2plus_defconfig/gcc-10/lab-cip/baseline-beaglebone-black.txt HTML log: https://storage.kernelci.org//next/master/next-20240627/arm/= omap2plus_defconfig/gcc-10/lab-cip/baseline-beaglebone-black.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.dmesg.crit: https://kernelci.org/test/case/id/667dd9b572c6272e= 127e7075 new failure (last pass: next-20240625) 1 lines 2024-06-27T21:29:12.072575 / # = 2024-06-27T21:29:12.081056 = 2024-06-27T21:29:12.185335 / # # 2024-06-27T21:29:12.193223 # 2024-06-27T21:29:12.295525 / # export SHELL=3D/bin/sh 2024-06-27T21:29:12.305139 export SHELL=3D/bin/sh 2024-06-27T21:29:12.407333 / # . /lava-1157939/environment 2024-06-27T21:29:12.417143 . /lava-1157939/environment 2024-06-27T21:29:12.518838 / # /lava-1157939/bin/lava-test-runner /lav= a-1157939/0 2024-06-27T21:29:12.529000 /lava-1157939/bin/lava-test-runner /lava-11= 57939/0 = ... (9 line(s) more) = = platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ jetson-tk1 | arm | lab-baylibre | gcc-10 | multi_v7= _defconfig | 1 = Details: https://kernelci.org/test/plan/id/667dcb941f01bd1e477e706d Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig/gcc-10/lab-baylibre/baseline-jetson-tk1.txt HTML log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig/gcc-10/lab-baylibre/baseline-jetson-tk1.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.login: https://kernelci.org/test/case/id/667dcb941f01bd1e477e7= 06e failing since 99 days (last pass: next-20240315, first fail: next-2= 0240320) = = platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ jetson-tk1 | arm | lab-baylibre | gcc-10 | multi_v7= _defc...G_ARM_LPAE=3Dy | 1 = Details: https://kernelci.org/test/plan/id/667dd3372a652d78817e70b7 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig+CONFIG_EFI=3Dy+CONFIG_ARM_LPAE=3Dy Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig+CONFIG_EFI=3Dy+CONFIG_ARM_LPAE=3Dy/gcc-10/lab-baylibre/b= aseline-jetson-tk1.txt HTML log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig+CONFIG_EFI=3Dy+CONFIG_ARM_LPAE=3Dy/gcc-10/lab-baylibre/b= aseline-jetson-tk1.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.login: https://kernelci.org/test/case/id/667dd3372a652d78817e7= 0b8 failing since 808 days (last pass: next-20220401, first fail: next-= 20220411) = = platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ r8a774c0-ek874 | arm64 | lab-cip | gcc-10 | defconfi= g+CON..._64K_PAGES=3Dy | 1 = Details: https://kernelci.org/test/plan/id/667dd7cd615332e97a7e7076 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig+CONFIG_ARM64_64K_PAGES=3Dy Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210= 110) Plain log: https://storage.kernelci.org//next/master/next-20240627/arm6= 4/defconfig+CONFIG_ARM64_64K_PAGES=3Dy/gcc-10/lab-cip/baseline-r8a774c0-ek8= 74.txt HTML log: https://storage.kernelci.org//next/master/next-20240627/arm6= 4/defconfig+CONFIG_ARM64_64K_PAGES=3Dy/gcc-10/lab-cip/baseline-r8a774c0-ek8= 74.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/arm64/rootfs.cpio.gz = * baseline.login: https://kernelci.org/test/case/id/667dd7cd615332e97a7e7= 077 new failure (last pass: next-20240625) = = platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ rk3288-rock2-square | arm | lab-collabora | gcc-10 | multi_v7= _defc...G_ARM_LPAE=3Dy | 1 = Details: https://kernelci.org/test/plan/id/667dd42d2c4b18e57b7e7077 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig+CONFIG_EFI=3Dy+CONFIG_ARM_LPAE=3Dy Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig+CONFIG_EFI=3Dy+CONFIG_ARM_LPAE=3Dy/gcc-10/lab-collabora/= baseline-rk3288-rock2-square.txt HTML log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig+CONFIG_EFI=3Dy+CONFIG_ARM_LPAE=3Dy/gcc-10/lab-collabora/= baseline-rk3288-rock2-square.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.login: https://kernelci.org/test/case/id/667dd42d2c4b18e57b7e7= 078 failing since 583 days (last pass: next-20221121, first fail: next-= 20221122) = = platform | arch | lab | compiler | defconfi= g | regressions -----------------------------+--------+---------------+----------+---------= ---------------------+------------ rk3288-veyron-jaq | arm | lab-collabora | gcc-10 | multi_v7= _defc...G_ARM_LPAE=3Dy | 1 = Details: https://kernelci.org/test/plan/id/667dd32835c305a8b37e7084 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig+CONFIG_EFI=3Dy+CONFIG_ARM_LPAE=3Dy Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig+CONFIG_EFI=3Dy+CONFIG_ARM_LPAE=3Dy/gcc-10/lab-collabora/= baseline-rk3288-veyron-jaq.txt HTML log: https://storage.kernelci.org//next/master/next-20240627/arm/= multi_v7_defconfig+CONFIG_EFI=3Dy+CONFIG_ARM_LPAE=3Dy/gcc-10/lab-collabora/= baseline-rk3288-veyron-jaq.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.login: https://kernelci.org/test/case/id/667dd32835c305a8b37e7= 085 failing since 583 days (last pass: next-20221121, first fail: next-= 20221122) = =20 . Date: Fri, 28 Jun 2024 14:48:03 +0100 From: Mark Brown To: Palmer Dabbelt , Paul Walmsley Cc: Alexandre Ghiti , Linux Kernel Mailing List , Linux Next Mailing List , Palmer Dabbelt , Samuel Holland Subject: linux-next: manual merge of the risc-v tree with the risc-v-fixes tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="XM8fDG3yiU/xHRk7" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1262192 org.kernel.vger.linux-next:61961 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --XM8fDG3yiU/xHRk7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the risc-v tree got a conflict in: arch/riscv/kernel/patch.c between commit: edf2d546bfd6f ("riscv: patch: Flush the icache right after patching to av= oid illegal insns") =66rom the risc-v-fixes tree and commit: 47742484ee162 ("riscv: Remove extra variable in patch_text_nosync()") =66rom the risc-v tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc arch/riscv/kernel/patch.c index ab03732d06c46,5b3f6406e8c44..0000000000000 --- a/arch/riscv/kernel/patch.c +++ b/arch/riscv/kernel/patch.c @@@ -200,10 -186,11 +202,9 @@@ NOKPROBE_SYMBOL(patch_insn_set) =20 int patch_text_set_nosync(void *addr, u8 c, size_t len) { - u32 *tp =3D addr; int ret; =20 - ret =3D patch_insn_set(tp, c, len); + ret =3D patch_insn_set(addr, c, len); - if (!ret) - flush_icache_range((uintptr_t)addr, (uintptr_t)addr + len); =20 return ret; } @@@ -232,10 -222,11 +236,9 @@@ NOKPROBE_SYMBOL(patch_insn_write) =20 int patch_text_nosync(void *addr, const void *insns, size_t len) { - u32 *tp =3D addr; int ret; =20 - ret =3D patch_insn_write(tp, insns, len); + ret =3D patch_insn_write(addr, insns, len); - if (!ret) - flush_icache_range((uintptr_t)addr, (uintptr_t)addr + len); =20 return ret; } --XM8fDG3yiU/xHRk7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ+vxIACgkQJNaLcl1U h9AQkwf9E6WgE4VKrfVrS84zknqc76iNM+/7fR+9Ce1xVlv8Fa0H4k7r4/aMQAfS r8HHC1IXV078WwNb8eaAdrtQqnwoox1hYJVCDhZxv1h+NBQizwUFU3y8Mheel9/t rnv4xTJzl7dQZlEIyd+VQIlxkge9PE/4w8KNYzSzLo0/8FX4K3fEtyt2x/o0b+bB E9Pp9ZhF/0HJSW/+JB1nO6pFa4AdOONfBNrWXL9yRUERLVHqFczbliUOJIQLq1Yx gTLGSkso+n4usB8acAMs3QfvnpwbUEbZTi8011lVm4CcRM/AkshvZSlXqWPqqlBu Gy6WMebWhp7Q0ys8+cq7+6iwvEE9eg== =r/BA -----END PGP SIGNATURE----- --XM8fDG3yiU/xHRk7-- . Date: Fri, 28 Jun 2024 14:59:20 +0100 From: Mark Brown To: David Sterba Cc: David Sterba , Filipe Manana , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the btrfs tree with the fs-current tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="caGNKGGUnezGAgPE" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1262203 org.kernel.vger.linux-next:61962 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --caGNKGGUnezGAgPE Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the btrfs tree got a conflict in: fs/btrfs/qgroup.c between commit: a7e4c6a3031c7 ("btrfs: qgroup: fix quota root leak after quota disable fa= ilure") =66rom the fs-current tree and commit: 27a6520fbc259 ("btrfs: do not BUG_ON() when freeing tree block after erro= r") =66rom the btrfs tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc fs/btrfs/qgroup.c index bf0f81d59b6bc,3cf9724eb188c..0000000000000 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c --caGNKGGUnezGAgPE Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ+wbgACgkQJNaLcl1U h9CyVwgAgYefifBatz0MEFkP3KCf+hQeCRKEJUt6iFc7bm/0Tb/6rUGybumFIb4j FE6lpidRTj/KdVqGvNFNxjSE/pElELA4zEyrIG7WNvx3m83JKTYs7a/LIbkpcRjh tU8v7R5k71O8lZNW8gRa0kIENQ/Mk4EV2R5Rd13HgtZy/+/f3WX6yFvOS3WT9MF9 dgksXSfSeEBoiUrVI4fnfzLEaGnm7/JvWZ7GgVSOfwfZ87NXjLbGiTCgo/VWhJFw xEcTjTjXGRXxzbWqWYYFSOfeINzbRyruxP7KmKRNUzwLLDmqsjfqABrWcRO6PIm5 uNM2pI+uoVC1agDSZGHMSYpXu2WTLQ== =83SX -----END PGP SIGNATURE----- --caGNKGGUnezGAgPE-- . Date: Fri, 28 Jun 2024 15:05:11 +0100 From: Mark Brown To: David Sterba Cc: David Sterba , Filipe Manana , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the btrfs tree with the fs-current tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="TB9WiHqMLIN2G4z6" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1262216 org.kernel.vger.linux-next:61963 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --TB9WiHqMLIN2G4z6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the btrfs tree got a conflict in: fs/btrfs/tree-log.c between commit: d1825752e3074 ("btrfs: use NOFS context when getting inodes during loggin= g and log replay") =66rom the fs-current tree and commits: 2eb717ce25c03 ("btrfs: use NOFS context when getting inodes during loggin= g and log replay") 8cfe0e0697c2d ("btrfs: remove super block argument from btrfs_iget()") =66rom the btrfs tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc fs/btrfs/tree-log.c index 0bce1d45e2526,f0cf8ce26f010..0000000000000 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c --TB9WiHqMLIN2G4z6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ+wxYACgkQJNaLcl1U h9D16Qf9FuIKLsg74QQcp8FdQCIJigZZnUL83BebRgWChemqh6fuEmt6lF4Vo3Wi mmtfYbV4KQ4/ds2fR8XIRkX5ObJp0idcRSPFAq9NknT/mjgdnBbMy4QL/HsZNuBG 37WAd71ffxudYsOmM0xUvXrK1854hWUxwX/wMe82O2i+CwSfYtZzVTgA1Ht8ibCK CTBCFXz6bLu7+MoAbmUYmSPA0qZPjw1PZMqw3GrzjkLIofv3zTxU1Pj27stldyYN P/AzOvk57flyZwbH7avfyCyFOIN7JsIo8EEOajwLMX1qW45fDMf6nwjED3IZlzUt z+FoQ9o9qUv6Ztp+9ZArjFHwRTaUAg== =FsKZ -----END PGP SIGNATURE----- --TB9WiHqMLIN2G4z6-- . Message-ID: <667ec328.050a0220.2efd4.5117@mx.google.com> Date: Fri, 28 Jun 2024 07:05:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Kernelci-Kernel: v6.10-rc5-405-g7aa7d4559632 X-Kernelci-Report-Type: build X-Kernelci-Branch: pending-fixes X-Kernelci-Tree: next Subject: next/pending-fixes build: 8 builds: 0 failed, 8 passed, 19 warnings (v6.10-rc5-405-g7aa7d4559632) To: linux-next@vger.kernel.org From: "kernelci.org bot" Xref: photonic.trudheim.com org.kernel.vger.linux-next:61964 Newsgroups: org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail next/pending-fixes build: 8 builds: 0 failed, 8 passed, 19 warnings (v6.10-= rc5-405-g7aa7d4559632) Full Build Summary: https://kernelci.org/build/next/branch/pending-fixes/ke= rnel/v6.10-rc5-405-g7aa7d4559632/ Tree: next Branch: pending-fixes Git Describe: v6.10-rc5-405-g7aa7d4559632 Git Commit: 7aa7d4559632edf7cc109be084cf98b4b17acaa5 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git Built: 8 unique architectures Warnings Detected: arc: haps_hs_smp_defconfig (gcc-10): 2 warnings arm64: arm: i386: mips: 32r2el_defconfig (gcc-10): 3 warnings riscv: sparc: sparc64_defconfig (gcc-10): 14 warnings x86_64: Warnings summary: 2 WARNING: modpost: EXPORT symbol "_mcount" [vmlinux] version genera= tion failed, symbol will not be versioned. 2 :1519:2: warning: #warning syscall clone3 not implemented [= -Wcpp] 1 arch/sparc/vdso/vdso32/../vclock_gettime.c:343:1: warning: no prev= ious prototype for =E2=80=98__vdso_gettimeofday_stick=E2=80=99 [-Wmissing-p= rototypes] 1 arch/sparc/vdso/vdso32/../vclock_gettime.c:307:1: warning: no prev= ious prototype for =E2=80=98__vdso_gettimeofday=E2=80=99 [-Wmissing-prototy= pes] 1 arch/sparc/vdso/vdso32/../vclock_gettime.c:282:1: warning: no prev= ious prototype for =E2=80=98__vdso_clock_gettime_stick=E2=80=99 [-Wmissing-= prototypes] 1 arch/sparc/vdso/vdso32/../vclock_gettime.c:254:1: warning: no prev= ious prototype for =E2=80=98__vdso_clock_gettime=E2=80=99 [-Wmissing-protot= ypes] 1 arch/sparc/vdso/vclock_gettime.c:343:1: warning: no previous proto= type for =E2=80=98__vdso_gettimeofday_stick=E2=80=99 [-Wmissing-prototypes] 1 arch/sparc/vdso/vclock_gettime.c:307:1: warning: no previous proto= type for =E2=80=98__vdso_gettimeofday=E2=80=99 [-Wmissing-prototypes] 1 arch/sparc/vdso/vclock_gettime.c:282:1: warning: no previous proto= type for =E2=80=98__vdso_clock_gettime_stick=E2=80=99 [-Wmissing-prototypes] 1 arch/sparc/vdso/vclock_gettime.c:254:1: warning: no previous proto= type for =E2=80=98__vdso_clock_gettime=E2=80=99 [-Wmissing-prototypes] 1 arch/sparc/prom/p1275.c:52:6: warning: no previous prototype for = =E2=80=98prom_cif_init=E2=80=99 [-Wmissing-prototypes] 1 arch/sparc/prom/misc_64.c:165:5: warning: no previous prototype fo= r =E2=80=98prom_get_mmu_ihandle=E2=80=99 [-Wmissing-prototypes] 1 arch/mips/boot/dts/img/boston.dts:136.23-177.6: Warning (interrupt= _provider): /pci@14000000/pci2_root@0,0/eg20t_bridge@1,0,0: '#interrupt-cel= ls' found, but node is not an interrupt provider 1 arch/mips/boot/dts/img/boston.dts:128.17-178.5: Warning (interrupt= _provider): /pci@14000000/pci2_root@0,0: '#interrupt-cells' found, but node= is not an interrupt provider 1 arch/mips/boot/dts/img/boston.dtb: Warning (interrupt_map): Failed= prerequisite 'interrupt_provider' 1 arch/arc/boot/dts/haps_hs_idu.dts:68.16-72.5: Warning (interrupt_p= rovider): /fpga/pct: '#interrupt-cells' found, but node is not an interrupt= provider 1 arch/arc/boot/dts/haps_hs_idu.dtb: Warning (interrupt_map): Failed= prerequisite 'interrupt_provider' =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D Detailed per-defconfig build reports: ---------------------------------------------------------------------------= ----- 32r2el_defconfig (mips, gcc-10) =E2=80=94 PASS, 0 errors, 3 warnings, 0 sec= tion mismatches Warnings: arch/mips/boot/dts/img/boston.dts:128.17-178.5: Warning (interrupt_prov= ider): /pci@14000000/pci2_root@0,0: '#interrupt-cells' found, but node is n= ot an interrupt provider arch/mips/boot/dts/img/boston.dts:136.23-177.6: Warning (interrupt_prov= ider): /pci@14000000/pci2_root@0,0/eg20t_bridge@1,0,0: '#interrupt-cells' f= ound, but node is not an interrupt provider arch/mips/boot/dts/img/boston.dtb: Warning (interrupt_map): Failed prer= equisite 'interrupt_provider' ---------------------------------------------------------------------------= ----- defconfig (riscv, gcc-10) =E2=80=94 PASS, 0 errors, 0 warnings, 0 section m= ismatches ---------------------------------------------------------------------------= ----- defconfig (arm64, gcc-10) =E2=80=94 PASS, 0 errors, 0 warnings, 0 section m= ismatches ---------------------------------------------------------------------------= ----- haps_hs_smp_defconfig (arc, gcc-10) =E2=80=94 PASS, 0 errors, 2 warnings, 0= section mismatches Warnings: arch/arc/boot/dts/haps_hs_idu.dts:68.16-72.5: Warning (interrupt_provid= er): /fpga/pct: '#interrupt-cells' found, but node is not an interrupt prov= ider arch/arc/boot/dts/haps_hs_idu.dtb: Warning (interrupt_map): Failed prer= equisite 'interrupt_provider' ---------------------------------------------------------------------------= ----- i386_defconfig (i386, gcc-10) =E2=80=94 PASS, 0 errors, 0 warnings, 0 secti= on mismatches ---------------------------------------------------------------------------= ----- multi_v7_defconfig (arm, gcc-10) =E2=80=94 PASS, 0 errors, 0 warnings, 0 se= ction mismatches ---------------------------------------------------------------------------= ----- sparc64_defconfig (sparc, gcc-10) =E2=80=94 PASS, 0 errors, 14 warnings, 0 = section mismatches Warnings: :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] arch/sparc/vdso/vclock_gettime.c:254:1: warning: no previous prototype = for =E2=80=98__vdso_clock_gettime=E2=80=99 [-Wmissing-prototypes] arch/sparc/vdso/vclock_gettime.c:282:1: warning: no previous prototype = for =E2=80=98__vdso_clock_gettime_stick=E2=80=99 [-Wmissing-prototypes] arch/sparc/vdso/vclock_gettime.c:307:1: warning: no previous prototype = for =E2=80=98__vdso_gettimeofday=E2=80=99 [-Wmissing-prototypes] arch/sparc/vdso/vclock_gettime.c:343:1: warning: no previous prototype = for =E2=80=98__vdso_gettimeofday_stick=E2=80=99 [-Wmissing-prototypes] arch/sparc/vdso/vdso32/../vclock_gettime.c:254:1: warning: no previous = prototype for =E2=80=98__vdso_clock_gettime=E2=80=99 [-Wmissing-prototypes] arch/sparc/vdso/vdso32/../vclock_gettime.c:282:1: warning: no previous = prototype for =E2=80=98__vdso_clock_gettime_stick=E2=80=99 [-Wmissing-proto= types] arch/sparc/vdso/vdso32/../vclock_gettime.c:307:1: warning: no previous = prototype for =E2=80=98__vdso_gettimeofday=E2=80=99 [-Wmissing-prototypes] arch/sparc/vdso/vdso32/../vclock_gettime.c:343:1: warning: no previous = prototype for =E2=80=98__vdso_gettimeofday_stick=E2=80=99 [-Wmissing-protot= ypes] arch/sparc/prom/misc_64.c:165:5: warning: no previous prototype for =E2= =80=98prom_get_mmu_ihandle=E2=80=99 [-Wmissing-prototypes] arch/sparc/prom/p1275.c:52:6: warning: no previous prototype for =E2=80= =98prom_cif_init=E2=80=99 [-Wmissing-prototypes] WARNING: modpost: EXPORT symbol "_mcount" [vmlinux] version generation = failed, symbol will not be versioned. :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] WARNING: modpost: EXPORT symbol "_mcount" [vmlinux] version generation = failed, symbol will not be versioned. ---------------------------------------------------------------------------= ----- x86_64_defconfig (x86_64, gcc-10) =E2=80=94 PASS, 0 errors, 0 warnings, 0 s= ection mismatches --- For more info write to . Date: Fri, 28 Jun 2024 17:51:31 +0100 From: Mark Brown To: Dave Airlie , DRI Cc: Linux Kernel Mailing List , Linux Next Mailing List , Riana Tauro , Rodrigo Vivi , Thomas =?iso-8859-1?Q?Hellstr=F6m?= Subject: linux-next: manual merge of the drm tree with the origin tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7IWLkhR3deeAeUwl" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1262432 org.kernel.vger.linux-next:61965 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --7IWLkhR3deeAeUwl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/xe/xe_gt_idle.c between commit: 2470b141bfae2 ("drm/xe: move disable_c6 call") =66rom the origin tree and commits: 6800e63cf97ba ("drm/xe: move disable_c6 call") 38e8c4184ea0e ("drm/xe: Enable Coarse Power Gating") ecab82af27873 ("drm/xe/vf: Don't support gtidle if VF") =66rom the drm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/gpu/drm/xe/xe_gt_idle.c index 944770fb2daff,67aba41405100..0000000000000 --- a/drivers/gpu/drm/xe/xe_gt_idle.c +++ b/drivers/gpu/drm/xe/xe_gt_idle.c --7IWLkhR3deeAeUwl Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ+6hIACgkQJNaLcl1U h9BZvwf+J82kZVRXzrNZjb7UKRVQsQVP8nAbDDMXpbBJsyU5tUHusr+/urAZoZAz Ph8paEH9AykYvDGiGMZ+He+UwFYd90x5EXsvdD+v4qeFHRT33RDWPJ9HeqKO7czY 9d7UIkFw1/j4q5prRT0PrGvirif5W6JCR1SS8iIU/BG/gEUZ6wBHBFuab9YOPWsO p4Ab6BJimKGf9xrzYBW39GkArebZTVD7QHEnP6AGSWrBmvYATBMhZ6tEUVFWvFHG 37mXZjJFjw/Jnb/bccp+8LjPOtaMs1fEEr/Fd4YQ6nW4ENQSBJOqeV9OMwaH53AP DlTYhtWsoaGvWk/GU5kPkcSj7TaP9A== =HPbD -----END PGP SIGNATURE----- --7IWLkhR3deeAeUwl-- . Date: Fri, 28 Jun 2024 18:03:39 +0100 From: Mark Brown To: Dave Airlie , DRI , Piotr =?iso-8859-1?Q?Pi=F3rkowski?= , Michal Wajdeczko Cc: buildfailureaftermergeofthedrmtree@sirena.org.uk, Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the drm Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="uOs/tamzhpjy196+" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1262448 org.kernel.vger.linux-next:61966 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --uOs/tamzhpjy196+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi all, After merging the drm tree, today's linux-next build (x86_64 allmodconfig) failed like this: /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c: In function 'pf_get_threshold': /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c:1788:27: error: unused variable 'xe' [-Werror=unused-variable] 1788 | struct xe_device *xe = gt_to_xe(gt); | ^~ cc1: all warnings being treated as errors Caused by commit 629df234bfe73d ("drm/xe/pf: Introduce functions to configure VF thresholds") I have used the tree from 20240627 instead. --uOs/tamzhpjy196+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ+7OoACgkQJNaLcl1U h9AZ7Af7BkWNkwptMGFswj/tCDTgrJq/z+dXFYulloh54R2jxB/Mi+47dqpkBM7g ZgIw8HD3dzN5t9voQsTvkuhecOhKXLXZBS6QE0CpO+B8DgIlD39yVzdzshNzhM0L /1Q/OAgbXI42YqEFptlp4cBbYIJjtCQm9nzyavlWJZRjW24nPEoe4fKtRWVBypKA nQYzY3K/BHtr19jfeTNMPzW0jSb0438F9csnctrS2xKYoxY70tlw/J2IbQAUUSld JzqRnHMRXoGx7WRMCta91wCl99SIS/QTsU6dBTwBl/wivZDPZtx5SsjDivkjVXBY NeG0kB5MK0FDpb5bEBAJNj787dQf7w== =Zwag -----END PGP SIGNATURE----- --uOs/tamzhpjy196+-- . Message-ID: <667ef428.170a0220.65411.6f45@mx.google.com> Date: Fri, 28 Jun 2024 10:34:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Kernelci-Kernel: v6.10-rc5-405-g7aa7d4559632 X-Kernelci-Report-Type: test X-Kernelci-Branch: pending-fixes X-Kernelci-Tree: next Subject: next/pending-fixes baseline: 77 runs, 1 regressions (v6.10-rc5-405-g7aa7d4559632) To: linux-next@vger.kernel.org, kernel-build-reports@lists.linaro.org, kernelci-results@groups.io From: "kernelci.org bot" Xref: photonic.trudheim.com org.kernel.vger.linux-next:61967 Newsgroups: org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail next/pending-fixes baseline: 77 runs, 1 regressions (v6.10-rc5-405-g7aa7d45= 59632) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressi= ons -----------+------+--------------+----------+--------------------+---------= --- jetson-tk1 | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 = = Details: https://kernelci.org/test/job/next/branch/pending-fixes/kernel/= v6.10-rc5-405-g7aa7d4559632/plan/baseline/ Test: baseline Tree: next Branch: pending-fixes Describe: v6.10-rc5-405-g7aa7d4559632 URL: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next= .git SHA: 7aa7d4559632edf7cc109be084cf98b4b17acaa5 = Test Regressions ---------------- = platform | arch | lab | compiler | defconfig | regressi= ons -----------+------+--------------+----------+--------------------+---------= --- jetson-tk1 | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 = = Details: https://kernelci.org/test/plan/id/667ec0d40c200260ea7e706d Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/pending-fixes/v6.10-rc5-4= 05-g7aa7d4559632/arm/multi_v7_defconfig/gcc-10/lab-baylibre/baseline-jetson= -tk1.txt HTML log: https://storage.kernelci.org//next/pending-fixes/v6.10-rc5-4= 05-g7aa7d4559632/arm/multi_v7_defconfig/gcc-10/lab-baylibre/baseline-jetson= -tk1.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.login: https://kernelci.org/test/case/id/667ec0d40c200260ea7e7= 06e failing since 9 days (last pass: v6.3-10703-gb3f869e79cdf0, first f= ail: v6.10-rc4-262-g1ce98b2c2d5b0) = =20 . Date: Fri, 28 Jun 2024 18:59:39 +0100 From: Mark Brown To: Jens Axboe Cc: Christian Brauner , John Garry , Linux Kernel Mailing List , Linux Next Mailing List , Mateusz Guzik , Prasad Singamsetty Subject: linux-next: manual merge of the block tree with the vfs-brauner tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="UFtvVvlITWZV7OjV" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1262511 org.kernel.vger.linux-next:61969 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --UFtvVvlITWZV7OjV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the block tree got a conflict in: fs/stat.c between commit: 0ef625bba6fb2 ("vfs: support statx(..., NULL, AT_EMPTY_PATH, ...)") =66rom the vfs-brauner tree and commit: 0f9ca80fa4f96 ("fs: Add initial atomic write support info to statx") 9abcfbd235f59 ("block: Add atomic write support for statx") =66rom the block tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc fs/stat.c index 6f65b3456cadb,bd0698dfd7b36..0000000000000 --- a/fs/stat.c +++ b/fs/stat.c @@@ -214,43 -245,6 +245,45 @@@ int getname_statx_lookup_flags(int flag return lookup_flags; } =20 +static int vfs_statx_path(struct path *path, int flags, struct kstat *sta= t, + u32 request_mask) +{ + int error =3D vfs_getattr(path, stat, request_mask, flags); ++ struct inode *backing_inode; + + if (request_mask & STATX_MNT_ID_UNIQUE) { + stat->mnt_id =3D real_mount(path->mnt)->mnt_id_unique; + stat->result_mask |=3D STATX_MNT_ID_UNIQUE; + } else { + stat->mnt_id =3D real_mount(path->mnt)->mnt_id; + stat->result_mask |=3D STATX_MNT_ID; + } + + if (path_mounted(path)) + stat->attributes |=3D STATX_ATTR_MOUNT_ROOT; + stat->attributes_mask |=3D STATX_ATTR_MOUNT_ROOT; + - /* Handle STATX_DIOALIGN for block devices. */ - if (request_mask & STATX_DIOALIGN) { - struct inode *inode =3D d_backing_inode(path->dentry); -=20 - if (S_ISBLK(inode->i_mode)) - bdev_statx_dioalign(inode, stat); - } ++ /* ++ * If this is a block device inode, override the filesystem ++ * attributes with the block device specific parameters that need to be ++ * obtained from the bdev backing inode. ++ */ ++ backing_inode =3D d_backing_inode(path->dentry); ++ if (S_ISBLK(backing_inode->i_mode)) ++ bdev_statx(backing_inode, stat, request_mask); + + return error; +} + +static int vfs_statx_fd(int fd, int flags, struct kstat *stat, + u32 request_mask) +{ + CLASS(fd_raw, f)(fd); + if (!f.file) + return -EBADF; + return vfs_statx_path(&f.file->f_path, flags, stat, request_mask); +} + /** * vfs_statx - Get basic and extra attributes by filename * @dfd: A file descriptor representing the base dir for a relative filen= ame --UFtvVvlITWZV7OjV Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ++gsACgkQJNaLcl1U h9BXlAf/RCundUFyfRJUHJaSqc0ABvooZWdLK/WwqB2FJxNGmcT+PvUZg+akPtV1 Op3BfiKQ+y+u7gogNsZQczUw/LPSwTt2CpTfq0wWwRTrSJsYMyEFCEPR75E9Y2Wl 4i/WYT3svi7YQnXSPbXCWL7SvZK1mG/TJ9/aJKGTAqmdqsXkU5i1gTShEU1T8Jr3 PxkA6QbX94lnRqLfms0DaC+HIeMYhY5d9peFs5OFqq2t9AbiasAtyoAc1p+fpHD2 Y0zIztl+5V92nSo+9291ypmo9LHlRjtcyylKCyp6nrMqERgFEm9vY8UpuKEUqbqD 4p2dDLKdkE8qpq6ZmRlCU4imVtAv/g== =cbyp -----END PGP SIGNATURE----- --UFtvVvlITWZV7OjV-- . Date: Fri, 28 Jun 2024 18:59:56 +0100 From: Mark Brown To: Jens Axboe Cc: Christian Brauner , John Garry , Linux Kernel Mailing List , Linux Next Mailing List , Prasad Singamsetty Subject: linux-next: manual merge of the block tree with the vfs-brauner tree Message-ID: X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="n3BU1z4wNyjl3BaP" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-next:61970 org.kernel.vger.linux-kernel:1262512 Newsgroups: org.kernel.vger.linux-next,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --n3BU1z4wNyjl3BaP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the block tree got a conflict in: include/linux/fs.h between commit: 1bc6d4452d5c9 ("fs: new helper vfs_empty_path()") =66rom the vfs-brauner tree and commit: c34fc6f26ab86 ("fs: Initial atomic write support") =66rom the block tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc include/linux/fs.h index dc9f9c4b2572d,db26b4a70c628..0000000000000 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@@ -3626,21 -3627,6 +3640,23 @@@ extern int vfs_fadvise(struct file *fil extern int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice); =20 +static inline bool vfs_empty_path(int dfd, const char __user *path) +{ + char c; + + if (dfd < 0) + return false; + + /* We now allow NULL to be used for empty path. */ + if (!path) + return true; + + if (unlikely(get_user(c, path))) + return false; + + return !c; +} + + bool generic_atomic_write_valid(struct iov_iter *iter, loff_t pos); +=20 #endif /* _LINUX_FS_H */ --n3BU1z4wNyjl3BaP Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ++hsACgkQJNaLcl1U h9BnqQgAgyvWDFwnlTNylsbsdCoJjHuCdavJNWNKo06nTjlFHdIn5wAHt0AwB2pl VdLnDgvAGTa30hnIb98ECrXgfMIVpuq9+o5rK2RRBn4IFZejjd4YGheSaA1k8XUL NjmGLRFeXA5cMYeZ3NzD6a1npR6dtNmlAVt12bBXeATRcwcMd96m6sUi+aID0Yqn XBECOHDUquq3eRA16FxetiuK9RFv4ALWQ5icc1iPo56ZgOIwmHJGZzGiCzVnCYvi QLPbLYcmrvW1erDxvqyoQBP9wsyNAUoVYnlm51L8b9KEmyIizAE6bCvjDYx24EWk 0E5va1OyEc1sNA+p+QlFQqYDNw9Kiw== =nwt1 -----END PGP SIGNATURE----- --n3BU1z4wNyjl3BaP-- . Date: Fri, 28 Jun 2024 19:56:57 +0100 From: Mark Brown To: Anup Patel Cc: Ian Rogers , Linux Kernel Mailing List , Linux Next Mailing List , Namhyung Kim , Shenlin Liang Subject: linux-next: manual merge of the kvm-riscv tree with the perf tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="zRopLGLXR8zcfVMV" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1262571 org.kernel.vger.linux-next:61972 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --zRopLGLXR8zcfVMV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the kvm-riscv tree got a conflict in: tools/perf/arch/riscv/util/Build between commit: e467705a9fb37 ("perf util: Make util its own library") =66rom the perf tree and commit: da7b1b525e972 ("perf kvm/riscv: Port perf kvm stat to RISC-V") =66rom the kvm-riscv tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc tools/perf/arch/riscv/util/Build index 65ec3c66a3754,d72b04f8d32bb..0000000000000 --- a/tools/perf/arch/riscv/util/Build +++ b/tools/perf/arch/riscv/util/Build @@@ -1,5 -1,6 +1,6 @@@ -perf-y +=3D perf_regs.o -perf-y +=3D header.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D header.o =20 -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o ++perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o --zRopLGLXR8zcfVMV Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ/B3gACgkQJNaLcl1U h9Ax4wf8D9HoIhbSjLhTzI7Vq4lj49enCDROzqB8utktsaggg5CVzAQXGS/w1PiA KROCfJRRz5PeoiN/Oawo7EKI2RX+e7YeRYvpfQxrWndWJcQjWVjSHwUNF5T13QXV rat7lqDa2g2f9terDGjOVLJJbmWvKGCc99ptcNqc91JWNS6XBxzupVa4FxLdj8Zc pGBNPMOSDWtAtUeyB8o2E+3mtlXCO9LqEwHxed1rX3MD+ICxSuoq1plEB/ebYIrL s19/s5+zMK25oLz534ks0i+MiZocpzLLaJ0HdTcedIoLdMATtZg1uXF+kkFNL1lg YMtvr7ssm/nLD0Xe3PNdAqirBN59HA== =CDMe -----END PGP SIGNATURE----- --zRopLGLXR8zcfVMV-- . Date: Fri, 28 Jun 2024 20:46:49 +0100 From: Mark Brown To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , Raphael Gallais-Pou , Yannick Fertre , Philippe Cornu , Greg Kroah-Hartman Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the drm tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="f/G9OlavzYhgk78r" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1262610 org.kernel.vger.linux-next:61973 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --f/G9OlavzYhgk78r Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, After merging the drm tree and then some other trees which seem to have allowed the driver to be built much later in the merge process today's linux-next build (x86_64 allmodconfig) failed like this: /tmp/next/build/drivers/gpu/drm/stm/lvds.c:1212:19: error: initialization o= f 'void (*)(struct platform_device *)' from incompatible pointer type 'int = (*)(struct platform_device *)' [-Werror=3Dincompatible-pointer-types] 1212 | .remove =3D lvds_remove, | ^~~~~~~~~~~ /tmp/next/build/drivers/gpu/drm/stm/lvds.c:1212:19: note: (near initializat= ion for 'lvds_platform_driver..remove') Caused by commit 6597efcfc53585d5 ("drm/stm: Allow build with COMPILE_TEST=3Dy") interacting with aca1cbc1c9860e39 ("drm/stm: lvds: add new STM32 LVDS Display Interface Tr= ansmitter driver") 0edb555a65d1ef04 ("platform: Make platform_driver::remove() return void") I have applied the below fixup patch. =46rom 59a5e11f41e93512ca1a5aed36c1c396d175797d Mon Sep 17 00:00:00 2001 =46rom: Mark Brown Date: Fri, 28 Jun 2024 20:45:16 +0100 Subject: [PATCH] drm: Fix up STM LVDS driver for void remove() conversion Signed-off-by: Mark Brown --- drivers/gpu/drm/stm/lvds.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/stm/lvds.c b/drivers/gpu/drm/stm/lvds.c index bfc8cb13fbc5c..2fa2c81784e97 100644 --- a/drivers/gpu/drm/stm/lvds.c +++ b/drivers/gpu/drm/stm/lvds.c @@ -1186,15 +1186,13 @@ static int lvds_probe(struct platform_device *pdev) return ret; } =20 -static int lvds_remove(struct platform_device *pdev) +static void lvds_remove(struct platform_device *pdev) { struct stm_lvds *lvds =3D platform_get_drvdata(pdev); =20 lvds_pixel_clk_unregister(lvds); =20 drm_bridge_remove(&lvds->lvds_bridge); - - return 0; } =20 static const struct of_device_id lvds_dt_ids[] =3D { --=20 2.39.2 --f/G9OlavzYhgk78r Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ/EygACgkQJNaLcl1U h9Dg9Af/YMVO1Lly6BdV05v0ivZ1USdvVJBnKSsyw9PjNdv2EJxmwZaeRdzaknnk 8pfPTCR4STWZVhgzHaoKGwdOJotO2W7rGEsKSbx6N2ivLoUjqHOZQ6Nb7FZXj5v9 O+P5EXUIQlaUY3LdFMh/4GI6suqI2E4WL6TXPZdjIerow3J9+vAQhfce7NqkwHFM Bo7PXw81tCTWP34zHOhyHDDoMsDDcxZwkrMbT02b/GHHNGM+h5sEbNo+dmibElEO DgEetM1K14MaT47S5PuHYpp7GSA9PTEcjJnLhRzOtVd9clybG4BQ9LkcuNQu+9iH G/kjrvP0p22zNpg/KNneN+Li6aZa/A== =CEG2 -----END PGP SIGNATURE----- --f/G9OlavzYhgk78r-- . Date: Fri, 28 Jun 2024 21:16:32 +0100 From: Mark Brown To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Jun 28 Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="GtAAJVELQfreE8oB" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1262638 org.kernel.vger.linux-next:61974 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --GtAAJVELQfreE8oB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi all, Stephen should be back on Monday so normal service restored. Changes since 20240627: The risc-v tree gained a conflcit with the risc-v-fixes tree. The btrfs tree gained multiple conflicts with the fs-current tree. The drm tree gained a conflict with Linus' tree. The drm tree gained a build failure, I used the version from 20240627 instead. The block tree gained multiple conflicts with the vfs-brauner tree. The kvm-riscv tree gained a conflict with the perf tree. The drm tree gained a build failure due to an interacton with the driver-core tree for which I applied a fixup. Non-merge commits (relative to Linus' tree): 8590 9252 files changed, 783165 insertions(+), 159592 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There is also the merge.log file in the Next directory. Between each merge, the tree was built with a defconfig for arm64, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. Below is a summary of the state of the merge. I am currently merging 378 trees (counting Linus' and 106 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. --GtAAJVELQfreE8oB Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ/Gh8ACgkQJNaLcl1U h9DGCwf/TmWrPzKQDBfhihxbIXYh37GXlciDBwkhG6BHuZn+vX/pWZ4uYWHcCoqW UaxNc77ZhIeUTRegDBiG8zqTPaoD17fYhAliFeYwInlETkLtNFFFYenqEvgDYd9B 3XrKGFi7NetLMcO/k2o3TdbJf1+dLZrcIV5xtg6x7TS/+G56rwVuKCv2nF5L9kCZ Wmh/p+b/xzSxbORhwtoi03tshNl9N8+G54H34teBfJrnswqKfL4B5ktkX7e3j8Mg NYpqkgzGpeS1FOmOIbveAL2IUsJuah6a/gHStwP74UaGDL2iszWEFvzoi1Gg/pbb MuJ5tZoyCoOxzTT7wRL6zIPYktikIg== =rOpE -----END PGP SIGNATURE----- --GtAAJVELQfreE8oB-- .