Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1396437 > unrolled thread
| Started by | YU Bo <tsu.yubo@gmail.com> |
|---|---|
| First post | 2016-05-08 16:50 +0200 |
| Last post | 2016-05-11 06:20 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] Staging: wlan-ng: fix comments style YU Bo <tsu.yubo@gmail.com> - 2016-05-08 16:50 +0200
Re: [PATCH] Staging: wlan-ng: fix comments style Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-05-09 14:30 +0200
Re: [PATCH] Staging: wlan-ng: fix comments style YU Bo <tsu.yubo@gmail.com> - 2016-05-11 03:10 +0200
Re: [PATCH] Staging: wlan-ng: fix comments style Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-05-11 06:20 +0200
| From | YU Bo <tsu.yubo@gmail.com> |
|---|---|
| Date | 2016-05-08 16:50 +0200 |
| Subject | [PATCH] Staging: wlan-ng: fix comments style |
| Message-ID | <rwybT-rs-3@gated-at.bofh.it> |
The patch fixed warning reported by checkpatch.pl: Block comments use a trailing */ on a separate line. Signed-off-by: YU Bo <tsu.yubo@gmail.com> --- drivers/staging/wlan-ng/prism2mgmt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/prism2mgmt.h b/drivers/staging/wlan-ng/prism2mgmt.h index e6472034da33..371c0fe8ae9d 100644 --- a/drivers/staging/wlan-ng/prism2mgmt.h +++ b/drivers/staging/wlan-ng/prism2mgmt.h @@ -82,10 +82,10 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp); int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp); int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp); -/*--------------------------------------------------------------- +/* * conversion functions going between wlan message data types and * Prism2 data types ----------------------------------------------------------------*/ +*/ /* byte area conversion functions*/ void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len); -- 1.7.10.4
[toc] | [next] | [standalone]
| From | Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-05-09 14:30 +0200 |
| Message-ID | <rwStY-5zM-27@gated-at.bofh.it> |
| In reply to | #1396437 |
On Sun, May 08, 2016 at 10:45:16AM -0400, YU Bo wrote: > The patch fixed warning reported by checkpatch.pl: Block comments use a > trailing */ on a separate line. > > Signed-off-by: YU Bo <tsu.yubo@gmail.com> > --- > drivers/staging/wlan-ng/prism2mgmt.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Patch doesn't apply to my tree, what branch did you make this against? thanks, greg k-h
[toc] | [prev] | [next] | [standalone]
| From | YU Bo <tsu.yubo@gmail.com> |
|---|---|
| Date | 2016-05-11 03:10 +0200 |
| Message-ID | <rxqOZ-65m-3@gated-at.bofh.it> |
| In reply to | #1397010 |
Hi Greg, On Mon, May 09, 2016 at 02:26:13PM +0200, Kroah-Hartman wrote: >On Sun, May 08, 2016 at 10:45:16AM -0400, YU Bo wrote: >> The patch fixed warning reported by checkpatch.pl: Block comments use a >> trailing */ on a separate line. >> >> Signed-off-by: YU Bo <tsu.yubo@gmail.com> >> --- >> drivers/staging/wlan-ng/prism2mgmt.h | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > >Patch doesn't apply to my tree, what branch did you make this against? Thanks for your reply. I made two branches on your tree:little,greg. Each time i went into a branch and type: git fetch origin && git rebase origin/staging-testing then i repated on different branch. Sure,i will reset my commit before these operations. Due to network issue,i have to make patch on local kernel and `scp` patch to my VPS then send you via mutt.It's ok for me to git am xx_xx.patch but fail to apply git am xx_xx.mbox which save from mutt sometime:( I will try to send you a series of patch and test it ok. Thanks again. > >thanks, > >greg k-h
[toc] | [prev] | [next] | [standalone]
| From | Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-05-11 06:20 +0200 |
| Message-ID | <rxtMS-Fp-9@gated-at.bofh.it> |
| In reply to | #1398622 |
On Tue, May 10, 2016 at 09:05:15PM -0400, YU Bo wrote: > Hi Greg, > On Mon, May 09, 2016 at 02:26:13PM +0200, Kroah-Hartman wrote: > > On Sun, May 08, 2016 at 10:45:16AM -0400, YU Bo wrote: > > > The patch fixed warning reported by checkpatch.pl: Block comments use a > > > trailing */ on a separate line. > > > > > > Signed-off-by: YU Bo <tsu.yubo@gmail.com> > > > --- > > > drivers/staging/wlan-ng/prism2mgmt.h | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > Patch doesn't apply to my tree, what branch did you make this against? > Thanks for your reply. > I made two branches on your tree:little,greg. > Each time i went into a branch and type: > git fetch origin && git rebase origin/staging-testing Ok, good, that is the correct branch, I guess we just got out of sync here, sorry about that. Try to rebase and resend. thanks, greg k-h
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web