Re: [GIT PULL] please pull infiniband.git

2015-02-07 Thread Yann Droneaud
Hi, Le vendredi 06 février 2015 à 13:19 -0800, Roland Dreier a écrit : > > Please pull from > > git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git > tags/rdma-for-linus > > > One more last-second RDMA change

Re: [GIT PULL] please pull infiniband.git

2014-11-02 Thread Sagi Grimberg
On 11/2/2014 10:06 PM, Dave Airlie wrote: On 17 October 2014 08:52, Roland Dreier wrote: Hi Linus, Please pull from git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git tags/rdma-for-linus Main set of Infin

Re: [GIT PULL] please pull infiniband.git

2014-11-02 Thread Eli Cohen
On Mon, Nov 03, 2014 at 06:06:45AM +1000, Dave Airlie wrote: > On 17 October 2014 08:52, Roland Dreier wrote: > > Hi Linus, > > > > Please pull from > > > > git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git > > tags/rdma-for-linus > > > >

Re: [GIT PULL] please pull infiniband.git

2014-11-02 Thread Dave Airlie
On 17 October 2014 08:52, Roland Dreier wrote: > Hi Linus, > > Please pull from > > git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git > tags/rdma-for-linus > > > Main set of InfiniBand/RDMA updates for 3.18 mer

Re: [GIT PULL] please pull infiniband.git

2014-10-20 Thread Doug Ledford
On Thu, 2014-10-16 at 15:52 -0700, Roland Dreier wrote: > Hi Linus, > > Please pull from > > git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git > tags/rdma-for-linus > > > Main set of InfiniBand/RDMA updates f

Re: [GIT PULL] please pull infiniband.git

2014-09-27 Thread Or Gerlitz
On Wed, Sep 24, 2014 at 12:58 AM, Roland Dreier wrote: > Hi Linus, [..] > This is later and bigger than I would like, and the blame is all on > me: I got very busy with other stuff for a few weeks during the 3.17 > cycle, and didn't prepare this tree as soon as I should have. However > I don't th

Re: [GIT PULL] please pull infiniband.git

2013-11-19 Thread Or Gerlitz
On 18/11/2013 20:40, Roland Dreier wrote: Hi Linus, Please pull from git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git tags/rdma-for-linus Main batch of InfiniBand/RDMA changes for 3.13: - Re-enable fl

Re: [GIT PULL] please pull infiniband.git

2013-10-15 Thread Roland Dreier
On Mon, Oct 14, 2013 at 5:52 PM, Linus Torvalds wrote: > So get your act together, and push back on the people you are supposed > to manage. Because this is *not* acceptable for post-rc5, and I'm > giving this single warning. Next time, I'll just ignore the sh*t you > send me. > > Comprende? Fair

Re: [GIT PULL] please pull infiniband.git

2013-10-14 Thread Linus Torvalds
On Mon, Oct 14, 2013 at 11:16 AM, Roland Dreier wrote: > > Last batch of IB changes for 3.12: many mlx5 hardware driver fixes plus > one trivial semicolon cleanup. Quite frankly, these mlx5 updates don't look like regression fixes. They look like "continued development" to me, and seem to be thin

Re: [GIT PULL] please pull infiniband.git

2013-09-05 Thread David Miller
From: Linus Torvalds Date: Thu, 5 Sep 2013 09:42:05 -0700 > On Wed, Sep 4, 2013 at 5:31 PM, Stephen Rothwell > wrote: >> >> I am carrying the following merge fix patch for a semantic conflict >> between this tree and Dave's net-next tree: > > Ok. I haven't gotten David's pull request yet, and

Re: [GIT PULL] please pull infiniband.git

2013-09-05 Thread Linus Torvalds
On Wed, Sep 4, 2013 at 5:31 PM, Stephen Rothwell wrote: > > I am carrying the following merge fix patch for a semantic conflict > between this tree and Dave's net-next tree: Ok. I haven't gotten David's pull request yet, and unless I get it later today I'll probably forget this. David, mind remi

Re: [GIT PULL] please pull infiniband.git

2013-09-04 Thread Stephen Rothwell
Hi Linus, On Wed, 4 Sep 2013 10:03:38 -0700 Roland Dreier wrote: > > Please pull from > > git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git > tags/rdma-for-linus I am carrying the following merge fix patch for a semantic conflict between this tree and Dave's net-next tre

Re: [GIT PULL] please pull infiniband.git

2013-07-10 Thread Bart Van Assche
On 07/10/13 16:38, Roland Dreier wrote: On Wed, Jul 10, 2013 at 7:35 AM, Sebastian Riemer wrote: I've checked the commits on that tag and the following commit is not what we've agreed on: Sorry about that. The discussion was long and complex and I probably made a mistake in aplying the patc

Re: [GIT PULL] please pull infiniband.git

2013-07-10 Thread Roland Dreier
On Wed, Jul 10, 2013 at 7:35 AM, Sebastian Riemer wrote: > > I've checked the commits on that tag and the following commit is not > what we've agreed on: Sorry about that. The discussion was long and complex and I probably made a mistake in aplying the patches. Please me send a patch to fix the

Re: [GIT PULL] please pull infiniband.git

2013-07-10 Thread Sebastian Riemer
Hi Roland, I've checked the commits on that tag and the following commit is not what we've agreed on: commit 086f44f58855ae18bab19fb794cce6c6d2c6143b Author: Bart Van Assche IB/srp: Avoid skipping srp_reset_host() after a transport error Together with the following commit this results in t

Re: [GIT PULL] please pull infiniband.git

2013-04-05 Thread David Woodhouse
On Mon, 2013-03-25 at 09:42 -0700, Roland Dreier wrote: > Hi Linus, > > Please pull from > > git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git > tags/rdma-for-linus > Vinit Agnihotri (1): > IB/qib: change QLogic to Intel > firmware/Makefile

Re: [GIT PULL] please pull infiniband.git

2012-12-14 Thread Roland Dreier
On Fri, Dec 14, 2012 at 7:36 AM, Linus Torvalds wrote: >> Any problem with this tree, or did it just slip through the cracks? > > It was merged seven hours before your email. Forgot to check? No, just dumb-assery in how I fetched in one place and checked in another. Sorry. -- To unsubscribe from

Re: [GIT PULL] please pull infiniband.git

2012-12-14 Thread Linus Torvalds
On Fri, Dec 14, 2012 at 1:56 AM, Roland Dreier wrote: > > Any problem with this tree, or did it just slip through the cracks? It was merged seven hours before your email. Forgot to check? Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a

Re: [GIT PULL] please pull infiniband.git

2012-12-14 Thread Roland Dreier
On Mon, Dec 10, 2012 at 9:59 PM, Roland Dreier wrote: > Hi Linus, > > Please pull from > > git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git > tags/rdma-for-linus Hi Linus, Any problem with this tree, or did it just slip through the cracks? Thanks, Roland > ---

Re: [GIT PULL] please pull infiniband.git for-linus

2008-01-03 Thread Dave Dillow
On Thu, 2008-01-03 at 18:11 -0500, Rik van Riel wrote: > On Thu, 03 Jan 2008 15:20:09 -0500 > David Dillow <[EMAIL PROTECTED]> wrote: > > > diff --git a/drivers/infiniband/ulp/srp/ib_srp.c > > b/drivers/infiniband/ulp/srp/ib_srp.c > > index 950228f..6e7e3c8 100644 > > --- a/drivers/infiniband/ulp

Re: [GIT PULL] please pull infiniband.git for-linus

2008-01-03 Thread Rik van Riel
On Thu, 03 Jan 2008 15:20:09 -0500 David Dillow <[EMAIL PROTECTED]> wrote: > diff --git a/drivers/infiniband/ulp/srp/ib_srp.c > b/drivers/infiniband/ulp/srp/ib_srp.c > index 950228f..6e7e3c8 100644 > --- a/drivers/infiniband/ulp/srp/ib_srp.c > +++ b/drivers/infiniband/ulp/srp/ib_srp.c > @@ -423,8

Re: [GIT PULL] please pull infiniband.git for-linus

2008-01-03 Thread Roland Dreier
> @@ -423,8 +423,8 @@ static void srp_remove_work(struct work_struct *work) > list_del(&target->list); > spin_unlock(&target->srp_host->target_lock); > > -srp_remove_host(target->scsi_host); > scsi_remove_host(target->scsi_host); > +srp_remove_host(target->scsi_host)

Re: [GIT PULL] please pull infiniband.git for-linus

2008-01-03 Thread David Dillow
Subject: IB/srp: Fix list corruption/oops on module reload ib_srp doesn't clean up the transport attributes properly when unloading, so it leaves references around to free'd memory. The srp_remove_host() cannot go before the scsi_remove_host() call as the documented call sequence suggests, as it

Re: [GIT PULL] please pull infiniband.git for-linus

2008-01-03 Thread David Dillow
On Thu, 2008-01-03 at 10:56 -0800, Roland Dreier wrote: > > If we've got time before 2.6.24 final, I'd wait on this a bit. > > ib_srp:srp_remove_work() has them reversed as well, and I'm currently > > tracking down why it oopses when the srp_remove_host() happens before > > the scsi_remove_host

Re: [GIT PULL] please pull infiniband.git for-linus

2008-01-03 Thread Roland Dreier
> If we've got time before 2.6.24 final, I'd wait on this a bit. > ib_srp:srp_remove_work() has them reversed as well, and I'm currently > tracking down why it oopses when the srp_remove_host() happens before > the scsi_remove_host(), which is the documented call sequence. I think the best thi

Re: [GIT PULL] please pull infiniband.git for-linus

2008-01-03 Thread David Dillow
On Thu, 2008-01-03 at 10:29 -0800, Roland Dreier wrote: > Linus, please pull from > > master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git > for-linus > > This tree is also available from kernel.org mirrors at: > > git://git.kernel.org/pub/scm/linux/kernel/git/roland/infin

Re: [GIT PULL] please pull infiniband.git for-linus

2007-10-12 Thread Andrew Morton
On Thu, 11 Oct 2007 18:17:19 -0700 (PDT) David Miller <[EMAIL PROTECTED]> wrote: > From: Roland Dreier <[EMAIL PROTECTED]> > 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 l

Re: [ofa-general] Re: [GIT PULL] please pull infiniband.git for-linus

2007-10-12 Thread Roland Dreier
> > 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??

Re: [GIT PULL] please pull infiniband.git for-linus

2007-10-12 Thread Jeff Garzik
Linus Torvalds wrote: Oh, and obviously, the NAPI changes may well have resulted in a merge that had no actual *conflicts* in it, but whether the end result works or not (and whether any IB drivers need updating due to the NAPI changes), I cannot tell. I've pushed out my tree, so people who are

Re: [GIT PULL] please pull infiniband.git for-linus

2007-10-11 Thread Linus Torvalds
On Thu, 11 Oct 2007, Greg KH wrote: > On Thu, Oct 11, 2007 at 07:58:04PM -0700, Linus Torvalds wrote: > > > > So I merged it all, and I don't expect any problems, but I'm hoping > > somebody is thinking about that mod_devicetable.h/file2alias.c mess. > > > > I'm not entirely sure who to blame

Re: [GIT PULL] please pull infiniband.git for-linus

2007-10-11 Thread Greg KH
On Thu, Oct 11, 2007 at 07:58:04PM -0700, Linus Torvalds wrote: > > So I merged it all, and I don't expect any problems, but I'm hoping > somebody is thinking about that mod_devicetable.h/file2alias.c mess. > > I'm not entirely sure who to blame on that thing. I'm adding Greg to the > Cc, on th

Re: [GIT PULL] please pull infiniband.git for-linus

2007-10-11 Thread David Miller
From: Linus Torvalds <[EMAIL PROTECTED]> Date: Thu, 11 Oct 2007 19:58:04 -0700 (PDT) > > > On Thu, 11 Oct 2007, David Miller wrote: > > > > 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 pulled the net stuff first, and

Re: [GIT PULL] please pull infiniband.git for-linus

2007-10-11 Thread Linus Torvalds
On Thu, 11 Oct 2007, David Miller wrote: > > 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 pulled the net stuff first, and merged the IB stuff afterwards. No conflicts in IB, but there *were* conflicts with the networking pu

Re: [ofa-general] Re: [GIT PULL] please pull infiniband.git for-linus

2007-10-11 Thread David Miller
From: Roland Dreier <[EMAIL PROTECTED]> Date: Thu, 11 Oct 2007 19:21:06 -0700 > 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 > y

Re: [ofa-general] Re: [GIT PULL] please pull infiniband.git for-linus

2007-10-11 Thread Roland Dreier
> > 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,

Re: [GIT PULL] please pull infiniband.git for-linus

2007-10-11 Thread David Miller
From: Roland Dreier <[EMAIL PROTECTED]> 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

Re: [GIT PULL] please pull infiniband.git for-linus branch

2007-08-22 Thread Stefan Roscher
Hi Roland, On Thursday 16 August 2007 18:19, Roland Dreier wrote: > > Hmm, if these things are appropriate for 2.6.23, maybe my patch > > adding linux/mutex.h to ehca_classes.h can go in too? > > Actually I queued Dotan's patches quite a while ago, although Linus > seems to be ignoring my pull

Re: [GIT PULL] please pull infiniband.git for-linus branch

2007-08-16 Thread Roland Dreier
> Hmm, if these things are appropriate for 2.6.23, maybe my patch > adding linux/mutex.h to ehca_classes.h can go in too? Actually I queued Dotan's patches quite a while ago, although Linus seems to be ignoring my pull requests. I don't see any urgency in adding more similar patches to 2.6.23,

Re: [GIT PULL] please pull infiniband.git for-linus branch

2007-08-15 Thread Michael S. Tsirkin
> Dotan Barak (3): > IB: Include from > IB: Include and from Hmm, if these things are appropriate for 2.6.23, maybe my patch adding linux/mutex.h to ehca_classes.h can go in too? -- MST - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a me