From: Jason Gunthorpe <jgg@ziepe.ca>
To: Dennis Dalessandro <dennis.dalessandro@intel.com>
Cc: dledford@redhat.com, linux-rdma@vger.kernel.org,
"Michael J. Ruhl" <michael.j.ruhl@intel.com>,
Mike Marciniszyn <mike.marciniszyn@intel.com>,
stable@vger.kernel.org
Subject: Re: [PATCH for-rc 0/2] IB/hfi1: RC patches
Date: Tue, 11 Sep 2018 09:17:25 -0600 [thread overview]
Message-ID: <20180911151725.GA29149@ziepe.ca> (raw)
In-Reply-To: <20180910143437.10122.50679.stgit@scvm10.sc.intel.com>
On Mon, Sep 10, 2018 at 07:53:44AM -0700, Dennis Dalessandro wrote:
> Hi Doug and Jason,
>
> Here are two patches that should probably land in the RC. The first one ensures
> we don't index beyond the end of an array. The other is more subtle but arguably
> more important. The bug it fixes results in incorrect IRQ bits to be set and the
> result is we do not get an interrupt for an error and have to wait for another
> interrupt to fire to see said error.
>
>
> Dennis Dalessandro (1):
> IB/hfi1: Ensure ucast_dlid access doesnt exceed bounds
>
> Michael J. Ruhl (1):
> IB/hfi1: set_intr_bits uses incorrect source for register modification
These don't apply to current for-rc:
Applying: IB/hfi1: Ensure ucast_dlid access doesnt exceed bounds
Applying: IB/hfi1: set_intr_bits uses incorrect source for register modification
Using index info to reconstruct a base tree...
M drivers/infiniband/hw/hfi1/chip.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/infiniband/hw/hfi1/chip.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/chip.c
error: Failed to merge in the changes.
Patch failed at 0002 IB/hfi1: set_intr_bits uses incorrect source for register modification
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Jason
next prev parent reply other threads:[~2018-09-11 20:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-10 14:53 [PATCH for-rc 0/2] IB/hfi1: RC patches Dennis Dalessandro
2018-09-10 14:53 ` [PATCH for-rc 1/2] IB/hfi1: Ensure ucast_dlid access doesnt exceed bounds Dennis Dalessandro
2018-09-11 15:17 ` Jason Gunthorpe [this message]
2018-09-11 16:25 ` [PATCH for-rc 0/2] IB/hfi1: RC patches Dennis Dalessandro
2018-09-11 17:38 ` Jason Gunthorpe
2018-09-11 19:28 ` Dennis Dalessandro
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=20180911151725.GA29149@ziepe.ca \
--to=jgg@ziepe.ca \
--cc=dennis.dalessandro@intel.com \
--cc=dledford@redhat.com \
--cc=linux-rdma@vger.kernel.org \
--cc=michael.j.ruhl@intel.com \
--cc=mike.marciniszyn@intel.com \
--cc=stable@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).