mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: rdreier@cisco.com
Cc: 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: Thu, 11 Oct 2007 18:17:19 -0700 (PDT)	[thread overview]
Message-ID: <20071011.181719.78707713.davem@davemloft.net> (raw)
In-Reply-To: <aday7e9b0m3.fsf@cisco.com>

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 really wish you would submit your inifiniband work through normal
network driver channels, such as Jeff Garzik.  Jeff has been syncing
on almost a daily basis with me so that I wouldn't have to worry about
changes coming out of left field and adding additional merge issues
for an already difficult merge.

Even if you're confident there won't be merge issues, could you just
wait for the net-2.6 stuff to go in first?

Thanks.

  reply	other threads:[~2007-10-12  1:17 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 [this message]
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
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=20071011.181719.78707713.davem@davemloft.net \
    --to=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