From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752786AbdJLS2H (ORCPT ); Thu, 12 Oct 2017 14:28:07 -0400 Received: from mga07.intel.com ([134.134.136.100]:29518 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751348AbdJLS2F (ORCPT ); Thu, 12 Oct 2017 14:28:05 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,367,1503385200"; d="scan'208";a="1024575863" Message-ID: <1507832866.5497.2.camel@intel.com> Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree From: Luciano Coelho To: Mark Brown Cc: Kalle Valo , Chaya Rachel Ivgi , Shahar S Matityahu , Wireless , Linux-Next Mailing List , Linux Kernel Mailing List Date: Thu, 12 Oct 2017 21:27:46 +0300 In-Reply-To: <20171012182114.fdeiv67ebx7c63te@sirena.co.uk> References: <20171012172512.tlsdjhppfz2hu4vr@sirena.co.uk> <1507832196.5497.1.camel@intel.com> <20171012182114.fdeiv67ebx7c63te@sirena.co.uk> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.26.1-1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2017-10-12 at 19:21 +0100, Mark Brown wrote: > On Thu, Oct 12, 2017 at 09:16:36PM +0300, Luciano Coelho wrote: > > > This is weird... The previous conflict was the exact opposite of > > this. > > 44fd09 came in from wireless-drivers and dd05f9 came from wireless- > > drivers-next. I don't understand why it is saying the opposite > > here... > > I may have confused the trees when I was pasting things in, the > commits > are filled in by hand. Ah, okay. But still, if the same patches conflicted twice, why wasn't there only one occurrence with both conflicts at once? -- Luca.