From: Theodore Ts'o <tytso@mit.edu>
To: David Miller <davem@davemloft.net>
Cc: dborkman@redhat.com, sfr@canb.auug.org.au,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
hannes@stressinduktion.org, netdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the random tree with the net-next tree
Date: Tue, 12 Nov 2013 18:24:55 -0500 [thread overview]
Message-ID: <20131112232455.GB1643@thunk.org> (raw)
In-Reply-To: <20131112.181717.2152470373264166279.davem@davemloft.net>
On Tue, Nov 12, 2013 at 06:17:17PM -0500, David Miller wrote:
> > Agreed. What's the schedule for pushing net-dev to Linus? I'm
> > currently at Korea Linux Forum, and I was originally planning on
> > pushing random.git to Linus sometime today, but I'm also willing to
> > wait for net-dev to go first. Either way, we should make sure Linus
> > is aware of the agreed-upon resolution of the merge conflict.
>
> Linus is going to pull it soon, I sent the pull request last night but
> he was away from decent internet access at the time.
Great, I'll wait for net-dev to show up in Linus's tree before I send
the pull request for random.git.
Thanks,
- Ted
prev parent reply other threads:[~2013-11-12 23:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-12 4:55 linux-next: manual merge of the random tree with the net-next tree Stephen Rothwell
2013-11-12 4:55 ` Stephen Rothwell
2013-11-12 8:55 ` Daniel Borkmann
2013-11-12 20:46 ` Stephen Rothwell
2013-11-14 15:17 ` Markos Chandras
2013-11-14 15:17 ` Markos Chandras
2013-11-12 23:02 ` Theodore Ts'o
2013-11-12 23:13 ` Hannes Frederic Sowa
2013-11-12 23:17 ` David Miller
2013-11-12 23:24 ` Theodore Ts'o [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=20131112232455.GB1643@thunk.org \
--to=tytso@mit.edu \
--cc=davem@davemloft.net \
--cc=dborkman@redhat.com \
--cc=hannes@stressinduktion.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.