From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>
Cc: linux-next@vger•kernel.org,
Reinette Chatre <reinette.chatre@intel•com>,
"John W. Linville" <linville@tuxdriver•com>
Subject: linux-next: manual merge of the net tree with the net-current tree
Date: Thu, 12 Feb 2009 13:46:04 +1100 [thread overview]
Message-ID: <20090212134604.5ce2fe53.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 819 bytes --]
Hi David,
Today's linux-next merge of the net tree got conflicts in
drivers/net/wireless/iwlwifi/iwl-agn.c and
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
89c581b3fb2986e303f1299e6458e3e9b115fa3f ("iwlwifi: fix suspend/resume
and its usage of pci saved state") from the net-current tree and commits
from the net tree.
I assume this is what John was referring to when he said:
> The iwlwifi patch corrects a problem (introduced by the previous iwlwifi
> fix) that disables the iwlwifi devices after suspend/resume. It will
> conflict with what is already in -next -- just take the hunks that are
> already in -next and ignore the hunks introduced here.
So I took that advise.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-02-12 2:46 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-12 2:46 Stephen Rothwell [this message]
2009-02-15 7:12 ` linux-next: manual merge of the net tree with the net-current tree David Miller
-- strict thread matches above, loose matches on Subject: below --
2009-03-16 5:05 Stephen Rothwell
2009-03-16 6:41 ` Kirsher, Jeffrey T
2009-03-16 8:19 ` Stephen Rothwell
2009-08-14 2:40 Stephen Rothwell
2009-08-14 2:50 ` David Miller
2009-08-14 4:19 ` Stephen Rothwell
2009-08-14 5:27 ` Dhananjay Phadke
2009-11-06 0:55 Stephen Rothwell
2009-11-06 1:40 ` David Miller
2009-11-06 2:32 ` Stephen Rothwell
2009-11-09 2:03 Stephen Rothwell
2009-11-09 4:59 ` David Miller
2009-11-17 2:16 Stephen Rothwell
2009-11-17 8:00 ` Oliver Hartkopp
2009-11-17 8:16 ` Stephen Rothwell
2009-11-17 8:07 ` David Miller
2009-11-17 8:10 ` Stephen Rothwell
2009-11-23 1:00 Stephen Rothwell
2009-11-23 18:09 ` Amit Salecha
2009-11-23 23:17 ` Stephen Rothwell
2009-11-23 1:00 Stephen Rothwell
2009-11-23 1:19 ` David Miller
2009-11-23 2:04 ` Stephen Rothwell
2009-11-23 2:11 ` David Miller
2009-11-24 3:11 Stephen Rothwell
2009-11-25 7:52 ` Jeff Kirsher
2009-11-30 1:11 ` David Miller
2009-11-30 2:46 ` Stephen Rothwell
2009-11-24 3:11 Stephen Rothwell
2009-11-30 1:12 ` David Miller
2010-06-15 2:00 Stephen Rothwell
2010-06-23 2:51 Stephen Rothwell
2010-06-23 4:14 ` Herbert Xu
2010-06-25 18:22 ` David Miller
2010-07-20 2:20 Stephen Rothwell
2010-07-20 2:34 ` Joe Perches
2010-07-21 1:27 ` David Miller
2010-07-29 1:05 Stephen Rothwell
2010-07-29 5:51 ` Jiri Pirko
2010-07-29 1:19 Stephen Rothwell
2010-07-29 1:26 ` Jeff Kirsher
2010-08-02 1:04 Stephen Rothwell
2010-09-23 2:14 Stephen Rothwell
2010-10-01 2:48 Stephen Rothwell
2010-10-01 3:27 ` Jerry Chu
2010-10-05 5:47 ` David Miller
2010-10-01 2:48 Stephen Rothwell
2010-10-07 1:31 Stephen Rothwell
2010-10-07 2:35 ` David Miller
2010-11-19 0:17 Stephen Rothwell
2010-11-19 21:11 ` David Miller
2010-11-19 0:17 Stephen Rothwell
2010-11-19 21:14 ` David Miller
2010-12-15 0:45 Stephen Rothwell
2011-02-09 0:56 Stephen Rothwell
2011-02-09 1:06 ` David Miller
2011-02-18 1:20 Stephen Rothwell
2011-03-03 2:40 Stephen Rothwell
2011-03-08 3:09 Stephen Rothwell
2011-03-08 9:44 ` Dmitry Kravkov
2011-03-09 0:11 ` Stephen Rothwell
2011-04-07 1:39 Stephen Rothwell
2011-04-07 20:48 ` David Miller
2011-04-19 3:16 Stephen Rothwell
2011-04-19 7:41 ` David Miller
2011-05-03 3:15 Stephen Rothwell
2011-05-03 3:42 ` David Miller
2011-05-03 4:21 ` Stephen Rothwell
2011-05-10 1:49 Stephen Rothwell
2011-05-10 11:55 ` Sathya.Perla
2011-05-17 2:01 Stephen Rothwell
2011-06-20 2:56 Stephen Rothwell
2011-06-20 3:39 ` Simon Horman
2011-06-20 4:26 ` David Miller
2011-09-28 2:54 Stephen Rothwell
2011-09-28 5:36 ` 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=20090212134604.5ce2fe53.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=reinette.chatre@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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