Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Sep 12, 2011
  1. Linux 3.1-rc6

    authored
  2. Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    authored
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm: Remove duplicate "return" statement
      drm/nv04/crtc: Bail out if FB is not bound to crtc
      drm/nouveau: fix nv04_sgdma_bind on non-"4kB pages" archs
      drm/nouveau: properly handle allocation failure in nouveau_sgdma_populate
      drm/nouveau: fix oops on pre-semaphore hardware
      drm/nv50/crtc: Bail out if FB is not bound to crtc
      drm/radeon/kms: fix DP detect and EDID fetch for DP bridges
  3. Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc

    authored
    * 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
      ARM: CSR: add missing sentinels to of_device_id tables
      ARM: cns3xxx: Fix newly introduced warnings in the PCIe code
      ARM: cns3xxx: Fix compile error caused by hardware.h removed
      ARM: davinci: fix cache flush build error
      ARM: davinci: correct MDSTAT_STATE_MASK
      ARM: davinci: da850 EVM: read mac address from SPI flash
      OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers
      OMAP2430: hwmod: musb: add missing terminator to omap2430_usbhsotg_addrs[]
      OMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomain
      OMAP4: clock: fix compile warning
      OMAP4: clock: re-enable previous clockdomain enable/disable sequence
      OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force wakeup
      OMAP: powerdomains: Make all powerdomain target states as ON at init
  4. @compudj

    ioctl: register LTTng ioctl

    compudj authored committed
    The LTTng 2.0 kernel tracer (stand-alone module package, available at
    http://lttng.org) uses the 0xF6 ioctl range for tracer control and
    transport operations.
    
    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. Merge branch 'for-linus' of git://github.com/chrismason/linux

    authored
    * 'for-linus' of git://github.com/chrismason/linux:
      Btrfs: add dummy extent if dst offset excceeds file end in
      Btrfs: calc file extent num_bytes correctly in file clone
      btrfs: xattr: fix attribute removal
      Btrfs: fix wrong nbytes information of the inode
      Btrfs: fix the file extent gap when doing direct IO
      Btrfs: fix unclosed transaction handle in btrfs_cont_expand
      Btrfs: fix misuse of trans block rsv
      Btrfs: reset to appropriate block rsv after orphan operations
      Btrfs: skip locking if searching the commit root in csum lookup
      btrfs: fix warning in iput for bad-inode
      Btrfs: fix an oops when deleting snapshots
  6. fuse: fix memory leak

    Miklos Szeredi authored committed
    kmemleak is reporting that 32 bytes are being leaked by FUSE:
    
      unreferenced object 0xe373b270 (size 32):
      comm "fusermount", pid 1207, jiffies 4294707026 (age 2675.187s)
      hex dump (first 32 bytes):
        01 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00  ................
        00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
      backtrace:
        [<b05517d7>] kmemleak_alloc+0x27/0x50
        [<b0196435>] kmem_cache_alloc+0xc5/0x180
        [<b02455be>] fuse_alloc_forget+0x1e/0x20
        [<b0245670>] fuse_alloc_inode+0xb0/0xd0
        [<b01b1a8c>] alloc_inode+0x1c/0x80
        [<b01b290f>] iget5_locked+0x8f/0x1a0
        [<b0246022>] fuse_iget+0x72/0x1a0
        [<b02461da>] fuse_get_root_inode+0x8a/0x90
        [<b02465cf>] fuse_fill_super+0x3ef/0x590
        [<b019e56f>] mount_nodev+0x3f/0x90
        [<b0244e95>] fuse_mount+0x15/0x20
        [<b019d1bc>] mount_fs+0x1c/0xc0
        [<b01b5811>] vfs_kern_mount+0x41/0x90
        [<b01b5af9>] do_kern_mount+0x39/0xd0
        [<b01b7585>] do_mount+0x2e5/0x660
        [<b01b7966>] sys_mount+0x66/0xa0
    
    This leak report is consistent and happens once per boot on
    3.1.0-rc5-dirty.
    
    This happens if a FORGET request is queued after the fuse device was
    released.
    
    Reported-by: Sitsofe Wheeler <sitsofe@yahoo.com>
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Tested-by: Sitsofe Wheeler <sitsofe@yahoo.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. fuse: fix flock breakage

    Miklos Szeredi authored committed
    Commit 37fb3a3 ("fuse: fix flock") added in 3.1-rc4 caused flock() to
    fail with ENOSYS with the kernel ABI version 7.16 or earlier.
    
    Fix by falling back to testing FUSE_POSIX_LOCKS for ABI versions 7.16
    and earlier.
    
    Reported-by: Martin Ziegler <ziegler@email.mathematik.uni-freiburg.de>
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Tested-by: Martin Ziegler <ziegler@email.mathematik.uni-freiburg.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @arndb
  9. @arndb
Commits on Sep 11, 2011
  1. Merge branch 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus

    authored
    * 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus:
      [media] vp7045: fix buffer setup
      [media] nuvoton-cir: simplify raw IR sample handling
      [media] [Resend] viacam: Don't explode if pci_find_bus() returns NULL
      [media] v4l2: Fix documentation of the codec device controls
      [media] gspca - sonixj: Fix the darkness of sensor om6802 in 320x240
      [media] gspca - sonixj: Fix wrong register mask for sensor om6802
      [media] gspca - ov519: Fix LED inversion of some ov519 webcams
      [media] pwc: precedence bug in pwc_init_controls()
  2. Merge branch 'for-linus' of git://openrisc.net/~jonas/linux

    authored
    * 'for-linus' of git://openrisc.net/~jonas/linux:
      Add missing DMA ops
      openrisc: don't use pt_regs in struct sigcontext
  3. @chrismason-xx

    Btrfs: add dummy extent if dst offset excceeds file end in

    Li Zefan authored chrismason-xx committed
    You can see there's no file extent with range [0, 4096]. Check this by
    btrfsck:
    
     # btrfsck /dev/sda7
     root 5 inode 258 errors 100
     ...
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  4. @chrismason-xx

    Btrfs: calc file extent num_bytes correctly in file clone

    Li Zefan authored chrismason-xx committed
    num_bytes should be 4096 not 12288.
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  5. @chrismason-xx

    btrfs: xattr: fix attribute removal

    David Sterba authored chrismason-xx committed
    An attribute is not removed by 'setfattr -x attr file' and remains
    visible in attr list. This makes xfstests/062 pass again.
    
    Signed-off-by: David Sterba <dsterba@suse.cz>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  6. @miaoxie @chrismason-xx

    Btrfs: fix wrong nbytes information of the inode

    miaoxie authored chrismason-xx committed
    If we write some data into the data hole of the file(no preallocation for this
    hole), Btrfs will allocate some disk space, and update nbytes of the inode, but
    the other element--disk_i_size needn't be updated. At this condition, we must
    update inode metadata though disk_i_size is not changed(btrfs_ordered_update_i_size()
    return 1).
    
     # mkfs.btrfs /dev/sdb1
     # mount /dev/sdb1 /mnt
     # touch /mnt/a
     # truncate -s 856002 /mnt/a
     # dd if=/dev/zero of=/mnt/a bs=4K count=1 conv=nocreat,notrunc
     # umount /mnt
     # btrfsck /dev/sdb1
     root 5 inode 257 errors 400
     found 32768 bytes used err is 1
    
    Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  7. @miaoxie @chrismason-xx

    Btrfs: fix the file extent gap when doing direct IO

    miaoxie authored chrismason-xx committed
    When we write some data to the place that is beyond the end of the file
    in direct I/O mode, a data hole will be created. And Btrfs should insert
    a file extent item that point to this hole into the fs tree. But unfortunately
    Btrfs forgets doing it.
    
    The following is a simple way to reproduce it:
     # mkfs.btrfs /dev/sdc2
     # mount /dev/sdc2 /test4
     # touch /test4/a
     # dd if=/dev/zero of=/test4/a seek=8 count=1 bs=4K oflag=direct conv=nocreat,notrunc
     # umount /test4
     # btrfsck /dev/sdc2
     root 5 inode 257 errors 100
    
    Reported-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
    Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
    Tested-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  8. @miaoxie @chrismason-xx

    Btrfs: fix unclosed transaction handle in btrfs_cont_expand

    miaoxie authored chrismason-xx committed
    The function - btrfs_cont_expand() forgot to close the transaction handle before
    it jump out the while loop. Fix it.
    
    Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  9. @liub @chrismason-xx

    Btrfs: fix misuse of trans block rsv

    liub authored chrismason-xx committed
    At the beginning of create_pending_snapshot, trans->block_rsv is set
    to pending->block_rsv and is used for snapshot things, however, when
    it is done, we do not recover it as will.
    
    Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  10. @liub @chrismason-xx

    Btrfs: reset to appropriate block rsv after orphan operations

    liub authored chrismason-xx committed
    While truncating free space cache, we forget to change trans->block_rsv
    back to the original one, but leave it with the orphan_block_rsv, and
    then with option inode_cache enable, it leads to countless warnings of
    btrfs_alloc_free_block and btrfs_orphan_commit_root:
    
    WARNING: at fs/btrfs/extent-tree.c:5711 btrfs_alloc_free_block+0x180/0x350 [btrfs]()
    ...
    WARNING: at fs/btrfs/inode.c:2193 btrfs_orphan_commit_root+0xb0/0xc0 [btrfs]()
    
    Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  11. @chrismason-xx

    Btrfs: skip locking if searching the commit root in csum lookup

    Josef Bacik authored chrismason-xx committed
    It's not enough to just search the commit root, since we could be cow'ing the
    very block we need to search through, which would mean that its locked and we'll
    still deadlock.  So use path->skip_locking as well.  Thanks,
    
    Signed-off-by: Josef Bacik <josef@redhat.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  12. @trofi @chrismason-xx

    btrfs: fix warning in iput for bad-inode

    trofi authored chrismason-xx committed
    iput() shouldn't be called for inodes in I_NEW state.
    We need to mark inode as constructed first.
    
    WARNING: at fs/inode.c:1309 iput+0x20b/0x210()
    Call Trace:
     [<ffffffff8103e7ba>] warn_slowpath_common+0x7a/0xb0
     [<ffffffff8103e805>] warn_slowpath_null+0x15/0x20
     [<ffffffff810eaf0b>] iput+0x20b/0x210
     [<ffffffff811b96fb>] btrfs_iget+0x1eb/0x4a0
     [<ffffffff811c3ad6>] btrfs_run_defrag_inodes+0x136/0x210
     [<ffffffff811ad55f>] cleaner_kthread+0x17f/0x1a0
     [<ffffffff81035b7d>] ? sub_preempt_count+0x9d/0xd0
     [<ffffffff811ad3e0>] ? transaction_kthread+0x280/0x280
     [<ffffffff8105af86>] kthread+0x96/0xa0
     [<ffffffff814336d4>] kernel_thread_helper+0x4/0x10
     [<ffffffff8105aef0>] ? kthread_worker_fn+0x190/0x190
     [<ffffffff814336d0>] ? gs_change+0xb/0xb
    
    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
    CC: Konstantin Khlebnikov <khlebnikov@openvz.org>
    Tested-by: David Sterba <dsterba@suse.cz>
    CC: Josef Bacik <josef@redhat.com>
    CC: Chris Mason <chris.mason@oracle.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  13. @liub @chrismason-xx

    Btrfs: fix an oops when deleting snapshots

    liub authored chrismason-xx committed
    We can reproduce this oops via the following steps:
    
    $ mkfs.btrfs /dev/sdb7
    $ mount /dev/sdb7 /mnt/btrfs
    $ for ((i=0; i<3; i++)); do btrfs sub snap /mnt/btrfs /mnt/btrfs/s_$i; done
    $ rm -fr /mnt/btrfs/*
    $ rm -fr /mnt/btrfs/*
    
    then we'll get
    ------------[ cut here ]------------
    kernel BUG at fs/btrfs/inode.c:2264!
    [...]
    Call Trace:
     [<ffffffffa05578c7>] btrfs_rmdir+0xf7/0x1b0 [btrfs]
     [<ffffffff81150b95>] vfs_rmdir+0xa5/0xf0
     [<ffffffff81153cc3>] do_rmdir+0x123/0x140
     [<ffffffff81145ac7>] ? fput+0x197/0x260
     [<ffffffff810aecff>] ? audit_syscall_entry+0x1bf/0x1f0
     [<ffffffff81153d0d>] sys_unlinkat+0x2d/0x40
     [<ffffffff8147896b>] system_call_fastpath+0x16/0x1b
    RIP  [<ffffffffa054f7b9>] btrfs_orphan_add+0x179/0x1a0 [btrfs]
    
    When it comes to btrfs_lookup_dentry, we may set a snapshot's inode->i_ino
    to BTRFS_EMPTY_SUBVOL_DIR_OBJECTID instead of BTRFS_FIRST_FREE_OBJECTID,
    while the snapshot's location.objectid remains unchanged.
    
    However, btrfs_ino() does not take this into account, and returns a wrong ino,
    and causes the oops.
    
    Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  14. @FlorianMickler

    [media] vp7045: fix buffer setup

    FlorianMickler authored Mauro Carvalho Chehab committed
    dvb_usb_device_init calls the frontend_attach method of this driver which
    uses vp7045_usb_ob. In order to have a buffer ready in vp7045_usb_op, it has to
    be allocated before that happens.
    
    Luckily we can use the whole private data as the buffer as it gets separately
    allocated on the heap via kzalloc in dvb_usb_device_init and is thus apt for
    use via usb_control_msg.
    
    This fixes a
    	BUG: unable to handle kernel paging request at 0000000000001e78
    
    reported by Tino Keitel and diagnosed by Dan Carpenter.
    
    Cc: stable@kernel.org # For v3.0 and upper
    Tested-by: Tino Keitel <tino.keitel@tikei.de>
    Signed-off-by: Florian Mickler <florian@mickler.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  15. @jarodwilson

    [media] nuvoton-cir: simplify raw IR sample handling

    jarodwilson authored Mauro Carvalho Chehab committed
    The nuvoton-cir driver was storing up consecutive pulse-pulse and
    space-space samples internally, for no good reason, since
    ir_raw_event_store_with_filter() already merges back to back like
    samples types for us. This should also fix a regression introduced late
    in 3.0 that related to a timeout change, which actually becomes correct
    when coupled with this change. Tested with RC6 and RC5 on my own
    nuvoton-cir hardware atop vanilla 3.0.0, after verifying quirky
    behavior in 3.0 due to the timeout change.
    
    Reported-by: Stephan Raue <sraue@openelec.tv>
    CC: Stephan Raue <sraue@openelec.tv>
    CC: stable@vger.kernel.org
    Signed-off-by: Jarod Wilson <jarod@redhat.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  16. @jjuhl

    [media] [Resend] viacam: Don't explode if pci_find_bus() returns NULL

    jjuhl authored Mauro Carvalho Chehab committed
    In the unlikely case that pci_find_bus() should return NULL
    viacam_serial_is_enabled() is going to dereference a NULL pointer and
    blow up. Better safe than sorry, so be defensive and check the
    pointer.
    
    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    Acked-by: Jonathan Corbet <corbet@lwn.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  17. [media] v4l2: Fix documentation of the codec device controls

    Kamil Debski authored Mauro Carvalho Chehab committed
    Fixed missing ids of the codec controls description in the controls.xml file.
    
    Signed-off-by: Kamil Debski <k.debski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Reported-by: Randy Dunlap <rdunlap@xenotime.net>
    Acked-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  18. [media] gspca - sonixj: Fix the darkness of sensor om6802 in 320x240

    Jean-François Moine authored Mauro Carvalho Chehab committed
    The images are clearer with a lower bridge clock.
    
    Signed-off-by: Jean-François Moine <moinejf@free.fr>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  19. [media] gspca - sonixj: Fix wrong register mask for sensor om6802

    Luiz Carlos Ramos authored Mauro Carvalho Chehab committed
    The bug was introduced by git commit 0e4d413, giving very dark images.
    
    Signed-off-by: Luiz Carlos Ramos <lramos.prof@yahoo.com.br>
    Signed-off-by: Jean-François Moine <moinejf@free.fr>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  20. [media] gspca - ov519: Fix LED inversion of some ov519 webcams

    Jean-François Moine authored Mauro Carvalho Chehab committed
    The list of the webcams which have LED inversion was rebuild scanning
    ms-win .inf files.
    
    Signed-off-by: Jean-François Moine <moinejf@free.fr>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  21. @error27

    [media] pwc: precedence bug in pwc_init_controls()

    error27 authored Mauro Carvalho Chehab committed
    '!' has higher precedence than '&' so we need parenthesis here.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  22. Add missing DMA ops

    Jonas Bonn authored
    For the initial architecture submission, not all of the DMA ops were
    implemented.  This patch adds the *map_page and *map_sg variants of the
    DMA mapping ops.
    
    This patch is currently of interest mainly to some drivers that haven't
    been submitted upstream yet.
    
    Signed-off-by: Jonas Bonn <jonas@southpole.se>
  23. @jamieiles @21cnbao

    ARM: CSR: add missing sentinels to of_device_id tables

    jamieiles authored 21cnbao committed
    The of_device_id tables used for matching should be terminated with
    empty sentinel values.
    
    Signed-off-by: Jamie Iles <jamie@jamieiles.com>
    Signed-off-by: Barry Song <baohua.song@csr.com>
  24. scsi: qla4xxx driver depends on NET

    Randy Dunlap authored committed
    When CONFIG_NET is disabled, SCSI_QLA_ISCSI selects SCSI_ISCSI_ATTRS,
    which uses network interfaces, so the build fails with multiple errors:
    
      warning: (ISCSI_TCP && SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_QLA_ISCSI && INFINIBAND_ISER) selects SCSI_ISCSI_ATTRS which has unmet direct dependencies (SCSI && NET)
    
      ERROR: "skb_trim" [drivers/scsi/scsi_transport_iscsi.ko] undefined!
      ERROR: "netlink_kernel_create" [drivers/scsi/scsi_transport_iscsi.ko] undefined!
      ERROR: "netlink_kernel_release" [drivers/scsi/scsi_transport_iscsi.ko] undefined!
      ...
    
    so make SCSI_QLA_ISCSI also depend on NET to prevent the build errors.
    
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Cc:	Ravi Anand <ravi.anand@qlogic.com>
    Cc:	Vikas Chaudhary <vikas.chaudhary@qlogic.com>
    Cc:	iscsi-driver@qlogic.com
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  25. Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/ker…

    authored
    …nel/git-cur/linux-2.6-arm
    
    * 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
      ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abort
      ARM: 7080/1: l2x0: make sure I&D are not locked down on init
      ARM: 7081/1: mach-integrator: fix the clocksource
      NET: am79c961: fix race in link status code
      ARM: 7067/1: mm: keep significant bits in pfn_valid
Commits on Sep 10, 2011
  1. @jkrzyszt

    ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abort

    jkrzyszt authored Russell King committed
    Commit be020f8, "ARM: entry: abort-macro: specify registers to be
    used for macros", while replacing register numbers with macro parameter
    names, mismatched the name used for r1. For me, this resulted in user
    space built for EABI with -march=armv4t -mtune=arm920t -mthumb-interwork
    -mthumb broken on my OMAP1510 based Amstrad Delta (old ABI and no thumb
    still worked for me though).
    
    Fix this by using correct parameter name fsr instead of mismatched psr,
    used by callers for another purpose.
    
    Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Something went wrong with that request. Please try again.