From: "John W. Linville" <linville@tuxdriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiri Pirko <jpirko@redhat.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the wireless tree with the net tree
Date: Thu, 18 Aug 2011 18:03:35 -0700 [thread overview]
Message-ID: <20110819010334.GC2487@tuxdriver.com> (raw)
In-Reply-To: <20110819105946.a46aa8a997f466d8a2e7f2f3@canb.auug.org.au>
On Fri, Aug 19, 2011 at 10:59:46AM +1000, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/staging/ath6kl/os/linux/ar6000_drv.c between commit afc4b13df143
> ("net: remove use of ndo_set_multicast_list in drivers") from the net
> tree and commit af2bf4b4ee58 ("staging: remove ath6kl") from the wireless
> tree.
>
> I just removed the file.
Cool, thanks. I imagine that any more "bombing runs" that touch
ath6kl in staging will be able to resolved in the same fashion.
Thanks!
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2011-08-19 15:00 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-19 0:59 linux-next: manual merge of the wireless tree with the net tree Stephen Rothwell
2011-08-19 0:59 ` Stephen Rothwell
2011-08-19 1:03 ` John W. Linville [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-06-23 2:47 Stephen Rothwell
2011-06-23 2:47 ` Stephen Rothwell
2011-05-19 1:02 Stephen Rothwell
2011-05-19 1:02 ` Stephen Rothwell
2010-07-21 2:04 Stephen Rothwell
2010-07-21 2:04 ` Stephen Rothwell
2010-07-09 1:51 Stephen Rothwell
2010-07-09 1:51 ` Stephen Rothwell
2010-07-09 9:59 ` Luciano Coelho
2010-06-23 2:51 Stephen Rothwell
2010-06-23 2:51 ` Stephen Rothwell
2010-06-04 1:48 Stephen Rothwell
2010-06-04 1:48 ` Stephen Rothwell
2010-06-04 6:14 ` Luciano Coelho
2010-04-12 4:05 Stephen Rothwell
2010-04-12 4:05 ` Stephen Rothwell
2010-02-16 1:01 Stephen Rothwell
2010-02-16 1:01 ` Stephen Rothwell
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=20110819010334.GC2487@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=jpirko@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.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.