29 Apr, 2013

1 commit


23 Apr, 2013

7 commits

  • Add tracepoints to debug checkpoint request.

    Signed-off-by: Namjae Jeon
    Signed-off-by: Pankaj Kumar
    Acked-by: Steven Rostedt
    [Jaegeuk: change expressions]
    Signed-off-by: Jaegeuk Kim

    Namjae Jeon
     
  • Add tracepoints to debug the various page write operation
    like data pages, meta pages.

    Signed-off-by: Namjae Jeon
    Signed-off-by: Pankaj Kumar
    Acked-by: Steven Rostedt
    [Jaegeuk: remove unnecessary tracepoints]
    Signed-off-by: Jaegeuk Kim

    Namjae Jeon
     
  • Add tracepoints to debug the block allocation & fallocate.

    Signed-off-by: Namjae Jeon
    Signed-off-by: Pankaj Kumar
    Acked-by: Steven Rostedt
    [Jaegeuk: enhance information]
    Signed-off-by: Jaegeuk Kim

    Namjae Jeon
     
  • Add tracepoints for tracing the garbage collector
    threads in f2fs with status of collection & type.

    Signed-off-by: Namjae Jeon
    Signed-off-by: Pankaj Kumar
    Acked-by: Steven Rostedt
    [Jaegeuk: modify slightly to show information]
    Signed-off-by: Jaegeuk Kim

    Namjae Jeon
     
  • Add tracepoints for page i/o operations and block allocation
    tracing during page read operation.

    Signed-off-by: Namjae Jeon
    Signed-off-by: Pankaj Kumar
    Acked-by: Steven Rostedt
    [Jaegeuk: combine and modify the tracepoint structures]
    Signed-off-by: Jaegeuk Kim

    Namjae Jeon
     
  • add tracepoints for tracing the truncate operations
    like truncate node/data blocks, f2fs_truncate etc.

    Tracepoints are added at entry and exit of operation
    to trace the success & failure of operation.

    Signed-off-by: Namjae Jeon
    Signed-off-by: Pankaj Kumar
    Acked-by: Steven Rostedt
    [Jaegeuk: combine and modify the tracepoint structures]
    Signed-off-by: Jaegeuk Kim

    Namjae Jeon
     
  • Add tracepoints in f2fs for tracing the syncing
    operations like filesystem sync, file sync enter/exit.
    It will helf to trace the code under debugging scenarios.

    Also add tracepoints for tracing the various inode operations
    like building inode, eviction of inode, link/unlike of
    inodes.

    Signed-off-by: Namjae Jeon
    Signed-off-by: Pankaj Kumar
    Acked-by: Steven Rostedt
    [Jaegeuk: combine and modify the tracepoint structures]
    Signed-off-by: Jaegeuk Kim

    Namjae Jeon
     

18 Mar, 2013

1 commit


08 Mar, 2013

5 commits

  • Pull drm fixes from Dave Airlie:
    "Misc radeon, nouveau, mgag200 and intel fixes.

    The intel fixes should contain the fix for the touchpad on the
    Chromebook - hey I'm an input maintainer now!"

    Hate to pee on your parade, Dave, but I don't think being an input
    maintainer is necessarily something to strive for..

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (25 commits)
    drm/tegra: drop "select DRM_HDMI"
    drm: Documentation typo fixes
    drm/mgag200: Bug fix: Renesas board now selects native resolution.
    drm/mgag200: Reject modes that are too big for VRAM
    drm/mgag200: 'fbdev_list' in 'struct mga_fbdev' is not used
    drm/radeon: don't check mipmap alignment if MIP_ADDRESS is FMASK
    drm/radeon: skip MC reset as it's probably not hung
    drm/radeon: add primary dac adj quirk for R200 board
    drm/radeon: don't set hpd, afmt interrupts when interrupts are disabled
    drm/i915: Turn off hsync and vsync on ADPA when disabling crt
    drm/i915: Fix incorrect definition of ADPA HSYNC and VSYNC bits
    drm/i915: also disable south interrupts when handling them
    drm/i915: enable irqs earlier when resuming
    drm/i915: Increase the RC6p threshold.
    DRM/i915: On G45 enable cursor plane briefly after enabling the display plane.
    drm/nv50-: prevent some races between modesetting and page flipping
    drm/nouveau/i2c: drop parent refcount when creating ports
    drm/nv84: fix regression in page flipping
    drm/nouveau: Fix typo in init_idx_addr_latched().
    drm/nouveau: Disable AGP on PowerPC again.
    ...

    Linus Torvalds
     
  • Pull ACPI and power management fixes from Rafael J Wysocki:

    - Two fixes for the new intel_pstate driver from Dirk Brandewie.

    - Fix for incorrect usage of the .find_bridge() callback from struct
    acpi_bus_type in the USB core and subsequent removal of that callback
    from Rafael J Wysocki.

    - ACPI processor driver cleanups from Chen Gang and Syam Sidhardhan.

    - ACPI initialization and error messages fix from Joe Perches.

    - Operating Performance Points documentation improvement from Nishanth
    Menon.

    - Fixes for memory leaks and potential concurrency issues and sysfs
    attributes leaks during device removal in the core device PM QoS code
    from Rafael J Wysocki.

    - Calxeda Highbank cpufreq driver simplification from Emilio López.

    - cpufreq comment cleanup from Namhyung Kim.

    - Fix for a section mismatch in Calxeda Highbank interprocessor
    communication code from Mark Langsdorf (this is not a PM fix strictly
    speaking, but the code in question went in through the PM tree).

    * tag 'pm+acpi-3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    cpufreq / intel_pstate: Do not load on VM that does not report max P state.
    cpufreq / intel_pstate: Fix intel_pstate_init() error path
    ACPI / glue: Drop .find_bridge() callback from struct acpi_bus_type
    ACPI / glue: Add .match() callback to struct acpi_bus_type
    ACPI / porocessor: Beautify code, pr->id is u32 which is never < 0
    ACPI / processor: Remove redundant NULL check before kfree
    ACPI / Sleep: Avoid interleaved message on errors
    PM / QoS: Remove device PM QoS sysfs attributes at the right place
    PM / QoS: Fix concurrency issues and memory leaks in device PM QoS
    cpufreq: highbank: do not initialize array with a loop
    PM / OPP: improve introductory documentation
    cpufreq: Fix a typo in comment
    mailbox, pl320-ipc: remove __init from probe function

    Linus Torvalds
     
  • Signed-off-by: Christopher Harvey
    Signed-off-by: Dave Airlie

    Christopher Harvey
     
  • Pull regulator fixes from Mark Brown:
    "A few small things here and there, nothing major here really. The
    conversion of twl4030ldo_ops to get_voltage_sel is a fix, as covered
    in the commit log it fixes inconsistency in handling of the IS_UNSUP()
    feature in the driver."

    * tag 'regulator-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
    regulator: fixed regulator_bulk_enable unwinding code
    regulator: twl: Convert twl4030ldo_ops to get_voltage_sel
    regulator: palmas: fix number of SMPS voltages
    regulator: core: fix documentation error in regulator_allow_bypass
    regulator: core: update kernel documentation for regulator_desc
    regulator: db8500-prcmu - remove incorrect __exit markup

    Linus Torvalds
     
  • Pull ecryptfs fixes from Tyler Hicks:
    "Minor code cleanups and new Kconfig option to disable /dev/ecryptfs

    The code cleanups fix up W=1 compiler warnings and some unnecessary
    checks. The new Kconfig option, defaulting to N, allows the rarely
    used eCryptfs kernel to userspace communication channel to be compiled
    out. This may be the first step in it being eventually removed."

    Hmm. I'm not sure whether these should be called "fixes", and it
    probably should have gone in the merge window. But I'll let it slide.

    * tag 'ecryptfs-3.9-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
    eCryptfs: allow userspace messaging to be disabled
    eCryptfs: Fix redundant error check on ecryptfs_find_daemon_by_euid()
    ecryptfs: ecryptfs_msg_ctx_alloc_to_free(): remove kfree() redundant null check
    eCryptfs: decrypt_pki_encrypted_session_key(): remove kfree() redundant null check
    eCryptfs: remove unneeded checks in virt_to_scatterlist()
    eCryptfs: Fix -Wmissing-prototypes warnings
    eCryptfs: Fix -Wunused-but-set-variable warnings
    eCryptfs: initialize payload_len in keystore.c

    Linus Torvalds
     

06 Mar, 2013

3 commits

  • Pull networking fixes from David Miller:
    "A moderately sized pile of fixes, some specifically for merge window
    introduced regressions although others are for longer standing items
    and have been queued up for -stable.

    I'm kind of tired of all the RDS protocol bugs over the years, to be
    honest, it's way out of proportion to the number of people who
    actually use it.

    1) Fix missing range initialization in netfilter IPSET, from Jozsef
    Kadlecsik.

    2) ieee80211_local->tim_lock needs to use BH disabling, from Johannes
    Berg.

    3) Fix DMA syncing in SFC driver, from Ben Hutchings.

    4) Fix regression in BOND device MAC address setting, from Jiri
    Pirko.

    5) Missing usb_free_urb in ISDN Hisax driver, from Marina Makienko.

    6) Fix UDP checksumming in bnx2x driver for 57710 and 57711 chips,
    fix from Dmitry Kravkov.

    7) Missing cfgspace_lock initialization in BCMA driver.

    8) Validate parameter size for SCTP assoc stats getsockopt(), from
    Guenter Roeck.

    9) Fix SCTP association hangs, from Lee A Roberts.

    10) Fix jumbo frame handling in r8169, from Francois Romieu.

    11) Fix phy_device memory leak, from Petr Malat.

    12) Omit trailing FCS from frames received in BGMAC driver, from Hauke
    Mehrtens.

    13) Missing socket refcount release in L2TP, from Guillaume Nault.

    14) sctp_endpoint_init should respect passed in gfp_t, rather than use
    GFP_KERNEL unconditionally. From Dan Carpenter.

    15) Add AISX AX88179 USB driver, from Freddy Xin.

    16) Remove MAINTAINERS entries for drivers deleted during the merge
    window, from Cesar Eduardo Barros.

    17) RDS protocol can try to allocate huge amounts of memory, check
    that the user's request length makes sense, from Cong Wang.

    18) SCTP should use the provided KMALLOC_MAX_SIZE instead of it's own,
    bogus, definition. From Cong Wang.

    19) Fix deadlocks in FEC driver by moving TX reclaim into NAPI poll,
    from Frank Li. Also, fix a build error introduced in the merge
    window.

    20) Fix bogus purging of default routes in ipv6, from Lorenzo Colitti.

    21) Don't double count RTT measurements when we leave the TCP receive
    fast path, from Neal Cardwell."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (61 commits)
    tcp: fix double-counted receiver RTT when leaving receiver fast path
    CAIF: fix sparse warning for caif_usb
    rds: simplify a warning message
    net: fec: fix build error in no MXC platform
    net: ipv6: Don't purge default router if accept_ra=2
    net: fec: put tx to napi poll function to fix dead lock
    sctp: use KMALLOC_MAX_SIZE instead of its own MAX_KMALLOC_SIZE
    rds: limit the size allocated by rds_message_alloc()
    MAINTAINERS: remove eexpress
    MAINTAINERS: remove drivers/net/wan/cycx*
    MAINTAINERS: remove 3c505
    caif_dev: fix sparse warnings for caif_flow_cb
    ax88179_178a: ASIX AX88179_178A USB 3.0/2.0 to gigabit ethernet adapter driver
    sctp: use the passed in gfp flags instead GFP_KERNEL
    ipv[4|6]: correct dropwatch false positive in local_deliver_finish
    l2tp: Restore socket refcount when sendmsg succeeds
    net/phy: micrel: Disable asymmetric pause for KSZ9021
    bgmac: omit the fcs
    phy: Fix phy_device_free memory leak
    bnx2x: Fix KR2 work-around condition
    ...

    Linus Torvalds
     
  • Pull irq fixes and cleanups from Thomas Gleixner:
    "Commit e5ab012c3271 ("nohz: Make tick_nohz_irq_exit() irq safe") is
    the first commit in the series and the minimal necessary bugfix, which
    needs to go back into stable.

    The remanining commits enforce irq disabling in irq_exit(), sanitize
    the hardirq/softirq preempt count transition and remove a bunch of no
    longer necessary conditionals."

    I personally love getting rid of the very subtle and confusing
    IRQ_EXIT_OFFSET thing. Even apart from the whole "more lines removed
    than added" thing.

    * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    irq: Don't re-enable interrupts at the end of irq_exit
    irq: Remove IRQ_EXIT_OFFSET workaround
    Revert "nohz: Make tick_nohz_irq_exit() irq safe"
    irq: Sanitize invoke_softirq
    irq: Ensure irq_exit() code runs with interrupts disabled
    nohz: Make tick_nohz_irq_exit() irq safe

    Linus Torvalds
     
  • Pull smpboot bugfix from Thomas Gleixner:
    "A single bugfix for a regression introduced with the conversion of the
    stop machine threads to the generic smpboot thread management
    facility"

    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    stop_machine: Mark per cpu stopper enabled early

    Linus Torvalds
     

05 Mar, 2013

1 commit


04 Mar, 2013

8 commits

  • After PCI and USB have stopped using the .find_bridge() callback in
    struct acpi_bus_type, the only remaining user of it is SATA, but SATA
    only pretends to be a user, because it points that callback to a stub
    always returning -ENODEV.

    For this reason, drop the SATA's dummy .find_bridge() callback and
    remove .find_bridge(), which is not used any more, from struct
    acpi_bus_type entirely.

    Signed-off-by: Rafael J. Wysocki
    Acked-by: Yinghai Lu
    Acked-by: Jeff Garzik

    Rafael J. Wysocki
     
  • USB uses the .find_bridge() callback from struct acpi_bus_type
    incorrectly, because as a result of the way it is used by USB every
    device in the system that doesn't have a bus type or parent is
    passed to usb_acpi_find_device() for inspection.

    What USB actually needs, though, is to call usb_acpi_find_device()
    for USB ports that don't have a bus type defined, but have
    usb_port_device_type as their device type, as well as for USB
    devices.

    To fix that replace the struct bus_type pointer in struct
    acpi_bus_type used for matching devices to specific subsystems
    with a .match() callback to be used for this purpose and update
    the users of struct acpi_bus_type, including USB, accordingly.
    Define the .match() callback routine for USB, usb_acpi_bus_match(),
    in such a way that it will cover both USB devices and USB ports
    and remove the now redundant .find_bridge() callback pointer from
    usb_acpi_bus.

    Signed-off-by: Rafael J. Wysocki
    Acked-by: Greg Kroah-Hartman
    Acked-by: Yinghai Lu
    Acked-by: Jeff Garzik

    Rafael J. Wysocki
     
  • When the userspace messaging (for the less common case of userspace key
    wrap/unwrap via ecryptfsd) is not needed, allow eCryptfs to build with
    it removed. This saves on kernel code size and reduces potential attack
    surface by removing the /dev/ecryptfs node.

    Signed-off-by: Kees Cook
    Signed-off-by: Tyler Hicks

    Kees Cook
     
  • Pull fbdev UAPI disintegration from David Howells:
    "You'll be glad to here that the end is nigh for the UAPI patches.
    Only the fbdev/framebuffer piece remains now that the SCSI stuff has
    gone in.

    Here are the UAPI disintegration bits for the fbdev drivers. It
    appears that Florian hasn't had time to deal with my patch, but back
    in December he did say he didn't mind if I pushed it forward."

    Yay. No more uapi movement. And hopefully no more big header file
    cleanups coming up either, it just tends to be very painful.

    * tag 'disintegrate-fbdev-20121220' of git://git.infradead.org/users/dhowells/linux-headers:
    UAPI: (Scripted) Disintegrate include/video

    Linus Torvalds
     
  • Pull more VFS bits from Al Viro:
    "Unfortunately, it looks like xattr series will have to wait until the
    next cycle ;-/

    This pile contains 9p cleanups and fixes (races in v9fs_fid_add()
    etc), fixup for nommu breakage in shmem.c, several cleanups and a bit
    more file_inode() work"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    constify path_get/path_put and fs_struct.c stuff
    fix nommu breakage in shmem.c
    cache the value of file_inode() in struct file
    9p: if v9fs_fid_lookup() gets to asking server, it'd better have hashed dentry
    9p: make sure ->lookup() adds fid to the right dentry
    9p: untangle ->lookup() a bit
    9p: double iput() in ->lookup() if d_materialise_unique() fails
    9p: v9fs_fid_add() can't fail now
    v9fs: get rid of v9fs_dentry
    9p: turn fid->dlist into hlist
    9p: don't bother with private lock in ->d_fsdata; dentry->d_lock will do just fine
    more file_inode() open-coded instances
    selinux: opened file can't have NULL or negative ->f_path.dentry

    (In the meantime, the hlist traversal macros have changed, so this
    required a semantic conflict fixup for the newly hlistified fid->dlist)

    Linus Torvalds
     
  • Pull new ImgTec Meta architecture from James Hogan:
    "This adds core architecture support for Imagination's Meta processor
    cores, followed by some later miscellaneous arch/metag cleanups and
    fixes which I kept separate to ease review:

    - Support for basic Meta 1 (ATP) and Meta 2 (HTP) core architecture
    - A few fixes all over, particularly for symbol prefixes
    - A few privilege protection fixes
    - Several cleanups (setup.c includes, split out a lot of
    metag_ksyms.c)
    - Fix some missing exports
    - Convert hugetlb to use vm_unmapped_area()
    - Copy device tree to non-init memory
    - Provide dma_get_sgtable()"

    * tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag: (61 commits)
    metag: Provide dma_get_sgtable()
    metag: prom.h: remove declaration of metag_dt_memblock_reserve()
    metag: copy devicetree to non-init memory
    metag: cleanup metag_ksyms.c includes
    metag: move mm/init.c exports out of metag_ksyms.c
    metag: move usercopy.c exports out of metag_ksyms.c
    metag: move setup.c exports out of metag_ksyms.c
    metag: move kick.c exports out of metag_ksyms.c
    metag: move traps.c exports out of metag_ksyms.c
    metag: move irq enable out of irqflags.h on SMP
    genksyms: fix metag symbol prefix on crc symbols
    metag: hugetlb: convert to vm_unmapped_area()
    metag: export clear_page and copy_page
    metag: export metag_code_cache_flush_all
    metag: protect more non-MMU memory regions
    metag: make TXPRIVEXT bits explicit
    metag: kernel/setup.c: sort includes
    perf: Enable building perf tools for Meta
    metag: add boot time LNKGET/LNKSET check
    metag: add __init to metag_cache_probe()
    ...

    Linus Torvalds
     
  • Pull watchdog updates from Wim Van Sebroeck:
    "This contains:
    - fixes and improvements
    - devicetree bindings
    - conversion to watchdog generic framework of the following drivers:
    - booke_wdt
    - bcm47xx_wdt.c
    - at91sam9_wdt
    - Removal of old STMP3xxx driver
    - Addition of following new drivers:
    - new driver for STMP3xxx and i.MX23/28
    - Retu watchdog driver"

    * git://www.linux-watchdog.org/linux-watchdog: (30 commits)
    watchdog: sp805_wdt depends on ARM
    watchdog: davinci_wdt: update to devm_* API
    watchdog: davinci_wdt: use devm managed clk get
    watchdog: at91rm9200: add DT support
    watchdog: add timeout-sec property binding
    watchdog: at91sam9_wdt: Convert to use the watchdog framework
    watchdog: omap_wdt: Add option nowayout
    watchdog: core: dt: add support for the timeout-sec dt property
    watchdog: bcm47xx_wdt.c: add hard timer
    watchdog: bcm47xx_wdt.c: rename wdt_time to timeout
    watchdog: bcm47xx_wdt.c: rename ops methods
    watchdog: bcm47xx_wdt.c: use platform device
    watchdog: bcm47xx_wdt.c: convert to watchdog core api
    watchdog: Convert BookE watchdog driver to watchdog infrastructure
    watchdog: s3c2410_wdt: Use devm_* functions
    watchdog: remove old STMP3xxx driver
    watchdog: add new driver for STMP3xxx and i.MX23/28
    rtc: stmp3xxx: add wdt-accessor function
    watchdog: introduce retu_wdt driver
    watchdog: intel_scu_watchdog: fix Kconfig dependency
    ...

    Linus Torvalds
     
  • Pull second set of slave-dmaengine updates from Vinod Koul:
    "Arnd's patch moves the dw_dmac to use generic DMA binding. I agreed
    to merge this late as it will avoid the conflicts between trees.

    The second patch from Matt adding a dma_request_slave_channel_compat
    API was supposed to be picked up, but somehow never got picked up.
    Some patches dependent on this are already in -next :("

    * 'next' of git://git.infradead.org/users/vkoul/slave-dma:
    dmaengine: dw_dmac: move to generic DMA binding
    dmaengine: add dma_request_slave_channel_compat()

    Linus Torvalds
     

03 Mar, 2013

14 commits

  • Pull ext4 bug fixes from Ted Ts'o:
    "Various bug fixes for ext4. The most important is a fix for the new
    extent cache's slab shrinker which can cause significant, user-visible
    pauses when the system is under memory pressure."

    * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
    ext4: enable quotas before orphan cleanup
    ext4: don't allow quota mount options when quota feature enabled
    ext4: fix a warning from sparse check for ext4_dir_llseek
    ext4: convert number of blocks to clusters properly
    ext4: fix possible memory leak in ext4_remount()
    jbd2: fix ERR_PTR dereference in jbd2__journal_start
    ext4: use percpu counter for extent cache count
    ext4: optimize ext4_es_shrink()

    Linus Torvalds
     
  • Pull NFS client bugfixes from Trond Myklebust:
    "We've just concluded another Connectathon interoperability testing
    week, and so here are the fixes for the bugs that were discovered:

    - Don't allow NFS silly-renamed files to be deleted
    - Don't start the retransmission timer when out of socket space
    - Fix a couple of pnfs-related Oopses.
    - Fix one more NFSv4 state recovery deadlock
    - Don't loop forever when LAYOUTGET returns NFS4ERR_LAYOUTTRYLATER"

    * tag 'nfs-for-3.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
    SUNRPC: One line comment fix
    NFSv4.1: LAYOUTGET EDELAY loops timeout to the MDS
    SUNRPC: add call to get configured timeout
    PNFS: set the default DS timeout to 60 seconds
    NFSv4: Fix another open/open_recovery deadlock
    nfs: don't allow nfs_find_actor to match inodes of the wrong type
    NFSv4.1: Hold reference to layout hdr in layoutget
    pnfs: fix resend_to_mds for directio
    SUNRPC: Don't start the retransmission timer when out of socket space
    NFS: Don't allow NFS silly-renamed files to be deleted, no signal

    Linus Torvalds
     
  • Pull btrfs update from Chris Mason:
    "The biggest feature in the pull is the new (and still experimental)
    raid56 code that David Woodhouse started long ago. I'm still working
    on the parity logging setup that will avoid inconsistent parity after
    a crash, so this is only for testing right now. But, I'd really like
    to get it out to a broader audience to hammer out any performance
    issues or other problems.

    scrub does not yet correct errors on raid5/6 either.

    Josef has another pass at fsync performance. The big change here is
    to combine waiting for metadata with waiting for data, which is a big
    latency win. It is also step one toward using atomics from the
    hardware during a commit.

    Mark Fasheh has a new way to use btrfs send/receive to send only the
    metadata changes. SUSE is using this to make snapper more efficient
    at finding changes between snapshosts.

    Snapshot-aware defrag is also included.

    Otherwise we have a large number of fixes and cleanups. Eric Sandeen
    wins the award for removing the most lines, and I'm hoping we steal
    this idea from XFS over and over again."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (118 commits)
    btrfs: fixup/remove module.h usage as required
    Btrfs: delete inline extents when we find them during logging
    btrfs: try harder to allocate raid56 stripe cache
    Btrfs: cleanup to make the function btrfs_delalloc_reserve_metadata more logic
    Btrfs: don't call btrfs_qgroup_free if just btrfs_qgroup_reserve fails
    Btrfs: remove reduplicate check about root in the function btrfs_clean_quota_tree
    Btrfs: return ENOMEM rather than use BUG_ON when btrfs_alloc_path fails
    Btrfs: fix missing deleted items in btrfs_clean_quota_tree
    btrfs: use only inline_pages from extent buffer
    Btrfs: fix wrong reserved space when deleting a snapshot/subvolume
    Btrfs: fix wrong reserved space in qgroup during snap/subv creation
    Btrfs: remove unnecessary dget_parent/dput when creating the pending snapshot
    btrfs: remove a printk from scan_one_device
    Btrfs: fix NULL pointer after aborting a transaction
    Btrfs: fix memory leak of log roots
    Btrfs: copy everything if we've created an inline extent
    btrfs: cleanup for open-coded alignment
    Btrfs: do not change inode flags in rename
    Btrfs: use reserved space for creating a snapshot
    clear chunk_alloc flag on retryable failure
    ...

    Linus Torvalds
     
  • Pull MTD update from David Woodhouse:
    "Fairly unexciting MTD merge for 3.9:

    - misc clean-ups in the MTD command-line partitioning parser
    (cmdlinepart)
    - add flash locking support for STmicro chips serial flash chips, as
    well as for CFI command set 2 chips.
    - new driver for the ELM error correction HW module found in various
    TI chips, enable the OMAP NAND driver to use the ELM HW error
    correction
    - added number of new serial flash IDs
    - various fixes and improvements in the gpmi NAND driver
    - bcm47xx NAND driver improvements
    - make the mtdpart module actually removable"

    * tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd: (45 commits)
    mtd: map: BUG() in non handled cases
    mtd: bcm47xxnflash: use pr_fmt for module prefix in messages
    mtd: davinci_nand: Use managed resources
    mtd: mtd_torturetest can cause stack overflows
    mtd: physmap_of: Convert device allocation to managed devm_kzalloc()
    mtd: at91: atmel_nand: for PMECC, add code to check the ONFI parameter ECC requirement.
    mtd: atmel_nand: make pmecc-cap, pmecc-sector-size in dts is optional.
    mtd: atmel_nand: avoid to report an error when lookup table offset is 0.
    mtd: bcm47xxsflash: adjust names of bus-specific functions
    mtd: bcm47xxpart: improve probing of nvram partition
    mtd: bcm47xxpart: add support for other erase sizes
    mtd: bcm47xxnflash: register this as normal driver
    mtd: bcm47xxnflash: fix message
    mtd: bcm47xxsflash: register this as normal driver
    mtd: bcm47xxsflash: write number of written bytes
    mtd: gpmi: add sanity check for the ECC
    mtd: gpmi: set the Golois Field bit for mx6q's BCH
    mtd: devices: elm: Removes literals in elm DT node
    mtd: gpmi: fix a dereferencing freed memory error
    mtd: fix the wrong timeo for panic_nand_wait()
    ...

    Linus Torvalds
     
  • Commit cc2383ec06be093789469852e1fe96e1148e9a2c ("mm: introduce
    arch-specific vma flag VM_ARCH_1") merged in v3.7-rc1.

    The above commit combined several arch-specific vma flags into one, and
    in the process it changed the VM_GROWSUP definition to depend on
    specific architectures rather than CONFIG_STACK_GROWSUP. Therefore add
    an ifdef for CONFIG_METAG to also set VM_GROWSUP.

    Signed-off-by: James Hogan
    Cc: Konstantin Khlebnikov
    Cc: Andrew Morton
    Cc: Mel Gorman
    Cc: Michel Lespinasse
    Cc: Al Viro
    Cc: linux-mm@kvack.org

    James Hogan
     
  • Meta core internal interrupts (from HWSTATMETA and friends) are vectored
    onto the TR1 core trigger for the current thread. This is demultiplexed
    in irq-metag.c to individual Linux IRQs for each internal interrupt.

    External SoC interrupts (from HWSTATEXT and friends) are vectored onto
    the TR2 core trigger for the current thread. This is demultiplexed in
    irq-metag-ext.c to individual Linux IRQs for each external SoC interrupt.
    The external irqchip has devicetree bindings for configuring the number
    of irq banks and the type of masking available.

    Signed-off-by: James Hogan
    Cc: Arnd Bergmann
    Cc: Grant Likely
    Cc: Rob Herring
    Cc: Rob Landley
    Cc: Dom Cobley
    Cc: Simon Arlott
    Cc: Viresh Kumar
    Cc: Maxime Ripard
    Cc: devicetree-discuss@lists.ozlabs.org
    Cc: linux-doc@vger.kernel.org

    James Hogan
     
  • Add time keeping code for metag. Meta hardware threads have 2 timers.
    The background timer (TXTIMER) is used as a free-running time base, and
    the interrupt timer (TXTIMERI) is used for the timer interrupt. Both
    counters traditionally count at approximately 1MHz.

    Signed-off-by: James Hogan
    Cc: John Stultz
    Cc: Thomas Gleixner

    James Hogan
     
  • The ptrace interface for metag provides access to some core register
    sets using the PTRACE_GETREGSET and PTRACE_SETREGSET operations. The
    details of the internal context structures is abstracted into user API
    structures to both ease use and allow flexibility to change the internal
    context layouts. Copyin and copyout functions for these register sets
    are exposed to allow signal handling code to use them to copy to and
    from the signal context.

    struct user_gp_regs (NT_PRSTATUS) provides access to the core general
    purpose register context.

    struct user_cb_regs (NT_METAG_CBUF) provides access to the TXCATCH*
    registers which contains information abuot a memory fault, unaligned
    access error or watchpoint. This can be modified to alter the way the
    fault is replayed on resume ("catch replay"), or to prevent the replay
    taking place.

    struct user_rp_state (NT_METAG_RPIPE) provides access to the state of
    the Meta read pipeline which can be used to hide memory latencies in
    hand optimised data loops.

    Extended DSP register state, DSP RAM, and hardware breakpoint registers
    aren't yet exposed through ptrace.

    Signed-off-by: James Hogan
    Cc: Andrew Morton
    Cc: Denys Vlasenko
    Cc: Arnd Bergmann
    Cc: Tony Lindgren
    Cc: "Paul E. McKenney"

    James Hogan
     
  • Some architectures have symbol prefixes and set CONFIG_SYMBOL_PREFIX,
    but this wasn't taken into account by the generic cond_syscall. It's
    easy enough to fix in a generic fashion, so add the symbol prefix to
    symbol names in cond_syscall when CONFIG_SYMBOL_PREFIX is set.

    Signed-off-by: James Hogan
    Acked-by: Arnd Bergmann
    Acked-by: Mike Frysinger

    James Hogan
     
  • Make asm-generic/io.h check CONFIG_VIRT_TO_BUS before defining
    virt_to_bus() and bus_to_virt(), otherwise it's easy to accidentally
    have a silently failing incorrect direct mapped definition rather then
    no definition at all.

    Signed-off-by: James Hogan
    Acked-by: Arnd Bergmann

    James Hogan
     
  • Pull device-mapper update from Alasdair G Kergon:
    "The main addition here is a long-desired target framework to allow an
    SSD to be used as a cache in front of a slower device. Cache tuning
    is delegated to interchangeable policy modules so these can be
    developed independently of the mechanics needed to shuffle the data
    around.

    Other than that, kcopyd users acquire a throttling parameter, ioctl
    buffer usage gets streamlined, more mempool reliance is reduced and
    there are a few other bug fixes and tidy-ups."

    * tag 'dm-3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm: (30 commits)
    dm cache: add cleaner policy
    dm cache: add mq policy
    dm: add cache target
    dm persistent data: add bitset
    dm persistent data: add transactional array
    dm thin: remove cells from stack
    dm bio prison: pass cell memory in
    dm persistent data: add btree_walk
    dm: add target num_write_bios fn
    dm kcopyd: introduce configurable throttling
    dm ioctl: allow message to return data
    dm ioctl: optimize functions without variable params
    dm ioctl: introduce ioctl_flags
    dm: merge io_pool and tio_pool
    dm: remove unused _rq_bio_info_cache
    dm: fix limits initialization when there are no data devices
    dm snapshot: add missing module aliases
    dm persistent data: set some btree fn parms const
    dm: refactor bio cloning
    dm: rename bio cloning functions
    ...

    Linus Torvalds
     
  • Pull SCSI updates from James Bottomley:
    "This is an assorted set of stragglers into the merge window with
    driver updates for qla2xxx, megaraid_sas, storvsc and ufs.

    It also includes pulls of the uapi tree (all the remaining SCSI
    pieces) and the fcoe tree (updates to fcoe and libfc)"

    * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (81 commits)
    [SCSI] ufs: Separate PCI code into glue driver
    [SCSI] ufs: Segregate PCI Specific Code
    [SCSI] scsi: fix lpfc build when wmb() is defined as mb()
    [SCSI] storvsc: Handle dynamic resizing of the device
    [SCSI] storvsc: Restructure error handling code on command completion
    [SCSI] storvsc: avoid usage of WRITE_SAME
    [SCSI] aacraid: suppress two GCC warnings
    [SCSI] hpsa: check for dma_mapping_error in hpsa_passthru ioctls
    [SCSI] hpsa: reorganize error handling in hpsa_passthru_ioctl
    [SCSI] hpsa: check for dma_mapping_error in hpsa_map_sg_chain_block
    [SCSI] hpsa: Check for dma_mapping_error for all code paths using fill_cmd
    [SCSI] hpsa: Check for dma_mapping_error in hpsa_map_one
    [SCSI] dc395x: uninitialized variable in device_alloc()
    [SCSI] Fix range check in scsi_host_dif_capable()
    [SCSI] storvsc: Initialize the sglist
    [SCSI] mpt2sas: Add support for OEM specific controller
    [SCSI] ipr: Fix oops while resetting an ipr adapter
    [SCSI] fnic: Fnic Trace Utility
    [SCSI] fnic: New debug flags and debug log messages
    [SCSI] fnic: fnic driver may hit BUG_ON on device reset
    ...

    Linus Torvalds
     
  • Tim found:

    WARNING: at arch/x86/kernel/smpboot.c:324 topology_sane.isra.2+0x6f/0x80()
    Hardware name: S2600CP
    sched: CPU #1's llc-sibling CPU #0 is not on the same node! [node: 1 != 0]. Ignoring dependency.
    smpboot: Booting Node 1, Processors #1
    Modules linked in:
    Pid: 0, comm: swapper/1 Not tainted 3.9.0-0-generic #1
    Call Trace:
    set_cpu_sibling_map+0x279/0x449
    start_secondary+0x11d/0x1e5

    Don Morris reproduced on a HP z620 workstation, and bisected it to
    commit e8d195525809 ("acpi, memory-hotplug: parse SRAT before memblock
    is ready")

    It turns out movable_map has some problems, and it breaks several things

    1. numa_init is called several times, NOT just for srat. so those
    nodes_clear(numa_nodes_parsed)
    memset(&numa_meminfo, 0, sizeof(numa_meminfo))
    can not be just removed. Need to consider sequence is: numaq, srat, amd, dummy.
    and make fall back path working.

    2. simply split acpi_numa_init to early_parse_srat.
    a. that early_parse_srat is NOT called for ia64, so you break ia64.
    b. for (i = 0; i < MAX_LOCAL_APIC; i++)
    set_apicid_to_node(i, NUMA_NO_NODE)
    still left in numa_init. So it will just clear result from early_parse_srat.
    it should be moved before that....
    c. it breaks ACPI_TABLE_OVERIDE...as the acpi table scan is moved
    early before override from INITRD is settled.

    3. that patch TITLE is total misleading, there is NO x86 in the title,
    but it changes critical x86 code. It caused x86 guys did not
    pay attention to find the problem early. Those patches really should
    be routed via tip/x86/mm.

    4. after that commit, following range can not use movable ram:
    a. real_mode code.... well..funny, legacy Node0 [0,1M) could be hot-removed?
    b. initrd... it will be freed after booting, so it could be on movable...
    c. crashkernel for kdump...: looks like we can not put kdump kernel above 4G
    anymore.
    d. init_mem_mapping: can not put page table high anymore.
    e. initmem_init: vmemmap can not be high local node anymore. That is
    not good.

    If node is hotplugable, the mem related range like page table and
    vmemmap could be on the that node without problem and should be on that
    node.

    We have workaround patch that could fix some problems, but some can not
    be fixed.

    So just remove that offending commit and related ones including:

    f7210e6c4ac7 ("mm/memblock.c: use CONFIG_HAVE_MEMBLOCK_NODE_MAP to
    protect movablecore_map in memblock_overlaps_region().")

    01a178a94e8e ("acpi, memory-hotplug: support getting hotplug info from
    SRAT")

    27168d38fa20 ("acpi, memory-hotplug: extend movablemem_map ranges to
    the end of node")

    e8d195525809 ("acpi, memory-hotplug: parse SRAT before memblock is
    ready")

    fb06bc8e5f42 ("page_alloc: bootmem limit with movablecore_map")

    42f47e27e761 ("page_alloc: make movablemem_map have higher priority")

    6981ec31146c ("page_alloc: introduce zone_movable_limit[] to keep
    movable limit for nodes")

    34b71f1e04fc ("page_alloc: add movable_memmap kernel parameter")

    4d59a75125d5 ("x86: get pg_data_t's memory from other node")

    Later we should have patches that will make sure kernel put page table
    and vmemmap on local node ram instead of push them down to node0. Also
    need to find way to put other kernel used ram to local node ram.

    Reported-by: Tim Gardner
    Reported-by: Don Morris
    Bisected-by: Don Morris
    Tested-by: Don Morris
    Signed-off-by: Yinghai Lu
    Cc: Tony Luck
    Cc: Thomas Renninger
    Cc: Tejun Heo
    Cc: Tang Chen
    Cc: Yasuaki Ishimatsu
    Signed-off-by: Linus Torvalds

    Yinghai Lu
     
  • Pull signal/compat fixes from Al Viro:
    "Fixes for several regressions introduced in the last signal.git pile,
    along with fixing bugs in truncate and ftruncate compat (on just about
    anything biarch at least one of those two had been done wrong)."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
    compat: restore timerfd settime and gettime compat syscalls
    [regression] braino in "sparc: convert to ksignal"
    fix compat truncate/ftruncate
    switch lseek to COMPAT_SYSCALL_DEFINE
    lseek() and truncate() on sparc really need sign extension

    Linus Torvalds