Changes in Makefile

d0034a7a4ac7fae708146ac0059b9c47a1543f0d - Merge branch 'next' into for-linus

Tue, 04 May 2021 20:46:00 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.13 merge window. List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

b7f8f259896f669f131713b0c74ba4d008daa71d - Merge tag 'v5.12-rc7' into ecryptfs/next

Mon, 19 Apr 2021 06:39:17 +0200

Merge tag 'v5.12-rc7' into ecryptfs/nextRequired to pick up idmapped mount changes which changed some functionparameters. List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

5acac83bf2e42f51ab9fd315d657798754bf0bb8 - Merge tag 'v5.12-rc4' into next

Thu, 25 Mar 2021 19:46:10 +0100

Merge tag 'v5.12-rc4' into nextSync up with the mainline to bring in newest APIs. List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5 - Merge drm/drm-next into drm-misc-next

Tue, 16 Mar 2021 09:06:23 +0100

Merge drm/drm-next into drm-misc-nextNoralf needs some patches in 5.12-rc3, and we've been delaying the 5.12merge due to the swap issue so it looks like a good time.Signed-off-by: Maxime Ripard List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

b470ebc9e0e57f53d1db9c49b8a3de4086babd05 - Merge tag 'irqchip-fixes-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Sun, 14 Mar 2021 16:34:35 +0100

Merge tag 'irqchip-fixes-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgentPull irqchip fixes from Marc Zyngier: - More compatible strings for the Ingenic irqchip (introducing the JZ4760B SoC) - Select GENERIC_IRQ_MULTI_HANDLER on the ARM ep93xx platform - Drop all GENERIC_IRQ_MULTI_HANDLER selections from the irqchip Kconfig, now relying on the architecture to get it right - Drop the debugfs_file field from struct irq_domain, now that debugfs can track things on its own List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

35bb28ece90dfb7f72b77ba529f25f79323d9581 - Merge drm/drm-next into drm-intel-next

Thu, 11 Mar 2021 07:19:46 +0100

Merge drm/drm-next into drm-intel-nextSync up with upstream.Signed-off-by: Jani Nikula List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

4c9f4865f4604744d4f1a43db22ac6ec9dc8e587 - Merge branch 'fixes-rc2' into fixes

Mon, 08 Mar 2021 10:34:12 +0100

Merge branch 'fixes-rc2' into fixes List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

cdd38c5f1ce4398ec58fec95904b75824daab7b5 - Merge remote-tracking branch 'net/master'

Wed, 24 Feb 2021 13:36:58 +0100

Merge remote-tracking branch 'net/master' List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

72d6e4871f0457dc9e498f8437ea344ee6b78075 - Merge commit '3e10585335b7967326ca7b4118cada0d2d00a2ab' into v5.12/vfio/next

Mon, 22 Feb 2021 18:14:24 +0100

Merge commit '3e10585335b7967326ca7b4118cada0d2d00a2ab' into v5.12/vfio/nextUpdate to new follow_pte() definition List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

3e89c7ea7a828fec5694101e0f0ff7240e634470 - Merge tag 'ras_updates_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Sun, 21 Feb 2021 04:06:34 +0100

Merge tag 'ras_updates_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tipPull RAS updates from Borislav Petkov: - move therm_throt.c to the thermal framework, where it belongs. - identify CPUs which miss to enter the broadcast handler, as an additional debugging aid.* tag 'ras_updates_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: thermal: Move therm_throt there from x86/mce x86/mce: Get rid of mcheck_intel_therm_init() x86/mce: Make mce_timed_out() identify holdout CPUs List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

9223d0dccb8f8523754122f68316dd1a4f39f7f8 - thermal: Move therm_throt there from x86/mce

Thu, 07 Jan 2021 13:29:05 +0100

thermal: Move therm_throt there from x86/mceThis functionality has nothing to do with MCE, move it to the thermalframework and untangle it from MCE.Requested-by: Peter Zijlstra Signed-off-by: Borislav Petkov Reviewed-by: Srinivas Pandruvada Tested-by: Srinivas Pandruvada Link: https://lkml.kernel.org/r/20210202121003.GD18075@zn.tnic List of files: /linux/arch/x86/kernel/cpu/mce/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/arch/x86/kernel/cpu/mce/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/arch/x86/kernel/cpu/mce/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/arch/x86/kernel/cpu/mce/Makefile

82ffd0454bd9bd57780966d47bfd56d579dd4fb3 - Merge tag 'v5.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Thu, 07 Feb 2019 16:44:43 +0100

Merge tag 'v5.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 5.0-rc5Sync with upstream (which now contains fbdev-v5.0-rc3 changes) toprepare a base for fbdev-v5.1 changes. List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

23d19ba06b9c5614d6457f5fed349ec8f6d4dac9 - Merge drm/drm-next into drm-misc-next

Fri, 11 Jan 2019 16:32:10 +0100

Merge drm/drm-next into drm-misc-nextdrm-next has been forwarded to 5.0-rc1, and we need it to apply the damagehelper for dirtyfb series from Noralf Trønnes.Signed-off-by: Maxime Ripard List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

49e41801b335f64610bbfd23e8f2bbaf34d46276 - Merge tag 'v5.0-rc1' into next-general

Thu, 10 Jan 2019 20:41:59 +0100

Merge tag 'v5.0-rc1' into next-generalLinux 5.0-rc1Sync to pick up LSM stacking work (which is based on -rc1). List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

3eb0930a425b086bdab38156aa4708427479a201 - Merge drm/drm-next into drm-intel-next-queued

Tue, 08 Jan 2019 09:50:22 +0100

Merge drm/drm-next into drm-intel-next-queuedGenerally catch up with 5.0-rc1, and specifically get the changes:96d4f267e40f ("Remove 'type' argument from access_ok() function")0b2c8f8b6b0c ("i915: fix missing user_access_end() in page fault exception case")594cc251fdd0 ("make 'user_access_begin()' do 'access_ok()'")Signed-off-by: Jani Nikula List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

eed9688f8513189295887e5a27ec7f576754b60e - Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Wed, 26 Dec 2018 22:03:47 +0100

Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tipPull x86 RAS updates from Borislav Petkov: "This time around we have a subsystem reorganization to offer, with the new directory being arch/x86/kernel/cpu/mce/ and all compilation units' names streamlined under it"* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mce: Restore MCE injector's module name x86/mce: Unify pr_* prefix x86/mce: Streamline MCE subsystem's naming List of files: /linux/arch/x86/kernel/cpu/mce/Makefile

72a8f089c382c078f8c7c1c759cb726de80d4284 - x86/mce: Restore MCE injector's module name

Tue, 18 Dec 2018 19:25:46 +0100

x86/mce: Restore MCE injector's module nameIt was mce-inject.ko but it turned into inject.ko since the containingsource file got renamed. Restore it.Fixes: 21afaf181362 ("x86/mce: Streamline MCE subsystem's naming")Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner Cc: linux-edac Cc: Tony Luck Link: https://lkml.kernel.org/r/20181218182546.GA21386@zn.tnic List of files: /linux/arch/x86/kernel/cpu/mce/Makefile