From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: David Miller <davem@davemloft.net>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: Reverts in "net" accidentally overwrote changes in "net-next"
Date: Mon, 24 Jun 2013 14:40:53 -0400 [thread overview]
Message-ID: <51C892B5.2020109@windriver.com> (raw)
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.
--
next reply other threads:[~2013-06-24 18:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-24 18:40 Paul Gortmaker [this message]
2013-06-24 19:44 ` Reverts in "net" accidentally overwrote changes in "net-next" David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51C892B5.2020109@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.