27 May, 2011

28 commits


26 May, 2011

12 commits

  • Choosing TMPFS_XATTR default N was switching off TMPFS_POSIX_ACL,
    even if it had been Y in oldconfig; and Linus reports that PulseAudio
    goes subtly wrong unless it can use ACLs on /dev/shm.

    Make TMPFS_POSIX_ACL select TMPFS_XATTR (and depend upon TMPFS),
    and move the TMPFS_POSIX_ACL entry before the TMPFS_XATTR entry,
    to avoid asking unnecessary questions then ignoring their answers.

    Signed-off-by: Hugh Dickins
    Signed-off-by: Linus Torvalds

    Eric Paris
     
  • Fix this:

    drivers/video/mb862xx/mb862xx-i2c.c: In function 'mb862xx_i2c_wait_event':
    drivers/video/mb862xx/mb862xx-i2c.c:25: error: implicit declaration of function 'udelay'

    caused by commit f8a6b1f44833 ("video: mb862xx: add support for
    controller's I2C bus adapter").

    Signed-off-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Stephen Rothwell
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd:
    net: fix get_net_ns_by_fd for !CONFIG_NET_NS
    ns proc: Return -ENOENT for a nonexistent /proc/self/ns/ entry.
    ns: Declare sys_setns in syscalls.h
    net: Allow setting the network namespace by fd
    ns proc: Add support for the ipc namespace
    ns proc: Add support for the uts namespace
    ns proc: Add support for the network namespace.
    ns: Introduce the setns syscall
    ns: proc files for namespace naming policy.

    Linus Torvalds
     
  • Commit a71ae47a2cbf ("slub: Fix double bit unlock in debug mode")
    removed the only goto to this label, resulting in

    mm/slub.c: In function '__slab_alloc':
    mm/slub.c:1834: warning: label 'unlock_out' defined but not used

    fixed trivially by the removal of the label itself too.

    Reported-by: Stephen Rothwell
    Cc: Christoph Lameter
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits)
    bonding: documentation and code cleanup for resend_igmp
    bonding: prevent deadlock on slave store with alb mode (v3)
    net: hold rtnl again in dump callbacks
    Add Fujitsu 1000base-SX PCI ID to tg3
    bnx2x: protect sequence increment with mutex
    sch_sfq: fix peek() implementation
    isdn: netjet - blacklist Digium TDM400P
    via-velocity: don't annotate MAC registers as packed
    xen: netfront: hold RTNL when updating features.
    sctp: fix memory leak of the ASCONF queue when free asoc
    net: make dev_disable_lro use physical device if passed a vlan dev (v2)
    net: move is_vlan_dev into public header file (v2)
    bug.h: Fix build with CONFIG_PRINTK disabled.
    wireless: fix fatal kernel-doc error + warning in mac80211.h
    wireless: fix cfg80211.h new kernel-doc warnings
    iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
    dst: catch uninitialized metrics
    be2net: hash key for rss-config cmd not set
    bridge: initialize fake_rtable metrics
    net: fix __dst_destroy_metrics_generic()
    ...

    Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (75 commits)
    mmc: core: eMMC bus width may not work on all platforms
    mmc: sdhci: Auto-CMD23 fixes.
    mmc: sdhci: Auto-CMD23 support.
    mmc: core: Block CMD23 support for UHS104/SDXC cards.
    mmc: sdhci: Implement MMC_CAP_CMD23 for SDHCI.
    mmc: core: Use CMD23 for multiblock transfers when we can.
    mmc: quirks: Add/remove quirks conditional support.
    mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver
    mmc: sdhci-pxa: Add quirks for DMA/ADMA to match h/w
    mmc: core: duplicated trial with same freq in mmc_rescan_try_freq()
    mmc: core: add support for eMMC Dual Data Rate
    mmc: core: eMMC signal voltage does not use CMD11
    mmc: sdhci-pxa: add platform code for UHS signaling
    mmc: sdhci: add hooks for setting UHS in platform specific code
    mmc: core: clear MMC_PM_KEEP_POWER flag on resume
    mmc: dw_mmc: fixed wrong regulator_enable in suspend/resume
    mmc: sdhi: allow powering down controller with no card inserted
    mmc: tmio: runtime suspend the controller, where possible
    mmc: sdhi: support up to 3 interrupt sources
    mmc: sdhi: print physical base address and clock rate
    ...

    Linus Torvalds
     
  • * 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
    xconfig: merge code path to conf_write()
    kconfig: do not record timestamp in .config
    gconfig: Hide unused left treeview when start up the interface
    gconfig: enable rules hint for main treeviews
    MAINTAINERS: Update KCONFIG entry
    kconfig-language: add to hints
    kconfig: Document the new "visible if" syntax
    kconfig: quiet commands when V=0
    kconfig: change update-po-config to reflect new layout of arch/um
    kconfig: make update-po-config work in KBUILD_OUTPUT
    kconfig: rearrange clean-files
    kconfig: change gconf to modify hostprogs-y like nconf and mconf
    kconfig: change qconf to modify hostprogs-y like nconf and mconf
    kconfig: only build kxgettext when needed
    nconfig: Silence unused return values from wattrset
    kconfig: Do not record timestamp in auto.conf and autoconf.h
    kconfig: get rid of unused flags
    kconfig: allow multiple inclusion of the same file
    kconfig: Avoid buffer underrun in choice input

    Linus Torvalds
     
  • * 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc:
    signal: sys_pause() should check signal_pending()
    ptrace: ptrace_resume() shouldn't wake up !TASK_TRACED thread

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: New driver for the SMSC EMC6W201
    hwmon: (abituguru) Depend on DMI
    hwmon: (it87) Use request_muxed_region
    hwmon: (sch5627) Trigger Vbat measurements
    hwmon: (sch5627) Add sch5627_send_cmd function
    i8k: Integrate with the hwmon subsystem
    hwmon: (max6650) Properly support the MAX6650
    hwmon: (max6650) Drop device detection
    Move ACPI power meter driver to hwmon
    hwmon: (f71882fg) Add support for F71808A
    hwmon: (f71882fg) Split has_beep in fan_has_beep and temp_has_beep
    hwmon: (asc7621) Drop duplicate dependency
    hwmon: (jc42) Change detection class
    hwmon: Add driver for AMD family 15h processor power information
    hwmon: (k10temp) Add support for Fam15h (Bulldozer)
    hwmon: Use helper functions to set and get driver data
    i8k: Avoid lahf in 64-bit code

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (26 commits)
    arch/tile: prefer "tilepro" as the name of the 32-bit architecture
    compat: include aio_abi.h for aio_context_t
    arch/tile: cleanups for tilegx compat mode
    arch/tile: allocate PCI IRQs later in boot
    arch/tile: support signal "exception-trace" hook
    arch/tile: use better definitions of xchg() and cmpxchg()
    include/linux/compat.h: coding-style fixes
    tile: add an RTC driver for the Tilera hypervisor
    arch/tile: finish enabling support for TILE-Gx 64-bit chip
    compat: fixes to allow working with tile arch
    arch/tile: update defconfig file to something more useful
    tile: do_hardwall_trap: do not play with task->sighand
    tile: replace mm->cpu_vm_mask with mm_cpumask()
    tile,mn10300: add device parameter to dma_cache_sync()
    audit: support the "standard"
    arch/tile: clarify flush_buffer()/finv_buffer() function names
    arch/tile: kernel-related cleanups from removing static page size
    arch/tile: various header improvements for building drivers
    arch/tile: disable GX prefetcher during cache flush
    arch/tile: tolerate disabling CONFIG_BLK_DEV_INITRD
    ...

    Linus Torvalds
     
  • * 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
    mach-ux500: voltage domain regulators for DB8500
    cpufreq: make DB8500 cpufreq driver compile
    cpufreq: update DB8500 cpufreq driver
    mach-ux500: move CPUfreq driver to cpufreq subsystem
    mfd: add DB5500 PRCMU driver
    mfd: update DB8500 PRCMU driver
    mach-ux500: move the DB8500 PRCMU driver to MFD
    mach-ux500: make PRCMU base address dynamic
    mach-ux500: rename PRCMU driver per SoC
    mach-ux500: update ASIC version detection
    mach-ux500: update SoC and board IRQ handling
    mach-ux500: update the DB5500 register file
    mach-ux500: update the DB8500 register file

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (37 commits)
    Blackfin: use new common PERCPU_INPUT define
    MAINTAINERS: Fix Analog Devices mailinglist address
    Blackfin: boards: update ASoC resources after machine driver overhaul
    Blackfin: work around anomaly 05000480
    Blackfin: fix addr type with bfin_write_{or,and} helpers
    Blackfin: convert /proc/sram to seq_file
    Blackfin: switch /proc/gpio to seq_file
    Blackfin: fix indentation with bfin_read() helper
    Blackfin: convert old cpumask API to new one
    Blackfin: don't touch task->cpus_allowed directly
    Blackfin: don't touch cpu_possible_map and cpu_present_map directly
    Blackfin: bf548-ezkit/bf561-ezkit: update nor flash layout
    Blackfin: initial perf_event support
    Blackfin: update anomaly lists to latest public info
    Blackfin: use on-chip reset func with newer parts
    Blackfin: bf533-stamp/bf537-stamp: drop ad1980 from defconfigs
    Blackfin: optimize MMR reads during startup a bit
    Blackfin: bf537: demux port H mask A and emac rx ints
    Blackfin: bf537: fix excessive gpio int demuxing
    Blackfin: bf54x: drop unused pm gpio handling
    ...

    Linus Torvalds