linux-next: manual merge of the modules tree with the compiler-attributes tree

linux-next: manual merge of the modules tree with the compiler-attributes tree

[Mark Brown]

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

Hi all,

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

  include/linux/export.h

between at least commit:

  69a94abb82eed ("export.h, genksyms: do not make genksyms calculate CRC of trimmed symbols")

from the compiler-attributes tree and commit:

  cb9b55d21fe06 ("module: add support for symbol namespaces.")

from the modules tree.

Since this conflcit is non-trivial, it's late and there's a good chance
I'm not going to actually finish building -next today I've just used the
commit from the last time -next was built, 3b5be16c7e90a69c, for the
modules tree - sorry.  I'll have another go tomorrow.  This means none
of the changes in modules-next are in -next as they were all committed
in the past week.

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

Re: linux-next: manual merge of the modules tree with the compiler-attributes tree

[Mark Brown]

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

On Sun, Sep 15, 2019 at 11:27:20PM +0100, Mark Brown wrote:

> Since this conflcit is non-trivial, it's late and there's a good chance
> I'm not going to actually finish building -next today I've just used the
> commit from the last time -next was built, 3b5be16c7e90a69c, for the
> modules tree - sorry.  I'll have another go tomorrow.  This means none
> of the changes in modules-next are in -next as they were all committed
> in the past week.

I had another look but I'm still not comfortable doing this merge in a
sensible timeframe so I punted again, sorry.  I'll probably carry on
doing this.

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

Re: linux-next: manual merge of the modules tree with the compiler-attributes tree

[Jessica Yu]

+++ Mark Brown [16/09/19 16:59 +0100]:
>On Sun, Sep 15, 2019 at 11:27:20PM +0100, Mark Brown wrote:
>
>> Since this conflcit is non-trivial, it's late and there's a good chance
>> I'm not going to actually finish building -next today I've just used the
>> commit from the last time -next was built, 3b5be16c7e90a69c, for the
>> modules tree - sorry.  I'll have another go tomorrow.  This means none
>> of the changes in modules-next are in -next as they were all committed
>> in the past week.
>
>I had another look but I'm still not comfortable doing this merge in a
>sensible timeframe so I punted again, sorry.  I'll probably carry on
>doing this.

Hi Mark,

Sorry for the trouble. We are currently working out a resolution
(https://lore.kernel.org/lkml/20190917150902.GA4116@linux-8ccs/).
Feel free to leave it at 3b5be16c7e90a69c until this gets resolved in
the next day or two..

Thanks,

Jessica

Re: linux-next: manual merge of the modules tree with the compiler-attributes tree

[Mark Brown]

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

On Tue, Sep 17, 2019 at 05:17:22PM +0200, Jessica Yu wrote:
> +++ Mark Brown [16/09/19 16:59 +0100]:

> > I had another look but I'm still not comfortable doing this merge in a
> > sensible timeframe so I punted again, sorry.  I'll probably carry on
> > doing this.

> Sorry for the trouble. We are currently working out a resolution
> (https://lore.kernel.org/lkml/20190917150902.GA4116@linux-8ccs/).
> Feel free to leave it at 3b5be16c7e90a69c until this gets resolved in
> the next day or two..

OK, that's easier for me so I'll do that!

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