From: David Miller <davem@davemloft•net>
To: sfr@canb•auug.org.au
Cc: linville@tuxdriver•com, linux-next@vger•kernel.org,
johannes@sipsolutions•net, tomas.winkler@intel•com,
reinette.chatre@intel•com, yi.zhu@intel•com
Subject: Re: linux-next: manual merge of the wireless tree
Date: Thu, 20 Nov 2008 00:27:05 -0800 (PST) [thread overview]
Message-ID: <20081120.002705.95132527.davem@davemloft.net> (raw)
In-Reply-To: <20081120140750.1373326e.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 20 Nov 2008 14:07:50 +1100
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-rx.c between commit
> 4018517a1a69a85c3d61b20fa02f187b80773137 ("iwlagn: fix RX skb alignment")
> from the wireless-current tree and commit
> 07e27f25d0c73f42562473f642f20b8fa996a9de ("iwlwifi: move rx queue read
> pointer into rxq") from the wireless tree.
>
> I wasn't sure how to resolve the conflict so have dropped the wireless
> tree for today. I assume it will be fixed in the wireless (or net) tree
> soon.
I'll sort these out with John somehow, thanks for the report
Stephen,
next prev parent reply other threads:[~2008-11-20 8:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-20 3:07 linux-next: manual merge of the wireless tree Stephen Rothwell
2008-11-20 8:27 ` David Miller [this message]
2008-11-20 13:48 ` John W. Linville
-- strict thread matches above, loose matches on Subject: below --
2008-11-26 8:40 Stephen Rothwell
2008-12-02 20:52 ` Luis R. Rodriguez
2008-09-17 7:43 Stephen Rothwell
2008-09-17 7:45 ` Johannes Berg
2008-07-03 4:43 Stephen Rothwell
2008-07-03 4:38 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=20081120.002705.95132527.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=johannes@sipsolutions$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=reinette.chatre@intel$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tomas.winkler@intel$(echo .)com \
--cc=yi.zhu@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