Re: [B.A.T.M.A.N.] Staging: batman-adv for 2.6.36 (renewed)

[Sven Eckelmann <sven.eckelmann@gmx.de>]

[-- Attachment #1: Type: Text/Plain, Size: 1611 bytes --]

Greg KH wrote:
> On Sun, Jun 06, 2010 at 09:28:12PM +0200, Sven Eckelmann wrote:
> > Hi,
> > 
> > here are patches targetted for 2.6.36. These replace all patches send to
> > you for 2.6.36 in mails following
> > 1275850985-27105-1-git-send-email-sven.eckelmann@gmx.de due to
> > conflicting changes for 2.6.35 from Dan Carpenter and Javier Martinez
> > Canillas.
> 
> I could not apply the following patches for some odd reason:
> 	2, 3, 4, 7, 9
> 
> I applied the others.
> 
> So you might want to resync on the my staging-next tree and see what
> went wrong.  Does it have something to do with the other batman patches
> I have in my staging.current tree to go to Linus?

You forgot(?) to apply the patches

 * Staging: batman-adv: return -EFAULT on copy_to_user errors
 * Staging: batman-adv: fix function prototype

With those patches it works like a charm. And at least the second one is 
extreme important for 2.6.35.

You said (or at least a script use by you) that you have them in 
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/ ... 
if that is some kind of aggregation from staging.current then yes - we depend 
on them. That was the reason why I had to resent all the patches (that's why 
there is a "renewed" in the title) - to allow you to apply them on top of 
those other two patches.

I wanted to sent you some more patches a hour or two ago... had to be delayed 
to find out what is going wrong here. I will sent them those need also the 
patches mentioned above.

Let's hope that this explains everything. :)

thanks,
	Sven

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]