From: Hans Verkuil <hverkuil@xs4all.nl> To: Mitali Borkar <mitaliborkar810@gmail.com>, martin.blumenstingl@googlemail.com, narmstrong@baylibre.com, mchehab@kernel.org, gregkh@linuxfoundation.org, khilman@baylibre.com Cc: linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, outreachy-kernel@googlegroups.com, linux-amlogic@lists.infradead.org, mitali_s@me.iitr.ac.in Subject: Re: Subject: [PATCH v2] staging: media: meson: vdec: declare u32 as static const appropriately Date: Tue, 13 Apr 2021 13:36:45 +0200 [thread overview] Message-ID: <69ffded9-548f-7595-8333-aebedae38de3@xs4all.nl> (raw) In-Reply-To: <YHV734NB4flpFjbF@kali> On 13/04/2021 13:09, Mitali Borkar wrote: > On Tue, Apr 13, 2021 at 09:26:01AM +0200, Hans Verkuil wrote: >> On 13/04/2021 08:27, Mitali Borkar wrote: >>> Declared 32 bit unsigned int as static constant inside a function >>> appropriately. >>> >>> Reported-by: kernel test robot <lkp@intel.com> >>> Signed-off-by: Mitali Borkar <mitaliborkar810@gmail.com> >>> --- >>> >>> Changes from v1:- Rectified the mistake by declaring u32 as static const >>> properly. >>> >>> drivers/staging/media/meson/vdec/codec_h264.c | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/staging/media/meson/vdec/codec_h264.c b/drivers/staging/media/meson/vdec/codec_h264.c >>> index ea86e9e1c447..80141b89a9f6 100644 >>> --- a/drivers/staging/media/meson/vdec/codec_h264.c >>> +++ b/drivers/staging/media/meson/vdec/codec_h264.c >>> @@ -287,8 +287,8 @@ static void codec_h264_resume(struct amvdec_session *sess) >>> struct amvdec_core *core = sess->core; >>> struct codec_h264 *h264 = sess->priv; >>> u32 mb_width, mb_height, mb_total; >>> - static const u32[] canvas3 = { ANCO_CANVAS_ADDR, 0 }; >>> - static const u32[] canvas4 = { 24, 0 }; >>> + static const u32 canvas3[] = { ANCO_CANVAS_ADDR, 0 }; >>> + static const u32 canvas4[] = { 24, 0 }; >> >> This is a patch on top of your previous (v1) patch. That won't work >> since the v1 is not merged, you need to make a patch against the current >> mainline code. >> > But Sir, since I have made changes in the code, and committed them, now, > if I open that file, it will contain those changes. Then should I > rewrite the patch body more accurately? You only committed the v1 change in your own repository, it's not in the upstream repository. And the patches you post must be against the upstream repository, not your own. 'git rebase -i' can be your friend here, it makes it easy to fold the second patch into the first, and then you only have to post the final version. Regards, Hans > >> Regards, >> >> Hans >> >>> >>> amvdec_set_canvases(sess, canvas3, canvas4); >>> >>> >>
WARNING: multiple messages have this Message-ID (diff)
From: Hans Verkuil <hverkuil@xs4all.nl> To: Mitali Borkar <mitaliborkar810@gmail.com>, martin.blumenstingl@googlemail.com, narmstrong@baylibre.com, mchehab@kernel.org, gregkh@linuxfoundation.org, khilman@baylibre.com Cc: linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, outreachy-kernel@googlegroups.com, linux-amlogic@lists.infradead.org, mitali_s@me.iitr.ac.in Subject: Re: Subject: [PATCH v2] staging: media: meson: vdec: declare u32 as static const appropriately Date: Tue, 13 Apr 2021 13:36:45 +0200 [thread overview] Message-ID: <69ffded9-548f-7595-8333-aebedae38de3@xs4all.nl> (raw) In-Reply-To: <YHV734NB4flpFjbF@kali> On 13/04/2021 13:09, Mitali Borkar wrote: > On Tue, Apr 13, 2021 at 09:26:01AM +0200, Hans Verkuil wrote: >> On 13/04/2021 08:27, Mitali Borkar wrote: >>> Declared 32 bit unsigned int as static constant inside a function >>> appropriately. >>> >>> Reported-by: kernel test robot <lkp@intel.com> >>> Signed-off-by: Mitali Borkar <mitaliborkar810@gmail.com> >>> --- >>> >>> Changes from v1:- Rectified the mistake by declaring u32 as static const >>> properly. >>> >>> drivers/staging/media/meson/vdec/codec_h264.c | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/staging/media/meson/vdec/codec_h264.c b/drivers/staging/media/meson/vdec/codec_h264.c >>> index ea86e9e1c447..80141b89a9f6 100644 >>> --- a/drivers/staging/media/meson/vdec/codec_h264.c >>> +++ b/drivers/staging/media/meson/vdec/codec_h264.c >>> @@ -287,8 +287,8 @@ static void codec_h264_resume(struct amvdec_session *sess) >>> struct amvdec_core *core = sess->core; >>> struct codec_h264 *h264 = sess->priv; >>> u32 mb_width, mb_height, mb_total; >>> - static const u32[] canvas3 = { ANCO_CANVAS_ADDR, 0 }; >>> - static const u32[] canvas4 = { 24, 0 }; >>> + static const u32 canvas3[] = { ANCO_CANVAS_ADDR, 0 }; >>> + static const u32 canvas4[] = { 24, 0 }; >> >> This is a patch on top of your previous (v1) patch. That won't work >> since the v1 is not merged, you need to make a patch against the current >> mainline code. >> > But Sir, since I have made changes in the code, and committed them, now, > if I open that file, it will contain those changes. Then should I > rewrite the patch body more accurately? You only committed the v1 change in your own repository, it's not in the upstream repository. And the patches you post must be against the upstream repository, not your own. 'git rebase -i' can be your friend here, it makes it easy to fold the second patch into the first, and then you only have to post the final version. Regards, Hans > >> Regards, >> >> Hans >> >>> >>> amvdec_set_canvases(sess, canvas3, canvas4); >>> >>> >> _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2021-04-13 11:37 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-13 6:27 Subject: [PATCH v2] staging: media: meson: vdec: declare u32 as static const appropriately Mitali Borkar 2021-04-13 6:27 ` Mitali Borkar 2021-04-13 6:54 ` [Outreachy kernel] " Julia Lawall 2021-04-13 6:54 ` Julia Lawall 2021-04-13 6:54 ` Julia Lawall 2021-04-13 6:58 ` Greg KH 2021-04-13 6:58 ` Greg KH 2021-04-13 7:26 ` Hans Verkuil 2021-04-13 7:26 ` Hans Verkuil 2021-04-13 11:09 ` Mitali Borkar 2021-04-13 11:09 ` Mitali Borkar 2021-04-13 11:36 ` Hans Verkuil [this message] 2021-04-13 11:36 ` Hans Verkuil
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=69ffded9-548f-7595-8333-aebedae38de3@xs4all.nl \ --to=hverkuil@xs4all.nl \ --cc=gregkh@linuxfoundation.org \ --cc=khilman@baylibre.com \ --cc=linux-amlogic@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-staging@lists.linux.dev \ --cc=martin.blumenstingl@googlemail.com \ --cc=mchehab@kernel.org \ --cc=mitali_s@me.iitr.ac.in \ --cc=mitaliborkar810@gmail.com \ --cc=narmstrong@baylibre.com \ --cc=outreachy-kernel@googlegroups.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.