02 Jan, 2013

1 commit


22 Dec, 2012

1 commit

  • Pull watchdog updates from Wim Van Sebroeck:
    "This includes some fixes and code improvements (like
    clk_prepare_enable and clk_disable_unprepare), conversion from the
    omap_wdt and twl4030_wdt drivers to the watchdog framework, addition
    of the SB8x0 chipset support and the DA9055 Watchdog driver and some
    OF support for the davinci_wdt driver."

    * git://www.linux-watchdog.org/linux-watchdog: (22 commits)
    watchdog: mei: avoid oops in watchdog unregister code path
    watchdog: Orion: Fix possible null-deference in orion_wdt_probe
    watchdog: sp5100_tco: Add SB8x0 chipset support
    watchdog: davinci_wdt: add OF support
    watchdog: da9052: Fix invalid free of devm_ allocated data
    watchdog: twl4030_wdt: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER
    watchdog: remove depends on CONFIG_EXPERIMENTAL
    watchdog: Convert dev_printk(KERN_ to dev_(
    watchdog: DA9055 Watchdog driver
    watchdog: omap_wdt: eliminate goto
    watchdog: omap_wdt: delete redundant platform_set_drvdata() calls
    watchdog: omap_wdt: convert to devm_ functions
    watchdog: omap_wdt: convert to new watchdog core
    watchdog: WatchDog Timer Driver Core: fix comment
    watchdog: s3c2410_wdt: use clk_prepare_enable and clk_disable_unprepare
    watchdog: imx2_wdt: Select the driver via ARCH_MXC
    watchdog: cpu5wdt.c: add missing del_timer call
    watchdog: hpwdt.c: Increase version string
    watchdog: Convert twl4030_wdt to watchdog core
    davinci_wdt: preparation for switch to common clock framework
    ...

    Linus Torvalds
     

21 Dec, 2012

12 commits

  • Merge the rest of Andrew's patches for -rc1:
    "A bunch of fixes and misc missed-out-on things.

    That'll do for -rc1. I still have a batch of IPC patches which still
    have a possible bug report which I'm chasing down."

    * emailed patches from Andrew Morton : (25 commits)
    keys: use keyring_alloc() to create module signing keyring
    keys: fix unreachable code
    sendfile: allows bypassing of notifier events
    SGI-XP: handle non-fatal traps
    fat: fix incorrect function comment
    Documentation: ABI: remove testing/sysfs-devices-node
    proc: fix inconsistent lock state
    linux/kernel.h: fix DIV_ROUND_CLOSEST with unsigned divisors
    memcg: don't register hotcpu notifier from ->css_alloc()
    checkpatch: warn on uapi #includes that #include
    mm: cma: WARN if freed memory is still in use
    exec: do not leave bprm->interp on stack
    ...

    Linus Torvalds
     
  • Pull VFS update from Al Viro:
    "fscache fixes, ESTALE patchset, vmtruncate removal series, assorted
    misc stuff."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (79 commits)
    vfs: make lremovexattr retry once on ESTALE error
    vfs: make removexattr retry once on ESTALE
    vfs: make llistxattr retry once on ESTALE error
    vfs: make listxattr retry once on ESTALE error
    vfs: make lgetxattr retry once on ESTALE
    vfs: make getxattr retry once on an ESTALE error
    vfs: allow lsetxattr() to retry once on ESTALE errors
    vfs: allow setxattr to retry once on ESTALE errors
    vfs: allow utimensat() calls to retry once on an ESTALE error
    vfs: fix user_statfs to retry once on ESTALE errors
    vfs: make fchownat retry once on ESTALE errors
    vfs: make fchmodat retry once on ESTALE errors
    vfs: have chroot retry once on ESTALE error
    vfs: have chdir retry lookup and call once on ESTALE error
    vfs: have faccessat retry once on an ESTALE error
    vfs: have do_sys_truncate retry once on an ESTALE error
    vfs: fix renameat to retry on ESTALE errors
    vfs: make do_unlinkat retry once on ESTALE errors
    vfs: make do_rmdir retry once on ESTALE errors
    vfs: add a flags argument to user_path_parent
    ...

    Linus Torvalds
     
  • This file is already documented in the stable ABI (see commit
    5bbe1ec11fcf).

    Signed-off-by: Davidlohr Bueso
    Cc: Greg KH
    Cc: Mel Gorman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Davidlohr Bueso
     
  • Remove the documentation for capability.disable. The code supporting
    this parameter was removed with commit 5915eb53861c ("security: remove
    dummy module")

    Signed-off-by: Josh Boyer
    Acked-by: Serge Hallyn
    Cc: Rob Landley
    Cc: Miklos Szeredi
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Josh Boyer
     
  • …/linux-fs into for-linus

    Al Viro
     
  • Removed vmtruncate

    Signed-off-by: Marco Stornelli
    Signed-off-by: Al Viro

    Marco Stornelli
     
  • Pull nfsd update from Bruce Fields:
    "Included this time:

    - more nfsd containerization work from Stanislav Kinsbursky: we're
    not quite there yet, but should be by 3.9.

    - NFSv4.1 progress: implementation of basic backchannel security
    negotiation and the mandatory BACKCHANNEL_CTL operation. See

    http://wiki.linux-nfs.org/wiki/index.php/Server_4.0_and_4.1_issues

    for remaining TODO's

    - Fixes for some bugs that could be triggered by unusual compounds.
    Our xdr code wasn't designed with v4 compounds in mind, and it
    shows. A more thorough rewrite is still a todo.

    - If you've ever seen "RPC: multiple fragments per record not
    supported" logged while using some sort of odd userland NFS client,
    that should now be fixed.

    - Further work from Jeff Layton on our mechanism for storing
    information about NFSv4 clients across reboots.

    - Further work from Bryan Schumaker on his fault-injection mechanism
    (which allows us to discard selective NFSv4 state, to excercise
    rarely-taken recovery code paths in the client.)

    - The usual mix of miscellaneous bugs and cleanup.

    Thanks to everyone who tested or contributed this cycle."

    * 'for-3.8' of git://linux-nfs.org/~bfields/linux: (111 commits)
    nfsd4: don't leave freed stateid hashed
    nfsd4: free_stateid can use the current stateid
    nfsd4: cleanup: replace rq_resused count by rq_next_page pointer
    nfsd: warn on odd reply state in nfsd_vfs_read
    nfsd4: fix oops on unusual readlike compound
    nfsd4: disable zero-copy on non-final read ops
    svcrpc: fix some printks
    NFSD: Correct the size calculation in fault_inject_write
    NFSD: Pass correct buffer size to rpc_ntop
    nfsd: pass proper net to nfsd_destroy() from NFSd kthreads
    nfsd: simplify service shutdown
    nfsd: replace boolean nfsd_up flag by users counter
    nfsd: simplify NFSv4 state init and shutdown
    nfsd: introduce helpers for generic resources init and shutdown
    nfsd: make NFSd service structure allocated per net
    nfsd: make NFSd service boot time per-net
    nfsd: per-net NFSd up flag introduced
    nfsd: move per-net startup code to separated function
    nfsd: pass net to __write_ports() and down
    nfsd: pass net to nfsd_set_nrthreads()
    ...

    Linus Torvalds
     
  • Provide a proper invalidation method rather than relying on the netfs retiring
    the cookie it has and getting a new one. The problem with this is that isn't
    easy for the netfs to make sure that it has completed/cancelled all its
    outstanding storage and retrieval operations on the cookie it is retiring.

    Instead, have the cache provide an invalidation method that will cancel or wait
    for all currently outstanding operations before invalidating the cache, and
    will cause new operations to queue up behind that. Whilst invalidation is in
    progress, some requests will be rejected until the cache can stack a barrier on
    the operation queue to cause new operations to be deferred behind it.

    Signed-off-by: David Howells

    David Howells
     
  • Pull Ceph update from Sage Weil:
    "There are a few different groups of commits here. The largest is
    Alex's ongoing work to enable the coming RBD features (cloning,
    striping). There is some cleanup in libceph that goes along with it.

    Cyril and David have fixed some problems with NFS reexport (leaking
    dentries and page locks), and there is a batch of patches from Yan
    fixing problems with the fs client when running against a clustered
    MDS. There are a few bug fixes mixed in for good measure, many of
    which will be going to the stable trees once they're upstream.

    My apologies for the late pull. There is still a gremlin in the rbd
    map/unmap code and I was hoping to include the fix for that as well,
    but we haven't been able to confirm the fix is correct yet; I'll send
    that in a separate pull once it's nailed down."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (68 commits)
    rbd: get rid of rbd_{get,put}_dev()
    libceph: register request before unregister linger
    libceph: don't use rb_init_node() in ceph_osdc_alloc_request()
    libceph: init event->node in ceph_osdc_create_event()
    libceph: init osd->o_node in create_osd()
    libceph: report connection fault with warning
    libceph: socket can close in any connection state
    rbd: don't use ENOTSUPP
    rbd: remove linger unconditionally
    rbd: get rid of RBD_MAX_SEG_NAME_LEN
    libceph: avoid using freed osd in __kick_osd_requests()
    ceph: don't reference req after put
    rbd: do not allow remove of mounted-on image
    libceph: Unlock unprocessed pages in start_read() error path
    ceph: call handle_cap_grant() for cap import message
    ceph: Fix __ceph_do_pending_vmtruncate
    ceph: Don't add dirty inode to dirty list if caps is in migration
    ceph: Fix infinite loop in __wake_requests
    ceph: Don't update i_max_size when handling non-auth cap
    bdi_register: add __printf verification, fix arg mismatch
    ...

    Linus Torvalds
     
  • Fix the state management of internal fscache operations and the accounting of
    what operations are in what states.

    This is done by:

    (1) Give struct fscache_operation a enum variable that directly represents the
    state it's currently in, rather than spreading this knowledge over a bunch
    of flags, who's processing the operation at the moment and whether it is
    queued or not.

    This makes it easier to write assertions to check the state at various
    points and to prevent invalid state transitions.

    (2) Add an 'operation complete' state and supply a function to indicate the
    completion of an operation (fscache_op_complete()) and make things call
    it. The final call to fscache_put_operation() can then check that an op
    in the appropriate state (complete or cancelled).

    (3) Adjust the use of object->n_ops, ->n_in_progress, ->n_exclusive to better
    govern the state of an object:

    (a) The ->n_ops is now the number of extant operations on the object
    and is now decremented by fscache_put_operation() only.

    (b) The ->n_in_progress is simply the number of objects that have been
    taken off of the object's pending queue for the purposes of being
    run. This is decremented by fscache_op_complete() only.

    (c) The ->n_exclusive is the number of exclusive ops that have been
    submitted and queued or are in progress. It is decremented by
    fscache_op_complete() and by fscache_cancel_op().

    fscache_put_operation() and fscache_operation_gc() now no longer try to
    clean up ->n_exclusive and ->n_in_progress. That was leading to double
    decrements against fscache_cancel_op().

    fscache_cancel_op() now no longer decrements ->n_ops. That was leading to
    double decrements against fscache_put_operation().

    fscache_submit_exclusive_op() now decides whether it has to queue an op
    based on ->n_in_progress being > 0 rather than ->n_ops > 0 as the latter
    will persist in being true even after all preceding operations have been
    cancelled or completed. Furthermore, if an object is active and there are
    runnable ops against it, there must be at least one op running.

    (4) Add a remaining-pages counter (n_pages) to struct fscache_retrieval and
    provide a function to record completion of the pages as they complete.

    When n_pages reaches 0, the operation is deemed to be complete and
    fscache_op_complete() is called.

    Add calls to fscache_retrieval_complete() anywhere we've finished with a
    page we've been given to read or allocate for. This includes places where
    we just return pages to the netfs for reading from the server and where
    accessing the cache fails and we discard the proposed netfs page.

    The bugs in the unfixed state management manifest themselves as oopses like the
    following where the operation completion gets out of sync with return of the
    cookie by the netfs. This is possible because the cache unlocks and returns
    all the netfs pages before recording its completion - which means that there's
    nothing to stop the netfs discarding them and returning the cookie.

    FS-Cache: Cookie 'NFS.fh' still has outstanding reads
    ------------[ cut here ]------------
    kernel BUG at fs/fscache/cookie.c:519!
    invalid opcode: 0000 [#1] SMP
    CPU 1
    Modules linked in: cachefiles nfs fscache auth_rpcgss nfs_acl lockd sunrpc

    Pid: 400, comm: kswapd0 Not tainted 3.1.0-rc7-fsdevel+ #1090 /DG965RY
    RIP: 0010:[] [] __fscache_relinquish_cookie+0x170/0x343 [fscache]
    RSP: 0018:ffff8800368cfb00 EFLAGS: 00010282
    RAX: 000000000000003c RBX: ffff880023cc8790 RCX: 0000000000000000
    RDX: 0000000000002f2e RSI: 0000000000000001 RDI: ffffffff813ab86c
    RBP: ffff8800368cfb50 R08: 0000000000000002 R09: 0000000000000000
    R10: ffff88003a1b7890 R11: ffff88001df6e488 R12: ffff880023d8ed98
    R13: ffff880023cc8798 R14: 0000000000000004 R15: ffff88003b8bf370
    FS: 0000000000000000(0000) GS:ffff88003bd00000(0000) knlGS:0000000000000000
    CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
    CR2: 00000000008ba008 CR3: 0000000023d93000 CR4: 00000000000006e0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    Process kswapd0 (pid: 400, threadinfo ffff8800368ce000, task ffff88003b8bf040)
    Stack:
    ffff88003b8bf040 ffff88001df6e528 ffff88001df6e528 ffffffffa00b46b0
    ffff88003b8bf040 ffff88001df6e488 ffff88001df6e620 ffffffffa00b46b0
    ffff88001ebd04c8 0000000000000004 ffff8800368cfb70 ffffffffa00b2c91
    Call Trace:
    [] nfs_fscache_release_inode_cookie+0x3b/0x47 [nfs]
    [] nfs_clear_inode+0x3c/0x41 [nfs]
    [] nfs4_evict_inode+0x2f/0x33 [nfs]
    [] evict+0xa1/0x15c
    [] dispose_list+0x2c/0x38
    [] prune_icache_sb+0x28c/0x29b
    [] prune_super+0xd5/0x140
    [] shrink_slab+0x102/0x1ab
    [] balance_pgdat+0x2f2/0x595
    [] ? process_timeout+0xb/0xb
    [] kswapd+0x270/0x289
    [] ? __init_waitqueue_head+0x46/0x46
    [] ? balance_pgdat+0x595/0x595
    [] kthread+0x7f/0x87
    [] kernel_thread_helper+0x4/0x10
    [] ? finish_task_switch+0x45/0xc0
    [] ? retint_restore_args+0xe/0xe
    [] ? __init_kthread_worker+0x53/0x53
    [] ? gs_change+0xb/0xb

    Signed-off-by: David Howells

    David Howells
     
  • Pull new F2FS filesystem from Jaegeuk Kim:
    "Introduce a new file system, Flash-Friendly File System (F2FS), to
    Linux 3.8.

    Highlights:
    - Add initial f2fs source codes
    - Fix an endian conversion bug
    - Fix build failures on random configs
    - Fix the power-off-recovery routine
    - Minor cleanup, coding style, and typos patches"

    From the Kconfig help text:

    F2FS is based on Log-structured File System (LFS), which supports
    versatile "flash-friendly" features. The design has been focused on
    addressing the fundamental issues in LFS, which are snowball effect
    of wandering tree and high cleaning overhead.

    Since flash-based storages show different characteristics according to
    the internal geometry or flash memory management schemes aka FTL, F2FS
    and tools support various parameters not only for configuring on-disk
    layout, but also for selecting allocation and cleaning algorithms.

    and there's an article by Neil Brown about it on lwn.net:

    http://lwn.net/Articles/518988/

    * tag 'for-3.8-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (36 commits)
    f2fs: fix tracking parent inode number
    f2fs: cleanup the f2fs_bio_alloc routine
    f2fs: introduce accessor to retrieve number of dentry slots
    f2fs: remove redundant call to f2fs_put_page in delete entry
    f2fs: make use of GFP_F2FS_ZERO for setting gfp_mask
    f2fs: rewrite f2fs_bio_alloc to make it simpler
    f2fs: fix a typo in f2fs documentation
    f2fs: remove unused variable
    f2fs: move error condition for mkdir at proper place
    f2fs: remove unneeded initialization
    f2fs: check read only condition before beginning write out
    f2fs: remove unneeded memset from init_once
    f2fs: show error in case of invalid mount arguments
    f2fs: fix the compiler warning for uninitialized use of variable
    f2fs: resolve build failures
    f2fs: adjust kernel coding style
    f2fs: fix endian conversion bugs reported by sparse
    f2fs: remove unneeded version.h header file from f2fs.h
    f2fs: update the f2fs document
    f2fs: update Kconfig and Makefile
    ...

    Linus Torvalds
     
  • Pull IOMMU updates from Joerg Roedel:
    "A few new features this merge-window. The most important one is
    probably, that dma-debug now warns if a dma-handle is not checked with
    dma_mapping_error by the device driver. This requires minor changes
    to some architectures which make use of dma-debug. Most of these
    changes have the respective Acks by the Arch-Maintainers.

    Besides that there are updates to the AMD IOMMU driver for refactor
    the IOMMU-Groups support and to make sure it does not trigger a
    hardware erratum.

    The OMAP changes (for which I pulled in a branch from Tony Lindgren's
    tree) have a conflict in linux-next with the arm-soc tree. The
    conflict is in the file arch/arm/mach-omap2/clock44xx_data.c which is
    deleted in the arm-soc tree. It is safe to delete the file too so
    solve the conflict. Similar changes are done in the arm-soc tree in
    the common clock framework migration. A missing hunk from the patch
    in the IOMMU tree will be submitted as a seperate patch when the
    merge-window is closed."

    * tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (29 commits)
    ARM: dma-mapping: support debug_dma_mapping_error
    ARM: OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf clocks
    iommu/omap: Adapt to runtime pm
    iommu/omap: Migrate to hwmod framework
    iommu/omap: Keep mmu enabled when requested
    iommu/omap: Remove redundant clock handling on ISR
    iommu/amd: Remove obsolete comment
    iommu/amd: Don't use 512GB pages
    iommu/tegra: smmu: Move bus_set_iommu after probe for multi arch
    iommu/tegra: gart: Move bus_set_iommu after probe for multi arch
    iommu/tegra: smmu: Remove unnecessary PTC/TLB flush all
    tile: dma_debug: add debug_dma_mapping_error support
    sh: dma_debug: add debug_dma_mapping_error support
    powerpc: dma_debug: add debug_dma_mapping_error support
    mips: dma_debug: add debug_dma_mapping_error support
    microblaze: dma-mapping: support debug_dma_mapping_error
    ia64: dma_debug: add debug_dma_mapping_error support
    c6x: dma_debug: add debug_dma_mapping_error support
    ARM64: dma_debug: add debug_dma_mapping_error support
    intel-iommu: Prevent devices with RMRRs from being placed into SI Domain
    ...

    Linus Torvalds
     

20 Dec, 2012

9 commits

  • Pull hwmon subsystem update from Jean Delvare:
    "There are many improvements to the it87 driver, as well as suspend
    support for the Winbond Super-I/O chips, and a few other fixes."

    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon-vid: Add support for AMD family 11h to 15h processors
    hwmon: (it87) Support PECI for additional chips
    hwmon: (it87) Report thermal sensor type as Intel PECI if appropriate
    hwmon: (it87) Manage device specific features with table
    hwmon: (it87) Replace pwm group macro with direct attribute definitions
    hwmon: (it87) Avoid quoted string splits across lines
    hwmon: (it87) Save fan registers in 2-dimensional array
    hwmon: (it87) Introduce support for tempX_offset sysfs attribute
    hwmon: (it87) Replace macro defining tempX_type sensors with direct definitions
    hwmon: (it87) Save voltage register values in 2-dimensional array
    hwmon: (it87) Save temperature registers in 2-dimensional array
    hwmon: (w83627ehf) Get rid of smatch warnings
    hwmon: (w83627hf) Don't touch nonexistent I2C address registers
    hwmon: (w83627ehf) Add support for suspend
    hwmon: (w83627hf) Add support for suspend
    hwmon: Fix PCI device reference leak in quirk

    Linus Torvalds
     
  • Linus Torvalds
     
  • This adds OF support for davinci_wdt driver.

    Signed-off-by: Murali Karicheri
    Acked-by: Grant Likely
    Signed-off-by: Wim Van Sebroeck

    Murali Karicheri
     
  • IT8721 and IT8728 support Intel PECI temperature reporting. Each sensor
    can be programmed to display the temperature reported on the PECI interface.

    If configured for Intel PECI, the driver reported the wrong sensor type for
    the respective thermal sensor. Fix the code to correctly report it as
    "Intel PECI (6)".

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

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

    Guenter Roeck
     
  • Pull Xtensa patchset from Chris Zankel:
    "This contains support of device trees, many fixes, and code clean-ups"

    * tag 'xtensa-20121218' of git://github.com/czankel/xtensa-linux: (33 commits)
    xtensa: don't try to build DTB when OF is disabled
    xtensa: set the correct ethernet address for xtfpga
    xtensa: clean up files to make them code-style compliant
    xtensa: provide endianness macro for sparse
    xtensa: fix RASID SR initialization
    xtensa: initialize CPENABLE SR when core has one
    xtensa: reset all timers on initialization
    Use for_each_compatible_node() macro.
    xtensa: add XTFPGA DTS
    xtensa: add support for the XTFPGA boards
    xtensa: add device trees support
    xtensa: add IRQ domains support
    xtensa: add U-Boot image support (uImage).
    xtensa: clean up boot make rules
    xtensa: fix mb and wmb definitions
    xtensa: add s32c1i-based spinlock implementations
    xtensa: add s32c1i-based bitops implementations
    xtensa: add s32c1i-based atomic ops implementations
    xtensa: add s32c1i sanity check
    xtensa: add trap_set_handler function
    ...

    Linus Torvalds
     
  • Pull small x86 fixes from Peter Anvin:
    "A collection of very small fixes, mostly pure documentation."

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86, doc: Document that bootloader ID 4 is used also by iPXE
    x86, doc: Add a formal bootloader ID for kexec-tools
    x86, 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops

    Linus Torvalds
     
  • Pull MTD updates from David Woodhouse:
    - Various cleanups especially in NAND tests
    - Add support for NAND flash on BCMA bus
    - DT support for sh_flctl and denali NAND drivers
    - Kill obsolete/superceded drivers (fortunet, nomadik_nand)
    - Fix JFFS2 locking bug in ENOMEM failure path
    - New SPI flash chips, as usual
    - Support writing in 'reliable mode' for DiskOnChip G4
    - Debugfs support in nandsim

    * tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd: (96 commits)
    mtd: nand: typo in nand_id_has_period() comments
    mtd: nand/gpio: use io{read,write}*_rep accessors
    mtd: block2mtd: throttle writes by calling balance_dirty_pages_ratelimited.
    mtd: nand: gpmi: reset BCH earlier, too, to avoid NAND startup problems
    mtd: nand/docg4: fix and improve read of factory bbt
    mtd: nand/docg4: reserve bb marker area in ecclayout
    mtd: nand/docg4: add support for writing in reliable mode
    mtd: mxc_nand: reorder part_probes to let cmdline override other sources
    mtd: mxc_nand: fix unbalanced clk_disable() in error path
    mtd: nandsim: Introduce debugfs infrastructure
    mtd: physmap_of: error checking to prevent a NULL pointer dereference
    mtg: docg3: potential divide by zero in doc_write_oob()
    mtd: bcm47xxnflash: writing support
    mtd: tests/read: initialize buffer for whole next page
    mtd: at91: atmel_nand: return bit flips for the PMECC read_page()
    mtd: fix recovery after failed write-buffer operation in cfi_cmdset_0002.c
    mtd: nand: onfi need to be probed in 8 bits mode
    mtd: nand: add NAND_BUSWIDTH_AUTO to autodetect bus width
    mtd: nand: print flash size during detection
    mted: nand_wait_ready timeout fix
    ...

    Linus Torvalds
     
  • Pull pwm changes from Thierry Reding:
    "A new driver has been added for the SPEAr platform and the
    TWL4030/6030 driver has been replaced by two drivers that control the
    regular PWMs and the PWM driven LEDs provided by the chips.

    The vt8500, tiecap, tiehrpwm, i.MX, LPC32xx and Samsung drivers have
    all been improved and the device tree bindings now support the PWM
    signal polarity."

    Fix up trivial conflicts due to __devinit/exit removal.

    * tag 'for-3.8-rc1' of git://gitorious.org/linux-pwm/linux-pwm: (21 commits)
    pwm: samsung: add missing s3c->pwm_id assignment
    pwm: lpc32xx: Set the chip base for dynamic allocation
    pwm: lpc32xx: Properly disable the clock on device removal
    pwm: lpc32xx: Fix the PWM polarity
    pwm: i.MX: eliminate build warning
    pwm: Export of_pwm_xlate_with_flags()
    pwm: Remove pwm-twl6030 driver
    pwm: New driver to support PWM driven LEDs on TWL4030/6030 series of PMICs
    pwm: New driver to support PWMs on TWL4030/6030 series of PMICs
    pwm: pwm-tiehrpwm: pinctrl support
    pwm: tiehrpwm: Add device-tree binding
    pwm: pwm-tiehrpwm: Adding TBCLK gating support.
    pwm: pwm-tiecap: pinctrl support
    pwm: tiecap: Add device-tree binding
    pwm: Add TI PWM subsystem driver
    pwm: Device tree support for PWM polarity
    pwm: vt8500: Ensure PWM clock is enabled during pwm_config
    pwm: vt8500: Fix build error
    pwm: spear: Staticize spear_pwm_config()
    pwm: Add SPEAr PWM chip driver support
    ...

    Linus Torvalds
     

19 Dec, 2012

11 commits

  • Pull module update from Rusty Russell:
    "Nothing all that exciting; a new module-from-fd syscall for those who
    want to verify the source of the module (ChromeOS) and/or use standard
    IMA on it or other security hooks."

    * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
    MODSIGN: Fix kbuild output when using default extra_certificates
    MODSIGN: Avoid using .incbin in C source
    modules: don't hand 0 to vmalloc.
    module: Remove a extra null character at the top of module->strtab.
    ASN.1: Use the ASN1_LONG_TAG and ASN1_INDEFINITE_LENGTH constants
    ASN.1: Define indefinite length marker constant
    moduleparam: use __UNIQUE_ID()
    __UNIQUE_ID()
    MODSIGN: Add modules_sign make target
    powerpc: add finit_module syscall.
    ima: support new kernel module syscall
    add finit_module syscall to asm-generic
    ARM: add finit_module syscall to ARM
    security: introduce kernel_module_from_file hook
    module: add flags arg to sys_finit_module()
    module: add syscall to load module from fd

    Linus Torvalds
     
  • Fix name of slink binding and address of sflash example to make it
    self consistent.

    Signed-off-by: Allen Martin
    Signed-off-by: Grant Likely

    Allen Martin
     
  • In order to use S32C1I instruction on cores with ATOMCTL SR the register
    must be properly initialized.

    Signed-off-by: Max Filippov
    Signed-off-by: Chris Zankel

    Max Filippov
     
  • Pull i2c-embedded changes from Wolfram Sang:
    - CBUS driver (an I2C variant)
    - continued rework of the omap driver
    - s3c2410 gets lots of fixes and gains pinctrl support
    - at91 gains DMA support
    - the GPIO muxer gains devicetree probing
    - typical fixes and additions all over

    * 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (45 commits)
    i2c: omap: Remove the OMAP_I2C_FLAG_RESET_REGS_POSTIDLE flag
    i2c: at91: add dma support
    i2c: at91: change struct members indentation
    i2c: at91: fix compilation warning
    i2c: mxs: Do not disable the I2C SMBus quick mode
    i2c: mxs: Handle i2c DMA failure properly
    i2c: s3c2410: Remove recently introduced performance overheads
    i2c: ocores: Move grlib set/get functions into #ifdef CONFIG_OF block
    i2c: s3c2410: Add fix for i2c suspend/resume
    i2c: s3c2410: Fix code to free gpios
    i2c: i2c-cbus-gpio: introduce driver
    i2c: ocores: Add support for the GRLIB port of the controller and use function pointers for getreg and setreg functions
    i2c: ocores: Add irq support for sparc
    i2c: omap: Move the remove constraint
    ARM: dts: cfa10049: Add the i2c muxer buses to the CFA-10049
    i2c: s3c2410: do not special case HDMIPHY stuck bus detection
    i2c: s3c2410: use exponential back off while polling for bus idle
    i2c: s3c2410: do not generate STOP for QUIRK_HDMIPHY
    i2c: s3c2410: grab adapter lock while changing i2c clock
    i2c: s3c2410: Add support for pinctrl
    ...

    Linus Torvalds
     
  • Merge patches from Andrew Morton:
    "Most of the rest of MM, plus a few dribs and drabs.

    I still have quite a few irritating patches left around: ones with
    dubious testing results, lack of review, ones which should have gone
    via maintainer trees but the maintainers are slack, etc.

    I need to be more activist in getting these things wrapped up outside
    the merge window, but they're such a PITA."

    * emailed patches from Andrew Morton : (48 commits)
    mm/vmscan.c: avoid possible deadlock caused by too_many_isolated()
    vmscan: comment too_many_isolated()
    mm/kmemleak.c: remove obsolete simple_strtoul
    mm/memory_hotplug.c: improve comments
    mm/hugetlb: create hugetlb cgroup file in hugetlb_init
    mm/mprotect.c: coding-style cleanups
    Documentation: ABI: /sys/devices/system/node/
    slub: drop mutex before deleting sysfs entry
    memcg: add comments clarifying aspects of cache attribute propagation
    kmem: add slab-specific documentation about the kmem controller
    slub: slub-specific propagation changes
    slab: propagate tunable values
    memcg: aggregate memcg cache values in slabinfo
    memcg/sl[au]b: shrink dead caches
    memcg/sl[au]b: track all the memcg children of a kmem_cache
    memcg: destroy memcg caches
    sl[au]b: allocate objects from memcg cache
    sl[au]b: always get the cache from its page in kmem_cache_free()
    memcg: skip memcg kmem allocations in specified code regions
    memcg: infrastructure to match an allocation to the right cache
    ...

    Linus Torvalds
     
  • Describe NUMA node sysfs files/attributes.

    Note that for the specific dates and contacts I couldn't find,
    I left it as default for Oct 2002 and linux-mm.

    Signed-off-by: Davidlohr Bueso
    Cc: Greg Kroah-Hartman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Davidlohr Bueso
     
  • Signed-off-by: Glauber Costa
    Cc: Christoph Lameter
    Cc: David Rientjes
    Cc: Frederic Weisbecker
    Cc: Greg Thelen
    Cc: Johannes Weiner
    Cc: JoonSoo Kim
    Cc: KAMEZAWA Hiroyuki
    Cc: Mel Gorman
    Cc: Michal Hocko
    Cc: Pekka Enberg
    Cc: Rik van Riel
    Cc: Suleiman Souhlal
    Cc: Tejun Heo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Glauber Costa
     
  • Signed-off-by: Glauber Costa
    Acked-by: Kamezawa Hiroyuki
    Acked-by: Michal Hocko
    Cc: Christoph Lameter
    Cc: David Rientjes
    Cc: Frederic Weisbecker
    Cc: Greg Thelen
    Cc: Johannes Weiner
    Cc: JoonSoo Kim
    Cc: Mel Gorman
    Cc: Pekka Enberg
    Cc: Rik van Riel
    Cc: Suleiman Souhlal
    Cc: Tejun Heo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Glauber Costa
     
  • It is useful to know how many charges are still left after a call to
    res_counter_uncharge. While it is possible to issue a res_counter_read
    after uncharge, this can be racy.

    If we need, for instance, to take some action when the counters drop down
    to 0, only one of the callers should see it. This is the same semantics
    as the atomic variables in the kernel.

    Since the current return value is void, we don't need to worry about
    anything breaking due to this change: nobody relied on that, and only
    users appearing from now on will be checking this value.

    Signed-off-by: Glauber Costa
    Reviewed-by: Michal Hocko
    Acked-by: Kamezawa Hiroyuki
    Acked-by: David Rientjes
    Cc: Johannes Weiner
    Cc: Suleiman Souhlal
    Cc: Tejun Heo
    Cc: Christoph Lameter
    Cc: Frederic Weisbecker
    Cc: Greg Thelen
    Cc: JoonSoo Kim
    Cc: Mel Gorman
    Cc: Pekka Enberg
    Cc: Rik van Riel
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Glauber Costa
     
  • Pull second round of input updates from Dmitry Torokhov:
    "As usual, there are a couple of new drivers, input core now supports
    managed input devices (devres), a slew of drivers now have device tree
    support and a bunch of fixes and cleanups."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (71 commits)
    Input: walkera0701 - fix crash on startup
    Input: matrix-keymap - provide a proper module license
    Input: gpio_keys_polled - switch to using gpio_request_one()
    Input: gpio_keys - switch to using gpio_request_one()
    Input: wacom - fix touch support for Bamboo Fun CTH-461
    Input: xpad - add a few new VID/PID combinations
    Input: xpad - minor formatting fixes
    Input: gpio-keys-polled - honor 'autorepeat' setting in platform data
    Input: tca8418-keypad - switch to using managed resources
    Input: tca8418_keypad - increase severity of failures in probe()
    Input: tca8418_keypad - move device ID tables closer to where they are used
    Input: tca8418_keypad - use dev_get_platdata() to retrieve platform data
    Input: tca8418_keypad - use a temporary variable for parent device
    Input: tca8418_keypad - add support for shared interrupt
    Input: tca8418_keypad - add support for device tree bindings
    Input: remove Compaq iPAQ H3600 (Bitsy) touchscreen driver
    Input: bu21013_ts - add support for Device Tree booting
    Input: bu21013_ts - move GPIO init and exit functions into the driver
    Input: bu21013_ts - request regulator that actually exists
    ARM: ux500: Strip out duplicate touch screen platform information
    ...

    Linus Torvalds
     
  • Pull powerpc update from Benjamin Herrenschmidt:
    "The main highlight is probably some base POWER8 support. There's more
    to come such as transactional memory support but that will wait for
    the next one.

    Overall it's pretty quiet, or rather I've been pretty poor at picking
    things up from patchwork and reviewing them this time around and Kumar
    no better on the FSL side it seems..."

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (73 commits)
    powerpc+of: Rename and fix OF reconfig notifier error inject module
    powerpc: mpc5200: Add a3m071 board support
    powerpc/512x: don't compile any platform DIU code if the DIU is not enabled
    powerpc/mpc52xx: use module_platform_driver macro
    powerpc+of: Export of_reconfig_notifier_[register,unregister]
    powerpc/dma/raidengine: add raidengine device
    powerpc/iommu/fsl: Add PAMU bypass enable register to ccsr_guts struct
    powerpc/mpc85xx: Change spin table to cached memory
    powerpc/fsl-pci: Add PCI controller ATMU PM support
    powerpc/86xx: fsl_pcibios_fixup_bus requires CONFIG_PCI
    drivers/virt: the Freescale hypervisor driver doesn't need to check MSR[GS]
    powerpc/85xx: p1022ds: Use NULL instead of 0 for pointers
    powerpc: Disable relocation on exceptions when kexecing
    powerpc: Enable relocation on during exceptions at boot
    powerpc: Move get_longbusy_msecs into hvcall.h and remove duplicate function
    powerpc: Add wrappers to enable/disable relocation on exceptions
    powerpc: Add set_mode hcall
    powerpc: Setup relocation on exceptions for bare metal systems
    powerpc: Move initial mfspr LPCR out of __init_LPCR
    powerpc: Add relocation on exception vector handlers
    ...

    Linus Torvalds
     

18 Dec, 2012

6 commits

  • Signed-off-by: Cyrill Gorcunov
    Cc: Pavel Emelyanov
    Cc: Oleg Nesterov
    Cc: Andrey Vagin
    Cc: Al Viro
    Cc: Alexey Dobriyan
    Cc: James Bottomley
    Cc: "Aneesh Kumar K.V"
    Cc: Alexey Dobriyan
    Cc: Matthew Helsley
    Cc: "J. Bruce Fields"
    Cc: "Aneesh Kumar K.V"
    Cc: Tvrtko Ursulin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cyrill Gorcunov
     
  • [akpm@linux-foundation.org: tweak documentation]
    Signed-off-by: Cyrill Gorcunov
    Cc: Pavel Emelyanov
    Cc: Oleg Nesterov
    Cc: Andrey Vagin
    Cc: Al Viro
    Cc: Alexey Dobriyan
    Cc: James Bottomley
    Cc: "Aneesh Kumar K.V"
    Cc: Alexey Dobriyan
    Cc: Matthew Helsley
    Cc: "J. Bruce Fields"
    Cc: "Aneesh Kumar K.V"
    Cc: Tvrtko Ursulin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cyrill Gorcunov
     
  • With this change, the aoe driver treats the value zero as special for
    the aoe_deadsecs module parameter. Normally, this value specifies the
    number of seconds during which the driver will continue to attempt
    retransmits to an unresponsive AoE target. After aoe_deadsecs has
    elapsed, the aoe driver marks the aoe device as "down" and fails all
    I/O.

    The new meaning of an aoe_deadsecs of zero is for the driver to
    retransmit commands indefinitely.

    Signed-off-by: Ed Cashin
    Cc: Jens Axboe
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ed Cashin
     
  • The context feature of sparse is used with the Linux kernel sources to
    check for imbalanced uses of locks. Document the annotations defined in
    include/linux/compiler.h that tell sparse what to expect when a lock is
    held on function entry, exit, or both.

    Signed-off-by: Ed Cashin
    Reviewed-by: Josh Triplett
    Acked-by: Christopher Li
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ed Cashin
     
  • It is currently impossible to examine the state of seccomp for a given
    process. While attaching with gdb and attempting "call
    prctl(PR_GET_SECCOMP,...)" will work with some situations, it is not
    reliable. If the process is in seccomp mode 1, this query will kill the
    process (prctl not allowed), if the process is in mode 2 with prctl not
    allowed, it will similarly be killed, and in weird cases, if prctl is
    filtered to return errno 0, it can look like seccomp is disabled.

    When reviewing the state of running processes, there should be a way to
    externally examine the seccomp mode. ("Did this build of Chrome end up
    using seccomp?" "Did my distro ship ssh with seccomp enabled?")

    This adds the "Seccomp" line to /proc/$pid/status.

    Signed-off-by: Kees Cook
    Reviewed-by: Cyrill Gorcunov
    Cc: Andrea Arcangeli
    Cc: James Morris
    Acked-by: Serge E. Hallyn
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kees Cook
     
  • During c/r sessions we've found that there is no way at the moment to
    fetch some VMA associated flags, such as mlock() and madvise().

    This leads us to a problem -- we don't know if we should call for mlock()
    and/or madvise() after restore on the vma area we're bringing back to
    life.

    This patch intorduces a new field into "smaps" output called VmFlags,
    where all set flags associated with the particular VMA is shown as two
    letter mnemonics.

    [ Strictly speaking for c/r we only need mlock/madvise bits but it has been
    said that providing just a few flags looks somehow inconsistent. So all
    flags are here now. ]

    This feature is made available on CONFIG_CHECKPOINT_RESTORE=n kernels, as
    other applications may start to use these fields.

    The data is encoded in a somewhat awkward two letters mnemonic form, to
    encourage userspace to be prepared for fields being added or removed in
    the future.

    [a.p.zijlstra@chello.nl: props to use for_each_set_bit]
    [sfr@canb.auug.org.au: props to use array instead of struct]
    [akpm@linux-foundation.org: overall redesign and simplification]
    [akpm@linux-foundation.org: remove unneeded braces per sfr, avoid using bloaty for_each_set_bit()]
    Signed-off-by: Cyrill Gorcunov
    Cc: Pavel Emelyanov
    Cc: Peter Zijlstra
    Cc: Stephen Rothwell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cyrill Gorcunov