All of lore.kernel.org
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <gregkh@linuxfoundation.org>,
	James Bottomley <James.Bottomley@hansenpartnership.com>,
	Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Arnd Bergmann <arnd@arndb.de>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1
Date: Sat, 6 May 2017 11:00:04 -0700	[thread overview]
Message-ID: <CA+55aFzZhbWv7cYN8q1yZJmzfhwKJWEmL6YW6BLxpPctG-_8SA@mail.gmail.com> (raw)
In-Reply-To: <20170506150911.1612bb15@canb.auug.org.au>

On Fri, May 5, 2017 at 10:09 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 5 May 2017 13:01:34 -0700 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>>
>>
>> I prefer doing merge resolutions myself, but I *also* really really
>> prefer the two sides of the conflict having been more aware of the
>> clash.
>
> Would that be this?

Yup. Apparently neither Greg nor James ended up reacting to that
email, though, so by the time I got the pull requests there was no
mention of it anywhere.

                 Linus

  reply	other threads:[~2017-05-06 18:00 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-05  0:18 [GIT PULL] Char/Misc driver patches for 4.12-rc1 Greg KH
2017-05-05  2:28 ` Linus Torvalds
2017-05-05 16:00   ` James Bottomley
2017-05-05 16:33     ` Linus Torvalds
2017-05-05 16:49       ` James Bottomley
2017-05-05 16:38     ` Greg KH
2017-05-05 19:46       ` James Bottomley
2017-05-05 20:01       ` Linus Torvalds
2017-05-06  5:09         ` Stephen Rothwell
2017-05-06 18:00           ` Linus Torvalds [this message]
2017-05-06 18:12             ` James Bottomley
2017-07-12  4:50               ` Stephen Rothwell

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=CA+55aFzZhbWv7cYN8q1yZJmzfhwKJWEmL6YW6BLxpPctG-_8SA@mail.gmail.com \
    --to=torvalds@linux-foundation.org \
    --cc=James.Bottomley@hansenpartnership.com \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=jarkko.sakkinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.