Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

* 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  vfs: make no_llseek the default
  vfs: don't use BKL in default_llseek
  llseek: automatically add .llseek fop
  libfs: use generic_file_llseek for simple_attr
  mac80211: disallow seeks in minstrel debug code
  lirc: make chardev nonseekable
  viotape: use noop_llseek
  raw: use explicit llseek file operations
  ibmasmfs: use generic_file_llseek
  spufs: use llseek in all file operations
  arm/omap: use generic_file_llseek in iommu_debug
  lkdtm: use generic_file_llseek in debugfs
  net/wireless: use generic_file_llseek in debugfs
  drm: use noop_llseek

diff --cc arch/arm/kernel/etm.c
Simple merge

diff --cc arch/arm/plat-mxc/audmux-v2.c
Simple merge

diff --cc arch/cris/arch-v10/drivers/ds1302.c
Simple merge

diff --cc arch/cris/arch-v10/drivers/pcf8563.c
Simple merge

diff --cc arch/cris/arch-v10/drivers/sync_serial.c
Simple merge

diff --cc arch/cris/arch-v32/drivers/cryptocop.c
Simple merge

diff --cc arch/cris/arch-v32/drivers/mach-a3/gpio.c
Simple merge

diff --cc arch/cris/arch-v32/drivers/mach-fs/gpio.c
Simple merge

diff --cc arch/cris/arch-v32/drivers/pcf8563.c
Simple merge

diff --cc arch/cris/arch-v32/drivers/sync_serial.c
Simple merge

diff --cc arch/ia64/kernel/salinfo.c
Simple merge

diff --cc arch/powerpc/kernel/lparcfg.c
Simple merge

diff --cc arch/um/drivers/harddog_kern.c
Simple merge

diff --cc block/bsg.c
Simple merge

diff --cc drivers/acpi/apei/erst-dbg.c
Simple merge

diff --cc drivers/block/DAC960.c
Simple merge

diff --cc drivers/block/aoe/aoechr.c
Simple merge

diff --cc drivers/block/paride/pg.c
Simple merge

diff --cc drivers/block/paride/pt.c
Simple merge

diff --cc drivers/block/pktcdvd.c
Simple merge

diff --cc drivers/char/apm-emulation.c
Simple merge

diff --cc drivers/char/ds1302.c
Simple merge

diff --cc drivers/char/ds1620.c
Simple merge

diff --cc drivers/char/dsp56k.c
Simple merge

diff --cc drivers/char/dtlk.c
Simple merge

diff --cc drivers/char/genrtc.c
Simple merge

diff --cc drivers/char/ip2/ip2main.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_devintf.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_watchdog.c
Simple merge

diff --cc drivers/char/lp.c
Simple merge

diff --cc drivers/char/mem.c
Simple merge

diff --cc drivers/char/mmtimer.c
Simple merge

diff --cc drivers/char/mwave/mwavedd.c
Simple merge

diff --cc drivers/char/pcmcia/cm4000_cs.c
Simple merge

diff --cc drivers/char/pcmcia/cm4040_cs.c
Simple merge

diff --cc drivers/char/raw.c
index 24b2b9160aa659ee1f8e0de3b13eabf2985db9d8,28c0169e34dab7fe2b0d3bc8ceab5463eaadf742..bfe25ea9766b94caf11ffbc5ca4fb3b766c2c188
--- 1/drivers/char/raw.c
--- 2/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@@ -297,11 -264,9 +298,12 @@@ static const struct file_operations raw
  
  static const struct file_operations raw_ctl_fops = {
        .unlocked_ioctl = raw_ctl_ioctl,
 +#ifdef CONFIG_COMPAT
 +      .compat_ioctl   = raw_ctl_compat_ioctl,
 +#endif
        .open           = raw_open,
        .owner          = THIS_MODULE,
+       .llseek         = noop_llseek,
  };
  
  static struct cdev raw_cdev;

diff --cc drivers/char/rio/rio_linux.c
Simple merge

diff --cc drivers/char/snsc.c
Simple merge

diff --cc drivers/char/tlclk.c
Simple merge

diff --cc drivers/char/toshiba.c
Simple merge

diff --cc drivers/char/viotape.c
Simple merge

diff --cc drivers/char/xilinx_hwicap/xilinx_hwicap.c
Simple merge

diff --cc drivers/gpu/drm/i810/i810_dma.c
index fb07e73581e84467ab59ebe744e21ff6f712d2ce,00f1bdaa65cdf0217c1084dc5e8bdfc8d94def26..ff33e53bbbf80dfbd470a444c854dc5ae158e32b
--- 1/drivers/gpu/drm/i810/i810_dma.c
--- 2/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@@ -116,9 -116,10 +116,10 @@@ static int i810_mmap_buffers(struct fil
  static const struct file_operations i810_buffer_fops = {
        .open = drm_open,
        .release = drm_release,
 -      .unlocked_ioctl = drm_ioctl,
 +      .unlocked_ioctl = i810_ioctl,
        .mmap = i810_mmap_buffers,
        .fasync = drm_fasync,
+       .llseek = noop_llseek,
  };
  
  static int i810_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)

diff --cc drivers/gpu/drm/i830/i830_dma.c
index cc92c7e6236fbdffb86078290b5b93dffad2cbad,5c6eb65f4e5157b04e319326e255a0a00c8958c5..ca6f31ff0eecc54a2868878c97b98c7cf6a71bb2
--- 1/drivers/gpu/drm/i830/i830_dma.c
--- 2/drivers/gpu/drm/i830/i830_dma.c
+++ b/drivers/gpu/drm/i830/i830_dma.c
@@@ -118,9 -118,10 +118,10 @@@ static int i830_mmap_buffers(struct fil
  static const struct file_operations i830_buffer_fops = {
        .open = drm_open,
        .release = drm_release,
 -      .unlocked_ioctl = drm_ioctl,
 +      .unlocked_ioctl = i830_ioctl,
        .mmap = i830_mmap_buffers,
        .fasync = drm_fasync,
+       .llseek = noop_llseek,
  };
  
  static int i830_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Simple merge

diff --cc drivers/gpu/vga/vgaarb.c
Simple merge

diff --cc drivers/hid/hidraw.c
Simple merge

diff --cc drivers/hid/usbhid/hiddev.c
Simple merge

diff --cc drivers/ide/ide-tape.c
Simple merge

diff --cc drivers/input/evdev.c
Simple merge

diff --cc drivers/input/joydev.c
Simple merge

diff --cc drivers/input/misc/uinput.c
Simple merge

diff --cc drivers/macintosh/via-pmu.c
Simple merge

diff --cc drivers/media/IR/ir-lirc-codec.c
Simple merge

diff --cc drivers/media/dvb/bt8xx/dst_ca.c
Simple merge

diff --cc drivers/media/dvb/dvb-core/dmxdev.c
Simple merge

diff --cc drivers/media/dvb/dvb-core/dvb_ca_en50221.c
Simple merge

diff --cc drivers/media/dvb/dvb-core/dvb_net.c
Simple merge

diff --cc drivers/media/dvb/dvb-core/dvbdev.c
Simple merge

diff --cc drivers/misc/phantom.c
Simple merge

diff --cc drivers/net/ppp_generic.c
Simple merge

diff --cc drivers/net/wireless/ray_cs.c
Simple merge

diff --cc drivers/oprofile/oprofile_files.c
Simple merge

diff --cc drivers/oprofile/oprofilefs.c
Simple merge

diff --cc drivers/rtc/rtc-m41t80.c
Simple merge

diff --cc drivers/scsi/3w-9xxx.c
Simple merge

diff --cc drivers/scsi/3w-sas.c
Simple merge

diff --cc drivers/scsi/3w-xxxx.c
Simple merge

diff --cc drivers/scsi/aacraid/linit.c
Simple merge

diff --cc drivers/scsi/ch.c
Simple merge

diff --cc drivers/scsi/dpt_i2o.c
Simple merge

diff --cc drivers/scsi/gdth.c
Simple merge

diff --cc drivers/scsi/megaraid.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_mm.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_ctl.c
Simple merge

diff --cc drivers/scsi/scsi_tgt_if.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc drivers/serial/mfd.c
Simple merge

diff --cc drivers/spi/dw_spi.c
Simple merge

diff --cc drivers/telephony/ixj.c
Simple merge

diff --cc drivers/usb/core/file.c
Simple merge

diff --cc drivers/vhost/net.c
Simple merge

diff --cc drivers/watchdog/cpwd.c
Simple merge

diff --cc fs/char_dev.c
Simple merge

diff --cc fs/coda/psdev.c
Simple merge

diff --cc fs/ecryptfs/file.c
Simple merge

diff --cc fs/gfs2/file.c
Simple merge

diff --cc fs/ocfs2/stack_user.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc fs/proc/task_mmu.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc kernel/kprobes.c
Simple merge

diff --cc kernel/trace/blktrace.c
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc kernel/trace/trace_events.c
Simple merge

diff --cc net/sunrpc/cache.c
Simple merge

diff --cc security/apparmor/apparmorfs.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge