[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4B8C2CC5.8000603@oracle.com>
Date: Mon, 01 Mar 2010 13:08:21 -0800
From: Randy Dunlap <randy.dunlap@...cle.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
CC: linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
Marcel Holtmann <marcel@...tmann.org>,
linux-bluetooth@...r.kernel.org, Netdev <netdev@...r.kernel.org>
Subject: Re: linux-next: Tree for March 1 (bluetooth/hci_sysfs)
On 03/01/10 02:02, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20100226:
>
> We are seeing conflicts migrate from being between 2 trees in linux-next
> to be between a tree and Linus' tree as things start to get merged.
>
>
> The net tree gained a conflict against Linus' tree.
static ssize_t inquiry_cache_read(struct file *file, char __user *userbuf,
size_t count, loff_t *ppos)
{
struct hci_dev *hdev = file->private_data;
struct inquiry_cache *cache = &hdev->inq_cache;
struct inquiry_entry *e;
char buf[4096]; // <<<<<<<<<<<<<<<<<<<<<<<<<<< huh? don't do that on stack.
int n = 0;
--
~Randy
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists