Changes in Makefile

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

Thu, 11 Jul 2019 08:24:10 +0200

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

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

Fri, 10 May 2019 20:43:46 +0200

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

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

Tue, 16 Apr 2019 10:50:34 +0200

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

2c2e5bb97544198a62e4edbf6aca5dd201979564 - Merge branch 'for-5.1/hid-asus' into for-linus

Tue, 05 Mar 2019 15:24:43 +0100

Merge branch 'for-5.1/hid-asus' into for-linusAsus Transbook T100CHI and T90CHI support from NOGUCHI Hiroshi List of files: /linux/arch/sh/tools/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 16:44:43 +0100

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

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

Fri, 11 Jan 2019 16:32:10 +0100

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

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

Thu, 10 Jan 2019 20:41:59 +0100

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

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

Tue, 08 Jan 2019 09:50:22 +0100

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

85e1ffbd42f664965dc05f6e9851c06379f27fb2 - Merge tag 'kbuild-v4.21-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Mon, 07 Jan 2019 01:33:10 +0100

Merge tag 'kbuild-v4.21-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuildPull more Kbuild updates from Masahiro Yamada: - improve boolinit.cocci and use_after_iter.cocci semantic patches - fix alignment for kallsyms - move 'asm goto' compiler test to Kconfig and clean up jump_label CONFIG option - generate asm-generic wrappers automatically if arch does not implement mandatory UAPI headers - remove redundant generic-y defines - misc cleanups* tag 'kbuild-v4.21-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kconfig: rename generated .*conf-cfg to *conf-cfg kbuild: remove unnecessary stubs for archheader and archscripts kbuild: use assignment instead of define ... endef for filechk_* rules arch: remove redundant UAPI generic-y defines kbuild: generate asm-generic wrappers if mandatory headers are missing arch: remove stale comments "UAPI Header export list" riscv: remove redundant kernel-space generic-y kbuild: change filechk to surround the given command with { } kbuild: remove redundant target cleaning on failure kbuild: clean up rule_dtc_dt_yaml kbuild: remove UIMAGE_IN and UIMAGE_OUT jump_label: move 'asm goto' support test to Kconfig kallsyms: lower alignment on ARM scripts: coccinelle: boolinit: drop warnings on named constants scripts: coccinelle: check for redeclaration kconfig: remove unused "file" field of yylval union nds32: remove redundant kernel-space generic-y nios2: remove unneeded HAS_DMA define List of files: /linux/arch/sh/tools/Makefile

172caf1993b7a6503a9f7faf589e2cf26eb1f219 - kbuild: remove redundant target cleaning on failure

Mon, 31 Dec 2018 09:24:08 +0100

kbuild: remove redundant target cleaning on failureSince commit 9c2af1c7377a ("kbuild: add .DELETE_ON_ERROR specialtarget"), the target file is automatically deleted on failure.The boilerplate code ... || { rm -f $@; false; }is unneeded.Signed-off-by: Masahiro Yamada List of files: /linux/arch/sh/tools/Makefile

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

Tue, 23 Feb 2016 15:07:08 +0100

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/tools/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 07:06:28 +0100

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

d9c5841e22231e4e49fd0a1004164e6fce59b7a6 - Merge branch 'x86/asm' into x86/atomic

Fri, 30 Apr 2010 01:53:17 +0200

Merge branch 'x86/asm' into x86/atomicMerge reason: Conflict between LOCK_PREFIX_HERE and relative alternatives pointersResolved Conflicts: arch/x86/include/asm/alternative.h arch/x86/kernel/alternative.cSigned-off-by: H. Peter Anvin List of files: /linux/arch/sh/tools/Makefile

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

Fri, 09 Apr 2010 16:17:41 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 List of files: /linux/arch/sh/tools/Makefile

f790c0ca6fad60b544bb73eda8cc841a6436725b - Merge branch 'master' of /repos/git/linux-2.6

Mon, 08 Mar 2010 12:55:23 +0100

Merge branch 'master' of /repos/git/linux-2.6Conflicts: net/ipv4/netfilter/nf_nat_core.c net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_netlink.cSigned-off-by: Patrick McHardy List of files: /linux/arch/sh/tools/Makefile

4ea41e2de5bba756858bb40f964e3490b6d1a25c - Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming

Thu, 04 Mar 2010 18:03:16 +0100

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incomingResolve merge conflict in fs/xfs/linux-2.6/xfs_export.c. List of files: /linux/arch/sh/tools/Makefile

35858adbfca13678af99fb31618ef4428d6dedb0 - Merge branch 'next' into for-linus

Mon, 01 Mar 2010 08:55:20 +0100

Merge branch 'next' into for-linus List of files: /linux/arch/sh/tools/Makefile

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

Fri, 26 Feb 2010 20:04:15 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6The SmartMedia FTL code depends on new kfifo bits from 2.6.33 List of files: /linux/arch/sh/tools/Makefile

3560adf62075829393743667ff338dd8fd26a5c2 - Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-streaming', 'u300' and 'umc' into devel

Thu, 25 Feb 2010 23:06:43 +0100

Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-streaming', 'u300' and 'umc' into devel List of files: /linux/arch/sh/tools/Makefile

03806fa20f6a081493a731a4b18ea66317f9f947 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

Thu, 25 Feb 2010 14:35:22 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream List of files: /linux/arch/sh/tools/Makefile