Changes in Makefile

13fe7056bebb4015c6231a07a1be4d3aebbfe979 - Merge branch 'next' into for-linus

Thu, 16 Aug 2018 20:10:56 +0200

Merge branch 'next' into for-linusPrepare input updates for 4.19 merge window. List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

c74a7469f97c0f40b46e82ee979f9fb1bb6e847c - Merge drm/drm-next into drm-intel-next-queued

Mon, 23 Jul 2018 18:13:12 +0200

Merge drm/drm-next into drm-intel-next-queuedWe need a backmerge to get DP_DPCD_REV_14 before we push otheri915 changes to dinq that could break compilation.Signed-off-by: Rodrigo Vivi List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

6b16f5d12202a23d875915349cc031c07fe1b3ec - Merge tag 'v4.18-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Thu, 28 Jun 2018 14:07:57 +0200

Merge tag 'v4.18-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 4.18-rc2 List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

57b54d74dd5c559bd35f2affaf11d8828aaf5733 - Merge tag 'v4.18-rc2' into next-general

Mon, 25 Jun 2018 18:20:40 +0200

Merge tag 'v4.18-rc2' into next-generalMerge to Linux 4.18-rc2 for security subsystem developers. List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

5aff29efbec020f0997e5cdbefce0ff383518986 - Merge branch 'ib/4.17-xen-kbdfront-runtime-config' into next

Wed, 13 Jun 2018 01:38:35 +0200

Merge branch 'ib/4.17-xen-kbdfront-runtime-config' into nextBring in xen-kbdfront changes. List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

675c00c3325723751864cc5867d736c58633cf3d - Merge branch 'linus' into locking/core, to pick up fixes

Fri, 25 May 2018 08:11:28 +0200

Merge branch 'linus' into locking/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

0548dc5cde19e88b8495cb74e3893d8c8713392a - Merge branch 'sched/urgent' into sched/core, to pick up fixes

Fri, 25 May 2018 08:04:39 +0200

Merge branch 'sched/urgent' into sched/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

bd9c67ad9693bacef086d65c1c6744645d4777e7 - Merge branch 'linus' into perf/core, to pick up fixes

Fri, 25 May 2018 08:02:43 +0200

Merge branch 'linus' into perf/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

dd8070bff204a67fcb6585f18047841a895b68d7 - Merge remote-tracking branch 'net-next/master' into mac80211-next

Wed, 23 May 2018 11:05:26 +0200

Merge remote-tracking branch 'net-next/master' into mac80211-nextBring in net-next which had pulled in net, so I have the changesfrom mac80211 and can apply a patch that would otherwise conflict.Signed-off-by: Johannes Berg List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

6f6e434aa267a6030477876d89444fe3a6b7a48d - Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Mon, 21 May 2018 22:01:54 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netS390 bpf_jit.S is removed in net-next and had changes in 'net',since that code isn't used any more take the removal.TLS data structures split the TX and RX components in 'net-next',put the new struct members from the bug fix in 'net' into the RXpart.The 'net-next' tree had some reworking of how the ERSPAN code works inthe GRE tunneling code, overlapping with a one-line headroomcalculation fix in 'net'.Overlapping changes in __sock_map_ctx_update_elem(), keep the bitsthat read the prog members via READ_ONCE() into local variablesbefore using them.Signed-off-by: David S. Miller List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

6741c4bb389da103c0d79ad1961884628900bfe6 - Merge tag 'mips_fixes_4.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips

Mon, 21 May 2018 17:58:00 +0200

Merge tag 'mips_fixes_4.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mipsPull MIPS fixes from James Hogan: - fix build with DEBUG_ZBOOT and MACH_JZ4770 (4.16) - include xilfpga FDT in fitImage and stop generating dtb.o (4.15) - fix software IO coherence on CM SMP systems (4.8) - ptrace: Fix PEEKUSR/POKEUSR to o32 FGRs (3.14) - ptrace: Expose FIR register through FP regset (3.13) - fix typo in KVM debugfs file name (3.10)* tag 'mips_fixes_4.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips: MIPS: Fix ptrace(2) PTRACE_PEEKUSR and PTRACE_POKEUSR accesses to o32 FGRs MIPS: xilfpga: Actually include FDT in fitImage MIPS: xilfpga: Stop generating useless dtb.o KVM: Fix spelling mistake: "cop_unsuable" -> "cop_unusable" MIPS: ptrace: Expose FIR register through FP regset MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770 MIPS: c-r4k: Fix data corruption related to cache coherence List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

a5a92abbce56c41ff121db41a33b9c0a0ff39365 - MIPS: xilfpga: Stop generating useless dtb.o

Wed, 25 Apr 2018 23:10:35 +0200

MIPS: xilfpga: Stop generating useless dtb.oA dtb.o is generated from nexys4ddr.dts but this is never used since ithas been moved to mips/generic with commit b35565bb16a5 ("MIPS: generic:Add support for MIPSfpga").Fixes: b35565bb16a5 ("MIPS: generic: Add support for MIPSfpga")Signed-off-by: Alexandre Belloni Cc: Ralf Baechle Cc: linux-mips@linux-mips.orgCc: # 4.15+Patchwork: https://patchwork.linux-mips.org/patch/19244/Signed-off-by: James Hogan List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

fca3aa16642200069eafa4ece17a60751bb891cd - MIPS: dts: Avoid unneeded built-in.a in DTS dirs

Mon, 16 Apr 2018 17:41:30 +0200

MIPS: dts: Avoid unneeded built-in.a in DTS dirsarch/mips/boot/dts/Makefile collects objects from sub-directories intobuilt-in.a only when CONFIG_BUILTIN_DTB is enabled. Reflect it also tothe sub-directory Makefiles. This suppresses unneeded built-in.acreation in arch/mips/boot/dts/*/ directories.While I am here, I replaced $(patsubst %.dtb, %.dtb.o, $(dtb-y)) with$(addsuffix .o, $(dtb-y)) to simplify the code a little bit.Signed-off-by: Masahiro Yamada Cc: Ralf Baechle Cc: Paul Cercueil Cc: Mathieu Malaterre Cc: Alexandre Belloni Cc: Mark Rutland Cc: Rob Herring Cc: linux-mips@linux-mips.orgCc: devicetree@vger.kernel.orgPatchwork: https://patchwork.linux-mips.org/patch/19099/Signed-off-by: James Hogan List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

664b0bae0b87f69bc9deb098f5e0158b9cf18e04 - Merge branch 'next' into for-linus

Thu, 05 Apr 2018 01:11:49 +0200

Merge branch 'next' into for-linusPrepare input updates for 4.17 merge window. List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

10a558374f3751cf4eb55143008975641dfc2cf4 - Merge tag 'v4.15' into next

Thu, 01 Feb 2018 09:41:33 +0100

Merge tag 'v4.15' into nextSync with mainline to get in trackpoint updates and other changes. List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

c86aa0129c07c8c7f54dc47656de99ab0eb809b3 - Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus

Wed, 31 Jan 2018 16:23:58 +0100

Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linusPull assorted small fixes queued for merge window. List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

7e86548e2cc8d308cb75439480f428137151b0de - Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes

Tue, 30 Jan 2018 15:08:27 +0100

Merge tag 'v4.15' into x86/pti, to be able to merge dependent changesTime has come to switch PTI development over to a v4.15 base - we'll stilltry to make sure that all PTI fixes backport cleanly to v4.14 and earlier.Signed-off-by: Ingo Molnar List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

ddb9e13af3bba3f8c36ccee0eb9563a82b425c12 - Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Mon, 29 Jan 2018 15:54:46 +0100

Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

0b5eca67bd2d0e6f6d0ccdc316aced0cc4bf2e9f - Merge branches 'topic/twl4030' and 'topic/twl6040' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-twl-breakage

Thu, 25 Jan 2018 19:16:26 +0100

Merge branches 'topic/twl4030' and 'topic/twl6040' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-twl-breakage List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile

d27998185da8fbdc35911307ae13518d168778d7 - Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

Fri, 19 Jan 2018 02:09:57 +0100

Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-nextThis merges in the ppc-kvm topic branch of the powerpc tree to gettwo patches which are prerequisites for the following patch series,plus another patch which touches both powerpc and KVM code.Signed-off-by: Paul Mackerras List of files: /linux/arch/mips/boot/dts/xilfpga/Makefile