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

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

[Stephen Rothwell]

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

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@canb.auug.org.au

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 #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Rusty Russell]

Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 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.

Well, I merged that whole branch actually.

>From now on I'll be cherry-picking instead (mainly because I want to
fold in fixes anyway, and that's a bit messy).

Cheers,
Rusty.

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

[Stephen Rothwell]

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

Hi all,

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

  arch/alpha/kernel/module.c

between commit:

  b6b17a8b3ecd ("alpha: fix R_ALPHA_LITERAL reloc for large modules")

from the origin tree and commit:

  a76b092b5655 ("module: replace module_layout with module_memory")

from the modules tree.

I fixed it up (the former removed the code modificed by the latter) 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 --]

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

[Stephen Rothwell]

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

Hi Rusty,

Today's linux-next merge of the modules tree got a conflict in Documentation/module-signing.txt between commit 3cafea307642 ("Add Documentation/module-signing.txt file") from the  tree and commit 160e01aca3da ("Add Documentation/module-signing.txt file") from the modules tree.

I fixed it up (I arbitrarily chose the version from Linus' tree) and can
carry the fix as necessary (no action is required).

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

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

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

[Stephen Rothwell]

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

Hi Rusty,

On Wed, 19 Dec 2012 16:08:08 +1030 Rusty Russell <rusty@rustcorp.com.au> wrote:
>
> I have reverted to the previous modules-next.

I see that Linus has pulled that in, could you please clean up your tree
in linux-next as well.  I will reset it by had for today.

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

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

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

[Rusty Russell]

Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Rusty,
>
> Today's linux-next merge of the modules tree got a conflict in
> kernel/modsign_pubkey.c between commit 84ecfd15f554 ("modsign: add symbol
> prefix to certificate list") from Linus' tree and commit bb8f5966421d
> ("MODSIGN: Avoid using .incbin in C source") from the modules tree.

Gah, I had a brainfart reading gitk and thought commit was not upstream
:(

(Paul Mackerras points out that gitk shows you what branches a commit is
in, so I now have no excuse.  He also offered to colour-code it for me
RSN, which would make it inescapable).

> I fixed it up (I just used the modules tree version as it removed the
> section of code modified by the former) and can carry the fix as
> necessary (no action is required).

Yes, but that leaves this turd in linux/kernel.h from
cbdbf2abb7844548a7d7a6a2ae7af6b6fbcea401:

+/* This helps us to avoid #ifdef CONFIG_SYMBOL_PREFIX */
+#ifdef CONFIG_SYMBOL_PREFIX
+#define SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
+#else
+#define SYMBOL_PREFIX ""
+#endif

I have reverted to the previous modules-next.

Thanks,
Rusty.

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

[Stephen Rothwell]

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

Hi Rusty,

Today's linux-next merge of the modules tree got a conflict in
kernel/modsign_pubkey.c between commit 84ecfd15f554 ("modsign: add symbol
prefix to certificate list") from Linus' tree and commit bb8f5966421d
("MODSIGN: Avoid using .incbin in C source") from the modules tree.

I fixed it up (I just used the modules tree version as it removed the
section of code modified by the former) and can carry the fix as
necessary (no action is required).

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

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

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

[Stephen Rothwell]

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

Hi Rusty,

Today's linux-next merge of the modules tree got a conflict in Makefile
between commit d183e6f570f3 ("UAPI: Move linux/version.h") from Linus'
tree and commit 91657140708d ("MODSIGN: Make mrproper should remove
generated files") from the modules 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 Makefile
index 5d8e7f2,e70ebfe..0000000
--- a/Makefile
+++ b/Makefile
@@@ -996,8 -993,12 +996,11 @@@ CLEAN_DIRS  += $(MODVERDIR
  # Directories & files removed with 'make mrproper'
  MRPROPER_DIRS  += include/config usr/include include/generated          \
                    arch/*/include/generated
 -MRPROPER_FILES += .config .config.old .version .old_version             \
 -                  include/linux/version.h                               \
 +MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
- 		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
+ 		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
+ 		  signing_key.priv signing_key.x509 x509.genkey		\
+ 		  extra_certificates signing_key.x509.keyid		\
+ 		  signing_key.x509.signer
  
  # clean - Delete most, but leave enough to build external modules
  #

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