Changes in Makefile

597473720f4dc69749542bfcfed4a927a43d935e - Merge branch 'next' into for-linus

Thu, 11 Jul 2019 08:24:10 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.3 merge window. List of files: /linux/drivers/vfio/platform/reset/Makefile

2a267e7c41aa88215de2b542de797d03d16ecdfd - Merge tag 'v5.1' into next

Fri, 10 May 2019 20:43:46 +0200

Merge tag 'v5.1' into nextSync up with mainline to bring in the latest APIs. List of files: /linux/drivers/vfio/platform/reset/Makefile

c3bdd5e65185f46150b3bac103b3854040487857 - Merge tag 'v5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mlx5-next

Tue, 23 Apr 2019 00:25:39 +0200

Merge tag 'v5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mlx5-nextLinux 5.1-rc1We forgot to reset the branch last merge window thus mlx5-next is outdatedand still based on 5.0-rc2. This merge commit is needed to sync mlx5-nextbranch with 5.1-rc1.Signed-off-by: Saeed Mahameed List of files: /linux/drivers/vfio/platform/reset/Makefile

95d002e0a34cb0f238abb39987f9980f325d8332 - Merge tag 'drm-intel-next-2019-04-04' into gvt-next

Tue, 16 Apr 2019 10:50:34 +0200

Merge tag 'drm-intel-next-2019-04-04' into gvt-nextMerge back drm-intel-next for engine name definition refinementand 54939ea0bd85 ("drm/i915: Switch to use HWS indices rather than addresses")that would need gvt fixes to depend on.Signed-off-by: Zhenyu Wang List of files: /linux/drivers/vfio/platform/reset/Makefile

9b0dcd0e5a27958b57e3e390f63c098d63a055da - Merge tag 'asoc-fix-v5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Thu, 11 Apr 2019 14:36:30 +0200

Merge tag 'asoc-fix-v5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v5.1A few core fixes along with the driver specific ones, mainly fixingsmall issues that only affect x86 platforms for various reasons (theirunusual machine enumeration mechanisms mainly, plus a fix for errorhandling in topology).There's some of the driver fixes that look larger than they are, likethe hdmi-codec changes which resulted in an indentation change, and mostof the other large changes are for new drivers like the STM32 changes. List of files: /linux/drivers/vfio/platform/reset/Makefile

3bfaf1f7044c6a3b1e00fcad2d0529f0da449d67 - Merge drm/drm-next into drm-misc-next

Wed, 10 Apr 2019 21:50:49 +0200

Merge drm/drm-next into drm-misc-nextFinally have a reason for a backmerge other than "it's been a while"!Backmerging drm-next to -misc-next to facilitate Rob Herring's work onPanfrost.Signed-off-by: Sean Paul List of files: /linux/drivers/vfio/platform/reset/Makefile

df7686101956929dcea410971656e34926773b88 - Merge tag 'v5.1-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Mon, 01 Apr 2019 13:12:09 +0200

Merge tag 'v5.1-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 5.1-rc3Sync with upstream (which now contains fbdev-v5.1 changes) toprepare a base for fbdev-v5.2 changes. List of files: /linux/drivers/vfio/platform/reset/Makefile

0e2f54f88b8b9bbdb3a73b6e67cffb402187c73f - Merge drm/drm-next into drm-intel-next-queued

Wed, 27 Mar 2019 17:23:53 +0100

Merge drm/drm-next into drm-intel-next-queuedThis is needed to get the fourcc code merged without conflicts.Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/vfio/platform/reset/Makefile

9d7b7bfbafba5e6cad609f1188243a7f0cd0d293 - Merge tag 'v5.1-rc2' into next-general

Wed, 27 Mar 2019 00:28:01 +0100

Merge tag 'v5.1-rc2' into next-generalMerge to Linux 5.1-rc2 for subsystems to work with. List of files: /linux/drivers/vfio/platform/reset/Makefile

249acb5f47df27109d74a0d904a5da56c8bac28f - Merge tag 'v5.1-rc1' into spi-5.2

Tue, 19 Mar 2019 14:12:32 +0100

Merge tag 'v5.1-rc1' into spi-5.2Linux 5.1-rc1 List of files: /linux/drivers/vfio/platform/reset/Makefile

c9e48084c88cf901ad0d99a889f2628a5622d90b - Merge tag 'v5.1-rc1' into regulator-5.2

Tue, 19 Mar 2019 14:12:18 +0100

Merge tag 'v5.1-rc1' into regulator-5.2Linux 5.1-rc1 List of files: /linux/drivers/vfio/platform/reset/Makefile

127470597b6b9466872d9794a80804ec95fff8ea - Merge tag 'v5.1-rc1' into asoc-5.2

Mon, 18 Mar 2019 12:15:09 +0100

Merge tag 'v5.1-rc1' into asoc-5.2Linux 5.1-rc1 List of files: /linux/drivers/vfio/platform/reset/Makefile

22d91ed32b653481f47e81719858678e8c92089e - Merge tag 'v5.1-rc1' into asoc-5.1

Mon, 18 Mar 2019 12:14:51 +0100

Merge tag 'v5.1-rc1' into asoc-5.1Linux 5.1-rc1 List of files: /linux/drivers/vfio/platform/reset/Makefile

a83b04232cec52a8a93700ab7f17a09500c558b8 - Merge tag 'vfio-v5.1-rc1' of git://github.com/awilliam/linux-vfio

Tue, 05 Mar 2019 03:56:36 +0100

Merge tag 'vfio-v5.1-rc1' of git://github.com/awilliam/linux-vfioPull VFIO updates from Alex Williamson: - Switch mdev to generic UUID API (Andy Shevchenko) - Fixup platform reset include paths (Masahiro Yamada) - Fix usage of MINORMASK (Chengguang Xu) - Remove noise from duplicate spapr table unsets (Alexey Kardashevskiy) - Restore device state after PM reset (Alex Williamson) - Ensure memory translation enabled for PCI ROM access (Eric Auger)* tag 'vfio-v5.1-rc1' of git://github.com/awilliam/linux-vfio: vfio_pci: Enable memory accesses before calling pci_map_rom vfio/pci: Restore device state on PM transition vfio/spapr_tce: Skip unsetting already unset table samples/vfio-mdev/mtty: expand minor range when registering chrdev region samples/vfio-mdev/mdpy: expand minor range when registering chrdev region samples/vfio-mdev/mbochs: expand minor range when registering chrdev region vfio: expand minor range when registering chrdev region vfio: platform: reset: fix up include directives to remove ccflags-y vfio-mdev: Switch to use new generic UUID API List of files: /linux/drivers/vfio/platform/reset/Makefile

3c8d7ef89bb8bd7d00910fa14d4dab14a8e0cf5a - vfio: platform: reset: fix up include directives to remove ccflags-y

Wed, 30 Jan 2019 03:52:31 +0100

vfio: platform: reset: fix up include directives to remove ccflags-yFor the include directive with double-quotes "", the preprocessorsearches the header in the relative path to the current file.Fix them up, and remove the header search path option.Signed-off-by: Masahiro Yamada Acked-by: Eric Auger Signed-off-by: Alex Williamson List of files: /linux/drivers/vfio/platform/reset/Makefile

664b0bae0b87f69bc9deb098f5e0158b9cf18e04 - Merge branch 'next' into for-linus

Thu, 05 Apr 2018 01:11:49 +0200

Merge branch 'next' into for-linusPrepare input updates for 4.17 merge window. List of files: /linux/drivers/vfio/platform/reset/Makefile

10a558374f3751cf4eb55143008975641dfc2cf4 - Merge tag 'v4.15' into next

Thu, 01 Feb 2018 09:41:33 +0100

Merge tag 'v4.15' into nextSync with mainline to get in trackpoint updates and other changes. List of files: /linux/drivers/vfio/platform/reset/Makefile

7e86548e2cc8d308cb75439480f428137151b0de - Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes

Tue, 30 Jan 2018 15:08:27 +0100

Merge tag 'v4.15' into x86/pti, to be able to merge dependent changesTime has come to switch PTI development over to a v4.15 base - we'll stilltry to make sure that all PTI fixes backport cleanly to v4.14 and earlier.Signed-off-by: Ingo Molnar List of files: /linux/drivers/vfio/platform/reset/Makefile

ddb9e13af3bba3f8c36ccee0eb9563a82b425c12 - Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Mon, 29 Jan 2018 15:54:46 +0100

Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux List of files: /linux/drivers/vfio/platform/reset/Makefile

0b5eca67bd2d0e6f6d0ccdc316aced0cc4bf2e9f - Merge branches 'topic/twl4030' and 'topic/twl6040' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-twl-breakage

Thu, 25 Jan 2018 19:16:26 +0100

Merge branches 'topic/twl4030' and 'topic/twl6040' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-twl-breakage List of files: /linux/drivers/vfio/platform/reset/Makefile