From: "Justin P. Mattock" <justinmattock@gmail.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Felix Fietkau <nbd@openwrt.org>,
"John W. Linville" <linville@tuxdriver.com>
Subject: Re: linux-next: manual merge of the trivial tree with the wireless tree
Date: Mon, 11 Apr 2011 08:24:24 -0700 [thread overview]
Message-ID: <4DA31D28.20906@gmail.com> (raw)
In-Reply-To: <alpine.LNX.2.00.1104111716590.12035@pobox.suse.cz>
On 04/11/2011 08:17 AM, Jiri Kosina wrote:
> 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.
>
o.k.!
Justin P. Mattock
next prev parent reply other threads:[~2011-04-11 15:24 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 [this message]
2011-04-13 9:14 ` Jiri Kosina
-- 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=4DA31D28.20906@gmail.com \
--to=justinmattock@gmail.com \
--cc=jkosina@suse.cz \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.