Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 28, 2011
  1. added readme for BMI

    Far McKon authored
Commits on Sep 3, 2009
  1. @tmlind

    Merge branch 'for-next'

    tmlind authored
    Conflicts:
    	arch/arm/mach-omap2/Makefile
    	arch/arm/mach-omap2/board-2430sdp.c
    	arch/arm/mach-omap2/board-3430sdp.c
    	arch/arm/mach-omap2/board-apollon.c
    	arch/arm/mach-omap2/board-generic.c
    	arch/arm/mach-omap2/board-h4.c
    	arch/arm/mach-omap2/board-ldp.c
    	arch/arm/mach-omap2/board-omap3evm.c
    	arch/arm/mach-omap2/board-zoom2.c
    	arch/arm/mach-omap2/mux.c
    	arch/arm/mach-omap2/pm-debug.c
    	arch/arm/plat-omap/include/mach/mux.h
  2. OMAP2/3 PM: create the OMAP PM interface and add a default OMAP PM no…

    Paul Walmsley authored paul committed
    …-op layer
    
    The interface provides device drivers, CPUFreq, and DSPBridge with a
    means of controlling OMAP power management parameters that are not yet
    supported by the Linux PM PMQoS interface.  Copious documentation is
    in the patch in Documentation/arm/OMAP/omap_pm and the interface
    header file, arch/arm/plat-omap/include/mach/omap-pm.h.
    
    Thanks to Rajendra Nayak <rnayak@ti.com> for adding CORE (VDD2) OPP
    support and moving the OPP table initialization earlier in the event
    that the clock code needs them.  Thanks to Tero Kristo
    <tero.kristo@nokia.com> for fixing the parameter check in
    omap_pm_set_min_bus_tput().  Jouni signed off on Tero's patch.
    
    Signed-off-by: Paul Walmsley <paul@pwsan.com>
    Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
    Signed-off-by: Rajendra Nayak <rnayak@ti.com>
    Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
    Signed-off-by: Jouni Högander <jouni.hogander@nokia.com>
    Cc: Tony Lindgren <tony@atomide.com>
    Cc: Igor Stoppa <igor.stoppa@nokia.com>
    Cc: Richard Woodruff <r-woodruff2@ti.com>
    Cc: Anand Sawant <sawant@ti.com>
    Cc: Sakari Poussa <sakari.poussa@nokia.com>
    Cc: Veeramanikandan Raju <veera@ti.com>
    Cc: Karthik Dasu <karthik-dp@ti.com>
Commits on Aug 28, 2009
  1. @tmlind

    Merge current mainline tree into linux-omap tree

    tmlind authored
    Merge branches 'master' and 'linus'
Commits on Aug 27, 2009
  1. @torvalds

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

    torvalds authored
    …/git/ericvh/v9fs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
      9p: update documentation pointers
      9p: remove unnecessary v9fses->options which duplicates the mount string
      net/9p: insulate the client against an invalid error code sent by a 9p server
      9p: Add missing cast for the error return value in v9fs_get_inode
      9p: Remove redundant inode uid/gid assignment
      9p: Fix possible regressions when ->get_sb fails.
      9p: Fix v9fs show_options
      9p: Fix possible memleak in v9fs_inode_from fid.
      9p: minor comment fixes
      9p: Fix possible inode leak in v9fs_get_inode.
      9p: Check for error in return value of v9fs_fid_add
Commits on Aug 24, 2009
  1. @tmlind

    Merge current mainline tree into linux-omap tree

    tmlind authored
    Merge branches 'master' and 'linus'
    
    Conflicts:
    	arch/arm/mach-omap2/board-omap3evm.c
    	drivers/net/netxen/netxen_nic_init.c
Commits on Aug 19, 2009
  1. @antonblanchard @torvalds

    AFS: Documentation updates

    antonblanchard authored torvalds committed
    Fix some issues with the AFS documentation, found when testing AFS on ppc64:
    
    - Update AFS features: reading/writing, local caching
    - Typo in kafs sysfs debug file
    - Use modprobe instead of insmod in example
    - Update IPs for grand.central.org
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Aug 18, 2009
  1. @kosaki @torvalds

    mm: revert "oom: move oom_adj value"

    kosaki authored torvalds committed
    The commit 2ff05b2 (oom: move oom_adj value) moveed the oom_adj value to
    the mm_struct.  It was a very good first step for sanitize OOM.
    
    However Paul Menage reported the commit makes regression to his job
    scheduler.  Current OOM logic can kill OOM_DISABLED process.
    
    Why? His program has the code of similar to the following.
    
    	...
    	set_oom_adj(OOM_DISABLE); /* The job scheduler never killed by oom */
    	...
    	if (vfork() == 0) {
    		set_oom_adj(0); /* Invoked child can be killed */
    		execve("foo-bar-cmd");
    	}
    	....
    
    vfork() parent and child are shared the same mm_struct.  then above
    set_oom_adj(0) doesn't only change oom_adj for vfork() child, it's also
    change oom_adj for vfork() parent.  Then, vfork() parent (job scheduler)
    lost OOM immune and it was killed.
    
    Actually, fork-setting-exec idiom is very frequently used in userland program.
    We must not break this assumption.
    
    Then, this patch revert commit 2ff05b2 and related commit.
    
    Reverted commit list
    ---------------------
    - commit 2ff05b2 (oom: move oom_adj value from task_struct to mm_struct)
    - commit 4d8b913 (oom: avoid unnecessary mm locking and scanning for OOM_DISABLE)
    - commit 8123681 (oom: only oom kill exiting tasks with attached memory)
    - commit 933b787 (mm: copy over oom_adj value at fork time)
    
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: Paul Menage <menage@google.com>
    Cc: David Rientjes <rientjes@google.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Rik van Riel <riel@redhat.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Nick Piggin <npiggin@suse.de>
    Cc: Mel Gorman <mel@csn.ul.ie>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Aug 17, 2009
  1. @ericvh

    9p: update documentation pointers

    ericvh authored
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Commits on Aug 13, 2009
  1. V4L/DVB (12402): em28xx: fix: some em2710 chips use a different vendo…

    Mauro Carvalho Chehab authored
    …r ID
    
    Thanks to hermann pitton <hermann-pitton@arcor.de> for pointing this new
    variation.
    
    Tested-by: hermann pitton <hermann-pitton@arcor.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  2. @mkrufky

    V4L/DVB (12391): saa7134: Use correct product name for Hauppauge WinT…

    mkrufky authored Mauro Carvalho Chehab committed
    …V-HVR1120 DVB-T/Hybrid
    
    Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  3. @mkrufky

    V4L/DVB (12390): saa7134: Use correct product name for Hauppauge WinT…

    mkrufky authored Mauro Carvalho Chehab committed
    …V-HVR1150 ATSC/QAM-Hybrid
    
    Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Commits on Aug 12, 2009
  1. @mika

    Documentation/kernel-parameters.txt: document libata's ignore_hpa option

    mika authored Jeff Garzik committed
    By default the kernel honors the HPA (host protected area) of hard
    drives.  Using libata's ignore_hpa module option it's possible to
    change this behaviour.
    
    Document usage and options of libata.ignore_hpa in
    Documentation/kernel-parameters.txt.
    
    Signed-off-by: Michael Prokop <mika@grml.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Commits on Aug 10, 2009
  1. @konis @torvalds

    documentation: register ioctl entry of nilfs2

    konis authored torvalds committed
    This will register the ioctl range used by nilfs2 file system to the
    table listed in Documentation/ioctl/ioctl-number.txt.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Aug 9, 2009
  1. @torvalds

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

    torvalds authored
    …/linux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      lockdep: Fix typos in documentation
      lockdep: Fix file mode of lock_stat
      rtmutex: Avoid deadlock in rt_mutex_start_proxy_lock()
Commits on Aug 7, 2009
  1. @torvalds

    Merge master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds authored
    * master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
      ARM: 5639/1: arm: clkdev.c should include <linux/clk.h>
      ARM: 5638/1: arch/arm/kernel/signal.c: use correct address space for CRUNCH
      ARM: 5637/1: [KS8695] Don't reference CLOCK_TICK_RATE in drivers
      ARM: S3C64XX: serial: Fix section mismatch warning
      ARM: S3C24XX: serial: Fix section mismatch warnings
      ARM: S3C: PWM fix for low duty cycle
      ARM: 5597/1: [PCI] reset all internal hardware prior PCI initialization
      ARM: 5627/1: Fix restoring of lr at the end of mcount
      ARM: 5624/1: Document cache aliasing region
      S3C64XX: Fix ARMCLK configuration
      S3C64XX: Fix get_rate() for ARMCLK
      S3C24XX: GPIO: Fix pin range check in s3c_gpiolib_getchip
      mx3 defconfig update
      mx27 defconfig update
      ARM: 5623/1: Treo680: ir shutdown typo fix
      ARM: includecheck fix: plat-stmp3xxx/pinmux.c
      ARM: includecheck fix: plat-s3c64xx/pm.c
      ARM: includecheck fix: mach-omap2/mcbsp.c
      ARM: includecheck fix: mach-omap1/mcbsp.c
      ARM: includecheck fix: board-sffsdr.c
      ...
  2. lockdep: Fix typos in documentation

    Li Zefan authored Ingo Molnar committed
    s/head/held
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    LKML-Reference: <4A7BD37E.9060806@cn.fujitsu.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
Commits on Aug 4, 2009
  1. @torvalds

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    torvalds authored
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      Make SCSI SG v4 driver enabled by default and remove EXPERIMENTAL dependency, since udev depends on BSG
      block: Update topology documentation
      block: Stack optimal I/O size
      block: Add a wrapper for setting minimum request size without a queue
      block: Make blk_queue_stack_limits use the new stacking interface
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits)
      ehea: Fix napi list corruption on ifconfig down
      igbvf: Allow VF driver to correctly recognize failure to set mac
      3c59x: Fix build failure with gcc 3.2
      sky2: Avoid transmits during sky2_down()
      iwlagn: do not send key clear commands when rfkill enabled
      libertas: Read buffer overflow
      drivers/net/wireless: introduce missing kfree
      drivers/net/wireless/iwlwifi: introduce missing kfree
      zd1211rw: fix unaligned access in zd_mac_rx
      cfg80211: fix regression on beacon world roaming feature
      cfg80211: add two missing NULL pointer checks
      ixgbe: Patch to modify 82598 PCIe completion timeout values
      bluetooth: rfcomm_init bug fix
      mlx4_en: Fix double pci unmapping.
      mISDN: Fix handling of receive buffer size in L1oIP
      pcnet32: VLB support fixes
      pcnet32: remove superfluous NULL pointer check in pcnet32_probe1()
      net: restore the original spinlock to protect unicast list
      netxen: fix coherent dma mask setting
      mISDN: Read buffer overflow
      ...
  3. @tmlind

    Merge current mainline tree into linux-omap tree

    tmlind authored
    Merge branches 'master' and 'linus'
    
    Conflicts:
    	drivers/leds/Kconfig
    	drivers/leds/Makefile
Commits on Aug 2, 2009
  1. @hmh @lenb

    thinkpad-acpi: remove dock and bay subdrivers

    hmh authored lenb committed
    The standard ACPI dock driver can handle the hotplug bays and docks of
    the ThinkPads just fine (including batteries) as of 2.6.27, and the
    code in thinkpad-acpi for the dock and bay subdrivers is currently
    broken anyway...
    
    Userspace needs some love to support the two-stage ejection nicely,
    but it is simple enough to do through udev rules (you don't even need
    HAL) so this wouldn't justify fixing the dock and bay subdrivers,
    either.
    
    That leaves warm-swap bays (_EJ3) support for thinkpad-acpi, as well
    as support for the weird dock of the model 570, but since such support
    has never left the "experimental" stage, it is also not a strong
    enough reason to find a way to fix this code.
    
    Users of ThinkPads with warm-swap bays are urged to request that _EJ3
    support be added to the regular ACPI dock driver, if such feature is
    indeed useful for them.
    
    Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
    Signed-off-by: Len Brown <len.brown@intel.com>
Commits on Aug 1, 2009
  1. block: Update topology documentation

    Martin K. Petersen authored Jens Axboe committed
    Update topology comments and sysfs documentation based upon discussions
    with Neil Brown.
    
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Commits on Jul 30, 2009
  1. @tklauser @davem330

    docbook: fix printk of ip address

    tklauser authored davem330 committed
    Use the %pI4 format string instead of %d.%d.%d.%d and NIPQUAD.
    
    Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux

    Russell King authored Russell King committed
  3. ARM: 5624/1: Document cache aliasing region

    Linus Walleij authored Russell King committed
    Augment the memory.txt file for ARM to list the cache aliasing
    region ffff4000-fffffff.
    
    Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  4. @rustyrussell

    lguest and virtio: cleanup struct definitions to Linux style.

    rustyrussell authored
    I've been doing this for years, and akpm picked me up on it about 12
    months ago.  lguest partly serves as example code, so let's do it Right.
    
    Also, remove two unused fields in struct vblk_info in the example launcher.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Ingo Molnar <mingo@redhat.com>
  5. @rustyrussell

    lguest: update commentry

    rustyrussell authored
    Every so often, after code shuffles, I need to go through and unbitrot
    the Lguest Journey (see drivers/lguest/README).  Since we now use RCU in
    a simple form in one place I took the opportunity to expand that explanation.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
  6. @rustyrussell

    lguest: fix comment style

    rustyrussell authored
    I don't really notice it (except to begrudge the extra vertical
    space), but Ingo does.  And he pointed out that one excuse of lguest
    is as a teaching tool, it should set a good example.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Ingo Molnar <mingo@redhat.com>
  7. @rustyrussell

    lguest: fix descriptor corruption in example launcher

    rustyrussell authored
    1d589bb "Add serial number support
    for virtio_blk, V4a" extended 'struct virtio_blk_config' to 536 bytes.
    Lguest and S/390 both use an 8 bit value for the feature length, and
    this change broke them (if the code is naive).
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: John Cooper <john.cooper@redhat.com>
    Cc: Christian Borntraeger <borntraeger@de.ibm.com>
  8. @torvalds

    sysrq, kdump: make sysrq-c consistent

    Hidetoshi Seto authored torvalds committed
    commit d6580a9 ("kexec: sysrq: simplify
    sysrq-c handler") changed the behavior of sysrq-c to unconditional
    dereference of NULL pointer.  So in cases with CONFIG_KEXEC, where
    crash_kexec() was directly called from sysrq-c before, now it can be said
    that a step of "real oops" was inserted before starting kdump.
    
    However, in contrast to oops via SysRq-c from keyboard which results in
    panic due to in_interrupt(), oops via "echo c > /proc/sysrq-trigger" will
    not become panic unless panic_on_oops=1.  It means that even if dump is
    properly configured to be taken on panic, the sysrq-c from proc interface
    might not start crashdump while the sysrq-c from keyboard can start
    crashdump.  This confuses traditional users of kdump, i.e.  people who
    expect sysrq-c to do common behavior in both of the keyboard and proc
    interface.
    
    This patch brings the keyboard and proc interface behavior of sysrq-c in
    line, by forcing panic_on_oops=1 before oops in sysrq-c handler.
    
    And some updates in documentation are included, to clarify that there is
    no longer dependency with CONFIG_KEXEC, and that now the system can just
    crash by sysrq-c if no dump mechanism is configured.
    
    Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
    Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
    Cc: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
    Acked-by: Neil Horman <nhorman@tuxdriver.com>
    Acked-by: Vivek Goyal <vgoyal@redhat.com>
    Cc: Brayan Arraes <brayan@yack.com.br>
    Cc: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Jul 28, 2009
  1. @gregkh

    driver core: documentation: make it clear that sysfs is optional

    Lucian Adrian Grijincu authored gregkh committed
    The original text suggested that sysfs is mandatory and always
    compiled in the kernel.
    
    Signed-off-by: Lucian Adrian Grijincu <lgrijincu@ixiacom.com>
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Commits on Jul 27, 2009
  1. @torvalds

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

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - Fix mute control with some ALC262 models
      ALSA: snd_usb_caiaq: add support for Audio2DJ
      ALSA: pcm - Fix hwptr buffer-size overlap bug
      ALSA: pcm - Fix warnings in debug loggings
      ALSA: pcm - Add logging of hwptr updates and interrupt updates
      ASoC: tlv320aic3x: Enable PLL when not bypassed
      ALSA: hda - Restore GPIO1 properly at resume with AD1984A
      ALSA: ctxfi - Fix uninitialized error checks
      ALSA: hda - Use snprintf() to be safer
      ALSA: usb-audio - Volume control quirk for QuickCam E 3500
      ALSA: pcm - Fix regressions with VMware
Commits on Jul 26, 2009
  1. @tiwai

    Merge branch 'fix/pcm-hwptr' into for-linus

    tiwai authored
    * fix/pcm-hwptr:
      ALSA: pcm - Fix hwptr buffer-size overlap bug
      ALSA: pcm - Fix warnings in debug loggings
      ALSA: pcm - Add logging of hwptr updates and interrupt updates
      ALSA: pcm - Fix regressions with VMware
Commits on Jul 24, 2009
  1. @brijohn

    V4L/DVB (12283): gspca - sn9c20x: New subdriver for sn9c201 and sn9c2…

    brijohn authored Mauro Carvalho Chehab committed
    …02 bridges.
    
    Signed-off-by: Brian Johnson <brijohn@gmail.com>
    Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  2. V4L/DVB (12235): em28xx: detects sensors also with the generic em2750…

    Mauro Carvalho Chehab authored
    …/2750 entry
    
    Webcams in general don't have eeprom. So, the sensor hint code should be
    called to properly detect what sensor is inside.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Something went wrong with that request. Please try again.