Messages in this thread |  | | Date | Wed, 13 Apr 2011 11:14:52 +0200 (CEST) | From | Jiri Kosina <> | Subject | Re: linux-next: manual merge of the trivial tree with the wireless tree |
| |
On Mon, 11 Apr 2011, Stephen Rothwell 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.
I have reverted the chunk in question, so the conflict should be gone.
Thanks,
-- Jiri Kosina SUSE Labs, Novell Inc.
|  |