linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiri Kosina <jkosina@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Felix Fietkau <nbd@openwrt.org>,
	"John W. Linville" <linville@tuxdriver.com>,
	"Justin P. Mattock" <justinmattock@gmail.com>
Subject: Re: linux-next: manual merge of the trivial tree with the wireless tree
Date: Wed, 13 Apr 2011 11:14:52 +0200 (CEST)	[thread overview]
Message-ID: <alpine.LNX.2.00.1104131114350.12035@pobox.suse.cz> (raw)
In-Reply-To: <20110411132844.fa651c08.sfr@canb.auug.org.au>

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.

  parent reply	other threads:[~2011-04-13  9:14 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-11  3:28 linux-next: manual merge of the trivial tree with the wireless tree Stephen Rothwell
2011-04-11 15:15 ` Justin P. Mattock
2011-04-11 15:17   ` Jiri Kosina
2011-04-11 15:24     ` Justin P. Mattock
2011-04-13  9:14 ` Jiri Kosina [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-08-21  4:20 Stephen Rothwell
2011-04-27  1:43 Stephen Rothwell
2011-04-27  9:22 ` Jiri Kosina
2009-11-17  4:49 Stephen Rothwell
2009-11-17 22:18 ` Jiri Kosina
2009-11-17 23:38   ` Stephen Rothwell
2009-06-03  5:22 Stephen Rothwell
2009-06-03  8:07 ` Jiri Kosina
2009-06-03  8:14   ` Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LNX.2.00.1104131114350.12035@pobox.suse.cz \
    --to=jkosina@suse.cz \
    --cc=justinmattock@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=nbd@openwrt.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).