* linux-next: Tree for March 1 @ 2010-03-01 10:02 Stephen Rothwell 2010-03-01 21:08 ` linux-next: Tree for March 1 (bluetooth/hci_sysfs) Randy Dunlap 2010-03-01 21:54 ` [PATCH -next] mtd/nand/r852: fix build for CONFIG_PM=n Randy Dunlap 0 siblings, 2 replies; 12+ messages in thread From: Stephen Rothwell @ 2010-03-01 10:02 UTC (permalink / raw) To: linux-next; +Cc: LKML [-- Attachment #1: Type: text/plain, Size: 13505 bytes --] 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 blackfin tree gained a build failure (due to a mismerge) for which I applied a patch. The m68k-current tree lost it conflict. The omap tree gained a conflict against the arm tree. The powerpc tree lost its conflicts. The i2c tree gained a build failure so I used the version from next-20100226. The v4l-dvb tree lost a conflict. The net tree gained a conflict against Linus' tree. The wireless tree lost its conflicts. The mtd tree gained a conflict agains Linus' tree and 2 build failures for which I applied patches. The mfd tree lost its conflicts. The drm tree lost its conflicts. The oprofile tree gained a conflict against Linus' tree. The usb tree gained a conflict against the block tree. The block tree gained a build failure for which I applied a patch. The driver-core tree gained a build failure for which I applied a patch. I applied a patch for Ingo Molnar (thanks) for a build failure in Linus' tree on x86 allyesconfig. ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc and sparc64 defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 158 trees (counting Linus' and 22 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Jan Dittmer for adding the linux-next tree to his build tests at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy Dunlap for doing many randconfig builds. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master Merging fixes/fixes Merging arm-current/master Merging m68k-current/for-linus Merging powerpc-merge/merge Merging sparc-current/master Merging scsi-rc-fixes/master Merging net-current/master Merging sound-current/for-linus Merging pci-current/for-linus Merging wireless-current/master Merging kbuild-current/for-linus Merging quilt/driver-core.current Merging quilt/tty.current Merging quilt/usb.current Merging quilt/staging.current Merging cpufreq-current/fixes Merging input-current/for-linus Merging md-current/for-linus Merging audit-current/for-linus Merging crypto-current/master Merging ide-curent/master Merging dwmw2/master Merging arm/devel Merging davinci/davinci-next Merging i.MX/for-next CONFLICT (content): Merge conflict in arch/arm/Makefile Merging msm/for-next Merging omap/for-next CONFLICT (content): Merge conflict in arch/arm/plat-omap/Kconfig Merging pxa/for-next Merging samsung/next-samsung CONFLICT (content): Merge conflict in arch/arm/Kconfig CONFLICT (content): Merge conflict in arch/arm/Makefile Applying: arm: fix bad merge of arch/arm/Kconfig Merging avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next Merging microblaze/next CONFLICT (content): Merge conflict in arch/microblaze/include/asm/prom.h Merging mips/mips-for-linux-next CONFLICT (content): Merge conflict in arch/mips/alchemy/common/platform.c CONFLICT (content): Merge conflict in arch/mips/alchemy/common/setup.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/db1200/platform.c CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/board_setup.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1100/platform.c CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/pb1200/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1500/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1550/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/platform.h CONFLICT (add/add): Merge conflict in arch/mips/alchemy/xxs1500/platform.c CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/octeon-irq.c CONFLICT (content): Merge conflict in arch/mips/configs/db1200_defconfig CONFLICT (content): Merge conflict in arch/mips/include/asm/mach-au1x00/au1000.h CONFLICT (content): Merge conflict in drivers/pcmcia/au1000_generic.h CONFLICT (add/add): Merge conflict in drivers/pcmcia/db1xxx_ss.c CONFLICT (add/add): Merge conflict in drivers/pcmcia/xxs1500_ss.c Merging parisc/next Merging powerpc/next Merging 4xx/next Merging 52xx-and-virtex/next Merging galak/next Merging s390/features Merging sh/master Merging genesis/master CONFLICT (content): Merge conflict in arch/arm/Kconfig Merging sparc/master Merging xtensa/master Applying: blackfin: fix mismerge of kernel/trace/trace_syscalls.c Merging ceph/for-next CONFLICT (content): Merge conflict in fs/gfs2/super.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c Merging cifs/master Merging configfs/linux-next Merging ecryptfs/next Merging ext3/for_next Merging ext4/next Merging fatfs/master Merging fuse/for-next Merging gfs2/master Merging jfs/next Merging logfs/master Merging nfs/linux-next CONFLICT (content): Merge conflict in fs/gfs2/super.c Applying: ceph: update for BDI_RECLAIMABLE change Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging squashfs/master Merging udf/for_next Merging v9fs/for-next Merging ubifs/linux-next Merging xfs/master Applying: nfsd: fixup for _xfs_log_force API change Merging reiserfs-bkl/reiserfs/kill-bkl Merging vfs/for-next Applying: logfs: fixup for write_inode API change Merging pci/linux-next Merging hid/for-next Merging quilt/i2c $ git reset --hard HEAD^ Merging refs/next/20100226/i2c Merging bjdooks-i2c/next-i2c CONFLICT (content): Merge conflict in drivers/i2c/busses/Kconfig CONFLICT (content): Merge conflict in drivers/i2c/busses/Makefile Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master CONFLICT (add/add): Merge conflict in drivers/media/video/tvp7002.c Merging kbuild/for-next Merging kconfig/for-next Merging ide/master Merging libata/NEXT Merging infiniband/for-next CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_main.c Merging acpi/test Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/linux-next Merging dlm/next Merging scsi/master Merging async_tx/next Merging net/master CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in drivers/firmware/iscsi_ibft.c Merging wireless/master Merging mtd/master CONFLICT (content): Merge conflict in drivers/mtd/nand/sh_flctl.c Merging crypto/master Merging sound/for-next Merging cpufreq/next CONFLICT (content): Merge conflict in drivers/acpi/processor_core.c Applying: cpufreq: merge fixup for processor_core.c rename Merging quilt/rr CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in drivers/char/hvc_console.c CONFLICT (content): Merge conflict in drivers/char/hvc_console.h Merging mmc/next Merging tmio-mmc/linux-next CONFLICT (content): Merge conflict in drivers/mfd/asic3.c CONFLICT (content): Merge conflict in drivers/mfd/t7l66xb.c CONFLICT (content): Merge conflict in drivers/mfd/tc6387xb.c CONFLICT (content): Merge conflict in drivers/mfd/tc6393xb.c CONFLICT (add/add): Merge conflict in drivers/mfd/tmio_core.c CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.c CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.h CONFLICT (content): Merge conflict in include/linux/mfd/tmio.h Merging input/next CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Merging lsm/for-next Merging block/for-next Merging quilt/device-mapper Merging embedded/master Merging firmware/master Merging pcmcia/master Merging battery/master Merging leds/for-mm Merging backlight/for-mm Merging kgdb/kgdb-next Merging slab/for-next Merging uclinux/for-next Merging md/for-next Merging mfd/for-next Merging hdlc/hdlc-next Merging drm/drm-next Merging voltage/for-next Merging security-testing/next CONFLICT (content): Merge conflict in security/tomoyo/realpath.c Merging lblnet/master Merging agp/agp-next Merging uwb/for-upstream Merging watchdog/master Merging bdev/master Merging dwmw2-iommu/master Merging cputime/cputime Merging osd/linux-next Merging jc_docs/docs-next Merging nommu/master Merging trivial/for-next CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/debug-macro.S CONFLICT (content): Merge conflict in drivers/net/qlge/qlge_ethtool.c CONFLICT (content): Merge conflict in drivers/net/qlge/qlge_main.c CONFLICT (content): Merge conflict in drivers/net/typhoon.c Merging audit/for-next Merging quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging fsnotify/for-next CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c CONFLICT (content): Merge conflict in kernel/audit_tree.c Merging irda/for-next CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c Merging hwlat/for-linus CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in drivers/misc/Makefile Merging drbd/for-jens Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in include/linux/Kbuild CONFLICT (content): Merge conflict in lib/Kconfig Merging i7core_edac/linux_next Merging devicetree/next-devicetree Merging spi/next-spi Merging limits/writable_limits CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S Merging omap_dss2/for-next Merging als/for-next Merging tip/auto-latest Applying: tip: fix trivial mismerge of tools/perf/util/probe-event.c Merging edac-amd/for-next Merging oprofile/for-next CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_event.c Applying: oprofile: merge fixup for arch/x86/kernel/cpu/perf_event_p6.c Merging percpu/for-next Applying: slab: update for percpu API change Merging workqueues/for-next Merging sfi/sfi-test Merging asm-generic/next Merging hwpoison/hwpoison Merging sysctl/master Merging quilt/driver-core CONFLICT (content): Merge conflict in drivers/base/power/main.c CONFLICT (content): Merge conflict in drivers/pcmcia/ds.c CONFLICT (content): Merge conflict in include/linux/device.h Applying: i2c: update for semaphore to mutex conversion of devices Merging quilt/tty Merging quilt/usb CONFLICT (content): Merge conflict in arch/arm/mach-mx2/devices.c CONFLICT (content): Merge conflict in arch/arm/mach-mx2/devices.h CONFLICT (content): Merge conflict in drivers/usb/early/ehci-dbgp.c CONFLICT (content): Merge conflict in drivers/usb/storage/scsiglue.c Merging quilt/staging CONFLICT (content): Merge conflict in drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.c left in tree. CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.h deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.h left in tree. $ git rm -f drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h Merging scsi-post-merge/master Applying: block: fix for "Consolidate phys_segment and hw_segment limits" Applying: sysfs: fix for thinko with sysfs_bin_attr_init() Applying: mtd: nand: fix name space clash Applying: dell-laptop: Fix build error by making buffer_mutex static Applying: mtd: declare inline functions static [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: Tree for March 1 (bluetooth/hci_sysfs) 2010-03-01 10:02 linux-next: Tree for March 1 Stephen Rothwell @ 2010-03-01 21:08 ` Randy Dunlap 2010-03-02 1:15 ` Stephen Rothwell 2010-03-01 21:54 ` [PATCH -next] mtd/nand/r852: fix build for CONFIG_PM=n Randy Dunlap 1 sibling, 1 reply; 12+ messages in thread From: Randy Dunlap @ 2010-03-01 21:08 UTC (permalink / raw) To: Stephen Rothwell Cc: linux-next, LKML, Marcel Holtmann, linux-bluetooth, Netdev 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 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: Tree for March 1 (bluetooth/hci_sysfs) 2010-03-01 21:08 ` linux-next: Tree for March 1 (bluetooth/hci_sysfs) Randy Dunlap @ 2010-03-02 1:15 ` Stephen Rothwell [not found] ` <20100302121526.36a1ea88.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> 0 siblings, 1 reply; 12+ messages in thread From: Stephen Rothwell @ 2010-03-02 1:15 UTC (permalink / raw) To: Randy Dunlap; +Cc: linux-next, LKML, Marcel Holtmann, linux-bluetooth, Netdev [-- Attachment #1: Type: text/plain, Size: 588 bytes --] Hi Randy, On Mon, 01 Mar 2010 13:08:21 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote: > > 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; Dave Miller is following up on that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <20100302121526.36a1ea88.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>]
* Re: linux-next: Tree for March 1 (bluetooth/hci_sysfs) [not found] ` <20100302121526.36a1ea88.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> @ 2010-03-02 2:14 ` David Miller [not found] ` <20100301.181415.266447389.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> 2010-03-03 1:23 ` Marcel Holtmann 0 siblings, 2 replies; 12+ messages in thread From: David Miller @ 2010-03-02 2:14 UTC (permalink / raw) To: sfr-3FnU+UHB4dNDw9hX6IcOSA Cc: randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA, linux-next-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, marcel-kz+m5ild9QBg9hUCZPvPmw, linux-bluetooth-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA From: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> Date: Tue, 2 Mar 2010 12:15:26 +1100 > Hi Randy, > > On Mon, 01 Mar 2010 13:08:21 -0800 Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> wrote: >> >> 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; > > Dave Miller is following up on that. This looks like a job for.... SEQ FILE! :-) I'm testing the following fix. diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 1a79a6c..f02c2ff 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c @@ -3,6 +3,7 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/debugfs.h> +#include <linux/seq_file.h> #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> @@ -405,44 +406,85 @@ static struct device_type bt_host = { .release = bt_host_release, }; -static int inquiry_cache_open(struct inode *inode, struct file *file) +static int inquiry_cache_show(struct seq_file *m, void *v) { - file->private_data = inode->i_private; + struct inquiry_entry *e = v; + struct inquiry_data *data; + bdaddr_t bdaddr; + + data = &e->data; + baswap(&bdaddr, &data->bdaddr); + + seq_printf(m, "%s %d %d %d 0x%.2x%.2x%.2x 0x%.4x %d %d %u\n", + batostr(&bdaddr), + data->pscan_rep_mode, data->pscan_period_mode, + data->pscan_mode, data->dev_class[2], + data->dev_class[1], data->dev_class[0], + __le16_to_cpu(data->clock_offset), + data->rssi, data->ssp_mode, e->timestamp); + return 0; } -static ssize_t inquiry_cache_read(struct file *file, char __user *userbuf, - size_t count, loff_t *ppos) +static void *inquiry_cache_get_idx(struct hci_dev *hdev, loff_t pos) { - struct hci_dev *hdev = file->private_data; struct inquiry_cache *cache = &hdev->inq_cache; - struct inquiry_entry *e; - char buf[4096]; - int n = 0; + struct inquiry_entry *e = cache->list; + + while (e && pos) { + e = e->next; + pos--; + } + return e; +} + +static void *inquiry_cache_start(struct seq_file *m, loff_t *pos) +{ + struct hci_dev *hdev = m->private; hci_dev_lock_bh(hdev); - for (e = cache->list; e; e = e->next) { - struct inquiry_data *data = &e->data; - bdaddr_t bdaddr; - baswap(&bdaddr, &data->bdaddr); - n += sprintf(buf + n, "%s %d %d %d 0x%.2x%.2x%.2x 0x%.4x %d %d %u\n", - batostr(&bdaddr), - data->pscan_rep_mode, data->pscan_period_mode, - data->pscan_mode, data->dev_class[2], - data->dev_class[1], data->dev_class[0], - __le16_to_cpu(data->clock_offset), - data->rssi, data->ssp_mode, e->timestamp); - } + return inquiry_cache_get_idx(hdev, *pos); +} + +static void *inquiry_cache_next(struct seq_file *m, void *v, loff_t *pos) +{ + struct inquiry_entry *e = v; + + ++*pos; + return e->next; +} + +static void inquiry_cache_stop(struct seq_file *m, void *v) +{ + struct hci_dev *hdev = m->private; hci_dev_unlock_bh(hdev); +} - return simple_read_from_buffer(userbuf, count, ppos, buf, n); +static const struct seq_operations inquiry_cache_ops = { + .start = inquiry_cache_start, + .next = inquiry_cache_next, + .stop = inquiry_cache_stop, + .show = inquiry_cache_show, +}; + +static int inquiry_cache_open(struct inode *inode, struct file *file) +{ + int rc = seq_open(file, &inquiry_cache_ops); + + if (rc >= 0) { + struct seq_file *m = file->private_data; + m->private = inode->i_private; + } + return rc; } static const struct file_operations inquiry_cache_fops = { - .open = inquiry_cache_open, - .read = inquiry_cache_read, + .open = inquiry_cache_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, }; int hci_register_sysfs(struct hci_dev *hdev) ^ permalink raw reply related [flat|nested] 12+ messages in thread
[parent not found: <20100301.181415.266447389.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>]
* Re: linux-next: Tree for March 1 (bluetooth/hci_sysfs) [not found] ` <20100301.181415.266447389.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> @ 2010-03-02 7:06 ` Marcel Holtmann 0 siblings, 0 replies; 12+ messages in thread From: Marcel Holtmann @ 2010-03-02 7:06 UTC (permalink / raw) To: David Miller Cc: sfr-3FnU+UHB4dNDw9hX6IcOSA, randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA, linux-next-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-bluetooth-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA Hi Dave, > >> 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; > > > > Dave Miller is following up on that. > > This looks like a job for.... SEQ FILE! :-) > > I'm testing the following fix. the patch looks good, but it doesn't do the job. I have to look into why that is. Will try to come up with a proper patch soon. Regards Marcel ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: Tree for March 1 (bluetooth/hci_sysfs) 2010-03-02 2:14 ` David Miller [not found] ` <20100301.181415.266447389.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> @ 2010-03-03 1:23 ` Marcel Holtmann 1 sibling, 0 replies; 12+ messages in thread From: Marcel Holtmann @ 2010-03-03 1:23 UTC (permalink / raw) To: David Miller Cc: sfr, randy.dunlap, linux-next, linux-kernel, linux-bluetooth, netdev Hi Dave, > >> 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; > > > > Dave Miller is following up on that. > > This looks like a job for.... SEQ FILE! :-) > > I'm testing the following fix. I have a working and tested patch that uses single_open(). Will send a patch with commit message and everything in a bit so you can apply it. Regards Marcel ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH -next] mtd/nand/r852: fix build for CONFIG_PM=n 2010-03-01 10:02 linux-next: Tree for March 1 Stephen Rothwell 2010-03-01 21:08 ` linux-next: Tree for March 1 (bluetooth/hci_sysfs) Randy Dunlap @ 2010-03-01 21:54 ` Randy Dunlap 2010-03-02 12:02 ` Maxim Levitsky 1 sibling, 1 reply; 12+ messages in thread From: Randy Dunlap @ 2010-03-01 21:54 UTC (permalink / raw) To: Stephen Rothwell Cc: linux-next, LKML, Maxim Levitsky, Rafael J. Wysocki, David Woodhouse, linux-mtd From: Randy Dunlap <randy.dunlap@oracle.com> Fix r852 build for the case of CONFIG_PM=n. drivers/mtd/nand/r852.c:1039: error: implicit declaration of function 'pci_prepare_to_sleep' drivers/mtd/nand/r852.c:1048: error: implicit declaration of function 'pci_back_from_sleep' This patch leaves r852_pm_ops untouched. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Maxim Levitsky <maximlevitsky@gmail.com> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: David Woodhouse <dwmw2@infradead.org> --- drivers/mtd/nand/r852.c | 5 +++++ 1 file changed, 5 insertions(+) --- linux-next-20100301.orig/drivers/mtd/nand/r852.c +++ linux-next-20100301/drivers/mtd/nand/r852.c @@ -1007,6 +1007,7 @@ void r852_shutdown(struct pci_dev *pci_d pci_disable_device(pci_dev); } +#ifdef CONFIG_PM int r852_suspend(struct device *device) { struct r852_device *dev = pci_get_drvdata(to_pci_dev(device)); @@ -1081,6 +1082,10 @@ int r852_resume(struct device *device) r852_update_card_detect(dev); return 0; } +#else +#define r852_suspend NULL +#define r852_resume NULL +#endif static const struct pci_device_id r852_pci_id_tbl[] = { -- ~Randy ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH -next] mtd/nand/r852: fix build for CONFIG_PM=n 2010-03-01 21:54 ` [PATCH -next] mtd/nand/r852: fix build for CONFIG_PM=n Randy Dunlap @ 2010-03-02 12:02 ` Maxim Levitsky 2010-03-11 16:29 ` Randy Dunlap 0 siblings, 1 reply; 12+ messages in thread From: Maxim Levitsky @ 2010-03-02 12:02 UTC (permalink / raw) To: Randy Dunlap Cc: Stephen Rothwell, linux-next, LKML, Rafael J. Wysocki, David Woodhouse, linux-mtd On Mon, 2010-03-01 at 13:54 -0800, Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap@oracle.com> > > Fix r852 build for the case of CONFIG_PM=n. > > drivers/mtd/nand/r852.c:1039: error: implicit declaration of function 'pci_prepare_to_sleep' > drivers/mtd/nand/r852.c:1048: error: implicit declaration of function 'pci_back_from_sleep' > > This patch leaves r852_pm_ops untouched. > > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> > Cc: Maxim Levitsky <maximlevitsky@gmail.com> > Cc: "Rafael J. Wysocki" <rjw@sisk.pl> > Cc: David Woodhouse <dwmw2@infradead.org> > --- > drivers/mtd/nand/r852.c | 5 +++++ > 1 file changed, 5 insertions(+) > > --- linux-next-20100301.orig/drivers/mtd/nand/r852.c > +++ linux-next-20100301/drivers/mtd/nand/r852.c > @@ -1007,6 +1007,7 @@ void r852_shutdown(struct pci_dev *pci_d > pci_disable_device(pci_dev); > } > > +#ifdef CONFIG_PM > int r852_suspend(struct device *device) > { > struct r852_device *dev = pci_get_drvdata(to_pci_dev(device)); > @@ -1081,6 +1082,10 @@ int r852_resume(struct device *device) > r852_update_card_detect(dev); > return 0; > } > +#else > +#define r852_suspend NULL > +#define r852_resume NULL > +#endif > > static const struct pci_device_id r852_pci_id_tbl[] = { > > oops, I forgot about that case again.. Acked-by: Maxim Levitsky <maximlevitsky@gmail.com> Best regards, Maxim Levitsky ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH -next] mtd/nand/r852: fix build for CONFIG_PM=n 2010-03-02 12:02 ` Maxim Levitsky @ 2010-03-11 16:29 ` Randy Dunlap 2010-03-11 16:34 ` Randy Dunlap 0 siblings, 1 reply; 12+ messages in thread From: Randy Dunlap @ 2010-03-11 16:29 UTC (permalink / raw) To: Maxim Levitsky Cc: Stephen Rothwell, linux-next, LKML, Rafael J. Wysocki, David Woodhouse, linux-mtd On 03/02/10 04:02, Maxim Levitsky wrote: > On Mon, 2010-03-01 at 13:54 -0800, Randy Dunlap wrote: >> From: Randy Dunlap <randy.dunlap@oracle.com> >> >> Fix r852 build for the case of CONFIG_PM=n. >> >> drivers/mtd/nand/r852.c:1039: error: implicit declaration of function 'pci_prepare_to_sleep' >> drivers/mtd/nand/r852.c:1048: error: implicit declaration of function 'pci_back_from_sleep' >> >> This patch leaves r852_pm_ops untouched. >> >> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> >> Cc: Maxim Levitsky <maximlevitsky@gmail.com> >> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> >> Cc: David Woodhouse <dwmw2@infradead.org> >> --- >> drivers/mtd/nand/r852.c | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> --- linux-next-20100301.orig/drivers/mtd/nand/r852.c >> +++ linux-next-20100301/drivers/mtd/nand/r852.c >> @@ -1007,6 +1007,7 @@ void r852_shutdown(struct pci_dev *pci_d >> pci_disable_device(pci_dev); >> } >> >> +#ifdef CONFIG_PM >> int r852_suspend(struct device *device) >> { >> struct r852_device *dev = pci_get_drvdata(to_pci_dev(device)); >> @@ -1081,6 +1082,10 @@ int r852_resume(struct device *device) >> r852_update_card_detect(dev); >> return 0; >> } >> +#else >> +#define r852_suspend NULL >> +#define r852_resume NULL >> +#endif >> >> static const struct pci_device_id r852_pci_id_tbl[] = { >> >> > oops, I forgot about that case again.. > Acked-by: Maxim Levitsky <maximlevitsky@gmail.com> Ping. can we get this added to linux-next, please? -- ~Randy ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH -next] mtd/nand/r852: fix build for CONFIG_PM=n 2010-03-11 16:29 ` 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 0 siblings, 1 reply; 12+ messages in thread From: Randy Dunlap @ 2010-03-11 16:34 UTC (permalink / raw) To: Randy Dunlap Cc: Stephen Rothwell, Maxim Levitsky, LKML, Rafael J. Wysocki, linux-next, linux-mtd, David Woodhouse On 03/11/10 08:29, Randy Dunlap wrote: > On 03/02/10 04:02, Maxim Levitsky wrote: >> On Mon, 2010-03-01 at 13:54 -0800, Randy Dunlap wrote: >>> From: Randy Dunlap <randy.dunlap@oracle.com> >>> >>> Fix r852 build for the case of CONFIG_PM=n. >>> >>> drivers/mtd/nand/r852.c:1039: error: implicit declaration of function 'pci_prepare_to_sleep' >>> drivers/mtd/nand/r852.c:1048: error: implicit declaration of function 'pci_back_from_sleep' >>> >>> This patch leaves r852_pm_ops untouched. >>> >>> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> >>> Cc: Maxim Levitsky <maximlevitsky@gmail.com> >>> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> >>> Cc: David Woodhouse <dwmw2@infradead.org> >>> --- >>> drivers/mtd/nand/r852.c | 5 +++++ >>> 1 file changed, 5 insertions(+) >>> >>> --- linux-next-20100301.orig/drivers/mtd/nand/r852.c >>> +++ linux-next-20100301/drivers/mtd/nand/r852.c >>> @@ -1007,6 +1007,7 @@ void r852_shutdown(struct pci_dev *pci_d >>> pci_disable_device(pci_dev); >>> } >>> >>> +#ifdef CONFIG_PM >>> int r852_suspend(struct device *device) >>> { >>> struct r852_device *dev = pci_get_drvdata(to_pci_dev(device)); >>> @@ -1081,6 +1082,10 @@ int r852_resume(struct device *device) >>> r852_update_card_detect(dev); >>> return 0; >>> } >>> +#else >>> +#define r852_suspend NULL >>> +#define r852_resume NULL >>> +#endif >>> >>> static const struct pci_device_id r852_pci_id_tbl[] = { >>> >>> >> oops, I forgot about that case again.. >> Acked-by: Maxim Levitsky <maximlevitsky@gmail.com> > > Ping. can we get this added to linux-next, please? Sorry, it's there, but there are still build errors. I will look at those... -- ~Randy ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/ ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH -next] mtd/nand/r852: fix build for CONFIG_PCI disabled 2010-03-11 16:34 ` Randy Dunlap @ 2010-03-11 17:10 ` Randy Dunlap 2010-03-11 20:59 ` Maxim Levitsky 0 siblings, 1 reply; 12+ messages in thread From: Randy Dunlap @ 2010-03-11 17:10 UTC (permalink / raw) To: Randy Dunlap Cc: Maxim Levitsky, Stephen Rothwell, linux-next, LKML, Rafael J. Wysocki, David Woodhouse, linux-mtd > > Sorry, it's there, but there are still build errors. > I will look at those... > From: Randy Dunlap <randy.dunlap@oracle.com> r852 fails to build when CONFIG_PCI is not enabled since it uses pci_*() calls and is a PCI driver, so it should depend on PCI to prevent build errors. It should also #include <linux/pci.h>. drivers/mtd/nand/r852.c:1053: error: implicit declaration of function 'pci_prepare_to_sleep' drivers/mtd/nand/r852.c:1062: error: implicit declaration of function 'pci_back_from_sleep' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Maxim Levitsky <maximlevitsky@gmail.com> --- drivers/mtd/nand/Kconfig | 1 + drivers/mtd/nand/r852.c | 1 + 2 files changed, 2 insertions(+) --- linux-next-20100311.orig/drivers/mtd/nand/Kconfig +++ linux-next-20100311/drivers/mtd/nand/Kconfig @@ -105,6 +105,7 @@ config MTD_NAND_IDS config MTD_NAND_RICOH tristate "Ricoh xD card reader" default n + depends on PCI select MTD_SM_COMMON help Enable support for Ricoh R5C852 xD card reader --- linux-next-20100311.orig/drivers/mtd/nand/r852.c +++ linux-next-20100311/drivers/mtd/nand/r852.c @@ -12,6 +12,7 @@ #include <linux/jiffies.h> #include <linux/workqueue.h> #include <linux/interrupt.h> +#include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/delay.h> #include <asm/byteorder.h> ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH -next] mtd/nand/r852: fix build for CONFIG_PCI disabled 2010-03-11 17:10 ` [PATCH -next] mtd/nand/r852: fix build for CONFIG_PCI disabled Randy Dunlap @ 2010-03-11 20:59 ` Maxim Levitsky 0 siblings, 0 replies; 12+ messages in thread From: Maxim Levitsky @ 2010-03-11 20:59 UTC (permalink / raw) To: Randy Dunlap Cc: Stephen Rothwell, linux-next, LKML, Rafael J. Wysocki, David Woodhouse, linux-mtd On Thu, 2010-03-11 at 09:10 -0800, Randy Dunlap wrote: > > > > Sorry, it's there, but there are still build errors. > > I will look at those... > > > > > From: Randy Dunlap <randy.dunlap@oracle.com> > > r852 fails to build when CONFIG_PCI is not enabled since it uses > pci_*() calls and is a PCI driver, so it should depend on PCI > to prevent build errors. > It should also #include <linux/pci.h>. Folks, sorry for Kconfig mess, I didn't test it well enough it seems... However, I #include the <linux/pci.h> in r852.h, so I don't think it is necessary here. Also, I disagree with the unconditional dependency on nand in sm_ftl. The purpose of CONFIG_SM_FTL_MUSEUM is solely to make it independent of nand. I'll look at how to fix that properly. Best regards, Maxim Levitsky ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2010-03-11 20:59 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-01 10:02 linux-next: Tree for March 1 Stephen Rothwell
2010-03-01 21:08 ` linux-next: Tree for March 1 (bluetooth/hci_sysfs) Randy Dunlap
2010-03-02 1:15 ` Stephen Rothwell
[not found] ` <20100302121526.36a1ea88.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2010-03-02 2:14 ` David Miller
[not found] ` <20100301.181415.266447389.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
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-02 12:02 ` Maxim Levitsky
2010-03-11 16:29 ` 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 20:59 ` Maxim Levitsky
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).