From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Justin P. Mattock" Subject: Re: linux-next: manual merge of the trivial tree with the wireless-next tree Date: Sun, 11 Dec 2011 19:43:53 -0800 Message-ID: <4EE57879.6060109@gmail.com> References: <20111205133757.2b6cd1675543c7da26f663a5@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-iy0-f174.google.com ([209.85.210.174]:36467 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752927Ab1LLDn5 (ORCPT ); Sun, 11 Dec 2011 22:43:57 -0500 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Jiri Kosina Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Johannes Berg , "John W. Linville" On 12/11/2011 03:33 PM, Jiri Kosina wrote: > On Mon, 5 Dec 2011, Stephen Rothwell wrote: > >> Hi Jiri, >> >> Today's linux-next merge of the trivial tree got a conflict in >> net/mac80211/work.c between commit e76aadc57228 ("mac80211: revert >> on-channel work optimisations") from the wireless-next tree and commit >> 42b2aa86c667 ("treewide: Fix typos in various parts of the kernel, and >> fix some comments") from the trivial tree. >> >> The former removed the comment that was fixed in the latter, so I did >> that. > > I have now dropped the conflicting hunk, thanks for reporting, Stephen. > not sure what hunk was removed from this, but if its from my commit I can pull -next and redu the patch so that its not conflicting and resend if you would like. Justin P. Mattock