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

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

Subject: Re: linux-next: manual merge of the scsi-mkp tree with the block tree
From: Christoph Hellwig <hch@xxxxxx>
Date: Thu, 18 Apr 2024 07:57:07 +0200
Cc: "Martin K. Petersen" <martin.petersen@xxxxxxxxxx>, Jens Axboe <axboe@xxxxxxxxx>, Christoph Hellwig <hch@xxxxxx>, Damien Le Moal <dlemoal@xxxxxxxxxx>, Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx>, Linux Next Mailing List <linux-next@xxxxxxxxxxxxxxx>
In-reply-to: <20240418145554.7a93325b@canb.auug.org.au>
References: <20240418145554.7a93325b@canb.auug.org.au>
User-agent: Mutt/1.5.17 (2007-11-01)

Thanks Stephen,

the conflict resolution looks good to me.

References:
- linux-next: manual merge of the scsi-mkp tree with the block tree
  - From: Stephen Rothwell

Prev by Date: linux-next: manual merge of the scsi-mkp tree with the block tree
Next by Date: linux-next: build warning after merge of the drm-intel tree
Previous by thread: linux-next: manual merge of the scsi-mkp tree with the block tree
Next by thread: Re: linux-next: manual merge of the scsi-mkp tree with the block tree
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel] [Linux USB Development] [Yosemite News] [Linux SCSI]

Powered by Linux