From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: "John W. Linville" <linville@tuxdriver.com>,
linux-next@vger.kernel.org, Yi Zhu <yi.zhu@intel.com>
Subject: linux-next: net tree merge conflict
Date: Wed, 14 May 2008 15:01:36 +1000 [thread overview]
Message-ID: <20080514150136.43e355a3.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
Hi Dave, John,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-4965-rs.c between commit
6243065d308ab566aa318a8adef853bc0418896d ("iwlwifi: fix compile error
when CONFIG_MAC80211_DEBUGFS is not selected") in the
net-current/wireless-current trees and commit
39e885049d9d5e6a65bb2543f82e136c02c253b5 ("iwlwifi: TLC modifications")
in the net/wireless trees. I did the obvious fixup.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
reply other threads:[~2008-05-14 5:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20080514150136.43e355a3.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=yi.zhu@intel.com \
/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).