From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>
Cc: linux-next@vger•kernel.org, Matt Carlson <mcarlson@broadcom•com>
Subject: linux-next: net/net-current merge conflict
Date: Tue, 10 Jun 2008 17:28:23 +1000 [thread overview]
Message-ID: <20080610172823.12e0fb8f.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
Hi Dave,
Today's linux-next merge of the net tree got a trivial conflict in
drivers/net/tg3.c between commit 1b84d9462a93ccfa99f725aad744ab4d1af8402b
("tg3: Update version to 3.92.1") from the net-current tree and commit
bb9122b829e960f4e242c04c2b38c12efb37757b ("tg3: Update version to 3.93")
from the net tree.
They both update the version and release dates. I took the net tree
version.
--
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:[~2008-06-10 7:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-10 7:28 Stephen Rothwell [this message]
2008-06-10 19:38 ` linux-next: net/net-current merge conflict Matt Carlson
2008-06-10 19:44 ` 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=20080610172823.12e0fb8f.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=mcarlson@broadcom$(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