Messages in this thread | | | Subject | Re: linux-next: manual merge of the scsi-mkp tree with the fixes tree | From | "Gustavo A. R. Silva" <> | Date | Thu, 7 Feb 2019 07:15:38 -0600 |
| |
On 2/7/19 12:15 AM, Stephen Rothwell wrote: > Hi all, > > On Thu, 7 Feb 2019 16:51:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: >> >> On Thu, 7 Feb 2019 15:47:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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. > > And that same patch appears in the kspp-gustavo tree as well ... >
I will remove it from my tree.
Thanks, Stephen.
-- Gustavo
| |