On Mon, 2020-01-13 at 08:57 +0100, Geert Uytterhoeven wrote:
> On Mon, Jan 13, 2020 at 8:41 AM Joe Perches <joe@xxxxxxxxxxx> wrote:
> > On Mon, 2020-01-13 at 08:25 +0100, Geert Uytterhoeven wrote:
> > > On Mon, Jan 13, 2020 at 7:36 AM Joe Perches <joe@xxxxxxxxxxx> wrote:
> > > > On Sun, 2020-01-12 at 18:13 +0100, Geert Uytterhoeven wrote:
> > > > > Merely enabling I2C and RTC selects REGMAP_I2C and REGMAP_SPI, even when
> > > > > no driver needs it. While the former can be moduler, the latter cannot,
> > > > > and thus becomes built-in.
> > > > >
> > > > > Fix this by moving the select statements for REGMAP_I2C and REGMAP_SPI
> > > > > from the RTC_I2C_AND_SPI helper to the individual drivers that depend on
> > > > > it.
> > > > >
> > > > > Note that the comment for RTC_I2C_AND_SPI refers to SND_SOC_I2C_AND_SPI
> > > > > for more information, but the latter does not select REGMAP_{I2C,SPI}
> > > > > itself, and defers that to the individual drivers, too.
> > > > >
> > > > > Fixes: 080481f54ef62121 ("rtc: merge ds3232 and ds3234")
> > > > > Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
> > > > > ---
> > > > > Joe: When merging addresses, scripts/get_maintainer.pl replaces
> > > > > Alexandre's authoritative email address from MAINTAINERS by the
> > > > > obsolete address in the SoB-line of the commit referred to by the
> > > > > Fixes-line.
> > > > What are you doing to get this changed output?
> > >
> > > scripts/get_maintainer.pl
> > > 0001-rtc-i2c-spi-Avoid-inclusion-of-REGMAP-support-when-n.patch
> > >
> > > > I get the same get_maintainer address output either way
> > > > with only with the 'blamed_fixes:' content added.
> > >
> > > Thanks, I can confirm it's fixed in next-20200110.
> > > With v5.5-rc6, it still gives the old addresss.
> >
> > Well, OK, get_maintainer is the same but there is a
> > different .mailmap in -next
>
> Indeed.
>
> However, I think the precedence should be
>
> MAINTAINERS > .mailmap > SoB in referenced commit
>
> instead of
>
> .mailmap > SoB in referenced commit > MAINTAINERS
>
> Do you agree?
Well, not really. Priority is:
1 .mailmap address
2 SoB address in commit message
2 SoB
address in referenced Fixes: commits
3 MAINTAINERS address
MAINTAINER entries are sometimes stale and .mailmap
is generally more current so perhaps it should be
1 .mailmap address
2 SoB address in commit message
3 MAINTAINERS address
4 SoB address in referenced Fixes: commits
But it seems a restructuring of get_maintainer
would be required to do that as the Fixes: line is
parsed before any filenames in a patch and I'm not
too bothered by the precedence and output right
now to muck around in get_maintainer's internals.
cheers, Joe
