Hi Hillf, 2016-04-29 Hillf Danton <[email protected]>:
> > > > From: Gustavo Padovan <[email protected]> > > > > struct sync_merge_data already have documentation on top of the > > struct definition. No need to duplicate it. > > > > Signed-off-by: Gustavo Padovan <[email protected]> > > Reviewed-by: Maarten Lankhorst <[email protected]> > > Reviewed-by: Daniel Vetter <[email protected]> > > --- > > drivers/staging/android/uapi/sync.h | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/staging/android/uapi/sync.h > > b/drivers/staging/android/uapi/sync.h > > index 7de5d6a..413303d 100644 > > --- a/drivers/staging/android/uapi/sync.h > > +++ b/drivers/staging/android/uapi/sync.h > > @@ -23,9 +23,9 @@ > > * @pad: padding for 64-bit alignment, should always be zero > > */ > > struct sync_merge_data { > > - char name[32]; /* name of new fence */ > > - __s32 fd2; /* fd of second fence */ > > - __s32 fence; /* fd on newly created fence */ > > + char name[32]; > > + __s32 fd2; > > + __s32 fence; > > __u32 flags; > > __u32 pad; > > }; > > @@ -33,8 +33,8 @@ struct sync_merge_data { > > /** > > * struct sync_fence_info - detailed fence information > > * @obj_name: name of parent sync_timeline > > - * @driver_name: name of driver implementing the parent > > - * @status: status of the fence 0:active 1:signaled <0:error > > +* @driver_name: name of driver implementing the parent > > +* @status: status of the fence 0:active 1:signaled <0:error > > Would you please specify why this hunk is needed, with > fence info not mentioned in commit message? This shouldn't be here. Probably some leftover from a rebase that I didn't notice. Thanks for pointing it out. I'll update this patch. Gustavo
