Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220616182524.7956-1-andriy.shevchenko@linux.intel.com>
 <Yrmr175fsQi6ToEY@google.com> <YrrO0CQVv6hj1AB0@smile.fi.intel.com>
 <YrxjTD0sJXh8cgVP@google.com> <CAHp75VdHpqAxS3jmFi-1Sw6wB1CP3wQVM_+5OP0C_yFFG336LA@mail.gmail.com>
 <Yr1YXHb3GqwZncFK@google.com>
In-Reply-To: <Yr1YXHb3GqwZncFK@google.com>
From:   Andy Shevchenko <andy.shevchenko@gmail.com>
Date:   Thu, 30 Jun 2022 10:07:18 +0200
Message-ID: <CAHp75Vf1UK9Z2P1D9v_j9rsdKoDXWSvb=wJgmkvACYgwofWrxA@mail.gmail.com>
Subject: Re: [PATCH v1 1/9] mfd: intel_soc_pmic_crc: Merge Intel PMIC core to crc
To:     Lee Jones <lee.jones@linaro.org>
Cc:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        Hans de Goede <hdegoede@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Andy Shevchenko <andy@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Thu, Jun 30, 2022 at 10:01 AM Lee Jones <lee.jones@linaro.org> wrote:
> On Wed, 29 Jun 2022, Andy Shevchenko wrote:
> > On Wed, Jun 29, 2022 at 4:36 PM Lee Jones <lee.jones@linaro.org> wrote:
> > > On Tue, 28 Jun 2022, Andy Shevchenko wrote:> > On Mon, Jun 27, 2022 at 02:08:39PM +0100, Lee Jones wrote:
> > > > > On Thu, 16 Jun 2022, Andy Shevchenko wrote:

...

> > > > > >  drivers/mfd/intel_soc_pmic_core.c | 160 -----------------------------
> > > > > >  drivers/mfd/intel_soc_pmic_core.h |  25 -----
> > > > > >  drivers/mfd/intel_soc_pmic_crc.c  | 162 ++++++++++++++++++++++++++++--
> > > > > >  4 files changed, 157 insertions(+), 193 deletions(-)
> > > > > >  delete mode 100644 drivers/mfd/intel_soc_pmic_core.c
> > > > > >  delete mode 100644 drivers/mfd/intel_soc_pmic_core.h
> > > > >
> > > > > Can you submit this again with the -M flag please.
> > > >
> > > > This is done with this flag. Basically for the last several years I do my
> > > > submissions with that flag.
> > >
> > > Odd.  I thought -M only showed diff for the changes.
> >
> > It's exactly what happens here in this patch. What did I miss?
> >
> > Note here is not renaming, but merging contents of one file (actually
> > two files) into another. What you are talking about is probably -D,
> > but AFAIR Git (at least that time) can't catch up deleted files from
> > the mbox format. That's why I do not use -D for submissions.
>
> Ah yes, that's probably it then.
>
> From a quick look at the diff (I missed the 2 "--" at the end), it
> looked like this was a rename.  In which case -M won't do anything
> useful here.  I'll have to brain grep the differences instead.

Please do, it will be good to have this double checked.

As I pointed out in the commit message the main difference in the code
(after massaging the header inclusion block) is the static const.
Without static we will have warning from the compiler, const is the
new thingy, besides the merge of the Copyright line.

-- 
With Best Regards,
Andy Shevchenko