Re: [Outreachy kernel] Re: [PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

2021-04-13 Thread Fabio M. De Francesco 
On Tuesday, April 13, 2021 12:56:36 PM CEST Mitali Borkar wrote:
> On Tue, Apr 13, 2021 at 01:44:32PM +0300, Sakari Ailus wrote:
> > On Tue, Apr 13, 2021 at 04:13:04PM +0530, Mitali Borkar wrote:
> > > On Tue, Apr 13, 2021 at 01:01:34PM +0300, Sakari Ailus wrote:
> > > > Hi Mitali,
> > > > 
> > > > Thanks for the update.
> > > > 
> > > > On Tue, Apr 13, 2021 at 10:46:06AM +0530, Mitali Borkar wrote:
> > > > > Reduced length of the line under 80 characters to meet
> > > > > linux-kernel
> > > > > coding style.
> > > > > 
> > > > > Signed-off-by: Mitali Borkar 
> > > > > ---
> > > > > 
> > > > > Changes from v1:- Reduced length of the line under 80 characters
> > > > > 
> > > > >  drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
> > > > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > > > 
> > > > > diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h
> > > > > b/drivers/staging/media/ipu3/include/intel-ipu3.h index
> > > > > 6a72c81d2b67..52dcc6cdcffc 100644
> > > > > --- a/drivers/staging/media/ipu3/include/intel-ipu3.h
> > > > > +++ b/drivers/staging/media/ipu3/include/intel-ipu3.h
> > > > > @@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
> > > > > 
> > > > >   */
> > > > >  
> > > > >  struct ipu3_uapi_ae_config {
> > > > >  
> > > > >   struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
> > > > > 
> > > > > - struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
> > > > > __aligned(32); +  struct ipu3_uapi_ae_weight_elem
> > > > > weights[IPU3_UAPI_AE_WEIGHTS] +   
__aligned(32);
> > > > 
> > > > Do you still have the other two patches in your tree? This doesn't
> > > > apply
> > > > here due to the different attribute syntax.
> > > 
> > > I have patch 1/6 and 2/6 in my tree which you asked me to drop.
> > 
> > Could you drop them and then submit v3?
> 
> I am extremely sorry Sir, but I am still learning to use git, drop them
> means to delete those commits? Even if I delete those, this patch was
> made after those, so the changes I made then will remain as it is, so
> what to do now?
> 
> > Thanks.
>
I think that this document can help:
https://kernelnewbies.org/GitTips

Fabio

Re: [PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

2021-04-13 Thread Sakari Ailus 
On Tue, Apr 13, 2021 at 04:26:36PM +0530, Mitali Borkar wrote:
> On Tue, Apr 13, 2021 at 01:44:32PM +0300, Sakari Ailus wrote:
> > On Tue, Apr 13, 2021 at 04:13:04PM +0530, Mitali Borkar wrote:
> > > On Tue, Apr 13, 2021 at 01:01:34PM +0300, Sakari Ailus wrote:
> > > > Hi Mitali,
> > > > 
> > > > Thanks for the update.
> > > > 
> > > > On Tue, Apr 13, 2021 at 10:46:06AM +0530, Mitali Borkar wrote:
> > > > > Reduced length of the line under 80 characters to meet linux-kernel
> > > > > coding style.
> > > > > 
> > > > > Signed-off-by: Mitali Borkar 
> > > > > ---
> > > > > 
> > > > > Changes from v1:- Reduced length of the line under 80 characters
> > > > > 
> > > > >  drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
> > > > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > > > 
> > > > > diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h 
> > > > > b/drivers/staging/media/ipu3/include/intel-ipu3.h
> > > > > index 6a72c81d2b67..52dcc6cdcffc 100644
> > > > > --- a/drivers/staging/media/ipu3/include/intel-ipu3.h
> > > > > +++ b/drivers/staging/media/ipu3/include/intel-ipu3.h
> > > > > @@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
> > > > >   */
> > > > >  struct ipu3_uapi_ae_config {
> > > > >   struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
> > > > > - struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS] 
> > > > > __aligned(32);
> > > > > + struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
> > > > > + __aligned(32);
> > > > 
> > > > Do you still have the other two patches in your tree? This doesn't apply
> > > > here due to the different attribute syntax.
> > > >
> > > I have patch 1/6 and 2/6 in my tree which you asked me to drop.
> > 
> > Could you drop them and then submit v3?
> >
> I am extremely sorry Sir, but I am still learning to use git, drop them
> means to delete those commits? Even if I delete those, this patch was
> made after those, so the changes I made then will remain as it is, so
> what to do now? 

No worries.

Yes, please remove the two commits, as you need to use the same (or at
least non-conflicting) baseline for the patches compared to the tree where
the patches will be applied.

So in practice what you need to do is to rebase these four patches on
linux-media tree's master branch and resolve the resulting conflict in this
patch (as the preceding patches no longer have the attribute changes).

The -i option for git rebase in particular is useful.

-- 
Sakari Ailus

Re: [PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

2021-04-13 Thread Mitali Borkar 
On Tue, Apr 13, 2021 at 01:44:32PM +0300, Sakari Ailus wrote:
> On Tue, Apr 13, 2021 at 04:13:04PM +0530, Mitali Borkar wrote:
> > On Tue, Apr 13, 2021 at 01:01:34PM +0300, Sakari Ailus wrote:
> > > Hi Mitali,
> > > 
> > > Thanks for the update.
> > > 
> > > On Tue, Apr 13, 2021 at 10:46:06AM +0530, Mitali Borkar wrote:
> > > > Reduced length of the line under 80 characters to meet linux-kernel
> > > > coding style.
> > > > 
> > > > Signed-off-by: Mitali Borkar 
> > > > ---
> > > > 
> > > > Changes from v1:- Reduced length of the line under 80 characters
> > > > 
> > > >  drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
> > > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > > 
> > > > diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h 
> > > > b/drivers/staging/media/ipu3/include/intel-ipu3.h
> > > > index 6a72c81d2b67..52dcc6cdcffc 100644
> > > > --- a/drivers/staging/media/ipu3/include/intel-ipu3.h
> > > > +++ b/drivers/staging/media/ipu3/include/intel-ipu3.h
> > > > @@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
> > > >   */
> > > >  struct ipu3_uapi_ae_config {
> > > > struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
> > > > -   struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS] 
> > > > __aligned(32);
> > > > +   struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
> > > > +   __aligned(32);
> > > 
> > > Do you still have the other two patches in your tree? This doesn't apply
> > > here due to the different attribute syntax.
> > >
> > I have patch 1/6 and 2/6 in my tree which you asked me to drop.
> 
> Could you drop them and then submit v3?
>
I am extremely sorry Sir, but I am still learning to use git, drop them
means to delete those commits? Even if I delete those, this patch was
made after those, so the changes I made then will remain as it is, so
what to do now? 

> Thanks.
> 
> -- 
> Sakari Ailus

Re: [PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

2021-04-13 Thread Sakari Ailus 
On Tue, Apr 13, 2021 at 04:13:04PM +0530, Mitali Borkar wrote:
> On Tue, Apr 13, 2021 at 01:01:34PM +0300, Sakari Ailus wrote:
> > Hi Mitali,
> > 
> > Thanks for the update.
> > 
> > On Tue, Apr 13, 2021 at 10:46:06AM +0530, Mitali Borkar wrote:
> > > Reduced length of the line under 80 characters to meet linux-kernel
> > > coding style.
> > > 
> > > Signed-off-by: Mitali Borkar 
> > > ---
> > > 
> > > Changes from v1:- Reduced length of the line under 80 characters
> > > 
> > >  drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h 
> > > b/drivers/staging/media/ipu3/include/intel-ipu3.h
> > > index 6a72c81d2b67..52dcc6cdcffc 100644
> > > --- a/drivers/staging/media/ipu3/include/intel-ipu3.h
> > > +++ b/drivers/staging/media/ipu3/include/intel-ipu3.h
> > > @@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
> > >   */
> > >  struct ipu3_uapi_ae_config {
> > >   struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
> > > - struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS] 
> > > __aligned(32);
> > > + struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
> > > + __aligned(32);
> > 
> > Do you still have the other two patches in your tree? This doesn't apply
> > here due to the different attribute syntax.
> >
> I have patch 1/6 and 2/6 in my tree which you asked me to drop.

Could you drop them and then submit v3?

Thanks.

-- 
Sakari Ailus

Re: [PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

2021-04-13 Thread Mitali Borkar 
On Tue, Apr 13, 2021 at 01:01:34PM +0300, Sakari Ailus wrote:
> Hi Mitali,
> 
> Thanks for the update.
> 
> On Tue, Apr 13, 2021 at 10:46:06AM +0530, Mitali Borkar wrote:
> > Reduced length of the line under 80 characters to meet linux-kernel
> > coding style.
> > 
> > Signed-off-by: Mitali Borkar 
> > ---
> > 
> > Changes from v1:- Reduced length of the line under 80 characters
> > 
> >  drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h 
> > b/drivers/staging/media/ipu3/include/intel-ipu3.h
> > index 6a72c81d2b67..52dcc6cdcffc 100644
> > --- a/drivers/staging/media/ipu3/include/intel-ipu3.h
> > +++ b/drivers/staging/media/ipu3/include/intel-ipu3.h
> > @@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
> >   */
> >  struct ipu3_uapi_ae_config {
> > struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
> > -   struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS] 
> > __aligned(32);
> > +   struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
> > +   __aligned(32);
> 
> Do you still have the other two patches in your tree? This doesn't apply
> here due to the different attribute syntax.
>
I have patch 1/6 and 2/6 in my tree which you asked me to drop.

> > struct ipu3_uapi_ae_ccm ae_ccm __aligned(32);
> >  } __packed;
> >  
> 
> -- 
> Kind regards,
> 
> Sakari Ailus

Re: [PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

2021-04-13 Thread Sakari Ailus 
Hi Mitali,

Thanks for the update.

On Tue, Apr 13, 2021 at 10:46:06AM +0530, Mitali Borkar wrote:
> Reduced length of the line under 80 characters to meet linux-kernel
> coding style.
> 
> Signed-off-by: Mitali Borkar 
> ---
> 
> Changes from v1:- Reduced length of the line under 80 characters
> 
>  drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h 
> b/drivers/staging/media/ipu3/include/intel-ipu3.h
> index 6a72c81d2b67..52dcc6cdcffc 100644
> --- a/drivers/staging/media/ipu3/include/intel-ipu3.h
> +++ b/drivers/staging/media/ipu3/include/intel-ipu3.h
> @@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
>   */
>  struct ipu3_uapi_ae_config {
>   struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
> - struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS] 
> __aligned(32);
> + struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
> + __aligned(32);

Do you still have the other two patches in your tree? This doesn't apply
here due to the different attribute syntax.

>   struct ipu3_uapi_ae_ccm ae_ccm __aligned(32);
>  } __packed;
>  

-- 
Kind regards,

Sakari Ailus

[PATCH v2 3/4] staging: media: intel-ipu3: reduce length of line

2021-04-12 Thread Mitali Borkar 
Reduced length of the line under 80 characters to meet linux-kernel
coding style.

Signed-off-by: Mitali Borkar 
---

Changes from v1:- Reduced length of the line under 80 characters

 drivers/staging/media/ipu3/include/intel-ipu3.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h 
b/drivers/staging/media/ipu3/include/intel-ipu3.h
index 6a72c81d2b67..52dcc6cdcffc 100644
--- a/drivers/staging/media/ipu3/include/intel-ipu3.h
+++ b/drivers/staging/media/ipu3/include/intel-ipu3.h
@@ -247,7 +247,8 @@ struct ipu3_uapi_ae_ccm {
  */
 struct ipu3_uapi_ae_config {
struct ipu3_uapi_ae_grid_config grid_cfg __aligned(32);
-   struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS] 
__aligned(32);
+   struct ipu3_uapi_ae_weight_elem weights[IPU3_UAPI_AE_WEIGHTS]
+   __aligned(32);
struct ipu3_uapi_ae_ccm ae_ccm __aligned(32);
 } __packed;
 
-- 
2.30.2