Changes in Kconfig

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/drivers/staging/nvec/Kconfig

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/drivers/staging/nvec/Kconfig

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/drivers/staging/nvec/Kconfig

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/drivers/staging/nvec/Kconfig

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/drivers/staging/nvec/Kconfig

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/drivers/staging/nvec/Kconfig

2040cf9f59037aa8aec749363e69ead165b67b43 - Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts

Tue, 10 Dec 2019 10:11:00 +0100

Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflictsSigned-off-by: Ingo Molnar List of files: /linux/drivers/staging/nvec/Kconfig

4f797f56c3786e2c6bc542b3f80e9a599b073976 - Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches

Sun, 08 Dec 2019 14:37:10 +0100

Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patchesSigned-off-by: Ingo Molnar List of files: /linux/drivers/staging/nvec/Kconfig

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/drivers/staging/nvec/Kconfig

0dd09bc02c1bad55e92306ca83b38b3cf48b9f40 - Merge tag 'staging-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Wed, 27 Nov 2019 19:57:52 +0100

Merge tag 'staging-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/stagingPull staging / iio updates from Greg KH: "Here is the big staging and iio set of patches for the 5.5-rc1 release. It's the usual huge collection of cleanup patches all over the drivers/staging/ area, along with a new staging driver, and a bunch of new IIO drivers as well. Full details are in the shortlog, but all of these have been in linux-next for a long time with no reported issues"* tag 'staging-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (548 commits) staging: vchiq: Have vchiq_dump_* functions return an error code staging: vchiq: Refactor indentation in vchiq_dump_* functions staging: fwserial: Fix Kconfig indentation (seven spaces) staging: vchiq_dump: Replace min with min_t staging: vchiq: Fix block comment format in vchiq_dump() staging: octeon: indent with tabs instead of spaces staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error staging: most: core: remove sysfs attr remove_link staging: vc04: Fix Kconfig indentation staging: pi433: Fix Kconfig indentation staging: nvec: Fix Kconfig indentation staging: most: Fix Kconfig indentation staging: fwserial: Fix Kconfig indentation staging: fbtft: Fix Kconfig indentation fbtft: Drop OF dependency fbtft: Make use of device property API fbtft: Drop useless #ifdef CONFIG_OF and dead code fbtft: Describe function parameters in kernel-doc fbtft: Make sure string is NULL terminated staging: rtl8723bs: remove set but not used variable 'change', 'pos' ... List of files: /linux/drivers/staging/nvec/Kconfig

f82ea85dd722b340225f576dfb28e04ad19d3b53 - staging: nvec: Fix Kconfig indentation

Wed, 20 Nov 2019 14:38:58 +0100

staging: nvec: Fix Kconfig indentationAdjust indentation from spaces to tab (+optional two spaces) as incoding style with command like: $ sed -e 's/^ /\t/' -i */KconfigSigned-off-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20191120133858.13369-1-krzk@kernel.orgSigned-off-by: Greg Kroah-Hartman List of files: /linux/drivers/staging/nvec/Kconfig

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/drivers/staging/nvec/Kconfig

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/drivers/staging/nvec/Kconfig

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/drivers/staging/nvec/Kconfig

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/drivers/staging/nvec/Kconfig

860dbce3d8dd90cb9e909c58fa79808766243651 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Sun, 02 Jun 2019 08:46:11 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux List of files: /linux/drivers/staging/nvec/Kconfig

2491b544ff3aa9717d427033206fa793be53429d - Merge drm/drm-next into drm-intel-next-queued

Tue, 28 May 2019 10:07:59 +0200

Merge drm/drm-next into drm-intel-next-queuedGet the HDR dependencies originally merged via drm-misc. Sync up alli915 changes applied via other trees. And get v5.2-rc2 as the baseline.Signed-off-by: Jani Nikula List of files: /linux/drivers/staging/nvec/Kconfig

374ed5429346a021c8e2d26fafce14c5b15dedd0 - Merge drm/drm-next into drm-misc-next

Wed, 22 May 2019 22:08:21 +0200

Merge drm/drm-next into drm-misc-nextBackmerging 5.2-rc1 to -misc-next for robherSigned-off-by: Sean Paul List of files: /linux/drivers/staging/nvec/Kconfig

f29f24b5568fd6169e0363c78f1a80db38d0e7e9 - Merge branch 'fixes-dra7' into fixes

Mon, 20 May 2019 17:32:11 +0200

Merge branch 'fixes-dra7' into fixes List of files: /linux/drivers/staging/nvec/Kconfig

73ee89436047dc58005bed7d1ded679c35292164 - Merge tag 'v5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Mon, 20 May 2019 15:31:34 +0200

Merge tag 'v5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 5.2-rc1Sync with upstream (which now contains fbdev-v5.2 changes) toprepare a base for fbdev-v5.3 changes. List of files: /linux/drivers/staging/nvec/Kconfig