netdev - Reverts in "net" accidentally overwrote changes in "net-next"

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 24 Jun 2013 14:40:53 -0400
From:	Paul Gortmaker <paul.gortmaker@...driver.com>
To:	David Miller <davem@...emloft.net>
CC:	"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Reverts in "net" accidentally overwrote changes in "net-next"

A build warning led me to notice this revert:

 ---------------
 commit 7a1a0cbfeb31f20acc10722642198e76bbc30cb9
 Author: David S. Miller <davem@...emloft.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.
--
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html