* linux-next: net/net-current merge conflict
@ 2008-06-10 7:28 Stephen Rothwell
2008-06-10 19:38 ` Matt Carlson
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-06-10 7:28 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Matt Carlson
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: net/net-current merge conflict
2008-06-10 7:28 linux-next: net/net-current merge conflict Stephen Rothwell
@ 2008-06-10 19:38 ` Matt Carlson
2008-06-10 19:44 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Matt Carlson @ 2008-06-10 19:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Miller, linux-next, Matt Carlson, mchan
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/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: net/net-current merge conflict
2008-06-10 19:38 ` Matt Carlson
@ 2008-06-10 19:44 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2008-06-10 19:44 UTC (permalink / raw)
To: mcarlson; +Cc: sfr, linux-next, mchan
From: "Matt Carlson" <mcarlson@broadcom•com>
Date: Tue, 10 Jun 2008 12:38:26 -0700
> 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?
I think there is no confusion, to be honest, consider:
1) The stable bug fix driver keeps incrementing the "N" in
x.y.N, so no problems.
2) The development driver keeps incrementing the "Y" in
x.Y and can be presumed to get the bug fixes when merges
happen from the stable branch. The inclusion of said bug
fixes is sort-of implicit in the higher "Y" value.
So really I don't see a reason to do anything special during
merges.
That's why, when I handled the merge tg3.c conflict yesterday
in net-next-2.6, I preserved the net-next-2.6 tg3.c driver
version value.
The driver version value has no meaning in the development
branch until Linus actually pulls it into his tree, for now
it just needs to have a larger "Y" than what is in the stable
series.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-06-10 19:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-10 7:28 linux-next: net/net-current merge conflict Stephen Rothwell
2008-06-10 19:38 ` Matt Carlson
2008-06-10 19:44 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox