On Mon, Mar 23, 2020 at 03:18:05PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/media/allegro-dvt/allegro-core.c
>
> between several commits from the v4l-dvb tree and commits:
>
> 5979afa2c4d1 ("staging: Replace zero-length array with flexible-array member")
> e3d21cbfa978 ("staging: media: allegro: align with parenthesis")
>
> from the staging tree.
>
> I fixed it up (see bottom and below merge fix patch) 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.
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Mon, 23 Mar 2020 15:12:50 +1100
> Subject: [PATCH] fix up for "staging: Replace zero-length array with flexible-array member"
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
> drivers/staging/media/allegro-dvt/allegro-mail.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/allegro-dvt/allegro-mail.h b/drivers/staging/media/allegro-dvt/allegro-mail.h
> index 1fd36f65be78..17db665f8e1e 100644
> --- a/drivers/staging/media/allegro-dvt/allegro-mail.h
> +++ b/drivers/staging/media/allegro-dvt/allegro-mail.h
> @@ -169,7 +169,7 @@ struct mcu_msg_push_buffers_internal_buffer {
> struct mcu_msg_push_buffers_internal {
> struct mcu_msg_header header;
> u32 channel_id;
> - struct mcu_msg_push_buffers_internal_buffer buffer[0];
> + struct mcu_msg_push_buffers_internal_buffer buffer[];
> } __attribute__ ((__packed__));
>
> struct mcu_msg_put_stream_buffer {
> --
> 2.25.0
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/staging/media/allegro-dvt/allegro-core.c
> index 34c3e55be902,1162cc38f3fc..000000000000
> --- a/drivers/staging/media/allegro-dvt/allegro-core.c
> +++ b/drivers/staging/media/allegro-dvt/allegro-core.c
> @@@ -2403,19 -2324,12 +2403,19 @@@ static int allegro_open(struct file *fi
> 0, ALLEGRO_GOP_SIZE_MAX,
> 1, channel->gop_size);
> v4l2_ctrl_new_std(handler,
> - &allegro_ctrl_ops,
> - V4L2_CID_MIN_BUFFERS_FOR_OUTPUT,
> - 1, 32,
> - 1, 1);
> + &allegro_ctrl_ops,
> + V4L2_CID_MIN_BUFFERS_FOR_OUTPUT,
> + 1, 32,
> + 1, 1);
> + if (handler->error != 0) {
> + ret = handler->error;
> + goto error;
> + }
> +
> channel->fh.ctrl_handler = handler;
>
> + v4l2_ctrl_cluster(3, &channel->mpeg_video_bitrate_mode);
> +
> channel->mcu_channel_id = -1;
> channel->user_id = -1;
>
Looks good, thanks!
greg k-h
