From: David Miller <davem@davemloft.net>
To: torvalds@linux-foundation.org
Cc: rdreier@cisco.com, akpm@linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT]: Networking for 2.6.30
Date: Thu, 26 Mar 2009 16:00:55 -0700 (PDT) [thread overview]
Message-ID: <20090326.160055.187303434.davem@davemloft.net> (raw)
In-Reply-To: <alpine.LFD.2.00.0903261555290.3032@localhost.localdomain>
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Mar 2009 15:56:24 -0700 (PDT)
> On Thu, 26 Mar 2009, David Miller wrote:
> >
> > Just FYI, I've just pushed a merge of the changes you pulled in today
> > in order to resolve the one merge conflict that arose.
>
> Well, I merged infiniband, and that caused more conflicts. I fixed them
> up, but people need to double-check my fixes.
Will do.
next prev parent reply other threads:[~2009-03-26 23:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-26 9:07 [GIT]: Networking for 2.6.30 David Miller
2009-03-26 9:41 ` Lorenzo Allegrucci
2009-03-26 22:25 ` David Miller
2009-03-26 22:56 ` Linus Torvalds
2009-03-26 23:00 ` David Miller [this message]
2009-03-26 23:25 ` RDMA/nes: Fix mis-merge Roland Dreier
2009-03-26 23:31 ` David Miller
2009-03-26 23:38 ` Linus Torvalds
2009-03-26 23:41 ` Linus Torvalds
2009-03-26 23:53 ` Roland Dreier
2009-03-27 7:29 ` David Miller
2009-03-26 23:48 ` Roland Dreier
2009-03-27 19:16 ` [PATCH] " Roland Dreier
2009-03-27 21:41 ` Linus Torvalds
2009-03-27 22:15 ` Roland Dreier
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=20090326.160055.187303434.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rdreier@cisco.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;
as well as URLs for NNTP newsgroup(s).