Changes in Makefile

3eb66e91a25497065c5322b1268cbc3953642227 - Merge tag 'v4.20' into for-linus

Tue, 15 Jan 2019 00:33:23 +0100

Merge tag 'v4.20' into for-linusSync with mainline to get linux/overflow.h among other things. List of files: /linux/drivers/video/fbdev/omap2/omapfb/Makefile

4116941b7a703f8c770998bb3a59966608cb5bb2 - Merge tag 'v4.20' into next

Mon, 14 Jan 2019 07:35:32 +0100

Merge tag 'v4.20' into nextMerge with mainline to bring in the new APIs. List of files: /linux/drivers/video/fbdev/omap2/omapfb/Makefile

472475000979a156bc32cd75caa59737f5a1caa5 - Merge branch 'for-4.20/apple' into for-linus

Tue, 23 Oct 2018 13:16:33 +0200

Merge branch 'for-4.20/apple' into for-linusSupport for Apple Magic Trackpad 2 List of files: /linux/drivers/video/fbdev/omap2/omapfb/Makefile

2863b00941bc3062ea3299ed4057acfd9e52c335 - Merge drm/drm-next into drm-intel-next-queued

Wed, 26 Sep 2018 10:24:04 +0200

Merge drm/drm-next into drm-intel-next-queuedCatch up in general, and get DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENTspecifically.Signed-off-by: Jani Nikula List of files: /linux/drivers/video/fbdev/omap2/omapfb/Makefile

9ac669fc01dbfef707ecaa6b618c0d03294cca16 - Merge tag 'y2038' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into timers/core

Sat, 15 Sep 2018 20:50:42 +0200

Merge tag 'y2038' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into timers/corePull more y2038 work from Arnd Bergman:y2038: convert more syscallsHere is another set of system call changes to prepare the change over to64-bit time_t. As before, the strategy is to change system calls thattake a 'struct timespec' argument over to 'struct __kernel_timespec',which for now is defined to be the same but will get redefined to use a64-bit time_t argument once we are ready to modify the system call tables.The major change from previous patches is that the plan is no longerto directly use the 'compat' system calls for providing compatibilitywith the existing 32-bit time_t based entry points. Instead, we renamethe compat code to something that makes more sense on 32-bit architectures,e.g. compat_timespec becomes old_timespec32.With the renamed types in place, change over the 'stat' and 'utimes'families of system calls, sched_rr_get_interval, recvmmsg andrt_sigtimedwait. Another series for poll, select and io_pgetevents iscurrently being tested. List of files: /linux/drivers/video/fbdev/omap2/omapfb/Makefile

e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce - Merge tag 'v4.19-rc2' into next-general

Tue, 04 Sep 2018 20:35:54 +0200

Merge tag 'v4.19-rc2' into next-generalSync to Linux 4.19-rc2 for downstream developers. List of files: /linux/drivers/video/fbdev/omap2/omapfb/Makefile

6e2d6b2728fcb408eabd7991804f8cb33ff59f20 - Merge tag 'v4.19-rc1' into asoc-4.19

Tue, 28 Aug 2018 20:03:57 +0200

Merge tag 'v4.19-rc1' into asoc-4.19Linux 4.19-rc1 List of files: /linux/drivers/video/fbdev/omap2/omapfb/Makefile

ea4d65f14f6aaa53e379b93c5544245ef081b3e7 - Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2

Tue, 28 Aug 2018 18:58:03 +0200

Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2 List of files: /linux/drivers/video/fbdev/omap2/omapfb/Makefile

bc537a9cc47eec7f4e32b8164c494ddc35dca8ac - Merge drm/drm-next into drm-misc-next

Mon, 27 Aug 2018 16:00:03 +0200

Merge drm/drm-next into drm-misc-nextNow that 4.19-rc1 is cut, backmerge it into -misc-next.Signed-off-by: Sean Paul List of files: /linux/drivers/video/fbdev/omap2/omapfb/Makefile

06e386a1db54ab6a671e103e929b590f7a88f0e3 - Merge tag 'fbdev-v4.19' of https://github.com/bzolnier/linux

Fri, 24 Aug 2018 00:44:58 +0200

Merge tag 'fbdev-v4.19' of https://github.com/bzolnier/linuxPull fbdev updates from Bartlomiej Zolnierkiewicz: "Mostly small fixes and cleanups for fb drivers (the biggest updates are for udlfb and pxafb drivers). This also adds deferred console takeover support to the console code and efifb driver. Summary: - add support for deferred console takeover, when enabled defers fbcon taking over the console from the dummy console until the first text is displayed on the console - together with the "quiet" kernel commandline option this allows fbcon to still be used together with a smooth graphical bootup (Hans de Goede) - improve console locking debugging code (Thomas Zimmermann) - copy the ACPI BGRT boot graphics to the framebuffer when deferred console takeover support is used in efifb driver (Hans de Goede) - update udlfb driver - fix lost console when the user unplugs a USB adapter, fix the screen corruption issue, fix locking and add some performance optimizations (Mikulas Patocka) - update pxafb driver - fix using uninitialized memory, switch to devm_* API, handle initialization errors and add support for lcd-supply regulator (Daniel Mack) - add support for boards booted with a DeviceTree in pxa3xx_gcu driver (Daniel Mack) - rename omap2 module to omap2fb.ko to avoid conflicts with omap1 driver (Arnd Bergmann) - enable ACPI-based enumeration for goldfishfb driver (Yu Ning) - fix goldfishfb driver to make user space Android code use 60 fps (Christoffer Dall) - print big fat warning when nomodeset kernel parameter is used in vgacon driver (Lyude Paul) - remove VLA usage from fsl-diu-fb driver (Kees Cook) - misc fixes (Julia Lawall, Geert Uytterhoeven, Fredrik Noring, Yisheng Xie, Dan Carpenter, Daniel Vetter, Anton Vasilyev, Randy Dunlap, Gustavo A. R. Silva, Colin Ian King, Fengguang Wu) - misc cleanups (Roman Kiryanov, Yisheng Xie, Colin Ian King)"* tag 'fbdev-v4.19' of https://github.com/bzolnier/linux: (54 commits) Documentation/fb: corrections for fbcon.txt fbcon: Do not takeover the console from atomic context dummycon: Stop exporting dummycon_[un]register_output_notifier fbcon: Only defer console takeover if the current console driver is the dummycon fbcon: Only allow FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER if fbdev is builtin fbdev: omap2: omapfb: fix ifnullfree.cocci warnings fbdev: omap2: omapfb: fix bugon.cocci warnings fbdev: omap2: omapfb: fix boolreturn.cocci warnings fb: amifb: fix build warnings when not builtin fbdev/core: Disable console-lock warnings when fb.lockless_register_fb is set console: Replace #if 0 with atomic var 'ignore_console_lock_warning' udlfb: use spin_lock_irq instead of spin_lock_irqsave udlfb: avoid prefetch udlfb: optimization - test the backing buffer udlfb: allow reallocating the framebuffer udlfb: set line_length in dlfb_ops_set_par udlfb: handle allocation failure udlfb: set optimal write delay udlfb: make a local copy of fb_ops udlfb: don't switch if we are switching to the same videomode ... List of files: /linux/drivers/video/fbdev/omap2/omapfb/Makefile

4bcd8c90ac0f27d3d76fcfc50582ff3685059de9 - omapfb: rename omap2 module to omap2fb.ko

Tue, 24 Jul 2018 19:11:27 +0200

omapfb: rename omap2 module to omap2fb.koIn a kernel configuration with both CONFIG_FB_OMAP=m and CONFIG_FB_OMAP2=m,Kbuild fails to point out that we have two modules with the same name (omapfb.ko),but instead fails with a cryptic error message like:ERROR: "omapfb_register_panel" [drivers/video/fbdev/omap/lcd_osk.ko] undefined!This can now happen when building a randconfig kernel with CONFIG_ARCH_OMAP1,as the omap1 fbdev driver depends on that, whiel the omap2 fbdev driver cannow be built anywhere with CONFIG_COMPILE_TEST.The solution is to rename one of the two modules, so for consistency withthe directory naming I decided to rename the omap2 version to omap2fb.ko.Fixes: 7378f1149884 ("media: omap2: omapfb: allow building it with COMPILE_TEST")Signed-off-by: Arnd Bergmann Acked-by: Tony Lindgren Cc: Mauro Carvalho Chehab Signed-off-by: Bartlomiej Zolnierkiewicz List of files: /linux/drivers/video/fbdev/omap2/omapfb/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/video/fbdev/omap2/omapfb/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/video/fbdev/omap2/omapfb/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/video/fbdev/omap2/omapfb/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/video/fbdev/omap2/omapfb/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/video/fbdev/omap2/omapfb/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/video/fbdev/omap2/omapfb/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/video/fbdev/omap2/omapfb/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/video/fbdev/omap2/omapfb/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/video/fbdev/omap2/omapfb/Makefile