From: Roland Dreier <rdreier@cisco.com>
To: David Miller <davem@davemloft.net>
Cc: jeff@garzik.org, torvalds@linux-foundation.org,
linux-kernel@vger.kernel.org, general@lists.openfabrics.org
Subject: Re: [ofa-general] Re: [GIT PULL] please pull infiniband.git for-linus
Date: Thu, 11 Oct 2007 19:21:06 -0700 [thread overview]
Message-ID: <adatzoxax9p.fsf@cisco.com> (raw)
In-Reply-To: <20071011.181719.78707713.davem@davemloft.net> (David Miller's message of "Thu, 11 Oct 2007 18:17:19 -0700 (PDT)")
> > 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'm not absolutely sure of anything but I have merged our two git
trees quite a few times during the 2.6.23 cycle and I have not seen
any conflicts. Unless you've added some more IB changes very recently
I don't think there should be any problem.
> 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.
I'm not sure what you mean. During the 2.6.23 cycle I've been sending
any patches that potentially could conflict with the net-2.6 tree to
you and Jeff so that you can merge them upstream via your tree. Or do
you mean Jeff should become the maintainer of drivers/infiniband??
Can't you guys just keep the networking stuff contained in its little
box so it doesn't create maintenance problems for InfiniBand stuff?
> 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?
I don't mind waiting but I guess it's up to Linus really.
- R.
next prev parent reply other threads:[~2007-10-12 2:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-12 1:08 [GIT PULL] please pull infiniband.git for-linus Roland Dreier
2007-10-12 1:17 ` David Miller
2007-10-12 2:21 ` Roland Dreier [this message]
2007-10-12 2:36 ` [ofa-general] " 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
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=adatzoxax9p.fsf@cisco.com \
--to=rdreier@cisco.com \
--cc=davem@davemloft.net \
--cc=general@lists.openfabrics.org \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--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