Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1636960
| From | Linus Torvalds <torvalds@linux-foundation.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 |
| Date | 2017-05-06 20:10 +0200 |
| Message-ID | <tEcjv-31k-5@gated-at.bofh.it> (permalink) |
| References | (1 earlier) <tDBai-3LK-7@gated-at.bofh.it> <tDNXP-402-7@gated-at.bofh.it> <tDOqR-4ap-5@gated-at.bofh.it> <tDRI6-6x1-11@gated-at.bofh.it> <tE08F-3Ni-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[GIT PULL] Char/Misc driver patches for 4.12-rc1 Greg KH <gregkh@linuxfoundation.org> - 2017-05-05 02:20 +0200
Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 Linus Torvalds <torvalds@linux-foundation.org> - 2017-05-05 04:30 +0200
Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 James Bottomley <James.Bottomley@HansenPartnership.com> - 2017-05-05 18:10 +0200
Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 Greg KH <gregkh@linuxfoundation.org> - 2017-05-05 18:40 +0200
Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 James Bottomley <James.Bottomley@HansenPartnership.com> - 2017-05-05 21:50 +0200
Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 Linus Torvalds <torvalds@linux-foundation.org> - 2017-05-05 22:10 +0200
Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 Stephen Rothwell <sfr@canb.auug.org.au> - 2017-05-06 07:10 +0200
Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 Linus Torvalds <torvalds@linux-foundation.org> - 2017-05-06 20:10 +0200
Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 James Bottomley <James.Bottomley@HansenPartnership.com> - 2017-05-06 20:20 +0200
Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 Linus Torvalds <torvalds@linux-foundation.org> - 2017-05-05 18:40 +0200
Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 James Bottomley <James.Bottomley@HansenPartnership.com> - 2017-05-05 18:50 +0200
csiph-web