linux-next: manual merge of the akpm tree with the kbuild tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
scripts/tags.sh between commit 9f14b4201239 ("scripts/tags.sh: Fix regex
syntax for etags") from the kbuild tree and commit "scripts/tags.sh: add
magic for declarations of popular kernel type" from the akpm tree.

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

diff --cc scripts/tags.sh
index 4c53b7d,b33e7ce..0000000
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@@ -205,30 -221,41 +221,41 @@@ emacs(
  	--regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'   \
  	--regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1/'		\
  	--regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/' \
 -	--regex='/PAGEFLAG\(([^,)]*).*/Page\1/'			\
 -	--regex='/PAGEFLAG\(([^,)]*).*/SetPage\1/'		\
 -	--regex='/PAGEFLAG\(([^,)]*).*/ClearPage\1/'		\
 -	--regex='/TESTSETFLAG\(([^,)]*).*/TestSetPage\1/'	\
 -	--regex='/TESTPAGEFLAG\(([^,)]*).*/Page\1/'		\
 -	--regex='/SETPAGEFLAG\(([^,)]*).*/SetPage\1/'		\
 -	--regex='/__SETPAGEFLAG\(([^,)]*).*/__SetPage\1/'	\
 -	--regex='/TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/'	\
 -	--regex='/__TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/'	\
 -	--regex='/CLEARPAGEFLAG\(([^,)]*).*/ClearPage\1/'	\
 -	--regex='/__CLEARPAGEFLAG\(([^,)]*).*/__ClearPage\1/'	\
 -	--regex='/__PAGEFLAG\(([^,)]*).*/__SetPage\1/'		\
 -	--regex='/__PAGEFLAG\(([^,)]*).*/__ClearPage\1/'	\
 -	--regex='/PAGEFLAG_FALSE\(([^,)]*).*/Page\1/'		\
 -	--regex='/TESTSCFLAG\(([^,)]*).*/TestSetPage\1/'	\
 -	--regex='/TESTSCFLAG\(([^,)]*).*/TestClearPage\1/'	\
 -	--regex='/SETPAGEFLAG_NOOP\(([^,)]*).*/SetPage\1/'	\
 -	--regex='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/'	\
 -	--regex='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/' \
 -	--regex='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
 -	--regex='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
 -	--regex='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'			\
 -	--regex='/PCI_OP_READ\((\w*).*[1-4]\)/pci_bus_read_config_\1/'	\
 -	--regex='/PCI_OP_WRITE\((\w*).*[1-4]\)/pci_bus_write_config_\1/'\
 +	--regex='/PAGEFLAG(\([^,)]*\).*/Page\1/'			\
 +	--regex='/PAGEFLAG(\([^,)]*\).*/SetPage\1/'		\
 +	--regex='/PAGEFLAG(\([^,)]*\).*/ClearPage\1/'		\
 +	--regex='/TESTSETFLAG(\([^,)]*\).*/TestSetPage\1/'	\
 +	--regex='/TESTPAGEFLAG(\([^,)]*\).*/Page\1/'		\
 +	--regex='/SETPAGEFLAG(\([^,)]*\).*/SetPage\1/'		\
 +	--regex='/__SETPAGEFLAG(\([^,)]*\).*/__SetPage\1/'	\
 +	--regex='/TESTCLEARFLAG(\([^,)]*\).*/TestClearPage\1/'	\
 +	--regex='/__TESTCLEARFLAG(\([^,)]*\).*/TestClearPage\1/'	\
 +	--regex='/CLEARPAGEFLAG(\([^,)]*\).*/ClearPage\1/'	\
 +	--regex='/__CLEARPAGEFLAG(\([^,)]*\).*/__ClearPage\1/'	\
 +	--regex='/__PAGEFLAG(\([^,)]*\).*/__SetPage\1/'		\
 +	--regex='/__PAGEFLAG(\([^,)]*\).*/__ClearPage\1/'	\
 +	--regex='/PAGEFLAG_FALSE(\([^,)]*\).*/Page\1/'		\
 +	--regex='/TESTSCFLAG(\([^,)]*\).*/TestSetPage\1/'	\
 +	--regex='/TESTSCFLAG(\([^,)]*\).*/TestClearPage\1/'	\
 +	--regex='/SETPAGEFLAG_NOOP(\([^,)]*\).*/SetPage\1/'	\
 +	--regex='/CLEARPAGEFLAG_NOOP(\([^,)]*\).*/ClearPage\1/'	\
 +	--regex='/__CLEARPAGEFLAG_NOOP(\([^,)]*\).*/__ClearPage\1/' \
 +	--regex='/TESTCLEARFLAG_FALSE(\([^,)]*\).*/TestClearPage\1/' \
 +	--regex='/__TESTCLEARFLAG_FALSE(\([^,)]*\).*/__TestClearPage\1/' \
 +	--regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/'		\
- 	--regex='/PCI_OP_READ(\([a-z]*[a-z]\).*[1-4])/pci_bus_read_config_\1/' \
- 	--regex='/PCI_OP_WRITE(\([a-z]*[a-z]\).*[1-4])/pci_bus_write_config_\1/'
++	--regex='/PCI_OP_READ(\(\w\).*[1-4])/pci_bus_read_config_\1/' \
++	--regex='/PCI_OP_WRITE(\(\w\).*[1-4])/pci_bus_write_config_\1/' \
+ 	--regex='/DEFINE_(MUTEX|SEMAPHORE|SPINLOCK)\((\w*)/\2/v/'	\
+ 	--regex='/DEFINE_(RAW_SPINLOCK|RWLOCK|SEQLOCK)\((\w*)/\2/v/'	\
+ 	--regex='/DECLARE_(RWSEM|COMPLETION)\((\w*)/\2/v/'		\
+ 	--regex='/DECLARE_BITMAP\((\w*)/\1/v/'				\
+ 	--regex='/(^|\s)(|L|H)LIST_HEAD\((\w*)/\3/v/'			\
+ 	--regex='/(^|\s)RADIX_TREE\((\w*)/\2/v/'			\
+ 	--regex='/DEFINE_PER_CPU\(([^,]*,\s*)(\w*).*\)/\2/v/'		\
+ 	--regex='/DEFINE_PER_CPU_SHARED_ALIGNED\(([^,]*,\s*)(\w*).*\)/\2/v/' \
+ 	--regex='/DECLARE_WAIT_QUEUE_HEAD\((\w*)/\1/v/'			\
+ 	--regex='/DECLARE_(TASKLET|WORK|DELAYED_WORK)\((\w*)/\2/v/'	\
+ 	--regex='/DEFINE_PCI_DEVICE_TABLE\((\w*)/\1/v/'
  
  	all_kconfigs | xargs $1 -a                              \
  	--regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpg6oBHr600w.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux