From: Wolfram Sang <wsa@the-dreams.de>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Linux-Renesas <linux-renesas-soc@vger.kernel.org>
Subject: Re: [PULL REQUEST] renesas/topic/sdhi-manual-calib for renesas drivers
Date: Mon, 1 Jul 2019 11:23:38 +0200 [thread overview]
Message-ID: <20190701092338.GA1968@kunai> (raw)
In-Reply-To: <CAMuHMdWLhRwdcvR=Y1TnBuo+zzUJi-iV75_eGO+29wboU2i4Vw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 955 bytes --]
Hi Geert,
> mmc/next is included in renesas-drivers anyway, but Ulf sometimes likes
> to rebase that branch.
I know :(
> Actually you made it more difficult for me, as you changed the mere
> possibility of a conflict due to Ulf rebasing mmc/next, into a certainty
> of your branch conflicting with mmc/next ;-)
Wouldn't that happen as well if I base it on an old version of mmc/next?
As soon as Ulf rebases -> problem. Geez, his rebasing is annoying.
What would be the easiest solution for you here? (except waiting for
-rc1 which was sadly not an option here)
> No problem, it's the same branch name, so I will fetch the new version
> (and I cannot compare with the old version ^-)
Right. I mainly wanted you to know that the content differs a little
from what I originally requested to pull.
> Summary: Thanks for your topic branch, I will include it in tomorrow's
> release!
Thanks!
Kind regards,
Wolfram
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-07-01 9:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-28 17:51 [PULL REQUEST] renesas/topic/sdhi-manual-calib for renesas drivers Wolfram Sang
2019-06-29 20:03 ` Wolfram Sang
2019-07-01 8:54 ` Geert Uytterhoeven
2019-07-01 9:23 ` Wolfram Sang [this message]
2019-07-01 9:26 ` Geert Uytterhoeven
2019-10-01 12:57 ` Geert Uytterhoeven
2019-10-01 15:20 ` Wolfram Sang
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=20190701092338.GA1968@kunai \
--to=wsa@the-dreams.de \
--cc=geert@linux-m68k.org \
--cc=linux-renesas-soc@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