From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] Revert "package/mono: remove target mips architecture"
Date: Thu, 9 Aug 2018 23:38:58 +0200 [thread overview]
Message-ID: <20180809233858.2c1dc72d@windsurf> (raw)
In-Reply-To: <87zhxvdyro.fsf@dell.be.48ers.dk>
Hello,
On Thu, 09 Aug 2018 23:18:51 +0200, Peter Korsgaard wrote:
> > I'm not sure if Peter prefers:
>
> > - that we wait until 2018.08 is released to merge back next into
> > master before applying this patch
>
> > - that we cherry-pick just
> > 0f96073561badde3c7abdf338abca7d00dba56dd from master to next and
> > then apply your patch to next
>
> > - that we merge master into next right now and apply your patch
>
> > Peter ?
>
> > I don't like option (1) because it leaves a patch waiting in patchwork.
>
> I guess option 2 should be fine and not really cause any issues when
> merging next into master, right?
I guess during the merge, Git will notice that the commit has already
been cherry-picked, and will simply skip it.
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2018-08-09 21:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-09 12:31 [Buildroot] [PATCH 1/2] package/mono: bump to version 5.14.0.177 Angelo Compagnucci
2018-08-09 12:31 ` [Buildroot] [PATCH 2/2] Revert "package/mono: remove target mips architecture" Angelo Compagnucci
2018-08-09 20:15 ` Thomas Petazzoni
2018-08-09 21:18 ` Peter Korsgaard
2018-08-09 21:38 ` Thomas Petazzoni [this message]
2018-08-10 13:48 ` Thomas Petazzoni
2018-08-09 20:13 ` [Buildroot] [PATCH 1/2] package/mono: bump to version 5.14.0.177 Thomas Petazzoni
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=20180809233858.2c1dc72d@windsurf \
--to=thomas.petazzoni@bootlin.com \
--cc=buildroot@busybox.net \
/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