From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751379AbcEKEQb (ORCPT ); Wed, 11 May 2016 00:16:31 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:37430 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750737AbcEKEQa (ORCPT ); Wed, 11 May 2016 00:16:30 -0400 Date: Wed, 11 May 2016 06:16:22 +0200 From: Kroah-Hartman To: YU Bo Cc: Kaur Chawla , Goyal , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, yuzibode@126.com Subject: Re: [PATCH] Staging: wlan-ng: fix comments style Message-ID: <20160511041622.GA28007@kroah.com> References: <20160508144513.GA10051@yubo-2> <20160509122613.GA29165@kroah.com> <20160511010514.GA3359@yubo-2> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160511010514.GA3359@yubo-2> User-Agent: Mutt/1.6.1 (2016-04-27) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > > --- > > > 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