From: "Matt Carlson" <mcarlson@broadcom•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Miller <davem@davemloft•net>,
linux-next@vger•kernel.org, Matt Carlson <mcarlson@broadcom•com>,
mchan@broadcom•com
Subject: Re: linux-next: net/net-current merge conflict
Date: Tue, 10 Jun 2008 12:38:26 -0700 [thread overview]
Message-ID: <20080610193826.GD5841@localdomain> (raw)
In-Reply-To: <20080610172823.12e0fb8f.sfr@canb.auug.org.au>
The correct thing to do would be to increment the net-next version every
time these conflicts appear. Right now and to the best of my knowledge,
this policy would only apply to the tg3 driver. Do you feel this is an
acceptable / sustainable way to deal with versioning between net and
net-next?
On Tue, Jun 10, 2008 at 05:28:23PM +1000, Stephen Rothwell wrote:
> 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/
next prev parent reply other threads:[~2008-06-10 19:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-10 7:28 linux-next: net/net-current merge conflict Stephen Rothwell
2008-06-10 19:38 ` Matt Carlson [this message]
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=20080610193826.GD5841@localdomain \
--to=mcarlson@broadcom$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchan@broadcom$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/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