Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the akpm-current tree with the kbuild tree
@ 2021-04-08 10:34 Stephen Rothwell
  2021-04-08 10:36 ` Stephen Rothwell
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2021-04-08 10:34 UTC (permalink / raw)
  To: Andrew Morton, Masahiro Yamada
  Cc: Linux Kernel Mailing List, Linux Next Mailing List, Piotr Gorski


[-- Attachment #1: Type: text/plain, Size: 976 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  Makefile

between commit:

  2f8864dbe668 ("kbuild: move module strip/compression code into scripts/Makefile.modinst")

from the kbuild tree and commit:

  7b35c1a01c2e ("init: add support for zstd compressed modules")

from the akpm-current tree.

Also commit

  ee2305118fc3 ("kbuild: add support for zstd compressed modules")

from the kbuild tree seems to do the same as the akpm-current commit
above, so I just effectively reverted the akpm-current commit.

I fixed it up (see above) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the akpm-current tree with the kbuild tree
  2021-04-08 10:34 linux-next: manual merge of the akpm-current tree with the kbuild tree Stephen Rothwell
@ 2021-04-08 10:36 ` Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2021-04-08 10:36 UTC (permalink / raw)
  To: Andrew Morton, Masahiro Yamada
  Cc: Linux Kernel Mailing List, Linux Next Mailing List, Piotr Gorski


[-- Attachment #1: Type: text/plain, Size: 1148 bytes --]

Hi all,

On Thu, 8 Apr 2021 20:34:49 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   Makefile

This also affected init/Kconfig

> between commit:
> 
>   2f8864dbe668 ("kbuild: move module strip/compression code into scripts/Makefile.modinst")
> 
> from the kbuild tree and commit:
> 
>   7b35c1a01c2e ("init: add support for zstd compressed modules")
> 
> from the akpm-current tree.
> 
> Also commit
> 
>   ee2305118fc3 ("kbuild: add support for zstd compressed modules")
> 
> from the kbuild tree seems to do the same as the akpm-current commit
> above, so I just effectively reverted the akpm-current commit.
> 
> I fixed it up (see above) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the akpm-current tree with the kbuild tree
@ 2020-05-11  8:23 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2020-05-11  8:23 UTC (permalink / raw)
  To: Andrew Morton, Masahiro Yamada
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, xujialu


[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  Makefile

between commit:

  0e92fd54b7c1 ("kbuild: remove {CLEAN,MRPROPER,DISTCLEAN}_DIRS")

from the kbuild tree and commit:

  51b26a64f220 ("scripts/tags.sh: add a intermediate file for 'make gtags'")

from the akpm-current 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 4334bcffa886,995020716343..000000000000
--- a/Makefile
+++ b/Makefile
@@@ -1413,7 -1397,8 +1413,7 @@@ MRPROPER_FILES += include/config includ
  		  *.spec
  
  # Directories & files removed with 'make distclean'
- DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
 -DISTCLEAN_DIRS  +=
+ DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS gtags.files
  
  # clean - Delete most, but leave enough to build external modules
  #

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the akpm-current tree with the kbuild tree
  2018-08-03  8:36 Stephen Rothwell
@ 2018-08-15 23:55 ` Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2018-08-15 23:55 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Masahiro Yamada, Linux-Next Mailing List,
	Linux Kernel Mailing List, Tetsuo Handa, Christoph Hellwig


[-- Attachment #1: Type: text/plain, Size: 2414 bytes --]

Hi all,

On Fri, 3 Aug 2018 18:36:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   lib/Kconfig.debug
> 
> between commit:
> 
>   06ec64b84c35 ("Kconfig: consolidate the "Kernel hacking" menu")
> 
> from the kbuild tree and commit:
> 
>   bbd89226bb66 ("fs/buffer.c: add debug print for __getblk_gfp() stall problem")
> 
> from the akpm-current 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 lib/Kconfig.debug
> index 46f755a60872,01ec99f1cf2e..000000000000
> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@@ -1729,10 -1713,9 +1727,9 @@@ config KPROBES_SANITY_TES
>   	bool "Kprobes sanity tests"
>   	depends on DEBUG_KERNEL
>   	depends on KPROBES
> - 	default n
>   	help
>   	  This option provides for testing basic kprobes functionality on
>  -	  boot. A sample kprobe, jprobe and kretprobe are inserted and
>  +	  boot. Samples of kprobe and kretprobe are inserted and
>   	  verified for functionality.
>   
>   	  Say N if you are unsure.
> @@@ -1851,12 -1820,8 +1844,11 @@@ config TEST_HAS
>   	  This is intended to help people writing architecture-specific
>   	  optimized versions.  If unsure, say N.
>   
>  +config TEST_IDA
>  +	tristate "Perform selftest on IDA functions"
>  +
>   config TEST_PARMAN
>   	tristate "Perform selftest on priority array manager"
> - 	default n
>   	depends on PARMAN
>   	help
>   	  Enable this option to test priority array manager on boot
> @@@ -2062,6 -2018,8 +2045,12 @@@ config IO_STRICT_DEVME
>   
>   	  If in doubt, say Y.
>   
> + config DEBUG_AID_FOR_SYZBOT
> +        bool "Additional debug code for syzbot"
> +        default n
> +        help
> +          This option is intended for testing by syzbot.
> ++
>  +source "arch/$(SRCARCH)/Kconfig.debug"
>  +
>  +endmenu # Kernel hacking

This is now a conflict between Linus' tree and the akpm-current tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the akpm-current tree with the kbuild tree
@ 2018-08-03  8:36 Stephen Rothwell
  2018-08-15 23:55 ` Stephen Rothwell
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2018-08-03  8:36 UTC (permalink / raw)
  To: Andrew Morton, Masahiro Yamada
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Tetsuo Handa,
	Christoph Hellwig


[-- Attachment #1: Type: text/plain, Size: 2088 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  lib/Kconfig.debug

between commit:

  06ec64b84c35 ("Kconfig: consolidate the "Kernel hacking" menu")

from the kbuild tree and commit:

  bbd89226bb66 ("fs/buffer.c: add debug print for __getblk_gfp() stall problem")

from the akpm-current 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 lib/Kconfig.debug
index 46f755a60872,01ec99f1cf2e..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -1729,10 -1713,9 +1727,9 @@@ config KPROBES_SANITY_TES
  	bool "Kprobes sanity tests"
  	depends on DEBUG_KERNEL
  	depends on KPROBES
- 	default n
  	help
  	  This option provides for testing basic kprobes functionality on
 -	  boot. A sample kprobe, jprobe and kretprobe are inserted and
 +	  boot. Samples of kprobe and kretprobe are inserted and
  	  verified for functionality.
  
  	  Say N if you are unsure.
@@@ -1851,12 -1820,8 +1844,11 @@@ config TEST_HAS
  	  This is intended to help people writing architecture-specific
  	  optimized versions.  If unsure, say N.
  
 +config TEST_IDA
 +	tristate "Perform selftest on IDA functions"
 +
  config TEST_PARMAN
  	tristate "Perform selftest on priority array manager"
- 	default n
  	depends on PARMAN
  	help
  	  Enable this option to test priority array manager on boot
@@@ -2062,6 -2018,8 +2045,12 @@@ config IO_STRICT_DEVME
  
  	  If in doubt, say Y.
  
+ config DEBUG_AID_FOR_SYZBOT
+        bool "Additional debug code for syzbot"
+        default n
+        help
+          This option is intended for testing by syzbot.
++
 +source "arch/$(SRCARCH)/Kconfig.debug"
 +
 +endmenu # Kernel hacking

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the akpm-current tree with the kbuild tree
@ 2017-11-02  7:13 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2017-11-02  7:13 UTC (permalink / raw)
  To: Andrew Morton, Masahiro Yamada
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Victor Chibotaru, Alexander Potapenko

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  Makefile

between commit:

  2e026cb9ffbb ("kbuild: do not call cc-option before KBUILD_CFLAGS initialization")

from the kbuild tree and commit:

  56db01c150f1 ("Makefile: support flag -fsanitizer-coverage=trace-cmp")

from the akpm-current tree.

I fixed it up (mostly - 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 94e70d8693f3,4ee187f133bb..000000000000
--- a/Makefile
+++ b/Makefile
@@@ -603,12 -619,6 +603,11 @@@ endi
  # Defaults to vmlinux, but the arch makefile usually adds further targets
  all: vmlinux
  
 +KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)
 +KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)
 +CFLAGS_GCOV	:= -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,)
- CFLAGS_KCOV	:= $(call cc-option,-fsanitize-coverage=trace-pc,)
 +export CFLAGS_GCOV CFLAGS_KCOV
 +
  # The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default
  # values of the respective KBUILD_* variables
  ARCH_CPPFLAGS :=

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the akpm-current tree with the kbuild tree
  2016-01-06  6:54 Stephen Rothwell
@ 2016-01-06  8:07 ` Michal Marek
  0 siblings, 0 replies; 10+ messages in thread
From: Michal Marek @ 2016-01-06  8:07 UTC (permalink / raw)
  To: Stephen Rothwell, Andrew Morton
  Cc: linux-next, linux-kernel, Kirill A. Shutemov

On 2016-01-06 07:54, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   scripts/tags.sh
> 
> between commit:
> 
>   93209d65c1d3 ("tags: Unify emacs and exuberant rules")
> 
> from the kbuild tree and commit:
> 
>   ef0e95208c33 ("page-flags: drop __TestClearPage*() helpers")
> 
> from the akpm-current tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

That's correct, thanks.

Michal

^ permalink raw reply	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the akpm-current tree with the kbuild tree
@ 2016-01-06  6:54 Stephen Rothwell
  2016-01-06  8:07 ` Michal Marek
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2016-01-06  6:54 UTC (permalink / raw)
  To: Andrew Morton, Michal Marek; +Cc: linux-next, linux-kernel, Kirill A. Shutemov

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  scripts/tags.sh

between commit:

  93209d65c1d3 ("tags: Unify emacs and exuberant rules")

from the kbuild tree and commit:

  ef0e95208c33 ("page-flags: drop __TestClearPage*() helpers")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc scripts/tags.sh
index bcc1d8cb142b,76f131ebc192..000000000000
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@@ -145,108 -150,8 +145,107 @@@ dogtags(
  	all_target_sources | gtags -i -f -
  }
  
 +# Basic regular expressions with an optional /kind-spec/ for ctags and
 +# the following limitations:
 +# - No regex modifiers
 +# - Use \{0,1\} instead of \?, because etags expects an unescaped ?
 +# - \s is not working with etags, use a space or [ \t]
 +# - \w works, but does not match underscores in etags
 +# - etags regular expressions have to match at the start of a line;
 +#   a ^[^#] is prepended by setup_regex unless an anchor is already present
 +regex_asm=(
 +	'/^\(ENTRY\|_GLOBAL\)(\([[:alnum:]_\\]*\)).*/\2/'
 +)
 +regex_c=(
 +	'/^SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/sys_\1/'
 +	'/^COMPAT_SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/compat_sys_\1/'
 +	'/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1/'
 +	'/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1_rcuidle/'
 +	'/^DEFINE_EVENT([^,)]*, *\([[:alnum:]_]*\).*/trace_\1/'
 +	'/^DEFINE_EVENT([^,)]*, *\([[:alnum:]_]*\).*/trace_\1_rcuidle/'
 +	'/^PAGEFLAG(\([[:alnum:]_]*\).*/Page\1/'
 +	'/^PAGEFLAG(\([[:alnum:]_]*\).*/SetPage\1/'
 +	'/^PAGEFLAG(\([[:alnum:]_]*\).*/ClearPage\1/'
 +	'/^TESTSETFLAG(\([[:alnum:]_]*\).*/TestSetPage\1/'
 +	'/^TESTPAGEFLAG(\([[:alnum:]_]*\).*/Page\1/'
 +	'/^SETPAGEFLAG(\([[:alnum:]_]*\).*/SetPage\1/'
 +	'/\<__SETPAGEFLAG(\([[:alnum:]_]*\).*/__SetPage\1/'
 +	'/\<TESTCLEARFLAG(\([[:alnum:]_]*\).*/TestClearPage\1/'
 +	'/\<__TESTCLEARFLAG(\([[:alnum:]_]*\).*/TestClearPage\1/'
 +	'/\<CLEARPAGEFLAG(\([[:alnum:]_]*\).*/ClearPage\1/'
 +	'/\<__CLEARPAGEFLAG(\([[:alnum:]_]*\).*/__ClearPage\1/'
 +	'/^__PAGEFLAG(\([[:alnum:]_]*\).*/__SetPage\1/'
 +	'/^__PAGEFLAG(\([[:alnum:]_]*\).*/__ClearPage\1/'
 +	'/^PAGEFLAG_FALSE(\([[:alnum:]_]*\).*/Page\1/'
 +	'/\<TESTSCFLAG(\([[:alnum:]_]*\).*/TestSetPage\1/'
 +	'/\<TESTSCFLAG(\([[:alnum:]_]*\).*/TestClearPage\1/'
 +	'/\<SETPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/SetPage\1/'
 +	'/\<CLEARPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/ClearPage\1/'
 +	'/\<__CLEARPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/__ClearPage\1/'
 +	'/\<TESTCLEARFLAG_FALSE(\([[:alnum:]_]*\).*/TestClearPage\1/'
- 	'/\<__TESTCLEARFLAG_FALSE(\([[:alnum:]_]*\).*/__TestClearPage\1/'
 +	'/^TASK_PFA_TEST([^,]*, *\([[:alnum:]_]*\))/task_\1/'
 +	'/^TASK_PFA_SET([^,]*, *\([[:alnum:]_]*\))/task_set_\1/'
 +	'/^TASK_PFA_CLEAR([^,]*, *\([[:alnum:]_]*\))/task_clear_\1/'
 +	'/^DEF_MMIO_\(IN\|OUT\)_[XD](\([[:alnum:]_]*\),[^)]*)/\2/'
 +	'/^DEBUGGER_BOILERPLATE(\([[:alnum:]_]*\))/\1/'
 +	'/^DEF_PCI_AC_\(\|NO\)RET(\([[:alnum:]_]*\).*/\2/'
 +	'/^PCI_OP_READ(\(\w*\).*[1-4])/pci_bus_read_config_\1/'
 +	'/^PCI_OP_WRITE(\(\w*\).*[1-4])/pci_bus_write_config_\1/'
 +	'/\<DEFINE_\(MUTEX\|SEMAPHORE\|SPINLOCK\)(\([[:alnum:]_]*\)/\2/v/'
 +	'/\<DEFINE_\(RAW_SPINLOCK\|RWLOCK\|SEQLOCK\)(\([[:alnum:]_]*\)/\2/v/'
 +	'/\<DECLARE_\(RWSEM\|COMPLETION\)(\([[:alnum:]_]\+\)/\2/v/'
 +	'/\<DECLARE_BITMAP(\([[:alnum:]_]*\)/\1/v/'
 +	'/\(^\|\s\)\(\|L\|H\)LIST_HEAD(\([[:alnum:]_]*\)/\3/v/'
 +	'/\(^\|\s\)RADIX_TREE(\([[:alnum:]_]*\)/\2/v/'
 +	'/\<DEFINE_PER_CPU([^,]*, *\([[:alnum:]_]*\)/\1/v/'
 +	'/\<DEFINE_PER_CPU_SHARED_ALIGNED([^,]*, *\([[:alnum:]_]*\)/\1/v/'
 +	'/\<DECLARE_WAIT_QUEUE_HEAD(\([[:alnum:]_]*\)/\1/v/'
 +	'/\<DECLARE_\(TASKLET\|WORK\|DELAYED_WORK\)(\([[:alnum:]_]*\)/\2/v/'
 +	'/\<DEFINE_PCI_DEVICE_TABLE(\([[:alnum:]_]*\)/\1/v/'
 +	'/\(^\s\)OFFSET(\([[:alnum:]_]*\)/\2/v/'
 +	'/\(^\s\)DEFINE(\([[:alnum:]_]*\)/\2/v/'
 +	'/\<DEFINE_HASHTABLE(\([[:alnum:]_]*\)/\1/v/'
 +)
 +regex_kconfig=(
 +	'/^[[:blank:]]*\(menu\|\)config[[:blank:]]\+\([[:alnum:]_]\+\)/\2/'
 +	'/^[[:blank:]]*\(menu\|\)config[[:blank:]]\+\([[:alnum:]_]\+\)/CONFIG_\2/'
 +)
 +setup_regex()
 +{
 +	local mode=$1 lang tmp=() r
 +	shift
 +
 +	regex=()
 +	for lang; do
 +		case "$lang" in
 +		asm)       tmp=("${regex_asm[@]}") ;;
 +		c)         tmp=("${regex_c[@]}") ;;
 +		kconfig)   tmp=("${regex_kconfig[@]}") ;;
 +		esac
 +		for r in "${tmp[@]}"; do
 +			if test "$mode" = "exuberant"; then
 +				regex[${#regex[@]}]="--regex-$lang=${r}b"
 +			else
 +				# Remove ctags /kind-spec/
 +				case "$r" in
 +				/*/*/?/)
 +					r=${r%?/}
 +				esac
 +				# Prepend ^[^#] unless already anchored
 +				case "$r" in
 +				/^*) ;;
 +				*)
 +					r="/^[^#]*${r#/}"
 +				esac
 +				regex[${#regex[@]}]="--regex=$r"
 +			fi
 +		done
 +	done
 +}
 +
  exuberant()
  {
 +	setup_regex exuberant asm c
  	all_target_sources | xargs $1 -a                        \
  	-I __initdata,__exitdata,__initconst,			\
  	-I __initdata_memblock					\

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the akpm-current tree with the kbuild tree
  2013-11-07  6:37 Stephen Rothwell
@ 2013-11-07  9:49 ` Michal Marek
  0 siblings, 0 replies; 10+ messages in thread
From: Michal Marek @ 2013-11-07  9:49 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Andrew Morton, linux-next, linux-kernel, Andi Kleen, Josh Triplett

On 7.11.2013 07:37, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in
> scripts/bloat-o-meter between commit 21cf6e584ce3 ("kbuild,
> bloat-o-meter: fix static detection") from the kbuild tree and commit
> 372dd3b27736 ("scripts/bloat-o-meter: ignore changes in the size of
> linux_banner") from the akpm-current tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

I sucked the bloat-o-meter fixes into the kbuild tree.

Michal

^ permalink raw reply	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the akpm-current tree with the kbuild tree
@ 2013-11-07  6:37 Stephen Rothwell
  2013-11-07  9:49 ` Michal Marek
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2013-11-07  6:37 UTC (permalink / raw)
  To: Andrew Morton
  Cc: linux-next, linux-kernel, Andi Kleen, Michal Marek, Josh Triplett


[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
scripts/bloat-o-meter between commit 21cf6e584ce3 ("kbuild,
bloat-o-meter: fix static detection") from the kbuild tree and commit
372dd3b27736 ("scripts/bloat-o-meter: ignore changes in the size of
linux_banner") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc scripts/bloat-o-meter
index 855198c9dedb,31c953195b52..000000000000
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@@ -19,9 -19,10 +19,10 @@@ def getsizes(file)
          size, type, name = l[:-1].split()
          if type in "tTdDbBrR":
              # strip generated symbols
-             if name[:6] == "__mod_": continue
+             if name.startswith("__mod_"): continue
+             if name == "linux_banner": continue
 -            # function names begin with '.' on 64-bit powerpc
 -            if "." in name[1:]: name = "static." + name.split(".")[0]
 +            # statics and some other optimizations adds random .NUMBER
 +            name = re.sub(r'\.[0-9]+', '', name)
              sym[name] = sym.get(name, 0) + int(size, 16)
      return sym
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, back to index

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-08 10:34 linux-next: manual merge of the akpm-current tree with the kbuild tree Stephen Rothwell
2021-04-08 10:36 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2020-05-11  8:23 Stephen Rothwell
2018-08-03  8:36 Stephen Rothwell
2018-08-15 23:55 ` Stephen Rothwell
2017-11-02  7:13 Stephen Rothwell
2016-01-06  6:54 Stephen Rothwell
2016-01-06  8:07 ` Michal Marek
2013-11-07  6:37 Stephen Rothwell
2013-11-07  9:49 ` Michal Marek

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git