Re: [d-kernel] [PATCH 1/2] config-aarch64: enable new configs for Rockchip, Qualcomm, Raspberry Pi

From: Vitaly Chikunov <vt@altlinux.org>
To: ALT Linux kernel packages development <devel-kernel@lists.altlinux.org>
Subject: Re: [d-kernel] [PATCH 1/2] config-aarch64: enable new configs for Rockchip, Qualcomm, Raspberry Pi
Date: Thu, 29 May 2025 04:06:25 +0300
Message-ID: <fwlequ7xsbxofzy6fwk53x6ej7nqdztscxwstthwpltfryliu5@3vxgyamtivgh> (raw)
In-Reply-To: <b3fe6929f49c0cc0d4d1d3327c7431924cbfe261.1748435730.git.antohami@altlinux.org>

On Wed, May 28, 2025 at 03:37:44PM +0300, Anton Midyukov wrote:
> Signed-off-by: Anton Midyukov <antohami@altlinux.org>

Этот патч не приложился git am. Но я его все равно приложил через patch.

  ...
  Applying: config-aarch64: enable new configs for Rockchip, Qualcomm, Raspberry Pi
  Patch failed at 0001 config-aarch64: enable new configs for Rockchip, Qualcomm, Raspberry Pi
  When you have resolved this problem, run "git am --continue".
  If you prefer to skip this patch, run "git am --skip" instead.
  To restore the original branch and stop patching, run "git am --abort".
  error: patch failed: config-aarch64:766
  error: config-aarch64: patch does not apply
  hint: Use 'git am --show-current-patch=diff' to see the failed patch

  $ git am --show-current-patch=diff | patch -p1
  patching file config-aarch64
  Hunk #1 succeeded at 766 with fuzz 1.  <-----
  Hunk #2 succeeded at 779 (offset -6 lines).
  Hunk #3 succeeded at 809 (offset -6 lines).
  Hunk #4 succeeded at 1178 (offset -6 lines).
  Hunk #5 succeeded at 1188 (offset -6 lines).

Крайне желательно, чтоб патчи прилагались через git am. Fuzz в patch(1)
может жестко ошибиться.

> ---
>  config-aarch64 | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/config-aarch64 b/config-aarch64
> index 4b7404a7a7a1..8fa15a678aa6 100644
> --- a/config-aarch64
> +++ b/config-aarch64
> @@ -766,6 +766,7 @@ CONFIG_IR_SUNXI=m
>  # CONFIG_CEC_PIN_ERROR_INJ is not set
>  # CONFIG_VIDEO_MUX is not set
>  CONFIG_VIDEO_QCOM_CAMSS=m
> +CONFIG_VIDEO_QCOM_IRIS=m
>  # CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
>  # CONFIG_VIDEO_XILINX is not set
>  CONFIG_VIDEO_SUN4I_CSI=m
> @@ -784,6 +785,7 @@ CONFIG_VIDEO_GC2145=m
>  CONFIG_VIDEO_ROCKCHIP_RGA=m
>  CONFIG_VIDEO_QCOM_VENUS=m
>  CONFIG_VIDEO_RASPBERRYPI_PISP_BE=m
> +CONFIG_VIDEO_RP1_CFE=m
>  CONFIG_VIDEO_MESON_AO_CEC=m
>  # CONFIG_VIDEO_MESON_G12A_AO_CEC is not set
>  CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
> @@ -813,6 +815,7 @@ CONFIG_ROCKCHIP_ANALOGIX_DP=y
>  CONFIG_ROCKCHIP_CDN_DP=y
>  CONFIG_ROCKCHIP_DW_HDMI=y
>  CONFIG_ROCKCHIP_DW_MIPI_DSI=y
> +CONFIG_ROCKCHIP_DW_MIPI_DSI2=y
>  CONFIG_ROCKCHIP_INNO_HDMI=y
>  CONFIG_ROCKCHIP_LVDS=y
>  CONFIG_ROCKCHIP_RGB=y
> @@ -1181,6 +1184,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y
>  CONFIG_V4L_PLATFORM_DRIVERS=y
>  CONFIG_V4L_MEM2MEM_DRIVERS=y
>  CONFIG_VIDEO_HANTRO=m
> +CONFIG_VIDEO_HANTRO_HEVC_RFC=y
>  CONFIG_VIDEO_HANTRO_ROCKCHIP=y
>  CONFIG_VIDEO_MESON_VDEC=m
>  # CONFIG_STAGING_BOARD is not set
> @@ -1190,6 +1194,7 @@ CONFIG_BCM_VIDEOCORE=m
>  CONFIG_BCM2835_VCHIQ=m
>  CONFIG_SND_BCM2835=m
>  CONFIG_VIDEO_BCM2835=m
> +CONFIG_VIDEO_BCM2835_UNICAM=m
>  CONFIG_BCM2835_VCHIQ_MMAL=m
>  # CONFIG_XIL_AXIS_FIFO is not set
>  # CONFIG_HMS_ANYBUSS_BUS is not set
> -- 
> 2.42.4
> 
> _______________________________________________
> devel-kernel mailing list
> devel-kernel@lists.altlinux.org
> https://lists.altlinux.org/mailman/listinfo/devel-kernel