From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f196.google.com ([209.85.215.196]:42528 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726670AbeIKURO (ORCPT ); Tue, 11 Sep 2018 16:17:14 -0400 Received: by mail-pg1-f196.google.com with SMTP id y4-v6so12420623pgp.9 for ; Tue, 11 Sep 2018 08:17:28 -0700 (PDT) Date: Tue, 11 Sep 2018 09:17:25 -0600 From: Jason Gunthorpe To: Dennis Dalessandro Cc: dledford@redhat.com, linux-rdma@vger.kernel.org, "Michael J. Ruhl" , Mike Marciniszyn , stable@vger.kernel.org Subject: Re: [PATCH for-rc 0/2] IB/hfi1: RC patches Message-ID: <20180911151725.GA29149@ziepe.ca> References: <20180910143437.10122.50679.stgit@scvm10.sc.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180910143437.10122.50679.stgit@scvm10.sc.intel.com> Sender: stable-owner@vger.kernel.org List-ID: 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