Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1457458
| From | Linus Torvalds <torvalds@linux-foundation.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [git pull] vfs pile 3 |
| Date | 2016-08-07 16:10 +0200 |
| Message-ID | <s3wW5-4OI-19@gated-at.bofh.it> (permalink) |
| References | <s3ng6-6Je-11@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Sat, Aug 6, 2016 at 11:46 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> I went for the second variant (backmerge), but if you prefer the third one,
> just pull #for-linus-2 and I'll send a separate pull request for the last
> commit. Or just cherry-pick that last commit from #for-linus after having
> pulled #for-linus-2.
Please don't do back-merges to avoid conflicts. I'd *much* rather just
get the conflict. Especially when it's that trivial.
Linus
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[git pull] vfs pile 3 Al Viro <viro@ZenIV.linux.org.uk> - 2016-08-07 05:50 +0200 Re: [git pull] vfs pile 3 Linus Torvalds <torvalds@linux-foundation.org> - 2016-08-07 16:10 +0200
csiph-web