* Reverts in "net" accidentally overwrote changes in "net-next"
@ 2013-06-24 18:40 Paul Gortmaker
2013-06-24 19:44 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Paul Gortmaker @ 2013-06-24 18:40 UTC (permalink / raw)
To: David Miller; +Cc: netdev@vger.kernel.org
A build warning led me to notice this revert:
---------------
commit 7a1a0cbfeb31f20acc10722642198e76bbc30cb9
Author: David S. Miller <davem@davemloft.net>
Date: Thu May 23 12:15:32 2013 -0700
net: Revert unused variable changes.
This reverts commits:
c573972c111eb4c6b3f3250ad71e7c75cc799833
1a5904342c7380ceddd61c0b37544d752d0b1433
da2e2c214953f37c2a6be20226537ca5a329724c
They were meant for net-next not net.
---------------
It appears to have been merged forward into net-next, and now
net-next has also lost the functional changes from them.
$ git checkout nn-Jun24
Switched to branch 'nn-Jun24'
$ git show c573972c111eb|patch -p1 --dry-run
patching file drivers/net/ethernet/sun/sunbmac.c
$ git show 1a5904342c738|patch -p1 --dry-run
patching file drivers/net/ethernet/korina.c
$ git show da2e2c214953f|patch -p1 --dry-run
patching file drivers/net/ethernet/apple/bmac.c
Paul.
--
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: Reverts in "net" accidentally overwrote changes in "net-next"
2013-06-24 18:40 Reverts in "net" accidentally overwrote changes in "net-next" Paul Gortmaker
@ 2013-06-24 19:44 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-06-24 19:44 UTC (permalink / raw)
To: paul.gortmaker; +Cc: netdev
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Mon, 24 Jun 2013 14:40:53 -0400
> A build warning led me to notice this revert:
>
> ---------------
> commit 7a1a0cbfeb31f20acc10722642198e76bbc30cb9
> Author: David S. Miller <davem@davemloft.net>
> Date: Thu May 23 12:15:32 2013 -0700
>
> net: Revert unused variable changes.
>
> This reverts commits:
>
> c573972c111eb4c6b3f3250ad71e7c75cc799833
> 1a5904342c7380ceddd61c0b37544d752d0b1433
> da2e2c214953f37c2a6be20226537ca5a329724c
>
> They were meant for net-next not net.
> ---------------
>
> It appears to have been merged forward into net-next, and now
> net-next has also lost the functional changes from them.
This should be fixed now.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-24 19:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-24 18:40 Reverts in "net" accidentally overwrote changes in "net-next" Paul Gortmaker
2013-06-24 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;
as well as URLs for NNTP newsgroup(s).