linux-next: manual merge of the modules tree with Linus' tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the modules tree got a conflict in
init/Kconfig between commit 754b7b63d112 ("sections: disable const
sections for PA-RISC v2") from Linus' tree and commit 54ddd23d78ba
("X.509: Add simple ASN.1 grammar compiler") from the modules tree.

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

BTW, Rusty, that commit from the modules tree has no SOB from you even
though you committed it.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc init/Kconfig
index ed6334d,abc6e63..0000000
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -1582,10 -1672,12 +1642,18 @@@ config PADAT
  	depends on SMP
  	bool
  
 +# Can be selected by architectures with broken toolchains
 +# that get confused by correct const<->read_only section
 +# mappings
 +config BROKEN_RODATA
 +	bool
 +
+ config ASN1
+ 	tristate
+ 	help
+ 	  Build a simple ASN.1 grammar compiler that produces a bytecode output
+ 	  that can be interpreted by the ASN.1 stream decoder and used to
+ 	  inform it as to what tags are to be expected in a stream and what
+ 	  functions to call on what tags.
+ 
  source "kernel/Kconfig.locks"

Attachment: pgp00000.pgp
Description: PGP signature