From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Sam Hansen <sam@meebo-inc.com>
Cc: devel@driverdev.osuosl.org,
Seth Jennings <sjenning@linux.vnet.ibm.com>,
Jerome Marchand <jmarchan@redhat.com>,
linux-kernel@vger.kernel.org, Nitin Gupta <ngupta@vflare.org>
Subject: Re: [PATCH V2 3/3] staging: zram: conventions, line splitting
Date: Mon, 11 Jun 2012 15:26:36 -0700 [thread overview]
Message-ID: <20120611222636.GA22569@kroah.com> (raw)
In-Reply-To: <CALJ0CeiibyAAJQC4kVxMLTEx=6dzZdzivpfHi4b3W-dst3Ha6w@mail.gmail.com>
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
next prev parent reply other threads:[~2012-06-11 22:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-07 20:20 [PATCH 0/3] Styleguide conformity Sam Hansen
2012-06-07 20:20 ` [PATCH 1/3] staging: zram: conventions pr_warning -> pr_warn() Sam Hansen
2012-06-08 7:34 ` Nitin Gupta
2012-06-07 20:20 ` [PATCH 2/3] staging: zram: conventions, __aligned() attribute Sam Hansen
2012-06-08 7:37 ` Nitin Gupta
2012-06-07 20:20 ` [PATCH 3/3] staging: zram: conventions, line splitting Sam Hansen
2012-06-07 20:28 ` Joe Perches
2012-06-07 20:30 ` sam hansen
2012-06-07 23:03 ` [PATCH V2 0/3] Styleguide conformity Sam Hansen
2012-06-07 23:03 ` [PATCH V2 1/3] staging: zram: conventions pr_warning -> pr_warn() Sam Hansen
2012-06-07 23:03 ` [PATCH V2 2/3] staging: zram: conventions, __aligned() attribute Sam Hansen
2012-06-07 23:03 ` [PATCH V2 3/3] staging: zram: conventions, line splitting Sam Hansen
2012-06-08 7:42 ` Nitin Gupta
2012-06-11 16:04 ` Greg Kroah-Hartman
2012-06-11 22:08 ` Sam Hansen
2012-06-11 22:26 ` Greg Kroah-Hartman [this message]
2012-06-11 22:29 ` Sam Hansen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120611222636.GA22569@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=devel@driverdev.osuosl.org \
--cc=jmarchan@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ngupta@vflare.org \
--cc=sam@meebo-inc.com \
--cc=sjenning@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox