Re: linux-next: manual merge of the tip tree with the kbuild tree
Hi all, On Fri, 25 Sep 2020 15:25:45 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/arm/Makefile > > between commit: > > 596b0474d3d9 ("kbuild: preprocess module linker script") > > from the kbuild tree and commit: > > 5a17850e251a ("arm/build: Warn on orphan section placement") > > from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > diff --cc arch/arm/Makefile > index e15f76ca2887,e589da3c8949.. > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@@ -16,6 -16,14 +16,10 @@@ LDFLAGS_vmlinux += --be > KBUILD_LDFLAGS_MODULE += --be8 > endif > > + # We never want expected sections to be placed heuristically by the > + # linker. All sections should be explicitly named in the linker script. > + LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn) > + > -ifeq ($(CONFIG_ARM_MODULE_PLTS),y) > -KBUILD_LDS_MODULE += $(srctree)/arch/arm/kernel/module.lds > -endif > - > GZFLAGS :=-9 > #KBUILD_CFLAGS +=-pipe > This is now a conflict between the kbuild tree and Linus' tree. -- Cheers, Stephen Rothwell pgpDNf0gmMc2O.pgp Description: OpenPGP digital signature
linux-next: manual merge of the tip tree with the kbuild tree
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/arm/Makefile between commit: 596b0474d3d9 ("kbuild: preprocess module linker script") from the kbuild tree and commit: 5a17850e251a ("arm/build: Warn on orphan section placement") from the tip tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm/Makefile index e15f76ca2887,e589da3c8949.. --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@@ -16,6 -16,14 +16,10 @@@ LDFLAGS_vmlinux += --be KBUILD_LDFLAGS_MODULE += --be8 endif + # We never want expected sections to be placed heuristically by the + # linker. All sections should be explicitly named in the linker script. + LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn) + -ifeq ($(CONFIG_ARM_MODULE_PLTS),y) -KBUILD_LDS_MODULE += $(srctree)/arch/arm/kernel/module.lds -endif - GZFLAGS :=-9 #KBUILD_CFLAGS+=-pipe pgpCuPdXMNPOx.pgp Description: OpenPGP digital signature
linux-next: manual merge of the tip tree with the kbuild tree
Hi all, Today's linux-next merge of the tip tree got a conflict in: Kbuild between commits: 86948e2a69de ("scripts/gdb: delay generation of gdb constants.py") f4d5577af6d3 ("kbuild: remove unimportant comments from ./Kbuild") from the kbuild tree and commit: 8d32588077bd ("locking/atomics: Check generated headers are up-to-date") from the tip tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc Kbuild index a07bbd62f052,4a4c47c38d1d.. --- a/Kbuild +++ b/Kbuild @@@ -50,5 -59,27 +50,18 @@@ quiet_cmd_syscalls = CALL$ missing-syscalls: scripts/checksyscalls.sh $(offsets-file) FORCE $(call cmd,syscalls) + # -# 5) Check atomic headers are up-to-date ++# Check atomic headers are up-to-date + # + + always += old-atomics + targets += old-atomics + + quiet_cmd_atomics = CALL$< + cmd_atomics = $(CONFIG_SHELL) $< + + old-atomics: scripts/atomic/check-atomics.sh FORCE + $(call cmd,atomics) + -# -# 6) Generate constants for Python GDB integration -# - -extra-$(CONFIG_GDB_SCRIPTS) += build_constants_py - -build_constants_py: $(timeconst-file) $(bounds-file) - @$(MAKE) $(build)=scripts/gdb/linux $@ - # Keep these three files during make clean no-clean-files := $(bounds-file) $(offsets-file) $(timeconst-file) pgptdqzuxSKLn.pgp Description: OpenPGP digital signature
linux-next: manual merge of the tip tree with the kbuild tree
Hi all, Today's linux-next merge of the tip tree got a conflict in: Makefile between commits: 65bba0423ecf ("kbuild: fix UML build error with CONFIG_GCC_PLUGINS") 059bc9fc375e ("kbuild: make 'archprepare' depend on 'scripts'") ce2fd53a10c7 ("kbuild: descend into scripts/gcc-plugins/ via scripts/Makefile") from the kbuild tree and commit: 6ac389346e69 ("Revert "kbuild/Makefile: Prepare for using macros in inline assembly code to work around asm() related GCC inlining bugs"") from the tip tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc Makefile index 6ae8a5382d5d,885c74b192f9.. --- a/Makefile +++ b/Makefile @@@ -1104,12 -1104,9 +1104,10 @@@ prepare2: prepare3 outputmakefile asm-g prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h $(cmd_crmodverdir) - macroprepare: prepare1 archmacros - - archprepare: archheaders archscripts macroprepare scripts -archprepare: archheaders archscripts prepare1 scripts_basic ++archprepare: archheaders archscripts prepare1 scripts -prepare0: archprepare gcc-plugins +prepare0: archprepare + $(Q)$(MAKE) $(build)=scripts/mod $(Q)$(MAKE) $(build)=. # All the preparing.. pgpUgH0Uolzus.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the tip tree with the kbuild tree
Hi all, On Mon, 6 Aug 2018 14:47:36 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got conflicts in: > > arch/arm64/Kconfig > arch/openrisc/Kconfig > > between commit: > > 1572497cb0e6 ("kconfig: include common Kconfig files from top-level > Kconfig") > > from the kbuild tree and commits: > > 78ae2e1cd845 ("arm64: Use the new GENERIC_IRQ_MULTI_HANDLER") > c5ca4560de0f ("openrisc: Use the new GENERIC_IRQ_MULTI_HANDLER") > > from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm64/Kconfig > index a3de6ad666d4,3d1011957823.. > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@@ -278,9 -265,10 +279,6 @@@ config ARCH_SUPPORTS_UPROBE > config ARCH_PROC_KCORE_TEXT > def_bool y > > - config MULTI_IRQ_HANDLER > - def_bool y > -source "init/Kconfig" > - > -source "kernel/Kconfig.freezer" > -- > source "arch/arm64/Kconfig.platforms" > > menu "Bus support" > diff --cc arch/openrisc/Kconfig > index fee9d91a66e6,dfb6a79ba7ff.. > --- a/arch/openrisc/Kconfig > +++ b/arch/openrisc/Kconfig > @@@ -71,9 -69,10 +71,6 @@@ config STACKTRACE_SUPPOR > config LOCKDEP_SUPPORT > def_bool y > > - config MULTI_IRQ_HANDLER > - def_bool y > -source "init/Kconfig" > - > -source "kernel/Kconfig.freezer" > -- > menu "Processor type and features" > > choice This is now a conflict between Linus' tree and the kbuild tree. -- Cheers, Stephen Rothwell pgpiaDSOj6EWq.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the tip tree with the kbuild tree
Hi all, On Mon, 6 Aug 2018 14:47:36 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got conflicts in: > > arch/arm64/Kconfig > arch/openrisc/Kconfig > > between commit: > > 1572497cb0e6 ("kconfig: include common Kconfig files from top-level > Kconfig") > > from the kbuild tree and commits: > > 78ae2e1cd845 ("arm64: Use the new GENERIC_IRQ_MULTI_HANDLER") > c5ca4560de0f ("openrisc: Use the new GENERIC_IRQ_MULTI_HANDLER") > > from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm64/Kconfig > index a3de6ad666d4,3d1011957823.. > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@@ -278,9 -265,10 +279,6 @@@ config ARCH_SUPPORTS_UPROBE > config ARCH_PROC_KCORE_TEXT > def_bool y > > - config MULTI_IRQ_HANDLER > - def_bool y > -source "init/Kconfig" > - > -source "kernel/Kconfig.freezer" > -- > source "arch/arm64/Kconfig.platforms" > > menu "Bus support" > diff --cc arch/openrisc/Kconfig > index fee9d91a66e6,dfb6a79ba7ff.. > --- a/arch/openrisc/Kconfig > +++ b/arch/openrisc/Kconfig > @@@ -71,9 -69,10 +71,6 @@@ config STACKTRACE_SUPPOR > config LOCKDEP_SUPPORT > def_bool y > > - config MULTI_IRQ_HANDLER > - def_bool y > -source "init/Kconfig" > - > -source "kernel/Kconfig.freezer" > -- > menu "Processor type and features" > > choice This is now a conflict between Linus' tree and the kbuild tree. -- Cheers, Stephen Rothwell pgpiaDSOj6EWq.pgp Description: OpenPGP digital signature
linux-next: manual merge of the tip tree with the kbuild tree
Hi all, Today's linux-next merge of the tip tree got conflicts in: arch/arm64/Kconfig arch/openrisc/Kconfig between commit: 1572497cb0e6 ("kconfig: include common Kconfig files from top-level Kconfig") from the kbuild tree and commits: 78ae2e1cd845 ("arm64: Use the new GENERIC_IRQ_MULTI_HANDLER") c5ca4560de0f ("openrisc: Use the new GENERIC_IRQ_MULTI_HANDLER") from the tip tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm64/Kconfig index a3de6ad666d4,3d1011957823.. --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@@ -278,9 -265,10 +279,6 @@@ config ARCH_SUPPORTS_UPROBE config ARCH_PROC_KCORE_TEXT def_bool y - config MULTI_IRQ_HANDLER - def_bool y -source "init/Kconfig" - -source "kernel/Kconfig.freezer" -- source "arch/arm64/Kconfig.platforms" menu "Bus support" diff --cc arch/openrisc/Kconfig index fee9d91a66e6,dfb6a79ba7ff.. --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@@ -71,9 -69,10 +71,6 @@@ config STACKTRACE_SUPPOR config LOCKDEP_SUPPORT def_bool y - config MULTI_IRQ_HANDLER - def_bool y -source "init/Kconfig" - -source "kernel/Kconfig.freezer" -- menu "Processor type and features" choice pgpym5LEEEYwS.pgp Description: OpenPGP digital signature
linux-next: manual merge of the tip tree with the kbuild tree
Hi all, Today's linux-next merge of the tip tree got conflicts in: arch/arm64/Kconfig arch/openrisc/Kconfig between commit: 1572497cb0e6 ("kconfig: include common Kconfig files from top-level Kconfig") from the kbuild tree and commits: 78ae2e1cd845 ("arm64: Use the new GENERIC_IRQ_MULTI_HANDLER") c5ca4560de0f ("openrisc: Use the new GENERIC_IRQ_MULTI_HANDLER") from the tip tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm64/Kconfig index a3de6ad666d4,3d1011957823.. --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@@ -278,9 -265,10 +279,6 @@@ config ARCH_SUPPORTS_UPROBE config ARCH_PROC_KCORE_TEXT def_bool y - config MULTI_IRQ_HANDLER - def_bool y -source "init/Kconfig" - -source "kernel/Kconfig.freezer" -- source "arch/arm64/Kconfig.platforms" menu "Bus support" diff --cc arch/openrisc/Kconfig index fee9d91a66e6,dfb6a79ba7ff.. --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@@ -71,9 -69,10 +71,6 @@@ config STACKTRACE_SUPPOR config LOCKDEP_SUPPORT def_bool y - config MULTI_IRQ_HANDLER - def_bool y -source "init/Kconfig" - -source "kernel/Kconfig.freezer" -- menu "Processor type and features" choice pgpym5LEEEYwS.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the tip tree with the kbuild tree
Hi Al, Since part of the tip tree has been merged into the vfs tree, this conflict also applies to the vfs tree, now. On Fri, 23 Jun 2017 13:50:17 +1000 Stephen Rothwellwrote: > > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/arm/include/uapi/asm/Kbuild > > between commit: > > ae3f4151737d ("kbuild: replace genhdr-y with generated-y") > > from the kbuild tree and commit: > > 6bc51cbaa9d7 ("signal: Remove non-uapi ") > > from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm/include/uapi/asm/Kbuild > index 424935e4515d,e9b098d6b766.. > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@@ -1,6 -1,8 +1,8 @@@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -genhdr-y += unistd-common.h > -genhdr-y += unistd-oabi.h > -genhdr-y += unistd-eabi.h > +generated-y += unistd-common.h > +generated-y += unistd-oabi.h > +generated-y += unistd-eabi.h > + > + generic-y += siginfo.h -- Cheers, Stephen Rothwell
Re: linux-next: manual merge of the tip tree with the kbuild tree
Hi Al, Since part of the tip tree has been merged into the vfs tree, this conflict also applies to the vfs tree, now. On Fri, 23 Jun 2017 13:50:17 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/arm/include/uapi/asm/Kbuild > > between commit: > > ae3f4151737d ("kbuild: replace genhdr-y with generated-y") > > from the kbuild tree and commit: > > 6bc51cbaa9d7 ("signal: Remove non-uapi ") > > from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm/include/uapi/asm/Kbuild > index 424935e4515d,e9b098d6b766.. > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@@ -1,6 -1,8 +1,8 @@@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -genhdr-y += unistd-common.h > -genhdr-y += unistd-oabi.h > -genhdr-y += unistd-eabi.h > +generated-y += unistd-common.h > +generated-y += unistd-oabi.h > +generated-y += unistd-eabi.h > + > + generic-y += siginfo.h -- Cheers, Stephen Rothwell
linux-next: manual merge of the tip tree with the kbuild tree
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/arm/include/uapi/asm/Kbuild between commit: ae3f4151737d ("kbuild: replace genhdr-y with generated-y") from the kbuild tree and commit: 6bc51cbaa9d7 ("signal: Remove non-uapi ") from the tip tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm/include/uapi/asm/Kbuild index 424935e4515d,e9b098d6b766.. --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@@ -1,6 -1,8 +1,8 @@@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -genhdr-y += unistd-common.h -genhdr-y += unistd-oabi.h -genhdr-y += unistd-eabi.h +generated-y += unistd-common.h +generated-y += unistd-oabi.h +generated-y += unistd-eabi.h + + generic-y += siginfo.h
linux-next: manual merge of the tip tree with the kbuild tree
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/arm/include/uapi/asm/Kbuild between commit: ae3f4151737d ("kbuild: replace genhdr-y with generated-y") from the kbuild tree and commit: 6bc51cbaa9d7 ("signal: Remove non-uapi ") from the tip tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm/include/uapi/asm/Kbuild index 424935e4515d,e9b098d6b766.. --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@@ -1,6 -1,8 +1,8 @@@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -genhdr-y += unistd-common.h -genhdr-y += unistd-oabi.h -genhdr-y += unistd-eabi.h +generated-y += unistd-common.h +generated-y += unistd-oabi.h +generated-y += unistd-eabi.h + + generic-y += siginfo.h
linux-next: manual merge of the tip tree with the kbuild tree
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/lib/memcpy_64.S arch/x86/kernel/x8664_ksyms_64.c between commit: 784d5699eddc ("x86: move exports to actual definitions") from the kbuild tree and commit: 9a6fb28a355d ("x86/mce: Improve memcpy_mcsafe()") from the tip tree. I fixed it up (see below - I also removed arch/x86/kernel/x8664_ksyms_64.c) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/x86/lib/memcpy_64.S index 94c917af9688,49e6ebac7e73.. --- a/arch/x86/lib/memcpy_64.S +++ b/arch/x86/lib/memcpy_64.S @@@ -276,8 -273,7 +276,8 @@@ ENTRY(memcpy_mcsafe_unrolled .L_done_memcpy_trap: xorq %rax, %rax ret - ENDPROC(memcpy_mcsafe) - EXPORT_SYMBOL_GPL(memcpy_mcsafe) + ENDPROC(memcpy_mcsafe_unrolled) ++EXPORT_SYMBOL_GPL(memcpy_mcsafe_unrolled) .section .fixup, "ax" /* Return -EFAULT for any failure */
linux-next: manual merge of the tip tree with the kbuild tree
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/lib/memcpy_64.S arch/x86/kernel/x8664_ksyms_64.c between commit: 784d5699eddc ("x86: move exports to actual definitions") from the kbuild tree and commit: 9a6fb28a355d ("x86/mce: Improve memcpy_mcsafe()") from the tip tree. I fixed it up (see below - I also removed arch/x86/kernel/x8664_ksyms_64.c) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/x86/lib/memcpy_64.S index 94c917af9688,49e6ebac7e73.. --- a/arch/x86/lib/memcpy_64.S +++ b/arch/x86/lib/memcpy_64.S @@@ -276,8 -273,7 +276,8 @@@ ENTRY(memcpy_mcsafe_unrolled .L_done_memcpy_trap: xorq %rax, %rax ret - ENDPROC(memcpy_mcsafe) - EXPORT_SYMBOL_GPL(memcpy_mcsafe) + ENDPROC(memcpy_mcsafe_unrolled) ++EXPORT_SYMBOL_GPL(memcpy_mcsafe_unrolled) .section .fixup, "ax" /* Return -EFAULT for any failure */
Re: linux-next: manual merge of the tip tree with the kbuild tree
That is the right fix indeed. Stephen Rothwell wrote: >Hi all, > >Today's linux-next merge of the tip tree got a conflict in >kernel/timeconst.pl between commit 70730bca1331 ("kernel: Replace >timeconst.pl with a bc script") from the kbuild tree and commit >63a3f603413f ("timeconst.pl: Eliminate Perl warning") from the tip >tree. > >I just droppped the tip tree version (I deleted the file) and can carry >the fix as necessary (no action is required). -- Sent from my mobile phone. Please excuse brevity and lack of formatting. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the tip tree with the kbuild tree
Hi all, Today's linux-next merge of the tip tree got a conflict in kernel/timeconst.pl between commit 70730bca1331 ("kernel: Replace timeconst.pl with a bc script") from the kbuild tree and commit 63a3f603413f ("timeconst.pl: Eliminate Perl warning") from the tip tree. I just droppped the tip tree version (I deleted the file) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpJVTRjLYwxv.pgp Description: PGP signature
linux-next: manual merge of the tip tree with the kbuild tree
Hi all, Today's linux-next merge of the tip tree got a conflict in kernel/timeconst.pl between commit 70730bca1331 (kernel: Replace timeconst.pl with a bc script) from the kbuild tree and commit 63a3f603413f (timeconst.pl: Eliminate Perl warning) from the tip tree. I just droppped the tip tree version (I deleted the file) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpJVTRjLYwxv.pgp Description: PGP signature
Re: linux-next: manual merge of the tip tree with the kbuild tree
That is the right fix indeed. Stephen Rothwell s...@canb.auug.org.au wrote: Hi all, Today's linux-next merge of the tip tree got a conflict in kernel/timeconst.pl between commit 70730bca1331 (kernel: Replace timeconst.pl with a bc script) from the kbuild tree and commit 63a3f603413f (timeconst.pl: Eliminate Perl warning) from the tip tree. I just droppped the tip tree version (I deleted the file) and can carry the fix as necessary (no action is required). -- Sent from my mobile phone. Please excuse brevity and lack of formatting. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/