1. 04 Jul, 2013 18 commits
    • Linus Torvalds's avatar
      Merge branch 'kconfig-diet' from Dave Hansen · e61aca51
      Linus Torvalds authored
      Merge Kconfig menu diet patches from Dave Hansen:
       "I think the "Kernel Hacking" menu has gotten a bit out of hand.  It is
        over 120 lines long on my system with everything enabled and options
        are scattered around it haphazardly.
      
              http://sr71.net/~dave/linux/kconfig-horror.png
      
        Let's try to introduce some sanity.  This set takes that 120 lines
        down to 55 and makes it vastly easier to find some things.  It's a
        start.
      
        This set stands on its own, but there is plenty of room for follow-up
        patches.  The arch-specific debug options still end up getting stuck
        in the top-level "kernel hacking" menu.  OPTIMIZE_INLINING, for
        instance, could obviously go in to the "compiler options" menu, but
        the fact that it is defined in arch/ in a separate Kconfig file keeps
        it on its own for the moment.
      
        The Signed-off-by's in here look funky.  I changed employers while
        working on this set, so I have signoffs from both email addresses"
      
      * emailed patches from Dave Hansen <dave@sr71.net>:
        hang and lockup detection menu
        kconfig: consolidate printk options
        group locking debugging options
        consolidate compilation option configs
        consolidate runtime testing configs
        order memory debugging Kconfig options
        consolidate per-arch stack overflow debugging options
      e61aca51
    • Dave Hansen's avatar
      hang and lockup detection menu · 92aef8fb
      Dave Hansen authored
      The hard/softlockup and hung-task entries take up 6 lines
      of screen real-estate when enabled.  I bet folks don't
      mess with these _that_ often, so move them in a group
      down a level.
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      92aef8fb
    • Dave Hansen's avatar
      kconfig: consolidate printk options · 604ff0dc
      Dave Hansen authored
      Same deal, take the printk-related things and hide them in a menu.
      This takes another 4 items out of the top-level menu.
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      604ff0dc
    • Dave Hansen's avatar
      group locking debugging options · 9eade16b
      Dave Hansen authored
      Original posting:
      
      	http://lkml.kernel.org/r/20121214184208.D9E5804D@kernel.stglabs.ibm.com
      
      There are quite a few of these, and we want to make sure that
      there is one-stop-shopping for lock debugging.
      Signed-off-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9eade16b
    • Dave Hansen's avatar
      consolidate compilation option configs · 6dfc0665
      Dave Hansen authored
      Original Post:
      
      	http://lkml.kernel.org/r/20121214184207.6E00DDEC@kernel.stglabs.ibm.com
      
      Again, trying to come up with some common themes of the stuff in
      the kernel hacking menu...  There are quite a few options to
      tweak compilation in some way, or perform extra compile-time
      checks.  Give them their own menu.
      
      The diff here looks a bit funny... makes it look like I'm
      moving debugfs even though I'm actually moving the options on
      either side of it.
      Signed-off-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6dfc0665
    • Dave Hansen's avatar
      consolidate runtime testing configs · 881c5149
      Dave Hansen authored
      Original posting:
      
      	http://lkml.kernel.org/r/20121214184206.FC11422F@kernel.stglabs.ibm.com
      
      These runtime tests are great, except that there are a lot of them,
      and they are very rarely needed.  Give them their own menu so that
      only the folks who need them will have to go looking for them.
      
      Note that there are some other runtime tests that are not in here,
      like for RCU or locking.  This menu should only be used for tests
      that do not have a more appropriate home.
      Signed-off-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      881c5149
    • Dave Hansen's avatar
      order memory debugging Kconfig options · 0610c8a8
      Dave Hansen authored
      Original posting:
      
      	http://lkml.kernel.org/r/20121214184203.37E6C724@kernel.stglabs.ibm.com
      
      There are a *LOT* of memory debugging options.  They are just scattered
      all over the "Kernel Hacking" menu.  Sure, "memory debugging" is a very
      vague term and it's going to be hard to make absolute rules about what
      goes in here, but this has to be better than what we had before.
      
      This does, however, leave out the architecture-specific memory
      debugging options (like x86's DEBUG_SET_MODULE_RONX).  There would need
      to be some substantial changes to move those in here.  Kconfig can not
      easily mix arch-specific and generic options together: it really
      requires a file per-architecture, and I think having an
      arch/foo/Kconfig.debug-memory might be taking things a bit too far
      Signed-off-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0610c8a8
    • Dave Hansen's avatar
      consolidate per-arch stack overflow debugging options · d1a1dc0b
      Dave Hansen authored
      Original posting:
      
      	http://lkml.kernel.org/r/20121214184202.F54094D9@kernel.stglabs.ibm.com
      
      Several architectures have similar stack debugging config options.
      They all pretty much do the same thing, some with slightly
      differing help text.
      
      This patch changes the architectures to instead enable a Kconfig
      boolean, and then use that boolean in the generic Kconfig.debug
      to present the actual menu option.  This removes a bunch of
      duplication and adds consistency across arches.
      Signed-off-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
      Reviewed-by: default avatarH. Peter Anvin <hpa@zytor.com>
      Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Acked-by: Chris Metcalf <cmetcalf@tilera.com> [for tile]
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d1a1dc0b
    • Linus Torvalds's avatar
      Merge branch 'hpfs' from Mikulas Patocka · da67db4e
      Linus Torvalds authored
      Merge hpfs patches from Mikulas Patocka.
      
      * emailed patches from Mikulas Patocka <mpatocka@artax.karlin.mff.cuni.cz>:
        hpfs: implement prefetch to improve performance
        hpfs: use mpage
        hpfs: better test for errors
      da67db4e
    • Mikulas Patocka's avatar
      hpfs: implement prefetch to improve performance · 275f495d
      Mikulas Patocka authored
      This patch implements prefetch to improve performance.  It helps mostly
      when scanning the bitmaps to calculate free space.
      Signed-off-by: default avatarMikulas Patocka <mpatocka@artax.karlin.mff.cuni.cz>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      275f495d
    • Mikulas Patocka's avatar
      hpfs: use mpage · a0c1b759
      Mikulas Patocka authored
      Use the mpage interface to improve performance.
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a0c1b759
    • Mikulas Patocka's avatar
      hpfs: better test for errors · 3ebacb05
      Mikulas Patocka authored
      The test if bitmap access is out of bound could errorneously pass if the
      device size is divisible by 16384 sectors and we are asking for one bitmap
      after the end.
      
      Check for invalid size in the superblock. Invalid size could cause integer
      overflows in the rest of the code.
      Signed-off-by: default avatarMikulas Patocka <mpatocka@artax.karlin.mff.cuni.cz>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3ebacb05
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 65b97fb7
      Linus Torvalds authored
      Pull powerpc updates from Ben Herrenschmidt:
       "This is the powerpc changes for the 3.11 merge window.  In addition to
        the usual bug fixes and small updates, the main highlights are:
      
         - Support for transparent huge pages by Aneesh Kumar for 64-bit
           server processors.  This allows the use of 16M pages as transparent
           huge pages on kernels compiled with a 64K base page size.
      
         - Base VFIO support for KVM on power by Alexey Kardashevskiy
      
         - Wiring up of our nvram to the pstore infrastructure, including
           putting compressed oopses in there by Aruna Balakrishnaiah
      
         - Move, rework and improve our "EEH" (basically PCI error handling
           and recovery) infrastructure.  It is no longer specific to pseries
           but is now usable by the new "powernv" platform as well (no
           hypervisor) by Gavin Shan.
      
         - I fixed some bugs in our math-emu instruction decoding and made it
           usable to emulate some optional FP instructions on processors with
           hard FP that lack them (such as fsqrt on Freescale embedded
           processors).
      
         - Support for Power8 "Event Based Branch" facility by Michael
           Ellerman.  This facility allows what is basically "userspace
           interrupts" for performance monitor events.
      
         - A bunch of Transactional Memory vs.  Signals bug fixes and HW
           breakpoint/watchpoint fixes by Michael Neuling.
      
        And more ...  I appologize in advance if I've failed to highlight
        something that somebody deemed worth it."
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)
        pstore: Add hsize argument in write_buf call of pstore_ftrace_call
        powerpc/fsl: add MPIC timer wakeup support
        powerpc/mpic: create mpic subsystem object
        powerpc/mpic: add global timer support
        powerpc/mpic: add irq_set_wake support
        powerpc/85xx: enable coreint for all the 64bit boards
        powerpc/8xx: Erroneous double irq_eoi() on CPM IRQ in MPC8xx
        powerpc/fsl: Enable CONFIG_E1000E in mpc85xx_smp_defconfig
        powerpc/mpic: Add get_version API both for internal and external use
        powerpc: Handle both new style and old style reserve maps
        powerpc/hw_brk: Fix off by one error when validating DAWR region end
        powerpc/pseries: Support compression of oops text via pstore
        powerpc/pseries: Re-organise the oops compression code
        pstore: Pass header size in the pstore write callback
        powerpc/powernv: Fix iommu initialization again
        powerpc/pseries: Inform the hypervisor we are using EBB regs
        powerpc/perf: Add power8 EBB support
        powerpc/perf: Core EBB support for 64-bit book3s
        powerpc/perf: Drop MMCRA from thread_struct
        powerpc/perf: Don't enable if we have zero events
        ...
      65b97fb7
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · ddcf6600
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
       - new driver to support GMT G762/G763 pwm fan controllers
       - add support for DS1631, DS1721, and DS1731 to ds1621 driver
       - remove detect function from ds1621 driver as unreliable
       - bug fixes in nct6775, iio_hwmon, and adm1021 drivers
       - remove redundant platform_set_drvdata in various drivers
       - add device tree support to ina2xx driver
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (ds1621) Fix temperature rounding operations
        hwmon: (nct6775) Drop unsupported fan alarm attributes for NCT6775
        hwmon: (nct6775) Fix temperature alarm attributes
        Add support for GMT G762/G763 PWM fan controllers
        hwmon: (ina2xx) Add device tree support to pass the shunt resistor
        hwmon: (ds1621) Update documentation
        hwmon: (ds1621) Add DS1731 chip support to ds1621 driver
        hwmon: (iio_hwmon) add alias table
        hwmon: (adm1021) Do not create min sysfs attributes for LM84
        hwmon: (ds1621) Remove detect function
        hwmon: (ds1621) Add ds1631 chip support to ds1621 driver and documentation
        hwmon: (ds1621) Add ds1721 update interval sysfs attribute
        hwmon: (ds1621) Add ds1721 chip support
        hwmon: (w83627ehf) Remove redundant platform_set_drvdata()
        hwmon: (ntc_thermistor) Remove redundant platform_set_drvdata()
        hwmon: (i5k_amb) Remove redundant platform_set_drvdata()
        hwmon: (coretemp) Remove redundant platform_set_drvdata()
        hwmon: (abituguru3) Remove redundant platform_set_drvdata()
      ddcf6600
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds · c16bfeb2
      Linus Torvalds authored
      Pull LED subsystem updates from Bryan Wu:
       - lp55xx device tree updates
       - mc13xxx driver updates
       - some clean up
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
        leds: mc13783: Fix "uninitialized variable" warning
        leds: Convert led class driver from legacy pm ops to dev_pm_ops
        leds: leds-mc13783: Add MC13892 LED support
        leds: leds-mc13783: Prepare driver to support MC13892 LEDs
        leds: renesas-tpu: cleanup a small type issue
        leds: use platform_{get,set}_drvdata()
        leds: leds-gpio: Let device core handle pinctrl
        leds: lp5562: Properly setup of_device_id table
        leds: lp5523: Properly setup of_device_id table
        leds: lp5521: Properly setup of_device_id table
        leds: lp5562: support the device tree feature
        leds: lp55xx: support dynamic channel settings in the device tree structure
        leds: leds-ns2: remove unnecessary platform_set_drvdata()
        leds: leds-mc13783: remove unnecessary platform_set_drvdata()
        leds: leds-gpio: remove unnecessary platform_set_drvdata()
        leds: atmel-pwm: remove unnecessary platform_set_drvdata()
        leds: lp55xx: add support for Device Tree bindings
      c16bfeb2
    • Linus Torvalds's avatar
      Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 1286da8b
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "A relative calm release at this time with a flat diffstat.  The only
        significant change in the ALSA core side is the support for more than
        32 card instances, configurable via kconfig.  Other than that, in both
        ASoC and other parts, mostly some improvements and fixes on the driver
        side.
      
         - hda: More quirks for ALC269-variants on Dell & co, VIA codec fixes
         - hda: Haswell HDMI audio fixes, runtime PM improvements
         - hda: Intel BayTrail support, ALC5505 DSP support
         - es1968: MediaForte M56VAP support
         - usb-audio: Improved support for Yamaha/Roland devices
         - usb-audio: M2Tech hiFace, Audio Advantage Micro II support
         - hdspm: wordclock fixes
         - ASoC: Pending fixes for WM8962
         - ASoC: Cleanups and fixes for Blackfin, SGTL5000 and UX500
         - ASoC: Generalisation of the Bluetooth and HDMI stub drivers
         - ASoC: SSM2518 and RT5640 codec drivers.
         - ASoC: Tegra CPUs with RT5640 machine driver
         - ASoC: AC'97 refactoring bug fixes
         - ASoC: ADAU1701 driver fixes
         - Clean up of *_set_drvdata() in a wide range of drivers"
      
      * tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (284 commits)
        ALSA: vmaster: Fix the regression of missing vmaster hook call
        ALSA: hda - Add Dell SSID to support Headset Mic recording
        ASoC: adau1701: remove control_data assignment
        ASoC: adau1701: more direct regmap usage
        ASoC: ac97: fixup multi-platform AC'97 module build failure
        ASoC: pxa2xx: fixup multi-platform AC'97 build failures
        ASoC: tegra20-ac97: Remove unused variable
        ASoC: tegra20-ac97: Remove duplicate error message
        ALSA: usb-audio: Add Audio Advantage Micro II
        ASoC: tas5086: fix Mid-Z implementation
        ASoC: tas5086: fix TAS5086_CLOCK_CONTROL register size
        ALSA: Replace the magic number 44 with const
        ALSA: hda - Fix the max length of control name in generic parser
        ALSA: hda - Guess what, it's two more Dell headset mic quirks
        ALSA: hda - Yet another Dell headset mic quirk
        ALSA: hda - Add support for ALC5505 DSP power-save mode
        ASoC: mfld: Remove unused variable
        ALSA: usb-audio: add quirks for Roland QUAD/OCTO-CAPTURE
        ALSA: usb-audio: claim autodetected PCM interfaces all at once
        ALSA: usb-audio: remove superfluous Roland quirks
        ...
      1286da8b
    • Linus Torvalds's avatar
      Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 9e220385
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
       "Overview of changes:
      
         - The rest of maintainer email address updates.
      
         - Some core updates - more robust default behavior for port
           multipliers, better error reporting for SG_IO commands, and a way
           to better work around now ancient and probably pretty rare PATA ->
           SATA bridges with ATAPI devices.
      
         - sata_rcar stabilization.
      
         - Some hardware PCI ID additions and one-off low level driver
           updates."
      
      * 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (22 commits)
        AHCI: use ATA_BUSY
        libata-zpodd: must use ata_tf_init()
        ahci: AHCI-mode SATA patch for Intel Coleto Creek DeviceIDs
        ata_piix: IDE-mode SATA patch for Intel Coleto Creek DeviceIDs
        libata: cleanup SAT error translation
        ahci: sata: add support for exynos5440 sata
        libata: skip SRST for all SIMG [34]7x port-multipliers
        ahci: remove pmp link online check in FBS EH
        sata highbank: add bit-banged SGPIO driver support
        ahci: make ahci_transmit_led_message into a function pointer
        sata_rcar: fix compilation warning in sata_rcar_thaw()
        sata_highbank: increase retry count but shorten duration for Calxeda controller
        ata: use pci_get_drvdata()
        ipr: qc_fill_rtf() method should not store alternate status register
        sata_rcar: add 'base' local variable to some functions
        sata_rcar: correct 'sata_rcar_sht'
        sata_rcar: kill superfluous code in sata_rcar_bmdma_fill_sg()
        libata: do not limit R-Car SATA driver to shmobile
        ata: use platform_{get,set}_drvdata()
        AHCI: Make distinct names for ports in /proc/interrupts
        ...
      9e220385
    • Linus Torvalds's avatar
      Merge branch 'akpm' (updates from Andrew Morton) · 7f0ef026
      Linus Torvalds authored
      Merge first patch-bomb from Andrew Morton:
       - various misc bits
       - I'm been patchmonkeying ocfs2 for a while, as Joel and Mark have been
         distracted.  There has been quite a bit of activity.
       - About half the MM queue
       - Some backlight bits
       - Various lib/ updates
       - checkpatch updates
       - zillions more little rtc patches
       - ptrace
       - signals
       - exec
       - procfs
       - rapidio
       - nbd
       - aoe
       - pps
       - memstick
       - tools/testing/selftests updates
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (445 commits)
        tools/testing/selftests: don't assume the x bit is set on scripts
        selftests: add .gitignore for kcmp
        selftests: fix clean target in kcmp Makefile
        selftests: add .gitignore for vm
        selftests: add hugetlbfstest
        self-test: fix make clean
        selftests: exit 1 on failure
        kernel/resource.c: remove the unneeded assignment in function __find_resource
        aio: fix wrong comment in aio_complete()
        drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
        drivers/memstick/host/r592.c: convert to module_pci_driver
        drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
        pps-gpio: add device-tree binding and support
        drivers/pps/clients/pps-gpio.c: convert to module_platform_driver
        drivers/pps/clients/pps-gpio.c: convert to devm_* helpers
        drivers/parport/share.c: use kzalloc
        Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
        aoe: update internal version number to v83
        aoe: update copyright date
        aoe: perform I/O completions in parallel
        ...
      7f0ef026
  2. 03 Jul, 2013 22 commits