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

From: Martin K. Petersen
Date: Wed Jul 10 2024 - 22:27:10 EST

Next message: Chengen Du: "Re: [PATCH v8] af_packet: Handle outgoing VLAN packets without hardware offloading"
Previous message: Boy Wu (吳勃誼): "Re: [PATCH v2] blk-cgroup: Replace u64_sync with blkg_stat_lock for stats update"
In reply to: Stephen Rothwell: "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 a conflict in:
>
> drivers/scsi/mpi3mr/mpi3mr_transport.c

Now resolved. Thanks!

--
Martin K. Petersen Oracle Linux Engineering

Next message: Chengen Du: "Re: [PATCH v8] af_packet: Handle outgoing VLAN packets without hardware offloading"
Previous message: Boy Wu (吳勃誼): "Re: [PATCH v2] blk-cgroup: Replace u64_sync with blkg_stat_lock for stats update"
In reply to: Stephen Rothwell: "linux-next: manual merge of the scsi-mkp tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]