| Submitter | Marek Lindner |
|---|---|
| Date | Feb. 17, 2012, 7:18 a.m. |
| Message ID | <1329463110-856-1-git-send-email-lindner_marek@yahoo.de> |
| Download | mbox |
| Permalink | /patch/141736/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Pull-request
git://git.open-mesh.org/linux-merge.git batman-adv-for-davemComments
From: Marek Lindner <lindner_marek@yahoo.de> Date: Fri, 17 Feb 2012 15:18:20 +0800 > The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f: > > Linux 3.3-rc1 (2012-01-19 15:04:48 -0800) > > are available in the git repository at: > > git://git.open-mesh.org/linux-merge.git batman-adv-for-davem Somethings up: [davem@drr net-next]$ git pull git://git.open-mesh.org/linux-merge.git batman-adv-for-davem fatal: Couldn't find remote ref batman-adv-for-davem which is strange because I can see the tag there on git.open-mesh.org when I check it with my web browser. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Friday 17 February 2012 15:23:23 David Miller wrote: > From: Marek Lindner <lindner_marek@yahoo.de> > Date: Fri, 17 Feb 2012 15:18:20 +0800 > > > The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f: > > Linux 3.3-rc1 (2012-01-19 15:04:48 -0800) > > > > are available in the git repository at: > > git://git.open-mesh.org/linux-merge.git batman-adv-for-davem > > Somethings up: > > [davem@drr net-next]$ git pull git://git.open-mesh.org/linux-merge.git > batman-adv-for-davem fatal: Couldn't find remote ref batman-adv-for-davem > > which is strange because I can see the tag there on git.open-mesh.org when > I check it with my web browser. Just tried it here (used linux-next for that) with git 1.7.9 and it worked fine. Maybe you are using an older version of git? At least the error message looks like it. Have you tried: git pull git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem But this will drop Mareks signature when done with an old git version (so no merged tag is created). Kind regards, Sven
From: Sven Eckelmann <sven@narfation.org> Date: Fri, 17 Feb 2012 21:44:19 +0100 > Have you tried: > > git pull git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem > > But this will drop Mareks signature when done with an old git version (so no > merged tag is created). Yes, that works, and I've pulled it into my tree. I'm reluctant to pull tags which are signed, I certainly don't have your personal keys in my key ring for example. And distributions ship with GIT versions that don't support signed tags, so... -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Feb 17, 2012 at 03:50:49PM -0500, David Miller wrote: > I'm reluctant to pull tags which are signed, I certainly don't have > your personal keys in my key ring for example. And distributions > ship with GIT versions that don't support signed tags, so... The signed tags interoperate fine with old versions, you won't be able to validate them but they shouldn't cause any hassle. If the key can't be verified then that might be more of an issue but if you're OK with pulling something that's completely unsigned you're not loosing anything, it'll just record the signature. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
David, this is the first patch set I'd like you to pull into net-next-2.6/3.4. It mainly brings infrastructure to dynamically change the routing alorithm and a couple of fixes / style improvements. Following the "sign your git tag" trend this is our first pull request which is signed with my key. Let me know if there any problems. Thanks, Marek The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f: Linux 3.3-rc1 (2012-01-19 15:04:48 -0800) are available in the git repository at: git://git.open-mesh.org/linux-merge.git batman-adv-for-davem for you to fetch changes up to ea3d2fd1b11fb3ef8706a48ece0a49a61bcd08bc: batman-adv: export used routing algorithm via sysfs (2012-02-17 02:50:20 +0800) ---------------------------------------------------------------- infrastructure to change routing algorithm at runtime & fixes ---------------------------------------------------------------- Antonio Quartulli (1): batman-adv: add tt_initialised flag to the orig_node struct Marek Lindner (6): batman-adv: simplify bat_ogm_receive API call batman-adv: warn if added interface is part of a bridge batman-adv: add infrastructure to change routing algorithm at runtime batman-adv: convert batman iv algorithm to use dynamic infrastructure batman-adv: allowing changing the routing algorithm via module parameter batman-adv: export used routing algorithm via sysfs Martin Hundebøll (2): batman-adv: Rm empty line from is_my_mac() in main.c batman-adv: Move is_out_of_time() to main.h for general use Sven Eckelmann (1): batman-adv: Explicitly mark the common header structure Documentation/ABI/testing/sysfs-class-net-mesh | 7 + net/batman-adv/{bat_ogm.h => bat_algo.h} | 20 +-- net/batman-adv/bat_debugfs.c | 22 ++ net/batman-adv/bat_iv_ogm.c | 245 +++++++++++++----------- net/batman-adv/bat_sysfs.c | 9 + net/batman-adv/hard-interface.c | 24 ++- net/batman-adv/icmp_socket.c | 6 +- net/batman-adv/main.c | 107 ++++++++++ net/batman-adv/main.h | 15 ++ net/batman-adv/originator.c | 1 + net/batman-adv/packet.h | 38 ++--- net/batman-adv/routing.c | 24 +-- net/batman-adv/send.c | 7 +- net/batman-adv/soft-interface.c | 18 +- net/batman-adv/translation-table.c | 67 +++---- net/batman-adv/types.h | 21 ++ net/batman-adv/unicast.c | 16 +- net/batman-adv/vis.c | 14 +- 18 files changed, 426 insertions(+), 235 deletions(-) rename net/batman-adv/{bat_ogm.h => bat_algo.h} (51%) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html