From: "John W. Linville" <linville@tuxdriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
linux-next@vger.kernel.org,
Darren Jenkins <darrenrjenkins@gmail.com>,
Harvey Harrison <harvey.harrison@gmail.com>
Subject: Re: linux-next: manual merge of the net tree
Date: Tue, 8 Jul 2008 08:22:27 -0400 [thread overview]
Message-ID: <20080708122227.GA4239@tuxdriver.com> (raw)
In-Reply-To: <20080708141607.404681a4.sfr@canb.auug.org.au>
On Tue, Jul 08, 2008 at 02:16:07PM +1000, Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-3945.c between commit
> 0ff1cca0e272045b9c11a2ff94bd3e6893c9308c
> ("drivers/net/wireless/iwlwifi/iwl-3945.c Fix type issue on 64bit") from
> the wireless-current tree and commit
> fd7c8a40b2a63863f749e4d17f0d94d2e5ab1331 ("mac80211: add helpers for
> frame control testing") from the net tree.
>
> I applied the former change to the latter's code and can carry the fixup
> while necessary.
Yes, that sounds like the right fix. I'm sorry I didn't get you a
merge-test in advance this time!
John
--
John W. Linville
linville@tuxdriver.com
next prev parent reply other threads:[~2008-07-08 12:38 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-08 4:16 linux-next: manual merge of the net tree Stephen Rothwell
2008-07-08 12:22 ` John W. Linville [this message]
2008-07-08 13:00 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-12-23 23:19 Stephen Rothwell
2008-12-24 2:15 ` David Miller
2008-12-24 14:41 ` Cyrill Gorcunov
2008-12-23 23:15 Stephen Rothwell
2008-12-24 2:16 ` David Miller
2008-12-15 3:44 Stephen Rothwell
2008-12-15 6:59 ` David Miller
2008-12-09 2:21 Stephen Rothwell
2008-12-09 22:17 ` J. Bruce Fields
2008-12-09 23:22 ` David Miller
2008-12-09 23:41 ` Stephen Rothwell
2008-12-09 2:13 Stephen Rothwell
2008-12-08 3:48 Stephen Rothwell
2008-12-08 7:26 ` David Miller
2008-12-29 3:53 ` Stephen Rothwell
2008-12-29 4:00 ` David Miller
2008-12-29 4:14 ` Stephen Rothwell
2008-12-01 3:26 Stephen Rothwell
2008-12-01 7:20 ` David Miller
2008-12-01 17:06 ` Mike Frysinger
2008-12-01 3:16 Stephen Rothwell
2008-11-27 3:40 Stephen Rothwell
2008-11-27 8:03 ` David Miller
2008-11-26 6:42 Stephen Rothwell
2008-11-26 6:34 Stephen Rothwell
2008-11-21 2:33 Stephen Rothwell
2008-11-21 2:29 Stephen Rothwell
2008-11-21 4:11 ` David Miller
2008-11-21 4:22 ` Stephen Rothwell
2008-11-20 2:10 Stephen Rothwell
2008-11-18 0:51 Stephen Rothwell
2008-11-12 2:59 Stephen Rothwell
2008-11-12 3:07 ` John W. Linville
2008-11-10 3:02 Stephen Rothwell
2008-11-11 7:00 ` David Miller
2008-11-11 8:24 ` Stephen Rothwell
2008-11-11 9:21 ` David Miller
2008-11-11 23:17 ` Stephen Rothwell
2008-11-07 4:33 Stephen Rothwell
2008-11-07 4:24 Stephen Rothwell
2008-11-07 4:47 ` David Miller
2008-10-29 3:11 Stephen Rothwell
2008-10-29 4:53 ` David Miller
2008-10-29 12:34 ` John W. Linville
2008-10-29 20:20 ` David Miller
2008-08-28 3:55 Stephen Rothwell
2008-08-28 8:15 ` David Miller
2008-07-16 7:00 Stephen Rothwell
2008-07-16 6:56 Stephen Rothwell
2008-07-10 4:02 Stephen Rothwell
2008-07-10 12:11 ` Patrick McHardy
2008-07-08 4:27 Stephen Rothwell
2008-07-08 6:03 ` Tobias Diedrich
2008-07-08 14:23 ` Rafael J. Wysocki
2008-07-08 4:10 Stephen Rothwell
2008-07-08 5:14 ` David Miller
2008-07-08 5:44 ` David Miller
2008-07-08 6:15 ` Stephen Rothwell
2008-07-03 4:08 Stephen Rothwell
2008-07-03 4:14 ` David Miller
2008-07-03 3:56 Stephen Rothwell
2008-07-03 4:11 ` Stephen Rothwell
2008-07-03 4:13 ` David Miller
2008-07-01 7:19 Stephen Rothwell
2008-07-01 9:33 ` David Miller
2008-07-01 15:09 ` Stephen Rothwell
2008-07-01 7:11 Stephen Rothwell
2008-06-19 3:04 Stephen Rothwell
2008-06-19 5:01 ` David Miller
2008-06-19 5:49 ` Stephen Rothwell
2008-06-13 21:56 linux-next: pending wireless/wireless-current merge conflict John W. Linville
2008-06-25 18:04 ` John W. Linville
2008-06-26 5:40 ` linux-next: manual merge of the net tree Stephen Rothwell
2008-06-26 5:54 ` David Miller
2008-06-26 6:58 ` Stephen Rothwell
2008-06-26 9:08 ` David Miller
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=20080708122227.GA4239@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=darrenrjenkins@gmail.com \
--cc=davem@davemloft.net \
--cc=harvey.harrison@gmail.com \
--cc=linux-next@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).