Changes in Makefile

c95baf12f5077419db01313ab61c2aac007d40cd - Merge drm-intel-next-queued into gvt-next

Thu, 20 Feb 2020 09:23:37 +0100

Merge drm-intel-next-queued into gvt-nextBackmerge to pull inhttps://patchwork.freedesktop.org/patch/353621/?series=73544&rev=1Signed-off-by: Zhenyu Wang List of files: /linux/kernel/livepatch/Makefile

28336be568bb473d16ba80db0801276fb4f1bbe5 - Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

Mon, 30 Dec 2019 08:10:51 +0100

Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflictsConflicts: init/main.c lib/Kconfig.debugSigned-off-by: Ingo Molnar List of files: /linux/kernel/livepatch/Makefile

b19efcabb587e5470a423ef778905f47e5a47f1a - Merge branch 'next' into for-linus

Sat, 01 Feb 2020 02:42:33 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.6 merge window. List of files: /linux/kernel/livepatch/Makefile

1bdd3e05a0a3b4a97ea88bc46fef8fb265c8b94c - Merge tag 'v5.5-rc5' into next

Fri, 10 Jan 2020 23:56:04 +0100

Merge tag 'v5.5-rc5' into nextSync up with mainline to get SPI "delay" API changes. List of files: /linux/kernel/livepatch/Makefile

22164fbe274c2dd96d2887fe121896d321000a61 - Merge drm/drm-next into drm-misc-next

Mon, 06 Jan 2020 10:35:33 +0100

Merge drm/drm-next into drm-misc-nextRequested, and we need v5.5-rc1 backported as our current branch is still based on v5.4.Signed-off-by: Maarten Lankhorst List of files: /linux/kernel/livepatch/Makefile

023265ed75d8792ca1d555430a8985511d3f8788 - Merge drm/drm-next into drm-intel-next-queued

Wed, 11 Dec 2019 09:35:37 +0100

Merge drm/drm-next into drm-intel-next-queuedSync up with v5.5-rc1 to get the updated lock_release() API among otherthings. Fix the conflict reported by Stephen Rothwell [1].[1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.auSigned-off-by: Jani Nikula List of files: /linux/kernel/livepatch/Makefile

942e6f8a8314e5550e254519dfba4ccd5170421d - Merge mainline/master into arm/fixes

Thu, 05 Dec 2019 22:16:58 +0100

Merge mainline/master into arm/fixesThis brings in the mainline tree right after armsoc contents was mergedthis release cycle, so that we can re-run savedefconfig, etc.Signed-off-by: Olof Johansson List of files: /linux/kernel/livepatch/Makefile

2ea352d5960ad469f5712cf3e293db97beac4e01 - Merge remote-tracking branch 'torvalds/master' into perf/core

Tue, 26 Nov 2019 15:06:19 +0100

Merge remote-tracking branch 'torvalds/master' into perf/coreTo pick up BPF changes we'll need.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/kernel/livepatch/Makefile

f838767555d40f29bc4771c5c8cc63193094b7cc - Merge tag 'livepatching-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching

Tue, 26 Nov 2019 04:43:48 +0100

Merge tag 'livepatching-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatchingPull livepatching updates from Petr Mladek: - New API to track system state changes done be livepatch callbacks. It helps to maintain compatibility between livepatches. - Update Kconfig help text. ORC is another reliable unwinder. - Disable generic selftest timeout. Livepatch selftests have their own per-operation fine-grained timeouts.* tag 'livepatching-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching: x86/stacktrace: update kconfig help text for reliable unwinders livepatch: Selftests of the API for tracking system state changes livepatch: Documentation of the new API for tracking system state changes livepatch: Allow to distinguish different version of system state changes livepatch: Basic API to track system state changes livepatch: Keep replaced patches until post_patch callback is called selftests/livepatch: Disable the timeout List of files: /linux/kernel/livepatch/Makefile

0e672adc87e5ae1758b6e0571b42d743a8324327 - Merge branch 'for-5.5/system-state' into for-linus

Mon, 25 Nov 2019 13:53:49 +0100

Merge branch 'for-5.5/system-state' into for-linus List of files: /linux/kernel/livepatch/Makefile

73727f4dafa2df107e85753c5ab703a1f344e1f1 - livepatch: Basic API to track system state changes

Wed, 30 Oct 2019 16:43:10 +0100

livepatch: Basic API to track system state changesThis is another step how to help maintaining more livepatches.One big help was the atomic replace and cumulative livepatches. Theselivepatches replace the already installed ones. Therefore it shouldbe enough when each cumulative livepatch is consistent.The problems might come with shadow variables and callbacks. They mightchange the system behavior or state so that it is no longer safe togo back and use an older livepatch or the original kernel code. Also,a new livepatch must be able to detect changes which were made bythe already installed livepatches.This is where the livepatch system state tracking gets useful. Itallows to: - find whether a system state has already been modified by previous livepatches - store data needed to manipulate and restore the system stateThe information about the manipulated system states is stored in anarray of struct klp_state. It can be searched by two new functionsklp_get_state() and klp_get_prev_state().The dependencies are going to be solved by a version field added later.The only important information is that it will be allowed to modifythe same state by more non-cumulative livepatches. It is similarto allowing to modify the same function several times. The livepatchauthor is responsible for preventing incompatible changes.Link: http://lkml.kernel.org/r/20191030154313.13263-3-pmladek@suse.comTo: Jiri Kosina Cc: Kamalesh Babulal Cc: Nicolai Stange Cc: live-patching@vger.kernel.orgCc: linux-kernel@vger.kernel.orgAcked-by: Miroslav Benes Acked-by: Joe Lawrence Acked-by: Josh Poimboeuf Signed-off-by: Petr Mladek List of files: /linux/kernel/livepatch/Makefile

58e16d792a6a8c6b750f637a4649967fcac853dc - Merge branch 'ti-sysc-fixes' into fixes

Tue, 13 Aug 2019 12:40:10 +0200

Merge branch 'ti-sysc-fixes' into fixes List of files: /linux/kernel/livepatch/Makefile

c39f2d9db0fd81ea20bb5cce9b3f082ca63753e2 - Merge branch 'next' into for-linus

Sat, 20 Jul 2019 06:07:56 +0200

Merge branch 'next' into for-linusPrepare second round of input updates for 5.3 merge window. List of files: /linux/kernel/livepatch/Makefile

ecb41832bd2a7a3f8ac93527cec5e51e3827daed - Merge tag 'v5.2' into next

Mon, 15 Jul 2019 18:42:32 +0200

Merge tag 'v5.2' into nextSync up with mainline to resolve conflicts in iforce driver. List of files: /linux/kernel/livepatch/Makefile

74acee309fb2a434dce215d44014e6f8e06975ae - Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus

Wed, 10 Jul 2019 01:39:57 +0200

Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus List of files: /linux/kernel/livepatch/Makefile

3c53c6255d598db7084c5c3d7553d7200e857818 - Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Mon, 08 Jul 2019 14:45:20 +0200

Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Updates for v5.3This is a very big update, mainly thanks to Morimoto-san's refactoringwork and some fairly large new drivers. - Lots more work on moving towards a component based framework from Morimoto-san. - Support for force disconnecting muxes from Jerome Brunet. - New drivers for Cirrus Logic CS47L35, CS47L85 and CS47L90, Conexant CX2072X, Realtek RT1011 and RT1308.Signed-off-by: Takashi Iwai List of files: /linux/kernel/livepatch/Makefile

1d2af80d581d1bae81594e497cd57e345235b940 - Merge tag 'nand/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next

Sat, 06 Jul 2019 22:51:56 +0200

Merge tag 'nand/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/nextNAND core changes:- use longest matching pattern in ->exec_op() default parser- export NAND operation tracer- add flag to indicate panic_write in MTD- use kzalloc() instead of kmalloc() and memset()Raw NAND controller drivers changes:- brcmnand: * fix BCH ECC layout for large page NAND parts * fallback to detected ecc-strength, ecc-step-size * when oops in progress use pio and interrupt polling * code refactor code to introduce helper functions * add support for v7.3 controller- FSMC: * use nand_op_trace for operation tracing- GPMI: * move all driver code into single file * various cleanups (including dmaengine changes) * use runtime PM to manage clocks * implement exec_op- MTK: * correct low level time calculation of r/w cycle * improve data sampling timing for read cycle * add validity check for CE# pin setting * fix wrongly assigned OOB buffer pointer issue * re-license MTK NAND driver as Dual MIT/GPL- STM32: * manage the get_irq error case * increase DMA completion timeoutsRaw NAND chips drivers changes:- Macronix: add read-retry supportOnenand driver changes:- add support for 8Gb datasize chips- avoid fall-through warningsSPI-NAND changes:- define macros for page-read ops with three-byte addresses- add support for two-byte device IDs and then for GigaDevice GD5F1GQ4UFxxG- add initial support for Paragon PN26G0xA- handle the case where the last page read has bitflips List of files: /linux/kernel/livepatch/Makefile

371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4 - Merge tag 'v5.2-rc6' into rdma.git for-next

Sat, 29 Jun 2019 02:18:23 +0200

Merge tag 'v5.2-rc6' into rdma.git for-nextFor dependencies in next patches.Resolve conflicts:- Use uverbs_get_cleared_udata() with new cq allocation flow- Continue to delete nes despite SPDX conflict- Resolve list appends in mlx5_command_str()- Use u16 for vport_rule stuff- Resolve list appends in struct ib_clientSigned-off-by: Jason Gunthorpe List of files: /linux/kernel/livepatch/Makefile

53c8b29abe42e5601cfa0ea5962532f0cfdec8a0 - Merge tag 'v5.2-rc6' into asoc-5.3

Wed, 26 Jun 2019 13:39:34 +0200

Merge tag 'v5.2-rc6' into asoc-5.3Linux 5.2-rc6 List of files: /linux/kernel/livepatch/Makefile

355a47ae7ebcf9d605aa809b259d380422e81b8d - Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixes

Wed, 26 Jun 2019 12:22:54 +0200

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixesSome fixes have been accidentally pushed to this, so I cannot fost-forward.Required to pull in the remove-fbcon-notifiers fixes.Signed-off-by: Maarten Lankhorst List of files: /linux/kernel/livepatch/Makefile