Re: [PATCH for-rc or next 0/2] Two small fixups

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Jul 01, 2021 at 11:50:51AM -0400, Dennis Dalessandro wrote:
> On 7/1/21 11:46 AM, Dennis Dalessandro wrote:
> > Hi Jason,
> >
> > These two small patches aren't realy fixing serious bugs. Maybe you want to
> > wait for 5.15 content, but they are small and have fixes lines. Maybe OK
> > for the RC, so wanted to get them out.
> >
> >
> > Mike Marciniszyn (2):
> >       IB/hfi1: Indicate DMA wait when txq is queued for wakeup
> >       IB/hfi1: Adjust pkey entry in index 0
> >
> >
> >  drivers/infiniband/hw/hfi1/init.c     |    7 +------
> >  drivers/infiniband/hw/hfi1/ipoib_tx.c |    3 +++
> >  2 files changed, 4 insertions(+), 6 deletions(-)
> >
> ^^^^^^^^^^^^^^^^^^^^ No clue how that got added. Looking into that right now.
> 

Oh yes, and it corrupted the diffs along the way too.

Using index info to reconstruct a base tree...
error: patch failed: drivers/infiniband/hw/hfi1/ipoib_tx.c:644
error: drivers/infiniband/hw/hfi1/ipoib_tx.c: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.

Discourage your IT department from mangling outgoing emails... Looks
like your site is using O365 - you may want to bypass your on prem
SMTP and submit directly to smtp.office365.com:587

This may help:

https://github.com/jgunthorpe/cloud_mdir_sync

Particularly the "outbound mail through smtp" section

Jason



[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]     [Yosemite Photos]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux