linux-next: manual merge of the staging tree with the v4l-dvb tree

public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Mauro Carvalho Chehab <mchehab@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Kaaira Gupta <kgupta@es•iitr.ac.in>,
	Michael Tretter <m.tretter@pengutronix•de>,
	Colin Ian King <colin.king@canonical•com>,
	Hans Verkuil <hverkuil-cisco@xs4all•nl>,
	Chuhong Yuan <hslester96@gmail•com>,
	"Gustavo A. R. Silva" <gustavo@embeddedor•com>
Subject: linux-next: manual merge of the staging tree with the v4l-dvb tree
Date: Mon, 23 Mar 2020 15:18:05 +1100	[thread overview]
Message-ID: <20200323151805.6a166c84@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2624 bytes --]

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@canb•auug.org.au>
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@canb•auug.org.au>
---
 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;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

next             reply	other threads:[~2020-03-23  4:18 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-23  4:18 Stephen Rothwell [this message]
2020-03-23  9:56 ` linux-next: manual merge of the staging tree with the v4l-dvb tree Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2024-10-16  3:18 Stephen Rothwell
2024-10-16  5:48 ` Greg KH
2023-02-13  2:13 Stephen Rothwell
2023-02-13  7:05 ` Greg KH
2020-03-19  3:44 Stephen Rothwell
2020-03-19  8:30 ` Greg KH
2019-04-26  6:06 Stephen Rothwell
2019-04-27  6:36 ` Greg KH
2019-05-08  1:54 ` Stephen Rothwell
2019-04-04  2:43 Stephen Rothwell
2018-12-10  5:53 Stephen Rothwell
2018-10-08  4:53 Stephen Rothwell
2018-10-08  4:47 Stephen Rothwell
2018-05-17  4:17 Stephen Rothwell
2018-05-17  7:22 ` Greg KH
2018-05-17 10:06 ` Mauro Carvalho Chehab
2018-05-26  4:45   ` Stephen Rothwell
2017-11-02  4:30 Stephen Rothwell
2017-04-11  3:32 Stephen Rothwell
2017-04-06  3:34 Stephen Rothwell
2017-04-06 18:58 ` Sean Young
2017-04-06 19:19   ` Greg KH
2017-04-06 20:39     ` Sean Young
2017-04-06 21:51       ` Stephen Rothwell
2017-02-06  4:31 Stephen Rothwell
2017-02-06  8:37 ` Greg KH
2016-03-04  5:24 Stephen Rothwell
2016-03-04 16:58 ` Greg KH
2015-05-11  5:28 Stephen Rothwell
2015-05-11 18:34 ` Greg KH
2015-03-24  5:29 Stephen Rothwell
2014-11-24  8:10 Stephen Rothwell
2014-11-24  8:09 Stephen Rothwell
2014-11-05  4:37 Stephen Rothwell
2014-11-05  4:31 Stephen Rothwell
2014-11-05  4:29 Stephen Rothwell
2014-11-06  2:19 ` Greg KH
2014-07-16  6:46 Stephen Rothwell
2014-07-16 20:52 ` Greg KH
2014-03-18  6:15 Stephen Rothwell
2014-03-17  7:55 Stephen Rothwell
2014-03-17 11:01 ` Mauro Carvalho Chehab
2014-03-17 18:29   ` Greg KH
     [not found]     ` < 20140317162937.2ccdec83@infradead.org>
2014-03-17 19:29     ` Mauro Carvalho Chehab
2014-03-17 22:27       ` Russell King
2014-03-19 15:30         ` Greg KH
2014-03-21 12:24           ` Grant Likely
2014-03-21 14:37             ` Grant Likely
2011-09-27  6:10 Stephen Rothwell
2011-09-27 14:18 ` Greg KH
2011-09-27 20:14 ` Paul Gortmaker
2011-07-16 13:03 Stephen Rothwell
2011-07-17  9:15 ` Greg KH
2011-03-04  5:39 Stephen Rothwell
2011-03-04 17:14 ` Greg KH
2011-03-04  5:39 Stephen Rothwell
2011-03-04 17:14 ` Greg KH
2011-03-04  5:39 Stephen Rothwell
2011-03-04 17:13 ` Greg KH
2011-03-04 17:54   ` Mauro Carvalho Chehab
2011-03-04 21:23     ` Greg KH
2011-03-04 22:17       ` Mauro Carvalho Chehab
2011-03-04  5:38 Stephen Rothwell
2011-03-04 17:12 ` Greg KH
2011-03-04  5:38 Stephen Rothwell
2011-03-04 17:13 ` Greg KH
2011-03-04  5:38 Stephen Rothwell
2011-03-04 17:12 ` Greg KH

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:1fd36f65be7 dfblob:17db665f8e1 )
 OR (
bs:"fix up for "
bs:"staging: Replace zero-length array with flexible-array member" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200323151805.6a166c84@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=colin.king@canonical$(echo .)com \
    --cc=greg@kroah$(echo .)com \
    --cc=gustavo@embeddedor$(echo .)com \
    --cc=hslester96@gmail$(echo .)com \
    --cc=hverkuil-cisco@xs4all$(echo .)nl \
    --cc=kgupta@es$(echo .)iitr.ac.in \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=m.tretter@pengutronix$(echo .)de \
    --cc=mchehab@kernel$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox