1. 17 Jan, 2012 2 commits
  2. 16 Jan, 2012 28 commits
  3. 15 Jan, 2012 10 commits
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 122804ec
      Linus Torvalds authored
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)
        [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver
        mb86a20s: Add a few more register settings at the init seq
        mb86a20s: Group registers into the same line
        [media] [PATCH] don't reset the delivery system on DTV_CLEAR
        [media] [BUG] it913x-fe fix typo error making SNR levels unstable
        [media] cx23885: Query the CX25840 during enum_input for status
        [media] cx25840: Add support for g_input_status
        [media] rc-videomate-m1f.c Rename to match remote controler name
        [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828
        [media] convert drivers/media/* to use module_platform_driver()
        [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB
        [media] Exynos4 JPEG codec v4l2 driver
        [media] doc: v4l: selection: choose pixels as units for selection rectangles
        [media] v4l: s5p-tv: mixer: fix setup of VP scaling
        [media] v4l: s5p-tv: mixer: add support for selection API
        [media] v4l: emulate old crop API using extended crop/compose API
        [media] doc: v4l: add documentation for selection API
        [media] doc: v4l: add binary images for selection API
        [media] v4l: add support for selection api
        [media] hd29l2: fix review findings
        ...
      122804ec
    • Linus Torvalds's avatar
      Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block · 16008d64
      Linus Torvalds authored
      * 'for-3.3/drivers' of git://git.kernel.dk/linux-block:
        mtip32xx: do rebuild monitoring asynchronously
        xen-blkfront: Use kcalloc instead of kzalloc to allocate array
        mtip32xx: uninitialized variable in mtip_quiesce_io()
        mtip32xx: updates based on feedback
        xen-blkback: convert hole punching to discard request on loop devices
        xen/blkback: Move processing of BLKIF_OP_DISCARD from dispatch_rw_block_io
        xen/blk[front|back]: Enhance discard support with secure erasing support.
        xen/blk[front|back]: Squash blkif_request_rw and blkif_request_discard together
        mtip32xx: update to new ->make_request() API
        mtip32xx: add module.h include to avoid conflict with moduleh tree
        mtip32xx: mark a few more items static
        mtip32xx: ensure that all local functions are static
        mtip32xx: cleanup compat ioctl handling
        mtip32xx: fix warnings/errors on 32-bit compiles
        block: Add driver for Micron RealSSD pcie flash cards
      16008d64
    • Linus Torvalds's avatar
      Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block · b3c9dd18
      Linus Torvalds authored
      * 'for-3.3/core' of git://git.kernel.dk/linux-block: (37 commits)
        Revert "block: recursive merge requests"
        block: Stop using macro stubs for the bio data integrity calls
        blockdev: convert some macros to static inlines
        fs: remove unneeded plug in mpage_readpages()
        block: Add BLKROTATIONAL ioctl
        block: Introduce blk_set_stacking_limits function
        block: remove WARN_ON_ONCE() in exit_io_context()
        block: an exiting task should be allowed to create io_context
        block: ioc_cgroup_changed() needs to be exported
        block: recursive merge requests
        block, cfq: fix empty queue crash caused by request merge
        block, cfq: move icq creation and rq->elv.icq association to block core
        block, cfq: restructure io_cq creation path for io_context interface cleanup
        block, cfq: move io_cq exit/release to blk-ioc.c
        block, cfq: move icq cache management to block core
        block, cfq: move io_cq lookup to blk-ioc.c
        block, cfq: move cfqd->icq_list to request_queue and add request->elv.icq
        block, cfq: reorganize cfq_io_context into generic and cfq specific parts
        block: remove elevator_queue->ops
        block: reorder elevator switch sequence
        ...
      
      Fix up conflicts in:
       - block/blk-cgroup.c
      	Switch from can_attach_task to can_attach
       - block/cfq-iosched.c
      	conflict with now removed cic index changes (we now use q->id instead)
      b3c9dd18
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 83c2f912
      Linus Torvalds authored
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits)
        perf tools: Fix compile error on x86_64 Ubuntu
        perf report: Fix --stdio output alignment when --showcpuutilization used
        perf annotate: Get rid of field_sep check
        perf annotate: Fix usage string
        perf kmem: Fix a memory leak
        perf kmem: Add missing closedir() calls
        perf top: Add error message for EMFILE
        perf test: Change type of '-v' option to INCR
        perf script: Add missing closedir() calls
        tracing: Fix compile error when static ftrace is enabled
        recordmcount: Fix handling of elf64 big-endian objects.
        perf tools: Add const.h to MANIFEST to make perf-tar-src-pkg work again
        perf tools: Add support for guest/host-only profiling
        perf kvm: Do guest-only counting by default
        perf top: Don't update total_period on process_sample
        perf hists: Stop using 'self' for struct hist_entry
        perf hists: Rename total_session to total_period
        x86: Add counter when debug stack is used with interrupts enabled
        x86: Allow NMIs to hit breakpoints in i386
        x86: Keep current stack in NMI breakpoints
        ...
      83c2f912
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f0ed5b9a
      Linus Torvalds authored
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, atomic: atomic64_read() take a const pointer
        x86, UV: Update Boot messages for SGI UV2 platform
      f0ed5b9a
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · a520458f
      Linus Torvalds authored
      * 'linux-next' of git://git.infradead.org/ubifs-2.6:
        UBI: use own macros for the layout volume
        UBI: fix nameless volumes handling
        UBIFS: fix non-debug configuration build
      a520458f
    • Antti Palosaari's avatar
      [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver · 12640003
      Antti Palosaari authored
      I added it by mistake. It is useless as no real hardware.
      It even uses even Cypress FX2, general USB bridge chip, default IDs
      that makes driver load all FX2 devices having default ID...
      Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      12640003
    • Richard Weinberger's avatar
      UBI: use own macros for the layout volume · 1f4f4347
      Richard Weinberger authored
      This is a minor nicification: UBI_LAYOUT_VOLUME_TYPE and
      UBI_LAYOUT_VOLUME_ALIGN are currently defined but not used -
      use them.
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
      1f4f4347
    • Richard Weinberger's avatar
      UBI: fix nameless volumes handling · 4a59c797
      Richard Weinberger authored
      Currently it's possible to create a volume without a name. E.g:
      ubimkvol -n 32 -s 2MiB -t static /dev/ubi0 -N ""
      
      After that vtbl_check() will always fail because it does not permit
      empty strings.
      
      Cc: stable@kernel.org
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
      4a59c797
    • Dominique Martinet's avatar
      UBIFS: fix non-debug configuration build · e234b5f2
      Dominique Martinet authored
      Fix a brown paperbag bug introduced by me in the previous commit. I was
      in hurry and forgot about the non-debug case completely.
      
      Artem: amend the commit message and tweak the patch to preserve alignment.
             This made the patch a bit less readable, though.
      Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
      e234b5f2