pull request: batman-adv 2011-01-29
Message ID | 201101301036.57928.sven@narfation.org (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers |
Return-Path: <sven@narfation.org> Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 35E6A15456F for <b.a.t.m.a.n@lists.open-mesh.org>; Sun, 30 Jan 2011 10:37:01 +0100 (CET) Received: from sven-laptop.home.narfation.org (i59F6CD6C.versanet.de [89.246.205.108]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 512109406F; Sun, 30 Jan 2011 10:37:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1296380253; bh=vzY99uqXChFO8+7+shn8rTxyzJa4tt9wUH1gfHSNwic=; h=From:To:Subject:Date:Cc:References:In-Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding:Message-Id; b=XOqsSoWTQltarwvHQ9bVXiLsGThlencCTJfMpaDiPFXNzdup6SC9Kh0msGwWRjLh7 TFDiQBYxguqMA5+f3hUw2UH7IO7MutNeFP1e1kCozxPnC3zsEHNdxR3mcPrH3rxW8V ryiOt2ZsXSpyVhFVnLy9SkBBzKp2SsWdDgFscpHE= From: Sven Eckelmann <sven@narfation.org> To: David Miller <davem@davemloft.net> Date: Sun, 30 Jan 2011 10:36:54 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37-trunk-686; KDE/4.4.5; i686; ; ) References: <1296337660-12376-1-git-send-email-sven@narfation.org> <20110129.190815.226768755.davem@davemloft.net> In-Reply-To: <20110129.190815.226768755.davem@davemloft.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart6117253.u5B2ZLxnRN"; protocol="application/pgp-signature"; micalg=pgp-sha512 Content-Transfer-Encoding: 7bit Message-Id: <201101301036.57928.sven@narfation.org> Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: Re: [B.A.T.M.A.N.] pull request: batman-adv 2011-01-29 X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n@lists.open-mesh.org> List-Id: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n.lists.open-mesh.org> List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe> List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n> List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org> List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help> List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe> X-List-Received-Date: Sun, 30 Jan 2011 09:37:01 -0000 |
Pull-request
git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/merge-oopsonlyMessage
Sven Eckelmann
Jan. 30, 2011, 9:36 a.m. UTC
On Sunday 30 January 2011 04:08:15 David Miller wrote: > I'm not taking 13 patches in one big bunch at this point post-merge-window, > now matter what they are. Thats why I tried to provide the 6 bug fixes only version without polishing - I could also try to reduce it to a 4 critical version (oops/memleak patches only without protocol implementation failures). Or is the problem that I tried to get them in as pull request? thanks, Sven Here are the oops/memleak patches only: The following changes since commit aa0adb1a85e159cf57f0e11282bc6c9e3606a5f3: batman-adv: Use "__attribute__" shortcut macros (2011-01-16 03:25:19 +0100) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/merge-oopsonly Linus Lüssing (1): batman-adv: Fix kernel panic when fetching vis data on a vis server Sven Eckelmann (3): batman-adv: Remove vis info on hashing errors batman-adv: Remove vis info element in free_info batman-adv: Make vis info stack traversal threadsafe net/batman-adv/vis.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
Comments
From: Sven Eckelmann <sven@narfation.org> Date: Sun, 30 Jan 2011 10:36:54 +0100 > On Sunday 30 January 2011 04:08:15 David Miller wrote: >> I'm not taking 13 patches in one big bunch at this point post-merge-window, >> now matter what they are. > > Thats why I tried to provide the 6 bug fixes only version without polishing - > I could also try to reduce it to a 4 critical version (oops/memleak patches > only without protocol implementation failures). > > Or is the problem that I tried to get them in as pull request? Please make a new patch series posting and pull request with only the most important fixes included. Once I accept those, you can send me a second patch series and pull request with the cleanups done on top. Just mention explicitly in this second pull request that there is a dependency upon the initial bug fixes. In this way I will know to pull net-2.6 into net-next-2.6 first, and then pull from your tree into net-next-2.6 Thanks.