Reverts in "net" accidentally overwrote changes in "net-next"
Subsystems (2)
A build warning led me to notice this revert:
---------------
commit 7a1a0cbfeb31f20acc10722642198e76bbc30cb9
Author: David S. Miller <[email protected]>
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.
--
David Miller
maintainerFrom: Paul Gortmaker <[email protected]>
Date: Mon, 24 Jun 2013 14:40:53 -0400
Quoted 15 lines
A build warning led me to notice this revert:
---------------
commit7a1a0cbfeb31f20acc10722642198e76bbc30cb9
Author: David S. Miller <[email protected]>
Date: Thu May 23 12:15:32 2013 -0700net: Revert unused variable changes.
This reverts commits:
c573972c111eb4c6b3f3250ad71e7c75cc799833
1a5904342c7380ceddd61c0b37544d752d0b1433
da2e2c214953f37c2a6be20226537ca5a329724c
Quoted 5 lines
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.