From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755529AbbAJWh7 (ORCPT ); Sat, 10 Jan 2015 17:37:59 -0500 Received: from mail-qa0-f54.google.com ([209.85.216.54]:44630 "EHLO mail-qa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750895AbbAJWh6 (ORCPT ); Sat, 10 Jan 2015 17:37:58 -0500 MIME-Version: 1.0 In-Reply-To: References: <1420927210-19738-1-git-send-email-dvlasenk@redhat.com> <1420927210-19738-3-git-send-email-dvlasenk@redhat.com> Date: Sat, 10 Jan 2015 14:37:57 -0800 X-Google-Sender-Auth: 6OcCIF0FJ_3n4SS1gzJ9916mE8c Message-ID: Subject: Re: [PATCH 2/4] x86: ia32entry.S: fix wrong symbolic constant usage: R11->ARGOFFSET From: Linus Torvalds To: Andy Lutomirski Cc: Denys Vlasenko , "linux-kernel@vger.kernel.org" , Oleg Nesterov , "H. Peter Anvin" , Borislav Petkov , Frederic Weisbecker , X86 ML , Alexei Starovoitov , Will Drewry , Kees Cook 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 Sat, Jan 10, 2015 at 2:27 PM, Linus Torvalds wrote: > > So the only way to avoid a conflict is to not touch the same code, or > to touch it *exactly* the same way in all respects. .. with the caveat that the exact definition of "overlap" can end up being somewhat fuzzy with the whole conflict simplification, so I guess it can actually end up helping. But I think it could go either way. Just from experience, the more important part is seeing that one branch is obviously a superset of the other, which tends to happen particularly with the case of "small parts of the new branch were already merged as bug-fixes during the last development cycle". Linus