From: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Sujith Manoharan <c_manoha@qca.qualcomm.com>,
"John W. Linville" <linville@tuxdriver.com>
Subject: Re: linux-next: manual merge of the net-next tree with the wireless tree
Date: Thu, 14 Jun 2012 10:20:13 +0530 [thread overview]
Message-ID: <4FD96D85.4010505@qca.qualcomm.com> (raw)
In-Reply-To: <20120614131256.2fed671219b8d571a47987c2@canb.auug.org.au>
Hi Stephen,
On Thursday 14 June 2012 08:42 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/wireless/ath/ath9k/main.c between commit bcb7ad7bcbef
> ("ath9k: Fix softlockup in AR9485") from the wireless tree and commit
> ef1b6cd9a1ba ("ath9k: Group link monitoring logic") from the net-next
> tree.
>
> The latter removes the code modified by the former, so I did that. The
> fix from the former patch may be needed elsewhere now.
the back ported version of this patch is recently sent
http://www.spinics.net/lists/linux-wireless/msg92125.html
--
thanks,
shafi
next prev parent reply other threads:[~2012-06-14 4:50 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-14 3:12 linux-next: manual merge of the net-next tree with the wireless tree Stephen Rothwell
2012-06-14 4:50 ` Mohammed Shafi Shajakhan [this message]
2012-06-14 12:59 ` John W. Linville
-- strict thread matches above, loose matches on Subject: below --
2023-10-24 0:24 Stephen Rothwell
2023-10-12 0:37 Stephen Rothwell
2023-10-12 8:10 ` Johannes Berg
2023-10-19 21:40 ` Jakub Kicinski
2023-10-20 5:49 ` Johannes Berg
2014-07-24 2:47 Stephen Rothwell
2014-07-23 2:00 Stephen Rothwell
2014-05-23 3:45 Stephen Rothwell
2014-02-26 3:21 Stephen Rothwell
2014-02-21 2:34 Stephen Rothwell
2013-09-27 3:03 Stephen Rothwell
2013-08-27 4:10 Stephen Rothwell
2013-04-04 0:44 Stephen Rothwell
2013-05-02 3:19 ` Stephen Rothwell
2013-04-02 2:00 Stephen Rothwell
2013-04-02 9:30 ` Samuel Ortiz
2013-03-26 0:51 Stephen Rothwell
2013-03-26 0:48 Stephen Rothwell
2012-07-03 1:44 Stephen Rothwell
2012-07-03 2:33 ` John W. Linville
2012-05-04 3:21 Stephen Rothwell
2012-05-04 4:35 ` Guy, Wey-Yi
2012-02-16 1:40 Stephen Rothwell
2012-02-16 1:37 Stephen Rothwell
2011-12-20 2:02 Stephen Rothwell
2011-12-15 2:53 Stephen Rothwell
2011-12-15 3:16 ` 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=4FD96D85.4010505@qca.qualcomm.com \
--to=mohammed@qca.qualcomm.com \
--cc=c_manoha@qca.qualcomm.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--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 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).