From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>
Cc: linux-next@vger•kernel.org,
Helmut Schaa <helmut.schaa@googlemail•com>,
"John W. Linville" <linville@tuxdriver•com>,
Reinette Chatre <reinette.chatre@intel•com>
Subject: linux-next: manual merge of the net tree with the tree
Date: Thu, 5 Feb 2009 14:00:04 +1100 [thread overview]
Message-ID: <20090205140004.7cd9f1bd.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 587 bytes --]
Hi Dave,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
c4e061ace75513aee227090486cc46dec7810c00 ("iwlwifi: save PCI state before
suspend, restore after resume") from the wireless-current tree and commit
2663516d8fb896430bf42dce41b3e2f141d63bd5 ("iwl3945: report killswitch
changes even if the interface is down") from the net and wireless trees.
Again, the former is just a subset of the latter.
--
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-05 3:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-05 3:00 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-22 1:51 linux-next: manual merge of the net tree with the tree Stephen Rothwell
2011-08-23 18:10 ` Niklaus Giger
2011-01-04 2:28 Stephen Rothwell
2010-10-12 0:17 Stephen Rothwell
2010-10-12 3:51 ` Stephen Rothwell
2010-10-12 5:56 ` Stefan Richter
2009-07-13 2:50 Stephen Rothwell
2009-05-21 4:06 Stephen Rothwell
2009-05-21 22:25 ` David Miller
2009-05-21 22:29 ` David Miller
2009-05-22 0:35 ` John W. Linville
2009-05-22 8:10 ` David Miller
2009-05-22 0:33 ` John W. Linville
2009-05-08 3:23 Stephen Rothwell
2009-05-08 7:49 ` David Miller
2009-05-08 8:21 ` Eric Dumazet
2009-04-21 1:06 Stephen Rothwell
2009-04-21 1:22 ` Herbert Xu
2009-04-21 8:33 ` David Miller
2009-04-21 11:08 ` Stephen Rothwell
2009-03-20 0:32 Stephen Rothwell
2009-03-20 4:38 ` Pantelis Koukousoulas
2009-03-20 8:24 ` Mark McLoughlin
2009-03-20 9:28 ` David Miller
2009-03-04 2:03 Stephen Rothwell
2009-02-05 2:55 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=20090205140004.7cd9f1bd.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=helmut.schaa@googlemail$(echo .)com \
--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