linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Doug Ledford <dledford@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Dennis Dalessandro <dennis.dalessandro@intel.com>,
	Janani Ravichandran <janani.rvchndrn@gmail.com>,
	Amitoj Kaur Chawla <amitoj1606@gmail.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: linux-next: manual merge of the rdma tree with Linus' tree
Date: Tue, 22 Mar 2016 11:24:39 +1100	[thread overview]
Message-ID: <20160322112439.1456e965@canb.auug.org.au> (raw)

Hi Doug,

Today's linux-next merge of the rdma tree got conflicts in:

  drivers/staging/rdma/hfi1/keys.c
  drivers/staging/rdma/hfi1/mr.c

between commits:

  809487c70388 ("staging: rdma: hfi1: Use DIV_ROUND_UP")
  037f741673e0 ("staging: rdma: hfi1: Do not use | with a variable with value 0")

from Linus' tree and commit:

  895420ddc8b3 ("staging/rdma/hfi1: Remove hfi1 MR and hfi1 specific qp type")

from the rdma tree.

I fixed it up (I just removed the 2 files - the changes from Linus'
tree may need to be applied to some other files, now) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

             reply	other threads:[~2016-03-22  0:24 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-22  0:24 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-06-22  1:52 linux-next: manual merge of the rdma tree with Linus' tree Stephen Rothwell
2021-05-21  0:34 Stephen Rothwell
2021-04-15  2:05 Stephen Rothwell
2021-02-10  2:15 Stephen Rothwell
2021-02-10 18:57 ` Pearson, Robert B
2021-02-10 20:36   ` Jason Gunthorpe
2021-02-10 22:08     ` Pearson, Robert B
2021-02-11 20:03       ` Martin Wilck
2019-11-05  1:17 Stephen Rothwell
2019-11-05  2:21 ` Jason Gunthorpe
2019-11-05  2:28   ` Stephen Rothwell
2019-10-24  0:01 Stephen Rothwell
2019-10-28 19:30 ` Jason Gunthorpe
2019-06-20  2:10 Stephen Rothwell
2019-06-20  3:25 ` Doug Ledford
2019-06-20  2:06 Stephen Rothwell
2019-06-20  3:24 ` Doug Ledford
2019-06-14  3:00 Stephen Rothwell
2019-06-14 13:11 ` Doug Ledford
2018-09-28  0:01 Stephen Rothwell
2018-09-29  2:57 ` Parav Pandit
2018-08-06  2:01 Stephen Rothwell
2018-08-06 19:41 ` Jason Gunthorpe
2018-08-06 21:49   ` Stephen Rothwell
2017-08-08  2:11 Stephen Rothwell
2017-07-14  1:14 Stephen Rothwell
2017-07-14  1:17 ` Doug Ledford
2017-07-14  3:34   ` Leon Romanovsky
2017-07-14  3:50     ` Stephen Rothwell
2017-07-14  4:55       ` Leon Romanovsky
2017-07-14 12:03         ` Doug Ledford
2017-07-14 13:46           ` Leon Romanovsky
2017-07-14  4:12     ` Doug Ledford
2017-07-14  4:54       ` Leon Romanovsky
2017-07-14 14:33         ` Doug Ledford
2017-07-14 15:10           ` Leon Romanovsky
2016-12-15  0:47 Stephen Rothwell
2016-10-10  0:59 Stephen Rothwell
2016-10-10  0:54 Stephen Rothwell
2016-08-05  1:05 Stephen Rothwell
2016-08-05  1:01 Stephen Rothwell
2016-08-05  0:52 Stephen Rothwell
2016-05-19  1:45 Stephen Rothwell
2016-03-22  0:33 Stephen Rothwell
2016-03-22  0:29 Stephen Rothwell
2016-03-22  0:17 Stephen Rothwell
2015-11-01  7:48 Stephen Rothwell
2015-11-02 10:40 ` Sagi Grimberg

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=20160322112439.1456e965@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=amitoj1606@gmail.com \
    --cc=dennis.dalessandro@intel.com \
    --cc=dledford@redhat.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=janani.rvchndrn@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.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).