From: Mark Brown <broonie@sirena.org.uk>
To: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: ksummit-discuss@lists.linuxfoundation.org
Subject: Re: [Ksummit-discuss] Maintainer's Summit Agenda Planning
Date: Mon, 16 Oct 2017 19:52:18 +0100 [thread overview]
Message-ID: <20171016185218.57obu7biasbjocpo@sirena.co.uk> (raw)
In-Reply-To: <1508163175.7571.2.camel@HansenPartnership.com>
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
On Mon, Oct 16, 2017 at 07:12:55AM -0700, James Bottomley wrote:
> On Wed, 2017-10-11 at 21:51 +0300, Jani Nikula wrote:
> > By -rc1 we (drm in general, drm/i915 in particular) will already have
> > accumulated easily 4-5 weeks' worth of commits for the *next* merge
> > window. Applying treewide stuff to Linus' tree at -rc1 forces a
> > backmerge and potentially conflicts galore
> If we're applying a semantic patch script (and we've verified it works
> well enough to use the script on the -rc1 main tree), couldn't you
> simply apply it to your tree at the same time?
git doesn't do the best job figuring out that the same change was made
in two different commits so you still end up with the conflicts. It's
much easier if we can just get changes in through the maintainer tree.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2017-10-16 18:52 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-05 19:20 Theodore Ts'o
2017-10-05 20:13 ` Rafael J. Wysocki
2017-10-05 21:55 ` Jiri Kosina
2017-10-06 14:59 ` Takashi Iwai
2017-10-06 15:27 ` James Bottomley
2017-10-06 16:26 ` Josh Poimboeuf
2017-10-06 16:32 ` Jonathan Corbet
2017-10-06 16:51 ` Josh Poimboeuf
2017-10-06 16:56 ` James Bottomley
2017-10-06 17:16 ` Josh Poimboeuf
2017-10-06 20:11 ` Linus Walleij
2017-10-09 8:13 ` Mark Brown
2017-10-09 15:54 ` Jiri Kosina
2017-10-09 16:37 ` James Bottomley
2017-10-09 16:47 ` Joe Perches
2017-10-09 16:49 ` Julia Lawall
2017-10-09 16:56 ` James Bottomley
2017-10-09 17:04 ` Joe Perches
2017-10-11 18:51 ` Jani Nikula
2017-10-12 10:03 ` Daniel Vetter
2017-10-16 14:12 ` James Bottomley
2017-10-16 14:25 ` Jani Nikula
2017-10-16 16:07 ` Joe Perches
2017-10-17 8:34 ` Jani Nikula
2017-10-18 1:27 ` Joe Perches
2017-10-18 10:41 ` Jani Nikula
2017-10-16 18:52 ` Mark Brown [this message]
2017-10-10 8:53 ` Jiri Kosina
2017-10-24 23:03 ` Kees Cook
2017-10-24 23:41 ` Joe Perches
2017-10-25 0:54 ` Kees Cook
2017-10-25 4:21 ` Julia Lawall
2017-10-25 4:29 ` Joe Perches
2017-10-25 4:36 ` Julia Lawall
2017-10-25 6:05 ` Martin K. Petersen
2017-10-25 6:55 ` Kees Cook
2017-10-25 7:34 ` Martin K. Petersen
2017-10-25 6:45 ` Frank Rowand
2017-10-25 7:56 ` Mark Brown
2017-10-25 9:39 ` Laurent Pinchart
2017-10-31 19:19 ` Rob Herring
2017-10-31 19:28 ` Kees Cook
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=20171016185218.57obu7biasbjocpo@sirena.co.uk \
--to=broonie@sirena.org.uk \
--cc=James.Bottomley@HansenPartnership.com \
--cc=ksummit-discuss@lists.linuxfoundation.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