Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754671Ab1DKPRy (ORCPT ); Mon, 11 Apr 2011 11:17:54 -0400 Received: from cantor2.suse.de ([195.135.220.15]:40365 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754508Ab1DKPRw (ORCPT ); Mon, 11 Apr 2011 11:17:52 -0400 Date: Mon, 11 Apr 2011 17:17:51 +0200 (CEST) From: Jiri Kosina To: "Justin P. Mattock" Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Felix Fietkau , "John W. Linville" Subject: Re: linux-next: manual merge of the trivial tree with the wireless tree In-Reply-To: <4DA31B20.1010205@gmail.com> Message-ID: References: <20110411132844.fa651c08.sfr@canb.auug.org.au> <4DA31B20.1010205@gmail.com> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) 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 Content-Length: 856 Lines: 22 On Mon, 11 Apr 2011, Justin P. Mattock wrote: > > Today's linux-next merge of the trivial tree got a conflict in > > drivers/net/wireless/ath/ath9k/phy.h between commit a9b6b2569cf1 > > ("ath9k_hw: turn a few big macros into functions") from the wireless tree > > and commit 6eab04a87677 ("treewide: remove extra semicolons") from the > > trivial tree. > > > > The former commit removed the code that the latter changed, so I did that. > > yikes... I dont like seeing that.. what can I do to help with this? No need for you to do anything. I'll resolve the conflict. -- Jiri Kosina SUSE Labs, Novell Inc. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/