Changes in Makefile

976e3645923bdd2fe7893aae33fd7a21098bfb28 - Merge branch 'next' into for-linus

Mon, 25 Nov 2019 22:26:56 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.5 merge window. List of files: /linux/drivers/misc/sgi-xp/Makefile

9f4813b531a0b8cc502fcfb142937fe4e9104d77 - Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixes

Tue, 19 Nov 2019 09:00:45 +0100

Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/misc/sgi-xp/Makefile

ac94be498f84f7327533b62faca4c3da64434904 - Merge branch 'linus' into x86/hyperv

Fri, 15 Nov 2019 10:30:50 +0100

Merge branch 'linus' into x86/hypervPick up upstream fixes to avoid conflicts. List of files: /linux/drivers/misc/sgi-xp/Makefile

728d90bdc9e480dc93913e59a0aa3c896c7aa697 - Merge tag 'v5.4-rc5' into next

Sun, 27 Oct 2019 19:00:19 +0100

Merge tag 'v5.4-rc5' into nextSync up with mainline. List of files: /linux/drivers/misc/sgi-xp/Makefile

112d6212c80a1c560757520bd822a41c0ad15c2c - Merge tag 'v5.4-rc3' into spi-5.4

Fri, 18 Oct 2019 19:30:49 +0200

Merge tag 'v5.4-rc3' into spi-5.4Linux 5.4-rc3 List of files: /linux/drivers/misc/sgi-xp/Makefile

fa41d6ee904266fa8739cafa6ec038c3a8e435b7 - Merge drm/drm-next into drm-intel-next-queued

Tue, 15 Oct 2019 10:18:26 +0200

Merge drm/drm-next into drm-intel-next-queuedBackmerging to pull in HDR DP code:https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.htmlSigned-off-by: Joonas Lahtinen List of files: /linux/drivers/misc/sgi-xp/Makefile

1913c7f3fc2514e09262baf2267a82dfdb215c39 - Merge tag 'fix-missing-panels' into fixes

Fri, 04 Oct 2019 18:06:41 +0200

Merge tag 'fix-missing-panels' into fixes List of files: /linux/drivers/misc/sgi-xp/Makefile

4092de1ba34eb376791809fb366bc15f8a9e0b7c - Merge drm/drm-next into drm-misc-next

Thu, 03 Oct 2019 16:38:50 +0200

Merge drm/drm-next into drm-misc-nextWe haven't done any backmerge for a while due to the merge window, and itstarts to become an issue for komeda. Let's bring 5.4-rc1 in.Signed-off-by: Maxime Ripard List of files: /linux/drivers/misc/sgi-xp/Makefile

77fdaa091d79c87323a9f3912a25f73e02ea2a01 - Merge drm/drm-fixes into drm-misc-fixes

Thu, 03 Oct 2019 09:59:29 +0200

Merge drm/drm-fixes into drm-misc-fixesWe haven't backmerged for a while, let's start the -rc period by pullingrc1.Signed-off-by: Maxime Ripard List of files: /linux/drivers/misc/sgi-xp/Makefile

76f0f227cffb570bc5ce343b1750f14907371d80 - Merge tag 'please-pull-ia64_for_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Tue, 17 Sep 2019 00:32:01 +0200

Merge tag 'please-pull-ia64_for_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linuxPull ia64 updates from Tony Luck: "The big change here is removal of support for SGI Altix"* tag 'please-pull-ia64_for_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: (33 commits) genirq: remove the is_affinity_mask_valid hook ia64: remove CONFIG_SWIOTLB ifdefs ia64: remove support for machvecs ia64: move the screen_info setup to common code ia64: move the ROOT_DEV setup to common code ia64: rework iommu probing ia64: remove the unused sn_coherency_id symbol ia64: remove the SGI UV simulator support ia64: remove the zx1 swiotlb machvec ia64: remove CONFIG_ACPI ifdefs ia64: remove CONFIG_PCI ifdefs ia64: remove the hpsim platform ia64: remove now unused machvec indirections ia64: remove support for the SGI SN2 platform drivers: remove the SGI SN2 IOC4 base support drivers: remove the SGI SN2 IOC3 base support qla2xxx: remove SGI SN2 support qla1280: remove SGI SN2 support misc/sgi-xp: remove SGI SN2 support char/mspec: remove SGI SN2 support ... List of files: /linux/drivers/misc/sgi-xp/Makefile

9726bfcdb977d6f78074fcc5dd23003b450c1f35 - misc/sgi-xp: remove SGI SN2 support

Tue, 13 Aug 2019 09:24:56 +0200

misc/sgi-xp: remove SGI SN2 supportNote this also marks xp broken on ia64 now, as the UV support, whichwas disable in generic kernels before actually never compiled due toundefined uv_gpa_to_soc_phys_ram and uv_gpa_in_mmr_space symbols sinceat least commit c2c9f1157414 ("x86: uv: update XPC to handle updatedBIOS interface").Signed-off-by: Christoph Hellwig Link: https://lkml.kernel.org/r/20190813072514.23299-11-hch@lst.deSigned-off-by: Tony Luck List of files: /linux/drivers/misc/sgi-xp/Makefile

498495dba268b20e8eadd7fe93c140c68b6cc9d2 - Merge branch 'fix/intel' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel

Mon, 08 Jan 2018 16:54:50 +0100

Merge branch 'fix/intel' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel List of files: /linux/drivers/misc/sgi-xp/Makefile

70a02f840c5113cd9255ce4c1b1848bb48b0bd21 - Merge tag 'v4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Fri, 29 Dec 2017 17:49:13 +0100

Merge tag 'v4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 4.15-rc5 List of files: /linux/drivers/misc/sgi-xp/Makefile

2ef6765ccaab2c69470d7049d9a9bf6456a6e666 - Merge tag 'drm-intel-next-2017-12-14' into gvt-next

Mon, 18 Dec 2017 09:29:37 +0100

Merge tag 'drm-intel-next-2017-12-14' into gvt-next- Fix documentation build issues (Randy, Markus)- Fix timestamp frequency calculation for perf on CNL (Lionel)- New DMC firmware for Skylake (Anusha)- GTT flush fixes and other GGTT write track and refactors (Chris)- Taint kernel when GPU reset fails (Chris)- Display workarounds organization (Lucas)- GuC and HuC initialization clean-up and fixes (Michal)- Other fixes around GuC submission (Michal)- Execlist clean-ups like caching ELSP reg offset and improving log readability (Chri\s)- Many other improvements on our logs and dumps (Chris)- Restore GT performance in headless mode with DMC loaded (Tvrtko)- Stop updating legacy fb parameters since FBC is not using anymore (Daniel)- More selftest improvements (Chris)- Preemption fixes and improvements (Chris)- x86/early-quirks improvements for Intel graphics stolen memory. (Joonas, Matthew)- Other improvements on Stolen Memory code to be resource centric. (Matthew)- Improvements and fixes on fence allocation/release (Chris).GVT:- fixes for two coverity scan errors (Colin)- mmio switch code refine (Changbin)- more virtual display dmabuf fixes (Tina/Gustavo)- misc cleanups (Pei)- VFIO mdev display dmabuf interface and gvt support (Tina)- VFIO mdev opregion support/fixes (Tina/Xiong/Chris)- workload scheduling optimization (Changbin)- preemption fix and temporal workaround (Zhenyu)- and misc fixes after refactor (Chris) List of files: /linux/drivers/misc/sgi-xp/Makefile

d21bd6898336a7892914d308d5e0868f0b863571 - Sync to v4.15-rc3 for security subsystem developers to work against.

Mon, 11 Dec 2017 07:01:08 +0100

Sync to v4.15-rc3 for security subsystem developers to work against. List of files: /linux/drivers/misc/sgi-xp/Makefile

6647852abc1fd74e9c5e0dcf404ea4cb9c929630 - Merge airlied/drm-next into drm-intel-next-queued

Fri, 08 Dec 2017 19:15:30 +0100

Merge airlied/drm-next into drm-intel-next-queuedChris requested this backmerge for a reconciliation ondrm_print.h between drm-misc-next and drm-intel-next-queuedSigned-off-by: Rodrigo Vivi List of files: /linux/drivers/misc/sgi-xp/Makefile

7b47c66cfa203288c43851260edeeb0fae56f692 - Merge arlied/drm-next into drm-misc-next

Mon, 04 Dec 2017 19:04:45 +0100

Merge arlied/drm-next into drm-misc-nextWe need to pull 66660d4cf21b (drm: add connector info/property fornon-desktop displays [v2]) into drm-misc-next to continue the developmentof the display rotation series.Effectively this also pulls 4.15-r2 into drm-misc-next.Signed-off-by: Gustavo Padovan List of files: /linux/drivers/misc/sgi-xp/Makefile

d218439feccafaa3e852bbaecc0d9f6110096b65 - Merge branch 'fix/amd' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-amd

Mon, 04 Dec 2017 18:59:52 +0100

Merge branch 'fix/amd' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-amd List of files: /linux/drivers/misc/sgi-xp/Makefile

cf40a76e7d5874bb25f4404eecc58a2e033af885 - Merge tag 'v4.15-rc1' into next-seccomp

Wed, 29 Nov 2017 02:47:41 +0100

Merge tag 'v4.15-rc1' into next-seccompLinux 4.15-rc1 List of files: /linux/drivers/misc/sgi-xp/Makefile

bc686442f8a601bccac1f22506ecdb4b0d62cadd - Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt

Tue, 28 Nov 2017 17:12:32 +0100

Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt List of files: /linux/drivers/misc/sgi-xp/Makefile