diff options
| author | David S. Miller | 2013-02-03 05:13:00 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-02-03 05:13:00 +0100 |
| commit | 33397a71217dda91b436726f046d78525fd08b22 (patch) | |
| tree | 19c163dd514244925ec8ee3df15f7b466630d61b /drivers/net/ethernet/stmicro | |
| parent | qlcnic: silence false positive overflow warning (diff) | |
| parent | wanrouter: delete now orphaned header content, files/drivers (diff) | |
| download | kernel-qcow2-linux-33397a71217dda91b436726f046d78525fd08b22.tar.gz kernel-qcow2-linux-33397a71217dda91b436726f046d78525fd08b22.tar.xz kernel-qcow2-linux-33397a71217dda91b436726f046d78525fd08b22.zip | |
Merge branch 'delete-wanrouter' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Paul Gortmaker says:
====================
The removal of wanrouter code was originally listed in the (now
gone) feature removal file since May 2012, and an RFC of the
deletion was posted[1] in late 2012. The overall concept was given
an OK, but defconfig contamination, build failures, etc. meant that
it didn't quite make it into mainline for 3.8.
Since that time, Dan discovered (via code audit) a runtime bug that
proves nobody has been using this for over four years[2]. With that
new information, I think it makes sense for someone to follow through
on Joe's original RFC and get this done for the 3.9 release.
In addition to resolving the build failures of the RFC by keeping
stub headers, this also splits the change into two parts, just like
the token ring removal did. Part #1 decouples the mainline kernel
from the expired subsystem, and part #2 does the large scale
deletion of the subsystem content.
The advantage of the above, is that a "git blame" will never lead
you to a 4000+ line deletion commit. The large scale deletion will
never show up in a "git blame" and hence the same advantages that we
get from the "--irreversible-delete" in the review stage of "git
format-patch" are also embedded into the git history itself. This
may seem like a moot point to some, but for those who spend a
considerable amount of time data mining in the git history, this is
probably worth doing.
I have done build tests of all[mod/yes]config for both the stage 1
(Makefile and Kconfig) and stage 2 (full driver delete) as a sanity
check, and the issues with the previously posted RFC should be gone.
Speaking of "--irreversible-delete" -- these patches were created
with that option, so if you want to use them locally, you are going
to have to pull (location below) the content instead of doing a
"git am" of the mailed out content.
[1] http://patchwork.ozlabs.org/patch/198794/
[2] http://www.spinics.net/lists/netdev/msg218670.html
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
0 files changed, 0 insertions, 0 deletions