Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

From: Martin K. Petersen
Date: Wed Aug 11 2021 - 23:25:45 EST

Next message: Chunfeng Yun: "[PATCH 2/6] usb: mtu3: fix the wrong HS mult value"
Previous message: Jason Wang: "Re: [RFC PATCH] virtio-net: use NETIF_F_GRO_HW instead of NETIF_F_LRO"
In reply to: Sreekanth Reddy: "Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Stephen,

> Today's linux-next merge of the scsi-mkp tree got conflicts in:
>
> drivers/scsi/mpt3sas/mpt3sas_base.c
> drivers/scsi/mpt3sas/mpt3sas_base.h

Fixed this up. Thanks!

--
Martin K. Petersen Oracle Linux Engineering

Next message: Chunfeng Yun: "[PATCH 2/6] usb: mtu3: fix the wrong HS mult value"
Previous message: Jason Wang: "Re: [RFC PATCH] virtio-net: use NETIF_F_GRO_HW instead of NETIF_F_LRO"
In reply to: Sreekanth Reddy: "Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]