08 Nov, 2011

2 commits

  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
    cpuidle: Single/Global registration of idle states
    cpuidle: Split cpuidle_state structure and move per-cpu statistics fields
    cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev->prepare()
    cpuidle: Move dev->last_residency update to driver enter routine; remove dev->last_state
    ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning
    ACPI: Export FADT pm_profile integer value to userspace
    thermal: Prevent polling from happening during system suspend
    ACPI: Drop ACPI_NO_HARDWARE_INIT
    ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()
    PNPACPI: Simplify disabled resource registration
    ACPI: Fix possible recursive locking in hwregs.c
    ACPI: use kstrdup()
    mrst pmu: update comment
    tools/power turbostat: less verbose debugging

    Linus Torvalds
     
  • * git://git.infradead.org/mtd-2.6: (226 commits)
    mtd: tests: annotate as DANGEROUS in Kconfig
    mtd: tests: don't use mtd0 as a default
    mtd: clean up usage of MTD_DOCPROBE_ADDRESS
    jffs2: add compr=lzo and compr=zlib options
    jffs2: implement mount option parsing and compression overriding
    mtd: nand: initialize ops.mode
    mtd: provide an alias for the redboot module name
    mtd: m25p80: don't probe device which has status of 'disabled'
    mtd: nand_h1900 never worked
    mtd: Add DiskOnChip G3 support
    mtd: m25p80: add EON flash EN25Q32B into spi flash id table
    mtd: mark block device queue as non-rotational
    mtd: r852: make r852_pm_ops static
    mtd: m25p80: add support for at25df321a spi data flash
    mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
    mtd: nand: switch `check_pattern()' to standard `memcmp()'
    mtd: nand: invalidate cache on unaligned reads
    mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
    mtd: nand: wait to set BBT version
    mtd: nand: scrub BBT on ECC errors
    ...

    Fix up trivial conflicts:
    - arch/arm/mach-at91/board-usb-a9260.c
    Merged into board-usb-a926x.c
    - drivers/mtd/maps/lantiq-flash.c
    add_mtd_partitions -> mtd_device_register vs changed to use
    mtd_device_parse_register.

    Linus Torvalds
     

07 Nov, 2011

4 commits

  • There are a lot userspace approaches to detect the usage of the
    platform (laptop, workstation, server, ...) and adjust kernel tunables
    accordingly (io/process scheduler, power management, ...).

    These approaches need constant maintaining and are ugly to implement
    (detect PCMCIA controller -> laptop,
    does not work on recent systems anymore, ...)
    On ACPI systems there is an easy and reliable way (if implemented
    in BIOS and most recent platforms have this value set).
    -> export it to userspace.

    Signed-off-by: Thomas Renninger
    Acked-by: Rafael J. Wysocki
    Signed-off-by: Len Brown

    Thomas Renninger
     
  • * git://github.com/rustyrussell/linux:
    module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
    module: Enable dynamic debugging regardless of taint

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
    powerpc/p3060qds: Add support for P3060QDS board
    powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX
    powerpc/85xx: Make kexec to interate over online cpus
    powerpc/fsl_booke: Fix comment in head_fsl_booke.S
    powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices
    powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver
    powerpc/85xx: Add 'fsl,pq3-gpio' compatiable for GPIO driver
    powerpc/86xx: Correct Gianfar support for GE boards
    powerpc/cpm: Clear muram before it is in use.
    drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager
    powerpc/fsl_msi: add support for "msi-address-64" property
    powerpc/85xx: Setup secondary cores PIR with hard SMP id
    powerpc/fsl-booke: Fix settlbcam for 64-bit
    powerpc/85xx: Adding DCSR node to dtsi device trees
    powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards
    powerpc/85xx: fix PHYS_64BIT selection for P1022DS
    powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map
    powerpc: respect mem= setting for early memory limit setup
    powerpc: Update corenet64_smp_defconfig
    powerpc: Update mpc85xx/corenet 32-bit defconfigs
    ...

    Fix up trivial conflicts in:
    - arch/powerpc/configs/40x/hcu4_defconfig
    removed stale file, edited elsewhere
    - arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:
    added opal and gelic drivers vs added ePAPR driver
    - drivers/tty/serial/8250.c
    moved UPIO_TSI to powerpc vs removed UPIO_DWAPB support

    Linus Torvalds
     
  • Use of the GPL or a compatible licence doesn't necessarily make the code
    any good. We already consider staging modules to be suspect, and this
    should also be true for out-of-tree modules which may receive very
    little review.

    Signed-off-by: Ben Hutchings
    Reviewed-by: Dave Jones
    Acked-by: Greg Kroah-Hartman
    Signed-off-by: Rusty Russell (patched oops-tracing.txt)

    Ben Hutchings
     

06 Nov, 2011

2 commits


05 Nov, 2011

11 commits

  • * 'for-3.2/drivers' of git://git.kernel.dk/linux-block: (30 commits)
    virtio-blk: use ida to allocate disk index
    hpsa: add small delay when using PCI Power Management to reset for kump
    cciss: add small delay when using PCI Power Management to reset for kump
    xen/blkback: Fix two races in the handling of barrier requests.
    xen/blkback: Check for proper operation.
    xen/blkback: Fix the inhibition to map pages when discarding sector ranges.
    xen/blkback: Report VBD_WSECT (wr_sect) properly.
    xen/blkback: Support 'feature-barrier' aka old-style BARRIER requests.
    xen-blkfront: plug device number leak in xlblk_init() error path
    xen-blkfront: If no barrier or flush is supported, use invalid operation.
    xen-blkback: use kzalloc() in favor of kmalloc()+memset()
    xen-blkback: fixed indentation and comments
    xen-blkfront: fix a deadlock while handling discard response
    xen-blkfront: Handle discard requests.
    xen-blkback: Implement discard requests ('feature-discard')
    xen-blkfront: add BLKIF_OP_DISCARD and discard request struct
    drivers/block/loop.c: remove unnecessary bdev argument from loop_clr_fd()
    drivers/block/loop.c: emit uevent on auto release
    drivers/block/cpqarray.c: use pci_dev->revision
    loop: always allow userspace partitions and optionally support automatic scanning
    ...

    Fic up trivial header file includsion conflict in drivers/block/loop.c

    Linus Torvalds
     
  • Originally, the runtime PM core would send an idle notification
    whenever a suspend attempt failed. The idle callback routine could
    then schedule a delayed suspend for some time later.

    However this behavior was changed by commit
    f71648d73c1650b8b4aceb3856bebbde6daa3b86 (PM / Runtime: Remove idle
    notification after failing suspend). No notifications were sent, and
    there was no clear mechanism to retry failed suspends.

    This caused problems for the usbhid driver, because it fails
    autosuspend attempts as long as a key is being held down. Therefore
    this patch (as1492) adds a mechanism for retrying failed
    autosuspends. If the callback routine updates the last_busy field so
    that the next autosuspend expiration time is in the future, the
    autosuspend will automatically be rescheduled.

    Signed-off-by: Alan Stern
    Tested-by: Henrik Rydberg
    Cc:
    Signed-off-by: Rafael J. Wysocki

    Alan Stern
     
  • This patch:
    * Substitutes some obsolete references to kernel/power/process.c by
    kernel/freezer.c.
    * Mentions kernel/freezer.c as being part of the "freezer" code along
    with the rest of the files.
    * Fixes a trivial typo.

    Signed-off-by: Srivatsa S. Bhat
    Signed-off-by: Rafael J. Wysocki

    Srivatsa S. Bhat
     
  • Remove 'as' for as is no longer supported, and we can not use
    'elevator=as' any more.

    Signed-off-by: Wang Sheng-Hui
    Signed-off-by: Randy Dunlap
    Cc: Jens Axboe
    Signed-off-by: Linus Torvalds

    Wang Sheng-Hui
     
  • Fix a typo (duplicated word) in Documentation/leds/leds-class.txt

    Signed-off-by: Bryan Wu
    Acked-by: Richard Purdie
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Bryan Wu
     
  • Removed the email for support and fixes for orphaned ip2 driver.

    Signed-off-by: Marcos Paulo de Souza
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Marcos Paulo Souza
     
  • Removed the reference of Roman Zippel, last maintainer, of orphaned
    HFS filesystem.

    Signed-off-by: Marcos Paulo de Souza
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Marcos Paulo de Souza
     
  • After commit 38829dc9d7b4 ("Documentation/CodingStyle: flesh out if-else
    examples") highlight that if _only_one_ branch of a conditional
    statement is a single statement, then braces are to be used on both
    branches.

    Signed-off-by: Antonio Ospite
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Antonio Ospite
     
  • Fixes the path to find the source files of the inotify subsystem.

    Signed-off-by: Marcos Paulo de Souza
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Marcos Paulo de Souza
     
  • This adds minor grammatical fixes to the description of the keys in the
    thinkpad-acpi documentation.

    Signed-off-by: Kumar Appaiah
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Kumar Appaiah
     
  • - ns cgroup has been removed.
    - it's true moving a task to another cgroup can fail.

    Signed-off-by: Li Zefan
    Acked-by: Paul Menage
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Li Zefan
     

04 Nov, 2011

8 commits

  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (144 commits)
    [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set
    [media] it913x [VER 1.07] Support for single ITE 9135 devices
    [media] Support for Terratec G1
    [media] cx25821: off by one in cx25821_vidioc_s_input()
    [media] media: tea5764: reconcile Kconfig symbol and macro
    [media] omap_vout: Add poll() support
    [media] omap3isp: preview: Add crop support on the sink pad
    [media] omap3isp: preview: Rename min/max input/output sizes defines
    [media] omap3isp: preview: Remove horizontal averager support
    [media] omap3isp: Report the ISP revision through the media controller API
    [media] omap3isp: ccdc: remove redundant operation
    [media] omap3isp: Fix memory leaks in initialization error paths
    [media] omap3isp: Add missing mutex_destroy() calls
    [media] omap3isp: Move *_init_entities() functions to the init/cleanup section
    [media] omap3isp: Move media_entity_cleanup() from unregister() to cleanup()
    [media] MFC: Change MFC firmware binary name
    [media] vb2: add vb2_get_unmapped_area in vb2 core
    [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor
    [media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control
    [media] media: ov6650: stylistic improvements
    ...

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: (w83627ehf) Add support for the W83627UHG
    hwmon: (w83627ehf) Clean up probe function
    hwmon: (w83627ehf) Properly report PECI and AMD-SI sensor types
    hwmon: Use i2c_smbus_{read,write}_word_swapped
    hwmon: (smsc47b397) Fix checkpatch errors
    hwmon: (lm90) Make code more readable
    hwmon: (lm90) Fix warnings
    hwmon: (ibmaem) Avoid repeated memory allocations
    hwmon: (ibmaem) Make instance initializations independent
    hwmon: (ibmaem) Fix error paths
    hwmon: (lm73) Make detection less problematic
    hwmon: Avoid building drivers for powerpc that read/write ISA addresses

    Linus Torvalds
     
  • * 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
    dt: add empty of_machine_is_compatible
    ahci: add DT binding for Calxeda AHCI controller
    dt/platform: minor cleanup
    dt: add empty of_alias_get_id() for non-dt builds

    Linus Torvalds
     
  • This is essentially a stripped down version of the W83627DHG. Noticeable
    difference is that it is still powered with +5V, as older models, even
    though the ADC resolution is 8 mV as newer models have.

    Thanks to Ulf Bruman (Saab Group) for doing all the testing.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
    be2net: Add detect UE feature for Lancer
    be2net: Prevent CQ full condition for Lancer
    be2net: Fix disabling multicast promiscous mode
    be2net: Fix endian issue in RX filter command
    af_packet: de-inline some helper functions
    MAINTAINERS: Add can-gw include to maintained files
    net: Add back alignment for size for __alloc_skb
    net: add missing bh_unlock_sock() calls
    l2tp: fix race in l2tp_recv_dequeue()
    ixgbevf: Update release version
    ixgbe: DCB, return max for IEEE traffic classes
    ixgbe: fix reading of the buffer returned by the firmware
    ixgbe: Fix compiler warnings
    ixgbe: fix smatch splat due to missing NULL check
    ixgbe: fix disabling of Tx laser at probe
    ixgbe: Fix link issues caused by a reset while interface is down
    igb: Fix for I347AT4 PHY cable length unit detection
    e100: make sure vlan support isn't advertised on old adapters
    e1000e: demote a debugging WARN to a debug log message
    net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c
    ...

    Linus Torvalds
     
  • Add devicetree match table to ahci platform driver for Calxeda Highbank
    AHCI controller.

    Signed-off-by: Rob Herring
    Acked-by: Grant Likely
    Cc: Jeff Garzik
    Cc: linux-ide@vger.kernel.org
    Cc: linux-kernel@vger.kernel.org
    Cc: devicetree-discuss@lists.ozlabs.org

    Rob Herring
     
  • V4L2_CID_POWER_LINE_FREQUENCY control allows applications to instruct
    a driver what is the power line frequency so an appropriate filter
    can be used by the device to cancel flicker by compensating the light
    intensity ripple. Currently in the menu we have entries for 50 Hz and
    60 Hz and for entirely disabling the anti-flicker filter.
    However some devices are capable of automatically detecting the
    frequency, so add V4L2_CID_POWER_LINE_FREQUENCY_AUTO entry for them.

    Signed-off-by: Sylwester Nawrocki
    Signed-off-by: Kyungmin Park
    Acked-by: Laurent Pinchart
    Signed-off-by: Mauro Carvalho Chehab

    Sylwester Nawrocki
     
  • [mchehab@redhat.com: remove emacs format crap at the end of the new files]
    Signed-off-by: Guennadi Liakhovetski
    Signed-off-by: Mauro Carvalho Chehab

    Guennadi Liakhovetski
     

03 Nov, 2011

13 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
    hwspinlock: add MAINTAINERS entries
    hwspinlock/omap: omap_hwspinlock_remove should be __devexit
    hwspinlock/u8500: add hwspinlock driver
    hwspinlock/core: register a bank of hwspinlocks in a single API call
    hwspinlock/core: remove stubs for register/unregister
    hwspinlock/core: use a mutex to protect the radix tree
    hwspinlock/core/omap: fix id issues on multiple hwspinlock devices
    hwspinlock/omap: simplify allocation scheme
    hwspinlock/core: simplify 'owner' handling
    hwspinlock/core: simplify Kconfig

    Fix up trivial conflicts (addition of omap_hwspinlock_pdata, removal of
    omap_spinlock_latency) in arch/arm/mach-omap2/hwspinlock.c

    Also, do an "evil merge" to fix a compile error in omap_hsmmc.c which
    for some reason was reported in the same email thread as the "please
    pull hwspinlock changes".

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/steve/linux-dm:
    dm: raid fix device status indicator when array initializing
    dm log userspace: add log device dependency
    dm log userspace: fix comment hyphens
    dm: add thin provisioning target
    dm: add persistent data library
    dm: add bufio
    dm: export dm get md
    dm table: add immutable feature
    dm table: add always writeable feature
    dm table: add singleton feature
    dm kcopyd: add dm_kcopyd_zero to zero an area
    dm: remove superfluous smp_mb
    dm: use local printk ratelimit
    dm table: propagate non rotational flag

    Linus Torvalds
     
  • Says Andrew:

    "60 patches. That's good enough for -rc1 I guess. I have quite a lot
    of detritus to be rechecked, work through maintainers, etc.

    - most of the remains of MM
    - rtc
    - various misc
    - cgroups
    - memcg
    - cpusets
    - procfs
    - ipc
    - rapidio
    - sysctl
    - pps
    - w1
    - drivers/misc
    - aio"

    * akpm: (60 commits)
    memcg: replace ss->id_lock with a rwlock
    aio: allocate kiocbs in batches
    drivers/misc/vmw_balloon.c: fix typo in code comment
    drivers/misc/vmw_balloon.c: determine page allocation flag can_sleep outside loop
    w1: disable irqs in critical section
    drivers/w1/w1_int.c: multiple masters used same init_name
    drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
    drivers/power/ds2780_battery.c: add a nolock function to w1 interface
    drivers/power/ds2780_battery.c: create central point for calling w1 interface
    w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
    pps gpio client: add missing dependency
    pps: new client driver using GPIO
    pps: default echo function
    include/linux/dma-mapping.h: add dma_zalloc_coherent()
    sysctl: make CONFIG_SYSCTL_SYSCALL default to n
    sysctl: add support for poll()
    RapidIO: documentation update
    drivers/net/rionet.c: fix ethernet address macros for LE platforms
    RapidIO: fix potential null deref in rio_setup_device()
    RapidIO: add mport driver for Tsi721 bridge
    ...

    Linus Torvalds
     
  • Lots of driver code does a dma_alloc_coherent() and then zeroes out the
    memory with a memset. Make it easy for them.

    Cc: Alexandre Bounine
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • When I tried to send a patch to remove it, Andi told me we still need to
    keep compabitlies for old libc, so we can't remove this completely. Then
    just make it default to n and remove the doc from
    feature-removal-schedule.txt.

    Signed-off-by: WANG Cong
    Cc: Eric Biederman
    Cc: Andi Kleen
    Cc: Alexey Dobriyan
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    WANG Cong
     
  • Update rapidio.txt to reflect changes from recent patch.
    See http://marc.info/?l=linux-kernel&m=131285620113589&w=2 for details.

    Signed-off-by: Alexandre Bounine
    Cc: Liu Gang
    Cc: Micha Nelissen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexandre Bounine
     
  • Add RapidIO mport driver for IDT TSI721 PCI Express-to-SRIO bridge device.
    The driver provides full set of callback functions defined for mport
    devices in RapidIO subsystem. It also is compatible with current version
    of RIONET driver (Ethernet over RapidIO messaging services).

    This patch is applicable to kernel versions starting from 2.6.39.

    Signed-off-by: Alexandre Bounine
    Signed-off-by: Chul Kim
    Cc: Kumar Gala
    Cc: Matt Porter
    Cc: Li Yang
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexandre Bounine
     
  • Reclaim decides to skip scanning an active list when the corresponding
    inactive list is above a certain size in comparison to leave the assumed
    working set alone while there are still enough reclaim candidates around.

    The memcg implementation of comparing those lists instead reports whether
    the whole memcg is low on the requested type of inactive pages,
    considering all nodes and zones.

    This can lead to an oversized active list not being scanned because of the
    state of the other lists in the memcg, as well as an active list being
    scanned while its corresponding inactive list has enough pages.

    Not only is this wrong, it's also a scalability hazard, because the global
    memory state over all nodes and zones has to be gathered for each memcg
    and zone scanned.

    Make these calculations purely based on the size of the two LRU lists
    that are actually affected by the outcome of the decision.

    Signed-off-by: Johannes Weiner
    Reviewed-by: Rik van Riel
    Cc: KOSAKI Motohiro
    Acked-by: KAMEZAWA Hiroyuki
    Cc: Daisuke Nishimura
    Cc: Balbir Singh
    Reviewed-by: Minchan Kim
    Reviewed-by: Ying Han
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Johannes Weiner
     
  • * git://github.com/rustyrussell/linux:
    virtio-blk: use ida to allocate disk index
    virtio: Add platform bus driver for memory mapped virtio device
    virtio: Dont add "config" to list for !per_vq_vector
    virtio: console: wait for first console port for early console output
    virtio: console: add port stats for bytes received, sent and discarded
    virtio: console: make discard_port_data() use get_inbuf()
    virtio: console: rename variable
    virtio: console: make get_inbuf() return port->inbuf if present
    virtio: console: Fix return type for get_inbuf()
    virtio: console: Use wait_event_freezable instead of _interruptible
    virtio: console: Ignore port name update request if name already set
    virtio: console: Fix indentation
    virtio: modify vring_init and vring_size to take account of the layout containing *_event_idx
    virtio.h: correct comment for struct virtio_driver
    virtio-net: Use virtio_config_val() for retrieving config
    virtio_config: Add virtio_config_val_len()
    virtio-console: Use virtio_config_val() for retrieving config

    Linus Torvalds
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue:
    vfs: add d_prune dentry operation
    vfs: protect i_nlink
    filesystems: add set_nlink()
    filesystems: add missing nlink wrappers
    logfs: remove unnecessary nlink setting
    ocfs2: remove unnecessary nlink setting
    jfs: remove unnecessary nlink setting
    hypfs: remove unnecessary nlink setting
    vfs: ignore error on forced remount
    readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
    vfs: fix dentry leak in simple_fill_super()

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (97 commits)
    jbd2: Unify log messages in jbd2 code
    jbd/jbd2: validate sb->s_first in journal_get_superblock()
    ext4: let ext4_ext_rm_leaf work with EXT_DEBUG defined
    ext4: fix a syntax error in ext4_ext_insert_extent when debugging enabled
    ext4: fix a typo in struct ext4_allocation_context
    ext4: Don't normalize an falloc request if it can fit in 1 extent.
    ext4: remove comments about extent mount option in ext4_new_inode()
    ext4: let ext4_discard_partial_buffers handle unaligned range correctly
    ext4: return ENOMEM if find_or_create_pages fails
    ext4: move vars to local scope in ext4_discard_partial_page_buffers_no_lock()
    ext4: Create helper function for EXT4_IO_END_UNWRITTEN and i_aiodio_unwritten
    ext4: optimize locking for end_io extent conversion
    ext4: remove unnecessary call to waitqueue_active()
    ext4: Use correct locking for ext4_end_io_nolock()
    ext4: fix race in xattr block allocation path
    ext4: trace punch_hole correctly in ext4_ext_map_blocks
    ext4: clean up AGGRESSIVE_TEST code
    ext4: move variables to their scope
    ext4: fix quota accounting during migration
    ext4: migrate cleanup
    ...

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
    udf: Cleanup metadata flags handling
    udf: Skip mirror metadata FE loading when metadata FE is ok
    ext3: Allow quota file use root reservation
    udf: Remove web reference from UDF MAINTAINERS entry
    quota: Drop path reference on error exit from quotactl
    udf: Neaten udf_debug uses
    udf: Neaten logging output, use vsprintf extension %pV
    udf: Convert printks to pr_
    udf: Rename udf_warning to udf_warn
    udf: Rename udf_error to udf_err
    udf: Promote some debugging messages to udf_error
    ext3: Remove the obsolete broken EXT3_IOC32_WAIT_FOR_READONLY.
    udf: Add readpages support for udf.
    ext3/balloc.c: local functions should be static
    ext2: fix the outdated comment in ext2_nfs_get_inode()
    ext3: remove deprecated oldalloc
    fs/ext3/balloc.c: delete useless initialization
    fs/ext2/balloc.c: delete useless initialization
    ext3: fix message in ext3_remount for rw-remount case
    ext3: Remove i_mutex from ext3_sync_file()

    Fix up trivial (printf format cleanup) conflicts in fs/udf/udfdecl.h

    Linus Torvalds
     
  • * 'for-linus' of git://github.com/richardweinberger/linux: (90 commits)
    um: fix ubd cow size
    um: Fix kmalloc argument order in um/vdso/vma.c
    um: switch to use of drivers/Kconfig
    UserModeLinux-HOWTO.txt: fix a typo
    UserModeLinux-HOWTO.txt: remove ^H characters
    um: we need sys/user.h only on i386
    um: merge delay_{32,64}.c
    um: distribute exports to where exported stuff is defined
    um: kill system-um.h
    um: generic ftrace.h will do...
    um: segment.h is x86-only and needed only there
    um: asm/pda.h is not needed anymore
    um: hw_irq.h can go generic as well
    um: switch to generic-y
    um: clean Kconfig up a bit
    um: a couple of missing dependencies...
    um: kill useless argument of free_chan() and free_one_chan()
    um: unify ptrace_user.h
    um: unify KSTK_...
    um: fix gcov build breakage
    ...

    Linus Torvalds