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, Ivo van Doorn <IvDoorn@gmail.com>
Subject: linux-next: net merge conflict
Date: Wed, 14 May 2008 14:54:25 +1000 [thread overview]
Message-ID: <20080514145425.a60d9e19.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 594 bytes --]
Hi Dave, John,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/rt2x00/rt61pci.c (at the end of rt61pci_beacon_update())
between commit 78720897459a0ed3843c80e9bd9ef1b2f7ae5c8f ("rt2x00:
Don't use pskb_expand_head()") in the net-current/wireless-current trees
and commit e58c6aca99357d7f85f18e0b661d8c5a87f926a9 ("rt2x00: Use rt2x00
queue numbering") in the net/wireless trees.
I think I did the right fixup, but it is probably worth checking.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2008-05-14 4:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-14 4:54 Stephen Rothwell [this message]
2008-05-14 5:08 ` linux-next: net merge conflict 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=20080514145425.a60d9e19.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=IvDoorn@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.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).