mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: David Miller <davem@davemloft.net>
Cc: rdreier@cisco.com, torvalds@linux-foundation.org,
	general@lists.openfabrics.org, linux-kernel@vger.kernel.org,
	jeff@garzik.org
Subject: Re: [GIT PULL] please pull infiniband.git for-linus
Date: Fri, 12 Oct 2007 18:10:19 -0700	[thread overview]
Message-ID: <20071012181019.3bb138cd.akpm@linux-foundation.org> (raw)
In-Reply-To: <20071011.181719.78707713.davem@davemloft.net>

On Thu, 11 Oct 2007 18:17:19 -0700 (PDT)
David Miller <davem@davemloft.net> wrote:

> From: Roland Dreier <rdreier@cisco.com>
> Date: Thu, 11 Oct 2007 18:08:52 -0700
> 
> > This will get the batch of changes queued up for the 2.6.24 merge
> > window (although I still have a few more things to merge later, once
> > Dave Miller's networking tree has landed too):
> 
> Roland are you absolutely sure this won't create merge conflicts with
> my 8MB net-2.6 merge, inside of which there are many infiniband
> driver changes?

I'd have told him if there were any such problems.

There might of course be runtime problems, but I'm sure the infiniband
developers are testing -mm kernels so that any such problems will be
picked up beforehand (heh, I kill me).


  parent reply	other threads:[~2007-10-13  1:10 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-12  1:08 Roland Dreier
2007-10-12  1:17 ` David Miller
2007-10-12  2:21   ` [ofa-general] " Roland Dreier
2007-10-12  2:36     ` David Miller
2007-10-12 13:07       ` Roland Dreier
2007-10-12  2:58   ` Linus Torvalds
2007-10-12  3:28     ` David Miller
2007-10-12  3:52     ` Greg KH
2007-10-12  4:03       ` Linus Torvalds
2007-10-12 22:19         ` Redesigning file2alias for easy merging (bits of kbuild/kconfig) Oleg Verych
2007-10-12 12:58     ` [GIT PULL] please pull infiniband.git for-linus Jeff Garzik
2007-10-13  1:10   ` Andrew Morton [this message]
2007-10-13 21:17 Roland Dreier
2008-01-03 18:29 Roland Dreier
2008-01-03 18:39 ` David Dillow
2008-01-03 18:56   ` Roland Dreier
2008-01-03 20:13     ` David Dillow
2008-01-03 20:20       ` David Dillow
2008-01-03 21:34         ` Roland Dreier
2008-01-03 23:11         ` Rik van Riel
2008-01-03 23:18           ` Dave Dillow

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=20071012181019.3bb138cd.akpm@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=davem@davemloft.net \
    --cc=general@lists.openfabrics.org \
    --cc=jeff@garzik.org \
    --cc=linux-kernel@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

Powered by JetHome