From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Eric Paris <eparis@redhat.com>
Cc: Linus <torvalds@linux-foundation.org>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Jaegeuk Kim <jaegeuk.kim@samsung.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Kees Cook <keescook@google.com>
Subject: Re: linux-next: recent rebases
Date: Wed, 12 Dec 2012 09:19:45 +1100 [thread overview]
Message-ID: <20121212091945.5ae4dab6e6716fdb4239201e@canb.auug.org.au> (raw)
In-Reply-To: <1355263123.3527.27.camel@localhost>
[-- Attachment #1: Type: text/plain, Size: 637 bytes --]
Hi Eric,
On Tue, 11 Dec 2012 16:58:43 -0500 Eric Paris <eparis@redhat.com> wrote:
>
> On Wed, 2012-12-12 at 08:41 +1100, Stephen Rothwell wrote:
> >
> > fsnotify: rebased to v3.6(!) to resolve a conflict.
> > git://git.infradead.org/users/eparis/notify.git#for-next
>
> I planned to let it sit in -next until at least next thursday before I
> sent a pull request. Thought that fit within the rules...
No worries, just noting. Though you could have just done a merge against
v3.6 with an explanation in the merge changelog of why it was done.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2012-12-11 22:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-11 21:41 Stephen Rothwell
2012-12-11 21:58 ` Eric Paris
2012-12-11 22:19 ` Stephen Rothwell [this message]
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=20121212091945.5ae4dab6e6716fdb4239201e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=eparis@redhat.com \
--cc=jaegeuk.kim@samsung.com \
--cc=keescook@google.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=torvalds@linux-foundation.org \
/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
all inboxes | Powered by JetHome®