From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Guilherme Piccoli <gpiccoli@canonical.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
linux-rtc@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>
Subject: Re: [PATCH v1 1/3] rtc: cmos: Stop using shared IRQ
Date: Thu, 23 Jan 2020 10:08:24 +0200 [thread overview]
Message-ID: <20200123080824.GT32742@smile.fi.intel.com> (raw)
In-Reply-To: <CAHD1Q_yjtJAd1KMGKD9Oh3BWSM4OzAA8TkBcs7r1ci4FZW+tQg@mail.gmail.com>
On Wed, Jan 22, 2020 at 05:05:15PM -0300, Guilherme Piccoli wrote:
> On Wed, Jan 22, 2020 at 4:58 PM Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
> > [...]
> > > The only oddity here is about the scissors, I'm not sure how it is
> > > supposed to work on git, but when I git am'ed the patch, the commit
> > > message was only "As reported by Guilherme G. Piccoli:", everything
> > > else was dropped.
> >
> > I didn't read any RFC or document about '--- ' line. But seems either bug in
> > git-am, or I have to put something else at the beginning of those lines.
> >
>
> Interesting! What I usually do is to add comments
> to-be-disregarded-on-merge right below "---", before the diff starts.
> Git will discard this full block. I guess probably having the "---" on
> top makes Git discard everything below it until the diff.
For the record it's '--- ' (mind the whitespace at the end).
> Anyway, hope your commit message don't get messed in the merge heh
I'll send a new version.
--
With Best Regards,
Andy Shevchenko
prev parent reply other threads:[~2020-01-23 8:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 14:45 [PATCH v1 1/3] rtc: cmos: Stop using shared IRQ Andy Shevchenko
2020-01-22 14:45 ` [PATCH v1 2/3] rtc: cmos: Use predefined value for RTC IRQ on legacy x86 Andy Shevchenko
2020-01-22 14:45 ` [PATCH v1 3/3] rtc: cmos: Refactor code by using the new dmi_get_bios_year() helper Andy Shevchenko
2020-01-22 16:57 ` [PATCH v1 1/3] rtc: cmos: Stop using shared IRQ Hans de Goede
2020-01-22 16:58 ` Hans de Goede
2020-01-22 17:32 ` Guilherme Piccoli
2020-01-22 19:58 ` Andy Shevchenko
2020-01-22 20:05 ` Guilherme Piccoli
2020-01-23 8:08 ` Andy Shevchenko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200123080824.GT32742@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=gpiccoli@canonical.com \
--cc=hdegoede@redhat.com \
--cc=linux-rtc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).