linux-next: manual merge of the modules tree with the mm-everything tree

[broonie]

Hi all,

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

  scripts/gdb/linux/constants.py.in

between commit:

  96839cd89fa9f ("scripts/gdb: print interrupts")

from the mm-everything tree and commit:

  b4aff7513df32 ("scripts/gdb: use mem instead of core_layout to get the module address")

from the modules 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 scripts/gdb/linux/constants.py.in
index 36fd2b1458531,8085d3693a055..0000000000000
--- a/scripts/gdb/linux/constants.py.in
+++ b/scripts/gdb/linux/constants.py.in
@@@ -58,10 -54,9 +58,13 @@@ LX_VALUE(SB_NODIRATIME
  /* linux/htimer.h */
  LX_GDBPARSED(hrtimer_resolution)
  
 +/* linux/irq.h */
 +LX_GDBPARSED(IRQD_LEVEL)
 +LX_GDBPARSED(IRQ_HIDDEN)
 +
+ /* linux/module.h */
+ LX_GDBPARSED(MOD_TEXT)
+ 
  /* linux/mount.h */
  LX_VALUE(MNT_NOSUID)
  LX_VALUE(MNT_NODEV)