Changes in Makefile

597473720f4dc69749542bfcfed4a927a43d935e - Merge branch 'next' into for-linus

Thu, 11 Jul 2019 06:24:10 +0000

Merge branch 'next' into for-linusPrepare input updates for 5.3 merge window. List of files: /linux/arch/sh/drivers/dma/Makefile

2a267e7c41aa88215de2b542de797d03d16ecdfd - Merge tag 'v5.1' into next

Fri, 10 May 2019 18:43:46 +0000

Merge tag 'v5.1' into nextSync up with mainline to bring in the latest APIs. List of files: /linux/arch/sh/drivers/dma/Makefile

95d002e0a34cb0f238abb39987f9980f325d8332 - Merge tag 'drm-intel-next-2019-04-04' into gvt-next

Tue, 16 Apr 2019 08:50:34 +0000

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/sh/drivers/dma/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 15:44:43 +0000

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/sh/drivers/dma/Makefile

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

Fri, 11 Jan 2019 15:32:10 +0000

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/sh/drivers/dma/Makefile

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

Thu, 10 Jan 2019 19:41:59 +0000

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/sh/drivers/dma/Makefile

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

Tue, 08 Jan 2019 08:50:22 +0000

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/sh/drivers/dma/Makefile

d538d94f0ca86cfedc892cc427169219acb3c2f7 - Merge branch 'master' into fixes

Fri, 04 Jan 2019 11:07:47 +0000

Merge branch 'master' into fixesWe have a fix to apply on top of commit 96d4f267e40f ("Remove 'type'argument from access_ok() function"), so merge master to get it. List of files: /linux/arch/sh/drivers/dma/Makefile

f346b0becb1bc62e45495f9cdbae3eef35d0b635 - Merge branch 'akpm' (patches from Andrew)

Sat, 29 Dec 2018 00:55:46 +0000

Merge branch 'akpm' (patches from Andrew)Merge misc updates from Andrew Morton: - large KASAN update to use arm's "software tag-based mode" - a few misc things - sh updates - ocfs2 updates - just about all of MM* emailed patches from Andrew Morton : (167 commits) kernel/fork.c: mark 'stack_vm_area' with __maybe_unused memcg, oom: notify on oom killer invocation from the charge path mm, swap: fix swapoff with KSM pages include/linux/gfp.h: fix typo mm/hmm: fix memremap.h, move dev_page_fault_t callback to hmm hugetlbfs: Use i_mmap_rwsem to fix page fault/truncate race hugetlbfs: use i_mmap_rwsem for more pmd sharing synchronization memory_hotplug: add missing newlines to debugging output mm: remove __hugepage_set_anon_rmap() include/linux/vmstat.h: remove unused page state adjustment macro mm/page_alloc.c: allow error injection mm: migrate: drop unused argument of migrate_page_move_mapping() blkdev: avoid migration stalls for blkdev pages mm: migrate: provide buffer_migrate_page_norefs() mm: migrate: move migrate_page_lock_buffers() mm: migrate: lock buffers before migrate_page_move_mapping() mm: migration: factor out code to compute expected number of page references mm, page_alloc: enable pcpu_drain with zone capability kmemleak: add config to select auto scan mm/page_alloc.c: don't call kasan_free_pages() at deferred mem init ... List of files: /linux/arch/sh/drivers/dma/Makefile

ff4a7481c3898ffc3cc271d6aca431d190c37247 - sh: drivers: convert to SPDX identifiers

Fri, 28 Dec 2018 08:31:49 +0000

sh: drivers: convert to SPDX identifiersUpdate license to use SPDX-License-Identifier instead of verbose licensetext.As original license mentioned, it is GPL-2.0 in SPDX.Then, MODULE_LICENSE() should be "GPL v2" instead of "GPL".See ${LINUX}/include/linux/module.h "GPL" [GNU Public License v2 or later] "GPL v2" [GNU Public License v2]Link: http://lkml.kernel.org/r/87h8fsct0a.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: Kuninori Morimoto Reviewed-by: Simon Horman Cc: Rich Felker Cc: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds List of files: /linux/arch/sh/drivers/dma/Makefile

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 14:07:08 +0000

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/arch/sh/drivers/dma/Makefile

f43dc23d5ea91fca257be02138a255f02d98e806 - Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework

Thu, 13 Jan 2011 06:06:28 +0000

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-reworkConflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg.c arch/sh/kernel/cpu/sh2a/setup-sh7201.c arch/sh/kernel/cpu/sh2a/setup-sh7203.c arch/sh/kernel/cpu/sh2a/setup-sh7206.c arch/sh/kernel/cpu/sh3/setup-sh7705.c arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh4-202.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4/setup-sh7760.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7780.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c arch/sh/kernel/cpu/sh4a/setup-shx3.c arch/sh/kernel/cpu/sh5/setup-sh5.c drivers/serial/sh-sci.c drivers/serial/sh-sci.h include/linux/serial_sci.h List of files: /linux/arch/sh/drivers/dma/Makefile

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

Tue, 08 Dec 2009 09:58:33 +0000

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Merge the BIOS workarounds from 2.6.32, and the swiotlb fallback on failure. List of files: /linux/arch/sh/drivers/dma/Makefile

6548698f929814375fa5d62ae1db96959b0418c1 - Merge commit 'v2.6.32' into reiserfs/kill-bkl

Mon, 07 Dec 2009 06:28:35 +0000

Merge commit 'v2.6.32' into reiserfs/kill-bklMerge-reason: The tree was based 2.6.31. It's better to be up to datewith 2.6.32. Although no conflicting changes were made in between,it gives benchmarking results closer to the lastest kernel behaviour. List of files: /linux/arch/sh/drivers/dma/Makefile

838632438145ac6863377eb12d8b8eef9c55d288 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Tue, 01 Dec 2009 07:16:22 +0000

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 List of files: /linux/arch/sh/drivers/dma/Makefile

46557bef3f3834ac33031c7be27d39d90d507442 - Merge branch 'drm-core-next' of ../linux-2.6 into drm-next

Wed, 18 Nov 2009 00:09:55 +0000

Merge branch 'drm-core-next' of ../linux-2.6 into drm-next List of files: /linux/arch/sh/drivers/dma/Makefile

7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1 - Merge commit 'v2.6.32-rc5' into for-linus

Tue, 03 Nov 2009 06:10:07 +0000

Merge commit 'v2.6.32-rc5' into for-linus List of files: /linux/arch/sh/drivers/dma/Makefile

e87a3dd33eab30b4db539500064a9584867e4f2c - Merge branch 'fix/misc' into topic/misc

Sun, 01 Nov 2009 10:11:07 +0000

Merge branch 'fix/misc' into topic/misc List of files: /linux/arch/sh/drivers/dma/Makefile

0b9e31e9264f1bad89856afb96da1688292f13b4 - Merge branch 'linus' into sched/core

Sun, 25 Oct 2009 16:30:53 +0000

Merge branch 'linus' into sched/coreConflicts: fs/proc/array.cMerge reason: resolve conflict and queue up dependent patch.Signed-off-by: Ingo Molnar List of files: /linux/arch/sh/drivers/dma/Makefile

0f8f86c7bdd1c954fbe153af437a0d91a6c5721a - Merge commit 'perf/core' into perf/hw-breakpoint

Sat, 17 Oct 2009 23:09:09 +0000

Merge commit 'perf/core' into perf/hw-breakpointConflicts: kernel/Makefile kernel/trace/Makefile kernel/trace/trace.h samples/MakefileMerge reason: We need to be uptodate with the perf events developmentbranch because we plan to rewrite the breakpoints API on top ofperf events. List of files: /linux/arch/sh/drivers/dma/Makefile