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
+++ 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, 3b5be16c
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 - s
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
4 matches
Mail list logo
