From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764873AbXGTBQS (ORCPT ); Thu, 19 Jul 2007 21:16:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753711AbXGTBQI (ORCPT ); Thu, 19 Jul 2007 21:16:08 -0400 Received: from smtp2.linux-foundation.org ([207.189.120.14]:50478 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756809AbXGTBQH (ORCPT ); Thu, 19 Jul 2007 21:16:07 -0400 Date: Thu, 19 Jul 2007 18:15:58 -0700 (PDT) From: Linus Torvalds To: Timothy Shimmin cc: akpm@linux-foundation.org, xfs@oss.sgi.com, linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] XFS update In-Reply-To: <46A00752.4040103@sgi.com> Message-ID: References: <469F7329.9080603@sgi.com> <46A00752.4040103@sgi.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 20 Jul 2007, Timothy Shimmin wrote: > > The window between pulling in and applying changes was obviously > large enough for Nick's changes to get in. Don't worry. Basically, merging is my job, and I happily do it. If I hit something that makes me nervous enough, I'll just push back and say "please merge this for me", but if I merge up conflicts on my own, I generally just let people know that I did it - not because it's a *problem*, but as a heads-up to let people know that they should double-check the end result. Quite frankly, real merge conflicts happen rarely enough that it really isn't a problem. And 99% of the time, the conflicts are really pretty damn obvious, and doing them isn't a problem at all. So even when I ask people to "please check", most of the time I expect that the end result is fine. So my "please double-check" was in no way meant to be a criticism or a "please do this better next time". It was _literally_ just meant to be just that and nothing more: a "please double-check", especially since for something like XFS, I'm not actually doing any testing personally. So no worries. Linus