John Hubbard e170672040 phy: fix build breakage: add PHY_MODE_SATA ... Commit 49e54187ae ("ata: libahci_platform: comply to PHY framework") uses the PHY_MODE_SATA, but that enum had not yet been added. This caused a build failure for me, with today's linux.git. Also, there is a potentially conflicting (mis-named) PHY_MODE_SATA, hiding in the Marvell Berlin SATA PHY driver. Fix the build by: 1) Renaming Marvell's defined value to a more scoped name, in order to avoid any potential conflicts: PHY_BERLIN_MODE_SATA. 2) Adding the missing enum, which was going to be added anyway as part of [1]. [1] https://lkml.kernel.org/r/20190108163124.6409-3-miquel.raynal@bootlin.com Fixes: 49e54187ae ("ata: libahci_platform: comply to PHY framework") Signed-off-by: John Hubbard <jhubbard@nvidia.com> Acked-by: Jens Axboe <axboe@kernel.dk> Acked-by: Olof Johansson <olof@lixom.net> Cc: Grzegorz Jaszczyk <jaz@semihalf.com> Cc: Miquel Raynal <miquel.raynal@bootlin.com> Cc: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2019-01-12 21:07:14 -08:00
..
acpi	Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-12-26 17:03:51 -08:00
asm-generic	Merge branch 'akpm' (patches from Andrew)	2019-01-05 09:16:18 -08:00
clocksource
crypto
drm	Merge tag 'drm-intel-fixes-2019-01-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes	2019-01-11 10:26:21 +01:00
dt-bindings	Merge branch 'next/drivers' into next/late	2019-01-04 14:31:38 -08:00
keys
kvm
linux	phy: fix build breakage: add PHY_MODE_SATA	2019-01-12 21:07:14 -08:00
math-emu
media
memory
misc
net	Remove 'type' argument from access_ok() function	2019-01-03 18:57:57 -08:00
pcmcia
ras
rdma
scsi	4.21 merge window pull request	2018-12-28 14:57:10 -08:00
soc	ARM: SoC driver updates	2018-12-31 17:32:35 -08:00
sound
target
trace	NFS client updates for Linux 4.21	2019-01-02 16:35:23 -08:00
uapi	Fix a handful of audit-related issue	2019-01-07 08:45:47 -08:00
video
xen