1. 06 Aug, 2010 5 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 132a4edb
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        sata_fsl,mv,nv: prepare for NCQ command completion update
        ata: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
        libata: more PCI IDs for jmicron controllers
        ata_piix: fix locking around SIDPR access
        [libata] update blacklist for new hyphenated pattern ranges (v2)
        libata: allow hyphenated pattern ranges
        ata_generic: drop hard coded DMA force logic for CENATEK
        [libata] ahci: Fix warning: comparison between 'enum <anonymous>' and 'enum <anonymous>'
        [libata] add ATA_CMD_DSM to ata_get_cmd_descript
        [libata] Add Samsung PATA controller driver, pata_samsung_cf
        [libata] Add 460EX on-chip SATA driver, sata_dwc_460ex
        libata: reduce blacklist size even more (v2)
        libata: reduce blacklist size (v2)
        libata: glob_match for ata_device_blacklist (v2)
        ahci_platform: Remove unneeded ahci_driver.probe assignment
        ahci_platform: Provide for vendor specific init
      132a4edb
    • Alan Stern's avatar
      SCSI: remove fake "address-of" expression · e6da54d8
      Alan Stern authored
      Fake "address-of" expressions that evaluate to NULL generally confuse
      readers and can provoke compiler warnings.  This patch (as1411) removes
      one such fake expression, using an "#ifdef" in its place.
      Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e6da54d8
    • Sam Ravnborg's avatar
      kconfig: fix make oldconfig · 14828349
      Sam Ravnborg authored
      Linus wrote:
       This seems to make "make oldconfig" a _lot_ more verbose than it
       used to be. In a very annoying way.
      
       I just did a quick git bisect. It's introduced by commit 4062f1a4
       ("kconfig: use long options in conf") by Sam Ravnborg. Apparently that
       thing is totally buggy, and doesn't just change the option names, but
       actively breaks them.
      
      The old behaviour (from years ago) were reintroduced by accident.  Fix
      this so we are back to the version that are silent if there is nothing
      to ask about.
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Reviewed-by: default avatarMichal Marek <mmarek@suse.cz>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      14828349
    • David Howells's avatar
      Fix init ordering of /dev/console vs callers of modprobe · 31d1d48e
      David Howells authored
      Make /dev/console get initialised before any initialisation routine that
      invokes modprobe because if modprobe fails, it's going to want to open
      /dev/console, presumably to write an error message to.
      
      The problem with that is that if the /dev/console driver is not yet
      initialised, the chardev handler will call request_module() to invoke
      modprobe, which will fail, because we never compile /dev/console as a
      module.
      
      This will lead to a modprobe loop, showing the following in the kernel
      log:
      
      	request_module: runaway loop modprobe char-major-5-1
      	request_module: runaway loop modprobe char-major-5-1
      	request_module: runaway loop modprobe char-major-5-1
      	request_module: runaway loop modprobe char-major-5-1
      	request_module: runaway loop modprobe char-major-5-1
      
      This can happen, for example, when the built in md5 module can't find
      the built in cryptomgr module (because the latter fails to initialise).
      The md5 module comes before the call to tty_init(), presumably because
      'crypto' comes before 'drivers' alphabetically.
      
      Fix this by calling tty_init() from chrdev_init().
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      31d1d48e
    • David Howells's avatar
      KEYS: request_key() should return -ENOKEY if the constructed key is negative · 1e456a12
      David Howells authored
      request_key() should return -ENOKEY if the key it constructs has been
      negatively instantiated.
      
      Without this, request_key() can return an unusable key to its caller,
      and if the caller then does key_validate() that won't catch the problem.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1e456a12
  2. 05 Aug, 2010 35 commits