Skip to content
Commits on Jan 22, 2011
  1. @torvalds

    Linux 2.6.38-rc2

    torvalds committed Jan 21, 2011
  2. @torvalds

    Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kern…

    …el/git/mchehab/linux-2.6
    
    * 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (101 commits)
      [media] staging/lirc: fix mem leaks and ptr err usage
      [media] hdpvr: reduce latency of i2c read/write w/recycled buffer
      [media] hdpvr: enable IR part
      [media] rc/mceusb: timeout should be in ns, not us
      [media] v4l2-device: fix 'use-after-freed' oops
      [media] v4l2-dev: don't memset video_device.dev
      [media] zoran: use video_device_alloc instead of kmalloc
      [media] w9966: zero device state after a detach
      [media] v4l: Fix a use-before-set in the control framework
      [media] v4l: Include linux/videodev2.h in media/v4l2-ctrls.h
      [media] DocBook/v4l: update V4L2 revision and update copyright years
      [media] DocBook/v4l: fix validation error in dev-rds.xml
      [media] v4l2-ctrls: queryctrl shouldn't attempt to replace V4L2_CID_PRIVATE_BASE IDs
      [media] v4l2-ctrls: fix missing 'read-only' check
      [media] pvrusb2: Provide more information about IR units to lirc_zilog and ir-kbd-i2c
      [media] ir-kbd-i2c: Add back defaults setting for Zilog Z8's at addr 0x71
      [media] lirc_zilog: Update TODO.lirc_zilog
      [media] lirc_zilog: Add Andy Walls to copyright notice and authors list
      [media] lirc_zilog: Remove useless struct i2c_driver.command function
      [media] lirc_zilog: Remove unneeded tests for existence of the IR Tx function
      ...
    torvalds committed Jan 21, 2011
Commits on Jan 21, 2011
  1. @torvalds

    KEYS: Fix up comments in key management code

    Fix up comments in the key management code.  No functional changes.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    David Howells committed with torvalds Jan 20, 2011
  2. @torvalds

    KEYS: Do some style cleanup in the key management code.

    Do a bit of a style clean up in the key management code.  No functional
    changes.
    
    Done using:
    
      perl -p -i -e 's!^/[*]*/\n!!' security/keys/*.c
      perl -p -i -e 's!} /[*] end [a-z0-9_]*[(][)] [*]/\n!}\n!' security/keys/*.c
      sed -i -s -e ": next" -e N -e 's/^\n[}]$/}/' -e t -e P -e 's/^.*\n//' -e "b next" security/keys/*.c
    
    To remove /*****/ lines, remove comments on the closing brace of a
    function to name the function and remove blank lines before the closing
    brace of a function.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    David Howells committed with torvalds Jan 20, 2011
  3. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      cifs: fix up CIFSSMBEcho for unaligned access
      cifs: fix unaligned accesses in cifsConvertToUCS
      cifs: clean up unaligned accesses in cifs_unicode.c
      cifs: fix unaligned access in check2ndT2 and coalesce_t2
      cifs: clean up unaligned accesses in validate_t2
      cifs: use get/put_unaligned functions to access ByteCount
      cifs: move time field in cifsInodeInfo
      cifs: TCP_Server_Info diet
      CIFS: Implement cifs_strict_readv (try #4)
      CIFS: Implement cifs_file_strict_mmap (try #2)
      CIFS: Implement cifs_strict_fsync
      CIFS: Make cifsFileInfo_put work with strict cache mode
    torvalds committed Jan 21, 2011
  4. @torvalds

    Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/ker…

    …nel/git/tj/percpu
    
    * 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
      x86,percpu: Move out of place 64 bit ops into X86_64 section
    torvalds committed Jan 21, 2011
  5. @torvalds

    Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/ker…

    …nel/git/tj/wq
    
    * 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
      workqueue: note the nested NOT_RUNNING test in worker_clr_flags() isn't a noop
      workqueue: relax lockdep annotation on flush_work()
    torvalds committed Jan 21, 2011
  6. @torvalds

    Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/…

    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)
      um: Use generic irq Kconfig
      tile: Use generic irq Kconfig
      sparc: Use generic irq Kconfig
      score: Use generic irq Kconfig
      powerpc: Use generic irq Kconfig
      parisc: Use generic irq Kconfig
      mn10300: Use generic irq Kconfig
      microblaze: Use generic irq Kconfig
      m68knommu: Use generic irq Kconfig
      ia64: Use generic irq Kconfig
      frv: Use generic irq Kconfig
      blackfin: Use generic irq Kconfig
      alpha: Use generic irq Kconfig
      genirq: Remove __do_IRQ
      m32r: Convert to generic irq Kconfig
      m32r: Convert usrv platform irq handling
      m32r: Convert opsput_lcdpld irq chip
      m32r: Convert opsput lanpld irq chip
      m32r: Convert opsput pld irq chip
      m32r: Convert opsput irq chip
      ...
    torvalds committed Jan 21, 2011
  7. @torvalds

    Merge branch 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/konrad/xen
    
    * 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen: p2m: correctly initialize partial p2m leaf
      xen: fix non-ANSI function warning in irq.c
    torvalds committed Jan 21, 2011
  8. @torvalds

    Merge branches 'fixes' and 'fwnet' of git://git.kernel.org/pub/scm/li…

    …nux/kernel/git/ieee1394/linux1394-2.6
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: core: fix unstable I/O with Canon camcorder
    
    * 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: net: is not experimental anymore
      firewire: net: invalidate ARP entries of removed nodes
    torvalds committed Jan 21, 2011
  9. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - Fix EAPD to low on CZC P10T tablet computer with ALC662
      ALSA: HDA: Add SKU ignore for another Thinkpad Edge 14
      ALSA: hda - Fix "unused variable" compile warning
      ALSA: hda - Add quirk for HP Z-series workstation
      Revert "ALSA: HDA: Create mixers on ALC887"
      ASoC: PXA: Fix codec address on Zipit Z2
      ASoC: PXA: Fix jack detection on Zipit Z2
      ASoC: Blackfin: fix DAI/SPORT config dependency issues
      ASoC: Blackfin TDM: use external frame syncs
      ASoC: Blackfin AC97: fix build error after multi-component update
      ASoC: Blackfin TDM: fix missed snd_soc_dai_get_drvdata update
      ASoC: documentation updates
      ALSA: ice1712 delta - initialize SPI clock
    torvalds committed Jan 21, 2011
  10. @torvalds

    Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6

    * 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
      powerpc/83xx: fix build failures on dt compatible list.
    torvalds committed Jan 21, 2011
  11. @torvalds

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (34 commits)
      powerpc/mpic: Fix mask/unmask timeout message
      powerpc/pseries: Add BNX2=m to defconfig
      powerpc: Enable 64kB pages and 1024 threads in pseries config
      powerpc: Disable mcount tracers in pseries defconfig
      powerpc/boot/dts: Install dts from the right directory
      powerpc: machine_check_generic is wrong on 64bit
      powerpc: Check RTAS extended log flag before checking length
      powerpc: Fix corruption when grabbing FWNMI data
      powerpc: Rework pseries machine check handler
      powerpc: Don't silently handle machine checks from userspace
      powerpc: Remove duplicate debugger hook in machine_check_exception
      powerpc: Never halt RTAS error logging after receiving an unrecoverable machine check
      powerpc: Don't force MSR_RI in machine_check_exception
      powerpc: Print 32 bits of DSISR in show_regs
      powerpc/kdump: Disable ftrace during kexec
      powerpc/kdump: Move crash_kexec_stop_spus to kdump crash handler
      powerpc/kexec: Remove empty ppc_md.machine_kexec_prepare
      powerpc/kexec: Don't initialise kexec hooks to default handlers
      powerpc/kdump: Remove ppc_md.machine_crash_shutdown
      powerpc/kexec: Remove ppc_md.machine_kexec
      ...
    torvalds committed Jan 21, 2011
  12. @michalsimek @torvalds

    mm: System without MMU do not need pte_mkwrite

    The patch "thp: export maybe_mkwrite" (commit 14fd403) breaks
    systems without MMU.
    
    Error log:
    
        CC      arch/microblaze/mm/init.o
      In file included from include/linux/mman.h:14,
                       from arch/microblaze/mm/consistent.c:24:
      include/linux/mm.h: In function 'maybe_mkwrite':
      include/linux/mm.h:482: error: implicit declaration of function 'pte_mkwrite'
      include/linux/mm.h:482: error: incompatible types in assignment
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    CC: Andrea Arcangeli <aarcange@redhat.com>
    Reviewed-by: Rik van Riel <riel@redhat.com>
    CC: Andrew Morton <akpm@linux-foundation.org>
    CC: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    michalsimek committed with torvalds Jan 21, 2011
  13. @torvalds

    MAINTAINERS: Update Roland Dreier's email address

    The cisco.com address will stop working soon, and besides no one can
    remember the second "d" in "rolandd" or how to spell "rdreier."
    
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Roland Dreier committed with torvalds Jan 20, 2011
  14. xen: p2m: correctly initialize partial p2m leaf

    After changing the p2m mapping to a tree by
    
      commit 58e0502
        xen: convert p2m to a 3 level tree
    
    and trying to boot a DomU with 615MB of memory, the following crash was
    observed in the dump:
    
    kernel direct mapping tables up to 26f00000 @ 1ec4000-1fff000
    BUG: unable to handle kernel NULL pointer dereference at (null)
    IP: [<c0107397>] xen_set_pte+0x27/0x60
    *pdpt = 0000000000000000 *pde = 0000000000000000
    
    Adding further debug statements showed that when trying to set up
    pfn=0x26700 the returned mapping was invalid.
    
    pfn=0x266ff calling set_pte(0xc1fe77f8, 0x6b3003)
    pfn=0x26700 calling set_pte(0xc1fe7800, 0x3)
    
    Although the last_pfn obtained from the startup info is 0x26700, which
    should in turn not be hit, the additional 8MB which are added as extra
    memory normally seem to be ok. This lead to looking into the initial
    p2m tree construction, which uses the smaller value and assuming that
    there is other code handling the extra memory.
    
    When the p2m tree is set up, the leaves are directly pointed to the
    array which the domain builder set up. But if the mapping is not on a
    boundary that fits into one p2m page, this will result in the last leaf
    being only partially valid. And as the invalid entries are not
    initialized in that case, things go badly wrong.
    
    I am trying to fix that by checking whether the current leaf is a
    complete map and if not, allocate a completely new page and copy only
    the valid pointers there. This may not be the most efficient or elegant
    solution, but at least it seems to allow me booting DomUs with memory
    assignments all over the range.
    
    BugLink: http://bugs.launchpad.net/bugs/686692
    [v2: Redid a bit of commit wording and fixed a compile warning]
    
    Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Stefan Bader committed with Konrad Rzeszutek Wilk Jan 20, 2011
  15. @torvalds

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/jack/linux-fs-2.6
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
      quota: Fix deadlock during path resolution
    torvalds committed Jan 21, 2011
  16. um: Use generic irq Kconfig

    No functional change.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Jeff Dike <jdike@addtoit.com>
    Thomas Gleixner committed Jan 19, 2011
  17. tile: Use generic irq Kconfig

    No functional change.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Chris Metcalf <cmetcalf@tilera.com>
    Thomas Gleixner committed Jan 19, 2011
  18. sparc: Use generic irq Kconfig

    No functional change.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: "David S. Miller" <davem@davemloft.net>
    Thomas Gleixner committed Jan 19, 2011
  19. score: Use generic irq Kconfig

    No functional change
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Chen Liqin <liqin.chen@sunplusct.com>
    Thomas Gleixner committed Jan 19, 2011
  20. powerpc: Use generic irq Kconfig

    No functional change.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Thomas Gleixner committed Jan 19, 2011
  21. parisc: Use generic irq Kconfig

    No functional change.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Kyle McMartin <kyle@mcmartin.ca>
    Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    Thomas Gleixner committed Jan 19, 2011
  22. mn10300: Use generic irq Kconfig

    No functional change.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: David Howells <dhowells@redhat.com>
    Thomas Gleixner committed Jan 19, 2011
  23. microblaze: Use generic irq Kconfig

    No functional change.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Michal Simek <monstr@monstr.eu>
    Thomas Gleixner committed Jan 19, 2011
  24. m68knommu: Use generic irq Kconfig

    No functional change.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Greg Ungerer <gerg@uclinux.org>
    Thomas Gleixner committed Jan 19, 2011
  25. ia64: Use generic irq Kconfig

    No functional change.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Tony Luck <tony.luck@intel.com>
    Thomas Gleixner committed Jan 19, 2011
  26. frv: Use generic irq Kconfig

    No functional change.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: David Howells <dhowells@redhat.com>
    Thomas Gleixner committed Jan 19, 2011
  27. blackfin: Use generic irq Kconfig

    No functional change.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Mike Frysinger <vapier@gentoo.org>
    Thomas Gleixner committed Jan 19, 2011
  28. alpha: Use generic irq Kconfig

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Richard Henderson <rth@twiddle.net>
    Thomas Gleixner committed Jan 19, 2011
  29. genirq: Remove __do_IRQ

    All architectures are finally converted. Remove the cruft.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: Mike Frysinger <vapier@gentoo.org>
    Cc: David Howells <dhowells@redhat.com>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Greg Ungerer <gerg@uclinux.org>
    Cc: Michal Simek <monstr@monstr.eu>
    Acked-by: David Howells <dhowells@redhat.com>
    Cc: Kyle McMartin <kyle@mcmartin.ca>
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Chen Liqin <liqin.chen@sunplusct.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Chris Metcalf <cmetcalf@tilera.com>
    Cc: Jeff Dike <jdike@addtoit.com>
    Thomas Gleixner committed Jan 19, 2011
  30. m32r: Convert to generic irq Kconfig

    Use the generic irq Kconfig. Select GENERIC_HARDIRQS_NO_DEPRECATED as
    we have converted all irq_chip functions.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Hirokazu Takata <takata@linux-m32r.org>
    Cc: Paul Mundt <lethal@linux-sh.org>
    Thomas Gleixner committed Jan 19, 2011
  31. m32r: Convert usrv platform irq handling

    Convert the irq chips to the new functions and use proper flow
    handlers. handle_level_irq is appropriate.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Hirokazu Takata <takata@linux-m32r.org>
    Cc: Paul Mundt <lethal@linux-sh.org>
    Thomas Gleixner committed Jan 19, 2011
  32. m32r: Convert opsput_lcdpld irq chip

    Convert the irq chips to the new functions and use proper flow
    handlers. handle_level_irq is appropriate.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Hirokazu Takata <takata@linux-m32r.org>
    Cc: Paul Mundt <lethal@linux-sh.org>
    Thomas Gleixner committed Jan 19, 2011
  33. m32r: Convert opsput lanpld irq chip

    Convert the irq chips to the new functions and use proper flow
    handlers. handle_level_irq is appropriate.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Hirokazu Takata <takata@linux-m32r.org>
    Cc: Paul Mundt <lethal@linux-sh.org>
    Thomas Gleixner committed Jan 19, 2011
Something went wrong with that request. Please try again.