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

From: Stephen Rothwell
Date: Thu Feb 07 2019 - 00:51:40 EST

Next message: Yizhuo Zhai: "Re: [PATCH] net: stmmac: Variable "val" in function sun8i_dwmac_set_syscon() could be uninitialized"
Previous message: Davidlohr Bueso: "Re: [PATCH -tip 0/2] more get_user_pages mmap_sem cleanups"
In reply to: Stephen Rothwell: "linux-next: manual merge of the scsi-mkp tree with the fixes tree"
Next in thread: Stephen Rothwell: "Re: linux-next: manual merge of the scsi-mkp tree with the fixes tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi all,

On Thu, 7 Feb 2019 15:47:47 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
> drivers/scsi/osd/osd_initiator.c
>
> between commit:
>
> 24648908acac ("scsi: osd: osd_initiator: mark expected switch fall-throughs")

I will remove that from my fixes tree for tomorrow.

--
Cheers,
Stephen Rothwell

Attachment: pgp2FioaIiK63.pgp
Description: OpenPGP digital signature

Next message: Yizhuo Zhai: "Re: [PATCH] net: stmmac: Variable "val" in function sun8i_dwmac_set_syscon() could be uninitialized"
Previous message: Davidlohr Bueso: "Re: [PATCH -tip 0/2] more get_user_pages mmap_sem cleanups"
In reply to: Stephen Rothwell: "linux-next: manual merge of the scsi-mkp tree with the fixes tree"
Next in thread: Stephen Rothwell: "Re: linux-next: manual merge of the scsi-mkp tree with the fixes tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]