From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Marcel Holtmann <marcel@holtmann.org>,
linux-bluetooth@vger.kernel.org, Netdev <netdev@vger.kernel.org>
Subject: Re: linux-next: Tree for March 1 (bluetooth/hci_sysfs)
Date: Mon, 01 Mar 2010 13:08:21 -0800 [thread overview]
Message-ID: <4B8C2CC5.8000603@oracle.com> (raw)
In-Reply-To: <20100301210210.c6f465e6.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2010-03-01 21:08 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-01 10:02 linux-next: Tree for March 1 Stephen Rothwell
2010-03-01 21:08 ` Randy Dunlap [this message]
2010-03-02 1:15 ` linux-next: Tree for March 1 (bluetooth/hci_sysfs) Stephen Rothwell
2010-03-02 2:14 ` David Miller
2010-03-02 2:14 ` David Miller
2010-03-02 7:06 ` Marcel Holtmann
2010-03-02 7:06 ` Marcel Holtmann
2010-03-03 1:23 ` Marcel Holtmann
2010-03-01 21:54 ` [PATCH -next] mtd/nand/r852: fix build for CONFIG_PM=n Randy Dunlap
2010-03-01 21:54 ` Randy Dunlap
2010-03-02 12:02 ` Maxim Levitsky
2010-03-02 12:02 ` Maxim Levitsky
2010-03-11 16:29 ` Randy Dunlap
2010-03-11 16:29 ` Randy Dunlap
2010-03-11 16:34 ` Randy Dunlap
2010-03-11 16:34 ` Randy Dunlap
2010-03-11 16:34 ` Randy Dunlap
2010-03-11 17:10 ` [PATCH -next] mtd/nand/r852: fix build for CONFIG_PCI disabled Randy Dunlap
2010-03-11 17:10 ` Randy Dunlap
2010-03-11 20:59 ` Maxim Levitsky
2010-03-11 20:59 ` Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B8C2CC5.8000603@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.