lkml.org 
[lkml]   [2012]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH V2 3/3] staging: zram: conventions, line splitting
On Mon, Jun 11, 2012 at 03:08:13PM -0700, Sam Hansen wrote:
> >  drivers/staging/zram/zram_drv.c |    8 ++++----
> >  1 files changed, 4 insertions(+), 4 deletions(-)
> >
> > This patch no longer applies to the tree :(
>
> Hi Greg,
> I wrote the patch against Linus' tree
> <http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git>.
> Is it more appropriate to write code against your staging tree
> <http://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git>?
>
> Have I been writing code against the wrong tree? If so, I'm a huge
> tool and sorry for the confusion :p

Problem is, other zram changes just went into my tree, so they probably
conflicted with your changes as well.

So yes, it's best to work against my staging-next branch for coding
style cleanups, or the linux-next tree, either should be fine.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2012-06-12 04:41    [W:0.074 / U:0.644 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site