From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752765AbaGQCSK (ORCPT ); Wed, 16 Jul 2014 22:18:10 -0400 Received: from purkki.adurom.net ([80.68.90.206]:59865 "EHLO purkki.adurom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750956AbaGQCSI (ORCPT ); Wed, 16 Jul 2014 22:18:08 -0400 From: Kalle Valo To: "John W. Linville" Cc: David Miller , torvalds@linux-foundation.org, akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT] Networking References: <20140715.002844.679028486034873225.davem@davemloft.net> <20140715.114614.827795344549781033.davem@davemloft.net> <20140715190252.GC26012@tuxdriver.com> Date: Thu, 17 Jul 2014 05:18:04 +0300 In-Reply-To: <20140715190252.GC26012@tuxdriver.com> (John W. Linville's message of "Tue, 15 Jul 2014 15:02:52 -0400") Message-ID: <877g3cbueb.fsf@purkki.adurom.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org "John W. Linville" writes: > On Tue, Jul 15, 2014 at 11:46:14AM -0700, David Miller wrote: >> From: Linus Torvalds >> Date: Tue, 15 Jul 2014 08:52:33 -0700 >> >> > And if David actually asks for these, my apologies.. >> >> I didn't ask for these :-) > > Just trying to be helpful, for those times when there are non-trivial > merge conflicts. I can stop. Just out of curiosity, what is the best way to send a proposal how to fix a merge conflict? For example, if I send a pull request to John which I know will issue a conflict it would be nice to include instructions (or some sort of patch) how I think it should be resolved. -- Kalle Valo