* linux-next: Tree for February 25 @ 2010-02-25 7:35 Stephen Rothwell 2010-02-25 17:21 ` linux-next: Tree for February 25 (quota) Randy Dunlap ` (3 more replies) 0 siblings, 4 replies; 14+ messages in thread From: Stephen Rothwell @ 2010-02-25 7:35 UTC (permalink / raw) To: linux-next; +Cc: LKML [-- Attachment #1: Type: text/plain, Size: 10802 bytes --] Hi all, Changes since 20100224: The samsung tree gained a conflict against the arm tree. The genesis tree gained a conflict against the arm and samsung trees. The infiniband tree gained a conflicts against the vfs tree. The block tree gained a conflict against Linus' tree. ---------------------------------------------------------------------------- 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 Merging pxa/for-next Merging samsung/next-samsung CONFLICT (rename/modify): Merge conflict in arch/arm/mach-s5p6442/include/mach/debug-macro.S CONFLICT (content): Merge conflict in arch/arm/Makefile 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/kernel/cpu/cache.c Merging mips/mips-for-linux-next 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 Merging ceph/for-next CONFLICT (content): Merge conflict in fs/gfs2/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 CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c 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 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 (content): Merge conflict in drivers/media/video/bt8xx/bttv-driver.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 Merging wireless/master CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2800pci.c Merging mtd/master Merging crypto/master Merging sound/for-next CONFLICT (content): Merge conflict in arch/arm/plat-mxc/Makefile 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 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 CONFLICT (content): Merge conflict in include/linux/blkdev.h 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 CONFLICT (content): Merge conflict in drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Makefile Merging hdlc/hdlc-next Merging drm/drm-next CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_fb_helper.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c 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 CONFLICT (content): Merge conflict in arch/microblaze/include/asm/prom.h CONFLICT (content): Merge conflict in drivers/serial/pmac_zilog.c 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 Merging edac-amd/for-next Merging oprofile/for-next 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 drivers/usb/early/ehci-dbgp.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 [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: linux-next: Tree for February 25 (quota) 2010-02-25 7:35 linux-next: Tree for February 25 Stephen Rothwell @ 2010-02-25 17:21 ` Randy Dunlap 2010-03-01 13:27 ` Jan Kara 2010-02-25 17:55 ` [PATCH -next] staging: fix wlan-ng printk format warning Randy Dunlap ` (2 subsequent siblings) 3 siblings, 1 reply; 14+ messages in thread From: Randy Dunlap @ 2010-02-25 17:21 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML, Jan Kara On 02/24/10 23:35, Stephen Rothwell wrote: > Hi all, > > Changes since 20100224: When CONFIG_BLOCK=n: fs/quota/dquot.c:2042: error: implicit declaration of function 'fsync_bdev' -- ~Randy ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: linux-next: Tree for February 25 (quota) 2010-02-25 17:21 ` linux-next: Tree for February 25 (quota) Randy Dunlap @ 2010-03-01 13:27 ` Jan Kara 2010-03-01 16:56 ` Randy Dunlap 0 siblings, 1 reply; 14+ messages in thread From: Jan Kara @ 2010-03-01 13:27 UTC (permalink / raw) To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, Jan Kara On Thu 25-02-10 09:21:39, Randy Dunlap wrote: > On 02/24/10 23:35, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20100224: > > > When CONFIG_BLOCK=n: > > fs/quota/dquot.c:2042: error: implicit declaration of function 'fsync_bdev' Thanks for notification. I've fixed this by the following patch: >From 9007983e9bf994200194727bcb87d45bb924b4a8 Mon Sep 17 00:00:00 2001 From: Jan Kara <jack@suse.cz> Date: Mon, 1 Mar 2010 14:24:36 +0100 Subject: [PATCH] vfs: Provide empty fsync_bdev if !CONFIG_BLOCK Provide empty declaration of fsync_bdev when CONFIG_BLOCK is not defined so that quota code can use it. Signed-off-by: Jan Kara <jack@suse.cz> --- include/linux/fs.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index ebb1cd5..b9e4f1c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1961,6 +1961,11 @@ static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb) { return 0; } + +static inline int fsync_bdev(struct block_device *bdev) +{ + return 0; +} #endif extern int sync_filesystem(struct super_block *); extern const struct file_operations def_blk_fops; -- 1.6.4.2 -- Jan Kara <jack@suse.cz> SUSE Labs, CR ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: linux-next: Tree for February 25 (quota) 2010-03-01 13:27 ` Jan Kara @ 2010-03-01 16:56 ` Randy Dunlap 0 siblings, 0 replies; 14+ messages in thread From: Randy Dunlap @ 2010-03-01 16:56 UTC (permalink / raw) To: Jan Kara; +Cc: Stephen Rothwell, linux-next, LKML On 03/01/10 05:27, Jan Kara wrote: > On Thu 25-02-10 09:21:39, Randy Dunlap wrote: >> On 02/24/10 23:35, Stephen Rothwell wrote: >>> Hi all, >>> >>> Changes since 20100224: >> >> >> When CONFIG_BLOCK=n: >> >> fs/quota/dquot.c:2042: error: implicit declaration of function 'fsync_bdev' > Thanks for notification. I've fixed this by the following patch: > > From 9007983e9bf994200194727bcb87d45bb924b4a8 Mon Sep 17 00:00:00 2001 > From: Jan Kara <jack@suse.cz> > Date: Mon, 1 Mar 2010 14:24:36 +0100 > Subject: [PATCH] vfs: Provide empty fsync_bdev if !CONFIG_BLOCK > > Provide empty declaration of fsync_bdev when CONFIG_BLOCK is not defined so > that quota code can use it. > > Signed-off-by: Jan Kara <jack@suse.cz> > --- > include/linux/fs.h | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/include/linux/fs.h b/include/linux/fs.h > index ebb1cd5..b9e4f1c 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -1961,6 +1961,11 @@ static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb) > { > return 0; > } > + > +static inline int fsync_bdev(struct block_device *bdev) > +{ > + return 0; > +} > #endif > extern int sync_filesystem(struct super_block *); > extern const struct file_operations def_blk_fops; Acked-by: Randy Dunlap <rdunlap@xenotime.net> Thanks. -- ~Randy ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH -next] staging: fix wlan-ng printk format warning 2010-02-25 7:35 linux-next: Tree for February 25 Stephen Rothwell 2010-02-25 17:21 ` linux-next: Tree for February 25 (quota) Randy Dunlap @ 2010-02-25 17:55 ` Randy Dunlap 2010-02-25 17:55 ` [PATCH -next] fs: fix compat_ioctl when CONFIG_BLOCK=n Randy Dunlap 2010-02-25 22:41 ` [PATCH -next] staging/pohmelfs: fix write_inode parameter warning Randy Dunlap 3 siblings, 0 replies; 14+ messages in thread From: Randy Dunlap @ 2010-02-25 17:55 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML, devel, Greg KH From: Randy Dunlap <randy.dunlap@oracle.com> Fix prism2fw.c printk format warning: drivers/staging/wlan-ng/prism2fw.c:209: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> --- drivers/staging/wlan-ng/prism2fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-next-20100225.orig/drivers/staging/wlan-ng/prism2fw.c +++ linux-next-20100225/drivers/staging/wlan-ng/prism2fw.c @@ -205,7 +205,7 @@ int prism2_fwtry(struct usb_device *udev return 1; } - printk(KERN_INFO "prism2_usb: %s will be processed, size %d\n", + printk(KERN_INFO "prism2_usb: %s will be processed, size %zu\n", PRISM2_USB_FWFILE, fw_entry->size); prism2_fwapply((const struct ihex_binrec *)fw_entry->data, wlandev); ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH -next] fs: fix compat_ioctl when CONFIG_BLOCK=n 2010-02-25 7:35 linux-next: Tree for February 25 Stephen Rothwell 2010-02-25 17:21 ` linux-next: Tree for February 25 (quota) Randy Dunlap 2010-02-25 17:55 ` [PATCH -next] staging: fix wlan-ng printk format warning Randy Dunlap @ 2010-02-25 17:55 ` Randy Dunlap 2010-02-25 21:27 ` [PATCH -next] pktcdvd: improve BKL and compat_ioctl.c usage Arnd Bergmann 2010-02-25 22:41 ` [PATCH -next] staging/pohmelfs: fix write_inode parameter warning Randy Dunlap 3 siblings, 1 reply; 14+ messages in thread From: Randy Dunlap @ 2010-02-25 17:55 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML, Arnd Bergmann, Al Viro From: Randy Dunlap <randy.dunlap@oracle.com> fs/compat_ioctl.c should omit pktcdvd.h and its ioctl when CONFIG_BLOCK is not enabled. This fixes these build errors: In file included from fs/compat_ioctl.c:105: include/linux/pktcdvd.h:166: error: field 'read_queue' has incomplete type include/linux/pktcdvd.h:167: error: field 'write_queue' has incomplete type include/linux/pktcdvd.h:207: error: field 'orig_bios' has incomplete type make[2]: *** [fs/compat_ioctl.o] Error 1 Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Al Viro <viro@zeniv.linux.org.uk> --- fs/compat_ioctl.c | 4 ++++ 1 file changed, 4 insertions(+) --- linux-next-20100225.orig/fs/compat_ioctl.c +++ linux-next-20100225/fs/compat_ioctl.c @@ -102,7 +102,9 @@ #include <linux/nbd.h> #include <linux/random.h> #include <linux/filter.h> +#ifdef CONFIG_BLOCK #include <linux/pktcdvd.h> +#endif #include <linux/hiddev.h> @@ -1126,8 +1128,10 @@ COMPATIBLE_IOCTL(PPGETMODE) COMPATIBLE_IOCTL(PPGETPHASE) COMPATIBLE_IOCTL(PPGETFLAGS) COMPATIBLE_IOCTL(PPSETFLAGS) +#ifdef CONFIG_BLOCK /* pktcdvd */ COMPATIBLE_IOCTL(PACKET_CTRL_CMD) +#endif /* Big A */ /* sparc only */ /* Big Q for sound/OSS */ ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH -next] pktcdvd: improve BKL and compat_ioctl.c usage 2010-02-25 17:55 ` [PATCH -next] fs: fix compat_ioctl when CONFIG_BLOCK=n Randy Dunlap @ 2010-02-25 21:27 ` Arnd Bergmann 2010-02-25 22:10 ` Randy Dunlap 0 siblings, 1 reply; 14+ messages in thread From: Arnd Bergmann @ 2010-02-25 21:27 UTC (permalink / raw) To: Randy Dunlap Cc: Stephen Rothwell, linux-next, LKML, Al Viro, Peter Osterlund, Jens Axboe, Akinobu Mita The pktcdvd driver uses proper locking and does not need the BKL in the ioctl and llseek functions of the character device, so kill both. Moving the compat_ioctl handling from common code into the driver itself fixes build problems when CONFIG_BLOCK is disabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- On Thursday 25 February 2010, Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap@oracle.com> > > fs/compat_ioctl.c should omit pktcdvd.h and its ioctl when CONFIG_BLOCK > is not enabled. This fixes these build errors: > > In file included from fs/compat_ioctl.c:105: > include/linux/pktcdvd.h:166: error: field 'read_queue' has incomplete type > include/linux/pktcdvd.h:167: error: field 'write_queue' has incomplete type > include/linux/pktcdvd.h:207: error: field 'orig_bios' has incomplete type > make[2]: *** [fs/compat_ioctl.o] Error 1 How about this one instead, cleaning pktcdvd ioctl handling up for good? diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 68b5957..f508015 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -48,6 +48,7 @@ #include <linux/module.h> #include <linux/types.h> #include <linux/kernel.h> +#include <linux/compat.h> #include <linux/kthread.h> #include <linux/errno.h> #include <linux/spinlock.h> @@ -3024,7 +3025,7 @@ static void pkt_get_status(struct pkt_ctrl_command *ctrl_cmd) mutex_unlock(&ctl_mutex); } -static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) +static long pkt_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { void __user *argp = (void __user *)arg; struct pkt_ctrl_command ctrl_cmd; @@ -3061,10 +3062,20 @@ static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cm return ret; } +#ifdef CONFIG_COMPAT +static long pkt_ctl_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +{ + return pkt_ctl_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); +} +#endif static const struct file_operations pkt_ctl_fops = { - .ioctl = pkt_ctl_ioctl, - .owner = THIS_MODULE, + .open = nonseekable_open, + .unlocked_ioctl = pkt_ctl_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = pkt_ctl_compat_ioctl, +#endif + .owner = THIS_MODULE, }; static struct miscdevice pkt_misc = { diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 0ca9ec4..fa61262 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -102,7 +102,6 @@ #include <linux/nbd.h> #include <linux/random.h> #include <linux/filter.h> -#include <linux/pktcdvd.h> #include <linux/hiddev.h> @@ -1126,8 +1125,6 @@ COMPATIBLE_IOCTL(PPGETMODE) COMPATIBLE_IOCTL(PPGETPHASE) COMPATIBLE_IOCTL(PPGETFLAGS) COMPATIBLE_IOCTL(PPSETFLAGS) -/* pktcdvd */ -COMPATIBLE_IOCTL(PACKET_CTRL_CMD) /* Big A */ /* sparc only */ /* Big Q for sound/OSS */ ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH -next] pktcdvd: improve BKL and compat_ioctl.c usage 2010-02-25 21:27 ` [PATCH -next] pktcdvd: improve BKL and compat_ioctl.c usage Arnd Bergmann @ 2010-02-25 22:10 ` Randy Dunlap 2010-03-02 12:06 ` Ingo Molnar 0 siblings, 1 reply; 14+ messages in thread From: Randy Dunlap @ 2010-02-25 22:10 UTC (permalink / raw) To: Arnd Bergmann Cc: Stephen Rothwell, linux-next, LKML, Al Viro, Peter Osterlund, Jens Axboe, Akinobu Mita On 02/25/10 13:27, Arnd Bergmann wrote: > The pktcdvd driver uses proper locking and does not need the > BKL in the ioctl and llseek functions of the character device, > so kill both. Moving the compat_ioctl handling from common code > into the driver itself fixes build problems when CONFIG_BLOCK is > disabled. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > On Thursday 25 February 2010, Randy Dunlap wrote: >> From: Randy Dunlap <randy.dunlap@oracle.com> >> >> fs/compat_ioctl.c should omit pktcdvd.h and its ioctl when CONFIG_BLOCK >> is not enabled. This fixes these build errors: >> >> In file included from fs/compat_ioctl.c:105: >> include/linux/pktcdvd.h:166: error: field 'read_queue' has incomplete type >> include/linux/pktcdvd.h:167: error: field 'write_queue' has incomplete type >> include/linux/pktcdvd.h:207: error: field 'orig_bios' has incomplete type >> make[2]: *** [fs/compat_ioctl.o] Error 1 > > How about this one instead, cleaning pktcdvd ioctl handling up for good? OK, that works too. Acked-by: Randy Dunlap <randy.dunlap@oracle.com> thanks, -- ~Randy ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH -next] pktcdvd: improve BKL and compat_ioctl.c usage 2010-02-25 22:10 ` Randy Dunlap @ 2010-03-02 12:06 ` Ingo Molnar 2010-03-02 23:38 ` Stephen Rothwell 0 siblings, 1 reply; 14+ messages in thread From: Ingo Molnar @ 2010-03-02 12:06 UTC (permalink / raw) To: Randy Dunlap Cc: Arnd Bergmann, Stephen Rothwell, linux-next, LKML, Al Viro, Peter Osterlund, Jens Axboe, Akinobu Mita * Randy Dunlap <randy.dunlap@oracle.com> wrote: > On 02/25/10 13:27, Arnd Bergmann wrote: > > The pktcdvd driver uses proper locking and does not need the > > BKL in the ioctl and llseek functions of the character device, > > so kill both. Moving the compat_ioctl handling from common code > > into the driver itself fixes build problems when CONFIG_BLOCK is > > disabled. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > --- > > On Thursday 25 February 2010, Randy Dunlap wrote: > >> From: Randy Dunlap <randy.dunlap@oracle.com> > >> > >> fs/compat_ioctl.c should omit pktcdvd.h and its ioctl when CONFIG_BLOCK > >> is not enabled. This fixes these build errors: > >> > >> In file included from fs/compat_ioctl.c:105: > >> include/linux/pktcdvd.h:166: error: field 'read_queue' has incomplete type > >> include/linux/pktcdvd.h:167: error: field 'write_queue' has incomplete type > >> include/linux/pktcdvd.h:207: error: field 'orig_bios' has incomplete type > >> make[2]: *** [fs/compat_ioctl.o] Error 1 > > > > How about this one instead, cleaning pktcdvd ioctl handling up for good? > > OK, that works too. > > Acked-by: Randy Dunlap <randy.dunlap@oracle.com> FYI, this build bug now triggers upstream too - none of the fixes was applied. Ingo ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH -next] pktcdvd: improve BKL and compat_ioctl.c usage 2010-03-02 12:06 ` Ingo Molnar @ 2010-03-02 23:38 ` Stephen Rothwell 0 siblings, 0 replies; 14+ messages in thread From: Stephen Rothwell @ 2010-03-02 23:38 UTC (permalink / raw) To: Ingo Molnar Cc: Randy Dunlap, Arnd Bergmann, linux-next, LKML, Al Viro, Peter Osterlund, Jens Axboe, Akinobu Mita [-- Attachment #1: Type: text/plain, Size: 338 bytes --] Hi Ingo, On Tue, 2 Mar 2010 13:06:21 +0100 Ingo Molnar <mingo@elte.hu> wrote: > > FYI, this build bug now triggers upstream too - none of the fixes was applied. Thanks again, I have put Arnd's patch in my fixes as well. -- 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] 14+ messages in thread
* [PATCH -next] staging/pohmelfs: fix write_inode parameter warning 2010-02-25 7:35 linux-next: Tree for February 25 Stephen Rothwell ` (2 preceding siblings ...) 2010-02-25 17:55 ` [PATCH -next] fs: fix compat_ioctl when CONFIG_BLOCK=n Randy Dunlap @ 2010-02-25 22:41 ` Randy Dunlap 2010-02-26 0:41 ` Stephen Rothwell 2010-03-07 9:22 ` Geert Uytterhoeven 3 siblings, 2 replies; 14+ messages in thread From: Randy Dunlap @ 2010-02-25 22:41 UTC (permalink / raw) To: Stephen Rothwell, devel; +Cc: linux-next, LKML, gregkh, Evgeniy Polyakov From: Randy Dunlap <randy.dunlap@oracle.com> sparse warns that: drivers/staging/pohmelfs/inode.c:1797: warning: initialization from incompatible pointer type so fix pohmelfs_write_inode() to have the expected parameters. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> --- drivers/staging/pohmelfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- linux-next-20100225.orig/drivers/staging/pohmelfs/inode.c +++ linux-next-20100225/drivers/staging/pohmelfs/inode.c @@ -396,7 +396,8 @@ int pohmelfs_remove_child(struct pohmelf /* * Writeback for given inode. */ -static int pohmelfs_write_inode(struct inode *inode, int sync) +static int pohmelfs_write_inode(struct inode *inode, + struct writeback_control *wbc) { struct pohmelfs_inode *pi = POHMELFS_I(inode); ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH -next] staging/pohmelfs: fix write_inode parameter warning 2010-02-25 22:41 ` [PATCH -next] staging/pohmelfs: fix write_inode parameter warning Randy Dunlap @ 2010-02-26 0:41 ` Stephen Rothwell 2010-03-07 9:22 ` Geert Uytterhoeven 1 sibling, 0 replies; 14+ messages in thread From: Stephen Rothwell @ 2010-02-26 0:41 UTC (permalink / raw) To: Randy Dunlap; +Cc: devel, linux-next, LKML, gregkh, Evgeniy Polyakov [-- Attachment #1: Type: text/plain, Size: 1186 bytes --] Hi Randy, On Thu, 25 Feb 2010 14:41:22 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote: > > From: Randy Dunlap <randy.dunlap@oracle.com> > > sparse warns that: > drivers/staging/pohmelfs/inode.c:1797: warning: initialization from incompatible pointer type > > so fix pohmelfs_write_inode() to have the expected parameters. > > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> > --- > drivers/staging/pohmelfs/inode.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > --- linux-next-20100225.orig/drivers/staging/pohmelfs/inode.c > +++ linux-next-20100225/drivers/staging/pohmelfs/inode.c > @@ -396,7 +396,8 @@ int pohmelfs_remove_child(struct pohmelf > /* > * Writeback for given inode. > */ > -static int pohmelfs_write_inode(struct inode *inode, int sync) > +static int pohmelfs_write_inode(struct inode *inode, > + struct writeback_control *wbc) > { > struct pohmelfs_inode *pi = POHMELFS_I(inode); > This patch is OK, but depends on changes that are in the vfs tree that are not in Linus' tree yet. -- 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] 14+ messages in thread
* Re: [PATCH -next] staging/pohmelfs: fix write_inode parameter warning 2010-02-25 22:41 ` [PATCH -next] staging/pohmelfs: fix write_inode parameter warning Randy Dunlap 2010-02-26 0:41 ` Stephen Rothwell @ 2010-03-07 9:22 ` Geert Uytterhoeven 2010-03-07 15:50 ` Greg KH 1 sibling, 1 reply; 14+ messages in thread From: Geert Uytterhoeven @ 2010-03-07 9:22 UTC (permalink / raw) To: Randy Dunlap Cc: Stephen Rothwell, devel, linux-next, LKML, gregkh, Evgeniy Polyakov On Thu, Feb 25, 2010 at 23:41, Randy Dunlap <randy.dunlap@oracle.com> wrote: > From: Randy Dunlap <randy.dunlap@oracle.com> > > sparse warns that: Not just sparse, plain gcc as well... > drivers/staging/pohmelfs/inode.c:1797: warning: initialization from incompatible pointer type > > so fix pohmelfs_write_inode() to have the expected parameters. And now it's in mainline, too... > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> > --- > drivers/staging/pohmelfs/inode.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > --- linux-next-20100225.orig/drivers/staging/pohmelfs/inode.c > +++ linux-next-20100225/drivers/staging/pohmelfs/inode.c > @@ -396,7 +396,8 @@ int pohmelfs_remove_child(struct pohmelf > /* > * Writeback for given inode. > */ > -static int pohmelfs_write_inode(struct inode *inode, int sync) > +static int pohmelfs_write_inode(struct inode *inode, > + struct writeback_control *wbc) > { > struct pohmelfs_inode *pi = POHMELFS_I(inode); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH -next] staging/pohmelfs: fix write_inode parameter warning 2010-03-07 9:22 ` Geert Uytterhoeven @ 2010-03-07 15:50 ` Greg KH 0 siblings, 0 replies; 14+ messages in thread From: Greg KH @ 2010-03-07 15:50 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Randy Dunlap, Stephen Rothwell, devel, linux-next, LKML, Evgeniy Polyakov On Sun, Mar 07, 2010 at 10:22:27AM +0100, Geert Uytterhoeven wrote: > On Thu, Feb 25, 2010 at 23:41, Randy Dunlap <randy.dunlap@oracle.com> wrote: > > From: Randy Dunlap <randy.dunlap@oracle.com> > > > > sparse warns that: > > Not just sparse, plain gcc as well... > > > drivers/staging/pohmelfs/inode.c:1797: warning: initialization from incompatible pointer type > > > > so fix pohmelfs_write_inode() to have the expected parameters. > > And now it's in mainline, too... This fix is queued up in the tree already sent to Linus so it should all be resolved soon. thanks, greg k-h ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2010-03-07 16:01 UTC | newest] Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-02-25 7:35 linux-next: Tree for February 25 Stephen Rothwell 2010-02-25 17:21 ` linux-next: Tree for February 25 (quota) Randy Dunlap 2010-03-01 13:27 ` Jan Kara 2010-03-01 16:56 ` Randy Dunlap 2010-02-25 17:55 ` [PATCH -next] staging: fix wlan-ng printk format warning Randy Dunlap 2010-02-25 17:55 ` [PATCH -next] fs: fix compat_ioctl when CONFIG_BLOCK=n Randy Dunlap 2010-02-25 21:27 ` [PATCH -next] pktcdvd: improve BKL and compat_ioctl.c usage Arnd Bergmann 2010-02-25 22:10 ` Randy Dunlap 2010-03-02 12:06 ` Ingo Molnar 2010-03-02 23:38 ` Stephen Rothwell 2010-02-25 22:41 ` [PATCH -next] staging/pohmelfs: fix write_inode parameter warning Randy Dunlap 2010-02-26 0:41 ` Stephen Rothwell 2010-03-07 9:22 ` Geert Uytterhoeven 2010-03-07 15:50 ` Greg KH
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.