Patchwork pull request: batman-adv 2012-05-01

login
register
mail settings
Submitter Antonio Quartulli
Date May 1, 2012, 8 a.m.
Message ID <1335859266-7546-1-git-send-email-ordex@autistici.org>
Download mbox
Permalink /patch/156016/
State Changes Requested
Delegated to: David Miller
Headers show

Pull-request

git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem

Comments

Antonio Quartulli - May 1, 2012, 8 a.m.
Hello David,

this is the new version of my previous pull request (issued on 2012-04-29).
I'd like to see this changesin net-next/linux-3.5.

In this pull request I entirely removed the D.A.T. code, that as we were
discussing in the previous thread, needs some rewriting to avoid directly
dealing with the neigh table.

This patchset only contains fixes and cleanups.

Letme know if there is any problem!

Thank you,
	Antonio

The following changes since commit 7a2a66a0ac1cf93d30869c4ecbfc71a2fda19397:

  Add linux-next specific files for 20120423 (2012-04-23 16:58:43 +1000)

are available in the git repository at:

  git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem

for you to fetch changes up to 969e62ad00763fed9ea28700ef7a7d97fdbfddf3:

  batman-adv: split neigh_new function into generic and batman iv specific parts (2012-05-01 00:37:58 +0200)

----------------------------------------------------------------
Included changes:

* minor fixes and cleanups
* minor routing protocol API cleanups

----------------------------------------------------------------
Antonio Quartulli (1):
      batman-adv: fix wrong dhcp option list browsing

Marek Lindner (6):
      batman-adv: introduce is_single_hop_neigh variable to increase readability
      batman-adv: introduce packet type handler array for incoming packets
      batman-adv: register batman ogm receive function during protocol init
      batman-adv: rename last_valid to last_seen
      batman-adv: replace HZ calculations with jiffies_to_msecs()
      batman-adv: split neigh_new function into generic and batman iv specific parts

 net/batman-adv/bat_debugfs.c    |    4 +-
 net/batman-adv/bat_iv_ogm.c     |   95 +++++++++++++++++++++++-------
 net/batman-adv/gateway_client.c |    6 +-
 net/batman-adv/hard-interface.c |  113 ------------------------------------
 net/batman-adv/main.c           |  122 ++++++++++++++++++++++++++++++++++++++-
 net/batman-adv/main.h           |    6 ++
 net/batman-adv/originator.c     |   50 ++++++++--------
 net/batman-adv/originator.h     |    6 +-
 net/batman-adv/routing.c        |   22 ++++---
 net/batman-adv/routing.h        |    4 +-
 net/batman-adv/send.c           |    2 +-
 net/batman-adv/types.h          |   11 ++--
 12 files changed, 249 insertions(+), 192 deletions(-)
--
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 Miller - May 1, 2012, 1:53 p.m.
From: Antonio Quartulli <ordex@autistici.org>
Date: Tue,  1 May 2012 10:00:59 +0200

> this is the new version of my previous pull request (issued on 2012-04-29).
> I'd like to see this changesin net-next/linux-3.5.
> 
> In this pull request I entirely removed the D.A.T. code, that as we were
> discussing in the previous thread, needs some rewriting to avoid directly
> dealing with the neigh table.
> 
> This patchset only contains fixes and cleanups.

When I pull this tree I start to get an enormous number of objects
sent over, way more than your pull request indicates:

[davem@bql net-next]$ git pull git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem
remote: Counting objects: 42485, done.        
remote: Compressing objects: 100% (7640/7640), done.        
Receiving objects:  12% (4594/36644), 1.42 MiB | 56 KiB/s     C-c C-c

I Ctrl-C'd this because I don't even want to see what this is going to crap
into my tree.

You have something totally inappropriate in there, and I think your changes
are not based upon my net-next tree, but rather something entirely else.

I took a quick look and it looks like you prepared this against either
Linus's tree or the 'net' tree.

NEVER DO THIS.

You must based your changes exactly, and solely, upon the tree you
want me to pull your stuff it into.  It is never appropriate to make
changes against another tree, and then ask me to pull the result of
that into mine.

Please do not waste my time with garbage like this.
--
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 Miller - May 1, 2012, 1:56 p.m.
From: David Miller <davem@davemloft.net>
Date: Tue, 01 May 2012 09:53:08 -0400 (EDT)

> I took a quick look and it looks like you prepared this against either
> Linus's tree or the 'net' tree.

Even worse, you based this on the linux-next tree.

What in the world is wrong with you?

What in your mind makes you think I want to pull in all
of the rest of the linux-next stuff into MY TREE?

I'm really pissed off.  Don't send me pull requests for at least
a week, I don't want to deal with you at all at this point.
--
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
Antonio Quartulli - May 1, 2012, 2:12 p.m.
On Tue, May 01, 2012 at 09:56:26 -0400, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Tue, 01 May 2012 09:53:08 -0400 (EDT)
> 
> > I took a quick look and it looks like you prepared this against either
> > Linus's tree or the 'net' tree.
> 
> Even worse, you based this on the linux-next tree.
> 
> What in the world is wrong with you?
> 
> What in your mind makes you think I want to pull in all
> of the rest of the linux-next stuff into MY TREE?
> 
> I'm really pissed off.  Don't send me pull requests for at least
> a week, I don't want to deal with you at all at this point.

I'm really sorry David.

You are right, when pulling the remote branch I wrongly chose the incorrect repo
from git.kernel.org (don't know what was going on in my brain and I swapped
net-next with linux-next) :-(. I paid my inexperience. But at least I (and
others) can learn from my errors.


Sorry for wasting your time.

I will surely avoid this in the future.



Best regards,