Changes in Makefile

03ab8e6297acd1bc0eedaa050e2a1635c576fd11 - Merge tag 'v5.18'

Tue, 31 May 2022 15:13:23 +0200

Merge tag 'v5.18'Linux 5.18 List of files: /linux/drivers/staging/fbtft/Makefile

de4fb176622d54a82ea3ceb7362392aaf5ff0b5a - Merge branches 'fixes' and 'misc' into for-linus

Fri, 01 Apr 2022 17:12:31 +0200

Merge branches 'fixes' and 'misc' into for-linus List of files: /linux/drivers/staging/fbtft/Makefile

b690490d6d466972ade172ee2e7f6ffa49e7e910 - Merge branch 'for-5.18/amd-sfh' into for-linus

Wed, 23 Mar 2022 09:58:40 +0100

Merge branch 'for-5.18/amd-sfh' into for-linus- dead code elimination (Christophe JAILLET) List of files: /linux/drivers/staging/fbtft/Makefile

1136fa0c07de570dc17858745af8be169d1440ba - Merge tag 'v5.17-rc4' into for-linus

Tue, 01 Mar 2022 08:12:55 +0100

Merge tag 'v5.17-rc4' into for-linusMerge with mainline to get the Intel ASoC generic helpers header andother changes. List of files: /linux/drivers/staging/fbtft/Makefile

986c6f7c3fc855032f3457a5a1b7fbcc09c375bb - Merge tag 'v5.17-rc4' into next

Fri, 18 Feb 2022 22:30:38 +0100

Merge tag 'v5.17-rc4' into nextSync up with mainline to get the latest changes in HID subsystem. List of files: /linux/drivers/staging/fbtft/Makefile

542898c5aa5c6a3179dffb1d1606884a63f75fed - Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

Mon, 07 Feb 2022 17:01:37 +0100

Merge remote-tracking branch 'drm/drm-next' into drm-misc-nextFirst backmerge into drm-misc-next. Required for more helpers backmerged,and to pull in 5.17 (rc2).Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/staging/fbtft/Makefile

7e6a6b400db8048bd1c06e497e338388413cf5bc - Merge tag 'kvmarm-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

Sat, 05 Feb 2022 06:58:25 +0100

Merge tag 'kvmarm-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEADKVM/arm64 fixes for 5.17, take #2- A couple of fixes when handling an exception while a SError has been delivered- Workaround for Cortex-A510's single-step[ erratum List of files: /linux/drivers/staging/fbtft/Makefile

876f7a438e4247a948268ad77b67c494f709cc30 - Merge drm/drm-next into drm-intel-gt-next

Thu, 03 Feb 2022 08:53:49 +0100

Merge drm/drm-next into drm-intel-gt-nextBackmerge to bring in 5.17-rc2 to introduce a common baselineto merge i915_regs changes from drm-intel-next.Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/staging/fbtft/Makefile

063565aca3734de4e73639a0e460a58d9418b3cd - Merge drm/drm-next into drm-intel-next

Mon, 31 Jan 2022 19:19:33 +0100

Merge drm/drm-next into drm-intel-nextCatch-up with 5.17-rc2 and trying to align with drm-intel-gt-nextfor a possible topic branch for merging the split of i915_regs...Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/staging/fbtft/Makefile

48ee4835b73c48590d05a54730dc8037ebd39d3b - Merge drm/drm-fixes into drm-misc-fixes

Wed, 26 Jan 2022 09:40:24 +0100

Merge drm/drm-fixes into drm-misc-fixesBackmerging drm/drm-fixes into drm-misc-fixes for v5.17-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/staging/fbtft/Makefile

1aa77e716c6f2332f2d4664f747ff4eba731825b - Merge remote-tracking branch 'torvalds/master' into perf/core

Thu, 13 Jan 2022 14:20:59 +0100

Merge remote-tracking branch 'torvalds/master' into perf/coreTo pick up fixes and get in line with other trees, powerpc kernelmostly this time, but BPF as well.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/staging/fbtft/Makefile

22ef12195e13c5ec58320dbf99ef85059a2c0820 - Merge tag 'staging-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Wed, 12 Jan 2022 20:18:49 +0100

Merge tag 'staging-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/stagingPull staging driver updates from Greg KH: "Here's the big set of staging driver updates for 5.17-rc1 Nothing major in here at all, just lots and lots of tiny cleanups. Overall more code was removed than added, which is always nice, but not a huge change. Majority of the work happened in the r8188eu driver, that had hundreds of cleanups happen on it, but almost all other staging drivers had cleanups as well. No new functionality was added, cleanups only. All of these have been in linux-next for a while with no reported problems"* tag 'staging-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (308 commits) staging: r8188eu: rename camelcase variable uintPeerChannel staging: r8188eu: make BW20_24G_Diff a 1-D array staging: r8188eu: make OFDM_24G_Diff a 1-D array staging: r8188eu: BW40_24G_Diff is set but not used staging: r8188eu: CCK_24G_Diff is set but not used staging: r8188eu: make Index24G_BW40_Base a 1-D array staging: r8188eu: make Index24G_CCK_Base a 1-D array staging: r8188eu: rfPath is always 0 staging: r8188eu: remove unneeded parameter from rtl8188e_SetHalODMVar staging: pi433: add comment to rx_lock mutex definition staging: pi433: fix frequency deviation check staging: vc04_services: rename BM2835 to BCM2835 in headers comments staging: vc04_services: rename string literal containing bm2835_* to bcm2835*_ staging: vc04_services: rename variables containing bm2835_* to bcm2835_* staging: vc04_services: rename functions containing bm2835_* to bcm2835_* staging: vc04_services: rename structures bm2835_mmal_dev and bm2835_mmal_v4l2_ctrl staging: greybus: audio: Check null pointer staging: r8188eu: add spaces around P2P_AP_P2P_CH_SWITCH_PROCESS_WK staging: r8188eu: turbo scan is always off for r8188eu staging: r8188eu: cmd_issued_cnt is set but not used ... List of files: /linux/drivers/staging/fbtft/Makefile

afa9755e359dcabc3f9127c1869a50e37777cdcc - staging: fbtft: Remove fb_watterott driver

Fri, 05 Nov 2021 21:24:48 +0100

staging: fbtft: Remove fb_watterott driverThis driver was made for a prototype and as far as I know it never wentinto production because it was too slow. So let's remove it.Acked-by: Sam Ravnborg Signed-off-by: Noralf Trønnes Link: https://lore.kernel.org/r/20211105202448.62518-1-noralf@tronnes.orgSigned-off-by: Greg Kroah-Hartman List of files: /linux/drivers/staging/fbtft/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/drivers/staging/fbtft/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/drivers/staging/fbtft/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/drivers/staging/fbtft/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/drivers/staging/fbtft/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/drivers/staging/fbtft/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/drivers/staging/fbtft/Makefile

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/fbtft/Makefile