From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754959AbYKKEMV (ORCPT ); Mon, 10 Nov 2008 23:12:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753539AbYKKEML (ORCPT ); Mon, 10 Nov 2008 23:12:11 -0500 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.124]:42745 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750787AbYKKEML (ORCPT ); Mon, 10 Nov 2008 23:12:11 -0500 Message-Id: <20081111041114.360885196@goodmis.org> User-Agent: quilt/0.46-1 Date: Mon, 10 Nov 2008 23:11:14 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Thomas Gleixner , Andrew Morton Subject: [PATCH 0/2] ftrace: updates for linux-tip Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ingo, The following patches are in: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git branch: tip/devel Steven Rostedt (2): ftrace: prevent ftrace_special from recursion ring-buffer: replace most bug ons with warn on and disable buffer ---- kernel/trace/ring_buffer.c | 65 +++++++++++++++++++++++++++++++++----------- kernel/trace/trace.c | 8 +++-- 2 files changed, 54 insertions(+), 19 deletions(-)