From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752314AbdEFSAN (ORCPT ); Sat, 6 May 2017 14:00:13 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:36741 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751116AbdEFSAF (ORCPT ); Sat, 6 May 2017 14:00:05 -0400 MIME-Version: 1.0 In-Reply-To: <20170506150911.1612bb15@canb.auug.org.au> References: <20170505001808.GA16769@kroah.com> <1494000006.2399.7.camel@HansenPartnership.com> <20170505163846.GA31211@kroah.com> <20170506150911.1612bb15@canb.auug.org.au> From: Linus Torvalds Date: Sat, 6 May 2017 11:00:04 -0700 X-Google-Sender-Auth: xp6sLfeZTvhEYoaS2fapbPp3nE4 Message-ID: Subject: Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 To: Stephen Rothwell Cc: Greg KH , James Bottomley , Jarkko Sakkinen , Andrew Morton , Arnd Bergmann , Linux Kernel Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, May 5, 2017 at 10:09 PM, Stephen Rothwell wrote: > > On Fri, 5 May 2017 13:01:34 -0700 Linus Torvalds 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