1. 22 Mar, 2011 30 commits
  2. 21 Mar, 2011 10 commits
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · eddecbb6
      Linus Torvalds authored
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        kbuild: Make DEBUG_SECTION_MISMATCH selectable, but not on by default
        genksyms: Regenerate lexer and parser
        genksyms: Track changes to enum constants
        genksyms: simplify usage of find_symbol()
        genksyms: Add helpers for building string lists
        genksyms: Simplify printing of symbol types
        genksyms: Simplify lexer
        genksyms: Do not paste the bison header file to lex.c
        modpost: fix trailing comma
        KBuild: silence "'scripts/unifdef' is up to date."
        kbuild: Add extra gcc checks
        kbuild: reenable section mismatch analysis
        unifdef: update to upstream version 2.5
      eddecbb6
    • Jesper Juhl's avatar
      Reduce sequential pointer derefs in scsi_error.c and reduce size as well · 0bf8c869
      Jesper Juhl authored
      This patch reduces the number of sequential pointer derefs in
      drivers/scsi/scsi_error.c
      
      This has been submitted a number of times over a couple of years.  I
      believe this version adresses all comments it has gathered over time.
      Please apply or reject with a reason.
      
      The benefits are:
      
       - makes the code easier to read.  Lots of sequential derefs of the same
         pointers is not easy on the eye.
      
       - theoretically at least, just dereferencing the pointers once can
         allow the compiler to generally slightly faster code, so in theory
         this could also be a micro speed optimization.
      
       - reduces size of object file (tiny effect: on x86-64, in at least one
         configuration, the text size decreased from 9439 bytes to 9400)
      
       - removes some pointless (mostly trailing) whitespace.
      Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0bf8c869
    • Gary Hade's avatar
      matroxfb: remove incorrect Matrox G200eV support · 38f7aa23
      Gary Hade authored
      Remove incorrect Matrox G200eV support that was previously added by
      commit e3a19388
      
      A serious issue with the incorrect G200eV support that reproduces on the
      Matrox G200eV equipped IBM x3650 M2 is the total lack of text (login
      banner, login prompt, etc) on the console when X is not running and
      total lack of text on all of the virtual consoles after X is started.
      
      Any concerns that the incorrect code (upstream since October 2008) has
      been successfully used on non-IBM G200eV equipped system(s) appear to be
      unwarranted.  In addition to the serious/non-intermittent nature of
      issues that have been spotted on IBM systems, complete removal of the
      incorrect code is clearly supported by the following Matrox (Yannick
      Heneault) provided input:
       "It impossible that this patch should have work on a system.
       The patch only declare the G200eV as a regular G200 which is
       not case. Many registers are different, including at least the
       PLL programming sequence. If the G200eV is programmed like a
       regular G200, it will not display anything."
      
      v1 - Initial patch that removed the incorrect code for _all_
           G200eV equipped systems.
      v2 - Darrick Wong provided patch that blacklisted the incorrect
           code on G200eV equipped IBM systems leaving it enabled on
           all G200eV equipped non-IBM systems.
      v3 - Same code changes included with v1 plus additional
           justification for complete removal of the incorrect code.
      Signed-off-by: default avatarGary Hade <garyhade@us.ibm.com>
      Cc: Darrick J. Wong <djwong@us.ibm.com>
      Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
      Cc: Petr Vandrovec <vandrove@vc.cvut.cz>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Yannick Heneault <yannick_heneault@matrox.com>
      Cc: Christian Toutant <ctoutant@matrox.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      38f7aa23
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 3155fe6d
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (23 commits)
        xfs: don't name variables "panic"
        xfs: factor agf counter updates into a helper
        xfs: clean up the xfs_alloc_compute_aligned calling convention
        xfs: kill support/debug.[ch]
        xfs: Convert remaining cmn_err() callers to new API
        xfs: convert the quota debug prints to new API
        xfs: rename xfs_cmn_err_fsblock_zero()
        xfs: convert xfs_fs_cmn_err to new error logging API
        xfs: kill xfs_fs_mount_cmn_err() macro
        xfs: kill xfs_fs_repair_cmn_err() macro
        xfs: convert xfs_cmn_err to xfs_alert_tag
        xfs: Convert xlog_warn to new logging interface
        xfs: Convert linux-2.6/ files to new logging interface
        xfs: introduce new logging API.
        xfs: zero proper structure size for geometry calls
        xfs: enable delaylog by default
        xfs: more sensible inode refcounting for ialloc
        xfs: stop using xfs_trans_iget in the RT allocator
        xfs: check if device support discard in xfs_ioc_trim()
        xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
        ...
      3155fe6d
    • Julien Tinnes's avatar
      Prevent rt_sigqueueinfo and rt_tgsigqueueinfo from spoofing the signal code · da48524e
      Julien Tinnes authored
      Userland should be able to trust the pid and uid of the sender of a
      signal if the si_code is SI_TKILL.
      
      Unfortunately, the kernel has historically allowed sigqueueinfo() to
      send any si_code at all (as long as it was negative - to distinguish it
      from kernel-generated signals like SIGILL etc), so it could spoof a
      SI_TKILL with incorrect siginfo values.
      
      Happily, it looks like glibc has always set si_code to the appropriate
      SI_QUEUE, so there are probably no actual user code that ever uses
      anything but the appropriate SI_QUEUE flag.
      
      So just tighten the check for si_code (we used to allow any negative
      value), and add a (one-time) warning in case there are binaries out
      there that might depend on using other si_code values.
      Signed-off-by: default avatarJulien Tinnes <jln@google.com>
      Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      da48524e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest · b52307ca
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest:
        ktest: Add STOP_TEST_AFTER to stop the test after a period of time
        ktest: Monitor kernel while running of user tests
        ktest: Fix bug where the test would not end after failure
        ktest: Add BISECT_FILES to run git bisect on paths
        ktest: Add BISECT_SKIP
        ktest: Add manual bisect
        ktest: Handle kernels before make oldnoconfig
        ktest: Start failure timeout on panic too
        ktest: Print logfile name on failure
      b52307ca
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · afd8c404
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (ads1015) Make gain and datarate configurable
        hwmon: (ads1015) Drop dynamic attribute group
        hwmon: Add support for Texas Instruments ADS1015
        hwmon: New driver for SMSC SCH5627
        hwmon: (abituguru*) Update my email address
        hwmon: (lm75) Speed up detection
        hwmon: (lm75) Add detection of the National Semiconductor LM75A
        hp_accel: Fix driver name
        Move lis3lv02d drivers to drivers/misc
        Move hp_accel to drivers/platform/x86
        Let Kconfig handle lis3lv02d dependencies
        hwmon: (sht15) Fix integer overflow in humidity calculation
        hwmon: (sht15) Spelling fix
        hwmon: (w83795) Document pin mapping
      afd8c404
    • Luck, Tony's avatar
      pstore: use mount option instead sysfs to tweak kmsg_bytes · 366f7e7a
      Luck, Tony authored
      /sys/fs is a somewhat strange way to tweak what could more
      obviously be tuned with a mount option.
      Suggested-by: default avatarChristoph Hellwig <hch@infradead.org>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      366f7e7a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · 10effcb5
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
        FS: lookup_mnt() is only used in the core fs routines now
        bfs: fix bitmap size argument to find_first_zero_bit()
        fs: Use BUG_ON(!mnt) at dentry_open().
        fs: devpts_pty_new() return -ENOMEM if dentry allocation failed
        nfs: lock() vs unlock() typo
        pstore: fix leaking ->i_private
        introduce sys_syncfs to sync a single file system
        Small typo fix...
        Filesystem: fifo: Fixed coding style issue.
        fs/inode: Fix kernel-doc format for inode_init_owner
        select: remove unused MAX_SELECT_SECONDS
        vfs: cleanup do_vfs_ioctl()
      10effcb5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · c3ca48f0
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        firewire: core: ignore link-active bit of new nodes, fix device recognition
        firewire: sbp2: revert obsolete 'fix stall with "Unsolicited response"'
        firewire: core: increase default SPLIT_TIMEOUT value
        firewire: ohci: Misleading kfree in ohci.c::pci_probe/remove
        firewire: ohci: omit IntEvent.busReset check rom AT queueing
        firewire: ohci: prevent starting of iso contexts with empty queue
        firewire: ohci: prevent iso completion callbacks after context stop
        firewire: core: rename some variables
        firewire: nosy: should work on Power Mac G4 PCI too
        firewire: core: fix card->reset_jiffies overflow
        firewire: cdev: remove unneeded reference
        firewire: cdev: always wait for outbound transactions to complete
        firewire: cdev: remove unneeded idr_find() from complete_transaction()
        firewire: ohci: log dead DMA contexts
      c3ca48f0