Hi Wolfram,
On Fri, Jun 28, 2019 at 7:52 PM Wolfram Sang <wsa@xxxxxxxxxxxxx> wrote:
> here is a topic branch for renesas-drivers. It was developed against
> mmc/next because there were some patches in there I needed. I know that
> -next branches are not good for renesas-drivers, so rebased to v5.2-rc6
It depends on (a) which subsystem, and (b) how stable it is.
mmc/next is included in renesas-drivers anyway, but Ulf sometimes likes
to rebase that branch.
> and cherry-picked what I needed. Further comments from the cover-letter:
>
> ===
>
> The patches were developed against mmc/next. However, the above branch
> is based on v5.2-rc6 with some cherry-picked patches from mmc/next, so
> Geert can consume it easier for his renesas-drivers branch. There are
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 ;-)
Unfortunately, when merging renesas/topic/sdhi-manual-calib, git is not
smart enough to notice your cherry-picked changes to the files are
identical to the ones in mmc/next until commit 520902bb1ce63518 ("mmc:
tmio: Use dma_max_mapping_size() instead of a workaround"). I can work
around that by merging the aforementioned commit first (git is smart
enough to handle that case), followed by the merge of the remainder of
your topic branch.
Or I can handle the conflict manually...
> The following changes since commit 4b972a01a7da614b4796475f933094751a295a2f:
>
> Linux 5.2-rc6 (2019-06-22 16:01:36 -0700)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/topic/sdhi-manual-calib
>
> for you to fetch changes up to a0b577d9d1154c48757da9a09c18056946832bd7:
>
> DEBUG: mmc: renesas_sdhi: add debug to verify manual calibration fix (2019-06-28 13:44:45 +0200)
[...]
> I rebased the branch to v2 of the series. Diffs are very minor, so I
> hope you can deal with the old pull request for it?
No problem, it's the same branch name, so I will fetch the new version
(and I cannot compare with the old version ^-)
Summary: Thanks for your topic branch, I will include it in tomorrow's
release!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
