07 Dec, 2013

1 commit

  • Pull devicetree fixes from Rob Herring:
    - Various DT binding documentation updates
    - Add Kumar Gala and remove Stephen Warren as DT binding maintainers

    * tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
    dt: binding: reword PowerPC 8xxx GPIO documentation
    ARM: tegra: delete nvidia,tegra20-spi.txt binding
    hwmon: ntc_thermistor: Fix typo (pullup-uV -> pullup-uv)
    of: add vendor prefix for GMT
    clk: exynos: Fix typos in DT bindings documentation
    of: Add vendor prefix for LG Corporation
    Documentation: net: fsl-fec.txt: Add phy-supply entry
    ARM: dts: doc: Document missing binding for omap5-mpu
    dt-bindings: add ARMv8 PMU binding
    MAINTAINERS: remove swarren from DT bindings
    MAINTAINERS: Add Kumar to Device Tree Binding maintainers group

    Linus Torvalds
     

06 Dec, 2013

2 commits

  • Pull NFS client bugfixes from Trond Myklebust:
    - Stable fix for a NFSv4.1 delegation and state recovery deadlock
    - Stable fix for a loop on irrecoverable errors when returning
    delegations
    - Fix a 3-way deadlock between layoutreturn, open, and state recovery
    - Update the MAINTAINERS file with contact information for Trond
    Myklebust
    - Close needs to handle NFS4ERR_ADMIN_REVOKED
    - Enabling v4.2 should not recompile nfsd and lockd
    - Fix a couple of compile warnings

    * tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
    nfs: fix do_div() warning by instead using sector_div()
    MAINTAINERS: Update contact information for Trond Myklebust
    NFSv4.1: Prevent a 3-way deadlock between layoutreturn, open and state recovery
    SUNRPC: do not fail gss proc NULL calls with EACCES
    NFSv4: close needs to handle NFS4ERR_ADMIN_REVOKED
    NFSv4: Update list of irrecoverable errors on DELEGRETURN
    NFSv4 wait on recovery for async session errors
    NFS: Fix a warning in nfs_setsecurity
    NFS: Enabling v4.2 should not recompile nfsd and lockd

    Linus Torvalds
     
  • Pull btrfs MAINTAINERS file update:
    "I'm still getting settled into new devel hardware etc, but I do have
    one commit for the next rc.

    This changes my email over to fb.com, and adds a MAINTAINERS entry for
    Josef as well"

    * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
    Btrfs: update the MAINTAINERS file

    Linus Torvalds
     

05 Dec, 2013

1 commit


04 Dec, 2013

1 commit


03 Dec, 2013

4 commits

  • I'm afraid I'm rather burned out w.r.t. DT bindings. As has probably
    been evident, I don't have and haven't made the time to review many
    recently. As such, remove myself from that MAINTAINERS entry.

    Signed-off-by: Stephen Warren
    Signed-off-by: Rob Herring

    Stephen Warren
     
  • I'm tossing my hat into the ring of maintainers/reviewers for device tree
    bindings based on history of dealing with DT on embedded PPC and starting
    work on ARM SoCs.

    Signed-off-by: Kumar Gala
    Acked-by: Pawel Moll
    Cc: Mark Rutland
    Acked-by: Stephen Warren
    Cc: Ian Campbell
    Cc: Rob Herring
    Cc: Grant Likely
    Cc: Olof Johansson
    Signed-off-by: Rob Herring

    Kumar Gala
     
  • Pull scheduler fixes from Ingo Molnar:
    "Various smaller fixlets, all over the place"

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    sched/doc: Fix generation of device-drivers
    sched: Expose preempt_schedule_irq()
    sched: Fix a trivial typo in comments
    sched: Remove unused variable in 'struct sched_domain'
    sched: Avoid NULL dereference on sd_busy
    sched: Check sched_domain before computing group power
    MAINTAINERS: Update file patterns in the lockdep and scheduler entries

    Linus Torvalds
     
  • Pull networking updates from David Miller:
    "Here is a pile of bug fixes that accumulated while I was in Europe"

    1) In fixing kernel leaks to userspace during copying of socket
    addresses, we broke a case that used to work, namely the user
    providing a buffer larger than the in-kernel generic socket address
    structure. This broke Ruby amongst other things. Fix from Dan
    Carpenter.

    2) Fix regression added by byte queue limit support in 8139cp driver,
    from Yang Yingliang.

    3) The addition of MSG_SENDPAGE_NOTLAST buggered up a few sendpage
    implementations, they should just treat it the same as MSG_MORE.
    Fix from Richard Weinberger and Shawn Landden.

    4) Handle icmpv4 errors received on ipv6 SIT tunnels correctly, from
    Oussama Ghorbel. In particular we should send an ICMPv6 unreachable
    in such situations.

    5) Fix some regressions in the recent genetlink fixes, in particular
    get the pmcraid driver to use the new safer interfaces correctly.
    From Johannes Berg.

    6) macvtap was converted to use a per-cpu set of statistics, but some
    code was still bumping tx_dropped elsewhere. From Jason Wang.

    7) Fix build failure of xen-netback due to missing include on some
    architectures, from Andy Whitecroft.

    8) macvtap double counts received packets in statistics, fix from Vlad
    Yasevich.

    9) Fix various cases of using *_STATS_BH() when *_STATS() is more
    appropriate. From Eric Dumazet and Hannes Frederic Sowa.

    10) Pktgen ipsec mode doesn't update the ipv4 header length and checksum
    properly after encapsulation. Fix from Fan Du.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (61 commits)
    net/mlx4_en: Remove selftest TX queues empty condition
    {pktgen, xfrm} Update IPv4 header total len and checksum after tranformation
    virtio_net: make all RX paths handle erors consistently
    virtio_net: fix error handling for mergeable buffers
    virtio_net: Fixed a trivial typo (fitler --> filter)
    netem: fix gemodel loss generator
    netem: fix loss 4 state model
    netem: missing break in ge loss generator
    net/hsr: Support iproute print_opt ('ip -details ...')
    net/hsr: Very small fix of comment style.
    MAINTAINERS: Added net/hsr/ maintainer
    ipv6: fix possible seqlock deadlock in ip6_finish_output2
    ixgbe: Make ixgbe_identify_qsfp_module_generic static
    ixgbe: turn NETIF_F_HW_L2FW_DOFFLOAD off by default
    ixgbe: ixgbe_fwd_ring_down needs to be static
    e1000: fix possible reset_task running after adapter down
    e1000: fix lockdep warning in e1000_reset_task
    e1000: prevent oops when adapter is being closed and reset simultaneously
    igb: Fixed Wake On LAN support
    inet: fix possible seqlock deadlocks
    ...

    Linus Torvalds
     

01 Dec, 2013

1 commit


23 Nov, 2013

2 commits

  • Pull x86 platform driver updates from Matthew Garrett:
    "A moderate diffstat, but it's almost entirely just moving the
    chromebook driver into its own directory in order to ease ARM support,
    adding back rfkill support to the one Dell laptop model where it's
    expected to work, updates to the Intel IPC driver for hardware I've
    never actually seen and the usual set of small fixes"

    [ This actually came in before the merge window closed, and I had just
    missed it because it didn't match my git pull email pattern. - Linus ]

    * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (24 commits)
    x86, wmi fix modalias_show return values
    ipc: Added support for IPC interrupt mode
    ipc: Handle error conditions in ipc command
    ipc: Enabled ipc support for additional intel platforms
    ipc: Added platform data structure
    thinkpad_acpi: Fix build error when CONFIG_SND_MAX_CARDS > 32
    platform: add chrome platform directory
    hp-wmi: detect "2009 BIOS or later" flag by WMI 0x0d for wireless cmd
    dell-wmi: Add KEY_MICMUTE to bios_to_linux_keycode
    platform:x86: Remove OOM message after input_allocate_device
    sony-laptop: fixe typos in sony_laptop_input_keycode_map
    sony-laptop: warn on multiple KBD backlight handles
    dell-laptop: Only enable rfkill functionality on laptops with a hw killswitch
    dell-laptop: Add a force_rfkill module parameter
    dell-laptop: Wait less long before updating rfkill after an rfkill keypress
    dell-laptop: Do not skip setting blocked bit rfkill_set while hw-blocked
    dell-laptop: Sync current block state to BIOS on hw switch change
    dell-laptop: Allow changing the sw_state while the radio is blocked by hw
    dell-laptop: Don't read-back sw_state on machines with a hardware switch
    dell-laptop: Don't set sw_state from the query callback
    ...

    Linus Torvalds
     
  • Pull second xfs update from Ben Myers:
    "There are a couple of patches that I wasn't quite sure about in time
    for our initial 3.13 pull request, a bugfix, and an update to add Dave
    to MAINTAINERS:

    Here we have a performance fix for inode iversion, increased inode
    cluster size for v5 superblock filesystems, a fix for error handling
    in xfs_bmap_add_attrfork, and a MAINTAINERS update to add Dave"

    * tag 'xfs-for-linus-v3.13-rc1-2' of git://oss.sgi.com/xfs/xfs:
    xfs: open code inc_inode_iversion when logging an inode
    xfs: increase inode cluster size for v5 filesystems
    xfs: fix unlock in xfs_bmap_add_attrfork
    xfs: update maintainers

    Linus Torvalds
     

22 Nov, 2013

3 commits

  • Merge patches from Andrew Morton:
    "13 fixes"

    * emailed patches from Andrew Morton :
    mm: place page->pmd_huge_pte to right union
    MAINTAINERS: add keyboard driver to Hyper-V file list
    x86, mm: do not leak page->ptl for pmd page tables
    ipc,shm: correct error return value in shmctl (SHM_UNLOCK)
    mm, mempolicy: silence gcc warning
    block/partitions/efi.c: fix bound check
    ARM: drivers/rtc/rtc-at91rm9200.c: disable interrupts at shutdown
    mm: hugetlbfs: fix hugetlbfs optimization
    kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS cleanly
    ipc,shm: fix shm_file deletion races
    mm: thp: give transparent hugepage code a separate copy_page
    checkpatch: fix "Use of uninitialized value" warnings
    configfs: fix race between dentry put and lookup

    Linus Torvalds
     
  • Pull security subsystem updates from James Morris:
    "In this patchset, we finally get an SELinux update, with Paul Moore
    taking over as maintainer of that code.

    Also a significant update for the Keys subsystem, as well as
    maintenance updates to Smack, IMA, TPM, and Apparmor"

    and since I wanted to know more about the updates to key handling,
    here's the explanation from David Howells on that:

    "Okay. There are a number of separate bits. I'll go over the big bits
    and the odd important other bit, most of the smaller bits are just
    fixes and cleanups. If you want the small bits accounting for, I can
    do that too.

    (1) Keyring capacity expansion.

    KEYS: Consolidate the concept of an 'index key' for key access
    KEYS: Introduce a search context structure
    KEYS: Search for auth-key by name rather than target key ID
    Add a generic associative array implementation.
    KEYS: Expand the capacity of a keyring

    Several of the patches are providing an expansion of the capacity of a
    keyring. Currently, the maximum size of a keyring payload is one page.
    Subtract a small header and then divide up into pointers, that only gives
    you ~500 pointers on an x86_64 box. However, since the NFS idmapper uses
    a keyring to store ID mapping data, that has proven to be insufficient to
    the cause.

    Whatever data structure I use to handle the keyring payload, it can only
    store pointers to keys, not the keys themselves because several keyrings
    may point to a single key. This precludes inserting, say, and rb_node
    struct into the key struct for this purpose.

    I could make an rbtree of records such that each record has an rb_node
    and a key pointer, but that would use four words of space per key stored
    in the keyring. It would, however, be able to use much existing code.

    I selected instead a non-rebalancing radix-tree type approach as that
    could have a better space-used/key-pointer ratio. I could have used the
    radix tree implementation that we already have and insert keys into it by
    their serial numbers, but that means any sort of search must iterate over
    the whole radix tree. Further, its nodes are a bit on the capacious side
    for what I want - especially given that key serial numbers are randomly
    allocated, thus leaving a lot of empty space in the tree.

    So what I have is an associative array that internally is a radix-tree
    with 16 pointers per node where the index key is constructed from the key
    type pointer and the key description. This means that an exact lookup by
    type+description is very fast as this tells us how to navigate directly to
    the target key.

    I made the data structure general in lib/assoc_array.c as far as it is
    concerned, its index key is just a sequence of bits that leads to a
    pointer. It's possible that someone else will be able to make use of it
    also. FS-Cache might, for example.

    (2) Mark keys as 'trusted' and keyrings as 'trusted only'.

    KEYS: verify a certificate is signed by a 'trusted' key
    KEYS: Make the system 'trusted' keyring viewable by userspace
    KEYS: Add a 'trusted' flag and a 'trusted only' flag
    KEYS: Separate the kernel signature checking keyring from module signing

    These patches allow keys carrying asymmetric public keys to be marked as
    being 'trusted' and allow keyrings to be marked as only permitting the
    addition or linkage of trusted keys.

    Keys loaded from hardware during kernel boot or compiled into the kernel
    during build are marked as being trusted automatically. New keys can be
    loaded at runtime with add_key(). They are checked against the system
    keyring contents and if their signatures can be validated with keys that
    are already marked trusted, then they are marked trusted also and can
    thus be added into the master keyring.

    Patches from Mimi Zohar make this usable with the IMA keyrings also.

    (3) Remove the date checks on the key used to validate a module signature.

    X.509: Remove certificate date checks

    It's not reasonable to reject a signature just because the key that it was
    generated with is no longer valid datewise - especially if the kernel
    hasn't yet managed to set the system clock when the first module is
    loaded - so just remove those checks.

    (4) Make it simpler to deal with additional X.509 being loaded into the kernel.

    KEYS: Load *.x509 files into kernel keyring
    KEYS: Have make canonicalise the paths of the X.509 certs better to deduplicate

    The builder of the kernel now just places files with the extension ".x509"
    into the kernel source or build trees and they're concatenated by the
    kernel build and stuffed into the appropriate section.

    (5) Add support for userspace kerberos to use keyrings.

    KEYS: Add per-user_namespace registers for persistent per-UID kerberos caches
    KEYS: Implement a big key type that can save to tmpfs

    Fedora went to, by default, storing kerberos tickets and tokens in tmpfs.
    We looked at storing it in keyrings instead as that confers certain
    advantages such as tickets being automatically deleted after a certain
    amount of time and the ability for the kernel to get at these tokens more
    easily.

    To make this work, two things were needed:

    (a) A way for the tickets to persist beyond the lifetime of all a user's
    sessions so that cron-driven processes can still use them.

    The problem is that a user's session keyrings are deleted when the
    session that spawned them logs out and the user's user keyring is
    deleted when the UID is deleted (typically when the last log out
    happens), so neither of these places is suitable.

    I've added a system keyring into which a 'persistent' keyring is
    created for each UID on request. Each time a user requests their
    persistent keyring, the expiry time on it is set anew. If the user
    doesn't ask for it for, say, three days, the keyring is automatically
    expired and garbage collected using the existing gc. All the kerberos
    tokens it held are then also gc'd.

    (b) A key type that can hold really big tickets (up to 1MB in size).

    The problem is that Active Directory can return huge tickets with lots
    of auxiliary data attached. We don't, however, want to eat up huge
    tracts of unswappable kernel space for this, so if the ticket is
    greater than a certain size, we create a swappable shmem file and dump
    the contents in there and just live with the fact we then have an
    inode and a dentry overhead. If the ticket is smaller than that, we
    slap it in a kmalloc()'d buffer"

    * 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (121 commits)
    KEYS: Fix keyring content gc scanner
    KEYS: Fix error handling in big_key instantiation
    KEYS: Fix UID check in keyctl_get_persistent()
    KEYS: The RSA public key algorithm needs to select MPILIB
    ima: define '_ima' as a builtin 'trusted' keyring
    ima: extend the measurement list to include the file signature
    kernel/system_certificate.S: use real contents instead of macro GLOBAL()
    KEYS: fix error return code in big_key_instantiate()
    KEYS: Fix keyring quota misaccounting on key replacement and unlink
    KEYS: Fix a race between negating a key and reading the error set
    KEYS: Make BIG_KEYS boolean
    apparmor: remove the "task" arg from may_change_ptraced_domain()
    apparmor: remove parent task info from audit logging
    apparmor: remove tsk field from the apparmor_audit_struct
    apparmor: fix capability to not use the current task, during reporting
    Smack: Ptrace access check mode
    ima: provide hash algo info in the xattr
    ima: enable support for larger default filedata hash algorithms
    ima: define kernel parameter 'ima_template=' to change configured default
    ima: add Kconfig default measurement list template
    ...

    Linus Torvalds
     
  • Signed-off-by: Haiyang Zhang
    Cc: Dmitry Torokhov
    Cc: "K. Y. Srinivasan"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Haiyang Zhang
     

21 Nov, 2013

1 commit

  • It makes sense to split out the Chromebook/Chromebox hardware platform
    drivers to a separate subdirectory, since some of it will be shared
    between ARM and x86.

    This moves over the existing chromeos_laptop driver without making
    any other changes, and adds appropriate Kconfig entries for the new
    directory. It also adds a MAINTAINERS entry for the new subdir.

    Signed-off-by: Olof Johansson
    Signed-off-by: Matthew Garrett

    Olof Johansson
     

20 Nov, 2013

1 commit

  • Pull networking fixes from David Miller:
    "Mostly these are fixes for fallout due to merge window changes, as
    well as cures for problems that have been with us for a much longer
    period of time"

    1) Johannes Berg noticed two major deficiencies in our genetlink
    registration. Some genetlink protocols we passing in constant
    counts for their ops array rather than something like
    ARRAY_SIZE(ops) or similar. Also, some genetlink protocols were
    using fixed IDs for their multicast groups.

    We have to retain these fixed IDs to keep existing userland tools
    working, but reserve them so that other multicast groups used by
    other protocols can not possibly conflict.

    In dealing with these two problems, we actually now use less state
    management for genetlink operations and multicast groups.

    2) When configuring interface hardware timestamping, fix several
    drivers that simply do not validate that the hwtstamp_config value
    is one the driver actually supports. From Ben Hutchings.

    3) Invalid memory references in mwifiex driver, from Amitkumar Karwar.

    4) In dev_forward_skb(), set the skb->protocol in the right order
    relative to skb_scrub_packet(). From Alexei Starovoitov.

    5) Bridge erroneously fails to use the proper wrapper functions to make
    calls to netdev_ops->ndo_vlan_rx_{add,kill}_vid. Fix from Toshiaki
    Makita.

    6) When detaching a bridge port, make sure to flush all VLAN IDs to
    prevent them from leaking, also from Toshiaki Makita.

    7) Put in a compromise for TCP Small Queues so that deep queued devices
    that delay TX reclaim non-trivially don't have such a performance
    decrease. One particularly problematic area is 802.11 AMPDU in
    wireless. From Eric Dumazet.

    8) Fix crashes in tcp_fastopen_cache_get(), we can see NULL socket dsts
    here. Fix from Eric Dumzaet, reported by Dave Jones.

    9) Fix use after free in ipv6 SIT driver, from Willem de Bruijn.

    10) When computing mergeable buffer sizes, virtio-net fails to take the
    virtio-net header into account. From Michael Dalton.

    11) Fix seqlock deadlock in ip4_datagram_connect() wrt. statistic
    bumping, this one has been with us for a while. From Eric Dumazet.

    12) Fix NULL deref in the new TIPC fragmentation handling, from Erik
    Hugne.

    13) 6lowpan bit used for traffic classification was wrong, from Jukka
    Rissanen.

    14) macvlan has the same issue as normal vlans did wrt. propagating LRO
    disabling down to the real device, fix it the same way. From Michal
    Kubecek.

    15) CPSW driver needs to soft reset all slaves during suspend, from
    Daniel Mack.

    16) Fix small frame pacing in FQ packet scheduler, from Eric Dumazet.

    17) The xen-netfront RX buffer refill timer isn't properly scheduled on
    partial RX allocation success, from Ma JieYue.

    18) When ipv6 ping protocol support was added, the AF_INET6 protocol
    initialization cleanup path on failure was borked a little. Fix
    from Vlad Yasevich.

    19) If a socket disconnects during a read/recvmsg/recvfrom/etc that
    blocks we can do the wrong thing with the msg_name we write back to
    userspace. From Hannes Frederic Sowa. There is another fix in the
    works from Hannes which will prevent future problems of this nature.

    20) Fix route leak in VTI tunnel transmit, from Fan Du.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (106 commits)
    genetlink: make multicast groups const, prevent abuse
    genetlink: pass family to functions using groups
    genetlink: add and use genl_set_err()
    genetlink: remove family pointer from genl_multicast_group
    genetlink: remove genl_unregister_mc_group()
    hsr: don't call genl_unregister_mc_group()
    quota/genetlink: use proper genetlink multicast APIs
    drop_monitor/genetlink: use proper genetlink multicast APIs
    genetlink: only pass array to genl_register_family_with_ops()
    tcp: don't update snd_nxt, when a socket is switched from repair mode
    atm: idt77252: fix dev refcnt leak
    xfrm: Release dst if this dst is improper for vti tunnel
    netlink: fix documentation typo in netlink_set_err()
    be2net: Delete secondary unicast MAC addresses during be_close
    be2net: Fix unconditional enabling of Rx interface options
    net, virtio_net: replace the magic value
    ping: prevent NULL pointer dereference on write to msg_name
    bnx2x: Prevent "timeout waiting for state X"
    bnx2x: prevent CFC attention
    bnx2x: Prevent panic during DMAE timeout
    ...

    Linus Torvalds
     

19 Nov, 2013

2 commits

  • Pull i2c changes from Wolfram Sang:
    - new drivers for exynos5, bcm kona, and st micro
    - bigger overhauls for drivers mxs and rcar
    - typical driver bugfixes, cleanups, improvements
    - got rid of the superfluous 'driver' member in i2c_client struct This
    touches a few drivers in other subsystems. All acked.

    * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits)
    i2c: bcm-kona: fix error return code in bcm_kona_i2c_probe()
    i2c: i2c-eg20t: do not print error message in syslog if no ACK received
    i2c: bcm-kona: Introduce Broadcom I2C Driver
    i2c: cbus-gpio: Fix device tree binding
    i2c: wmt: add missing clk_disable_unprepare() on error
    i2c: designware: add new ACPI IDs
    i2c: i801: Add Device IDs for Intel Wildcat Point-LP PCH
    i2c: exynos5: Remove incorrect clk_disable_unprepare
    i2c: i2c-st: Add ST I2C controller
    i2c: exynos5: add High Speed I2C controller driver
    i2c: rcar: fixup rcar type naming
    i2c: scmi: remove some bogus NULL checks
    i2c: sh_mobile & rcar: Enable the driver on all ARM platforms
    i2c: sh_mobile: Convert to clk_prepare/unprepare
    i2c: mux: gpio: use reg value for i2c_add_mux_adapter
    i2c: mux: gpio: use gpio_set_value_cansleep()
    i2c: Include linux/of.h header
    i2c: mxs: Fix PIO mode on i.MX23
    i2c: mxs: Rework the PIO mode operation
    i2c: mxs: distinguish i.MX23 and i.MX28 based I2C controller
    ...

    Linus Torvalds
     
  • Pull EDAC updates from Borislav Petkov:
    "Following up on last week's discussion, here's my part of the EDAC
    pile, highlights in the signed tag.

    The last two patches have a date from just now because I've just
    applied them to the tree after Johannes sent them to me earlier. I
    decided to forward them now because they're trivial.

    There's a third one for MPC85xx which adds PCIe error interrupt
    support but since it is not so trivial and hasn't seen any linux-next
    time, I'm deferring it to 3.14

    EDAC update highlights:
    - Support for Calxeda ECX-2000 memory controller, from Robert Richter
    - Misc Calxeda Highbank drivers and EDAC core cleanups, from Rob
    Herring and Robert Richter
    - New maintainer for Freescale's MPC85xx EDAC driver: Johannes
    Thumshirn"

    * tag 'edac_for_3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
    edac/85xx: Remove mpc85xx_pci_err_remove
    EDAC: Add edac-mpc85xx driver to MAINTAINERS
    edac, highbank: Moving error injection to sysfs for edac
    edac, highbank: Add MAINTAINERS entry
    edac: Unify reporting of device info for device, mc and pci
    edac, highbank: Improve and unify naming
    edac, highbank: Add Calxeda ECX-2000 support
    ARM: dts: calxeda: move memory-controller node out of ecx-common.dtsi
    edac, highbank: Fix interrupt setup of mem and l2 controller

    Linus Torvalds
     

18 Nov, 2013

1 commit


17 Nov, 2013

2 commits

  • Pull ARM SoC fixes from Olof Johansson:
    "A first set of batches of fixes for 3.13. The diffstat is large
    mostly because we're adding a defconfig for a family that's been
    lacking it, and there's some missing clock information added for i.MX
    and OMAP.

    The at91 new code is around dealing with RTC/RTT reset at boot to fix
    possible hangs due to pending wakeup interrupts coming in during early
    boot"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
    ARM: OMAP2+: Fix build for dra7xx without omap4 and 5
    ARM: OMAP2+: omap_device: maintain sane runtime pm status around suspend/resume
    doc: devicetree: Add bindings documentation for omap-des driver
    ARM: dts: doc: Document missing compatible property for omap-sham driver
    ARM: OMAP3: Beagle: fix return value check in beagle_opp_init()
    ARM: at91: fix hanged boot due to early rtt-interrupt
    ARM: at91: fix hanged boot due to early rtc-interrupt
    video: exynos_mipi_dsim: Remove unused variable
    ARM: highbank: only select errata 764369 if SMP
    ARM: sti: only select errata 764369 if SMP
    ARM: tegra: init fuse before setting reset handler
    ARM: vt8500: add defconfig for v6/v7 chips
    ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD
    ARM: OMAP: devicetree: fix SPI node compatible property syntax items
    pinctrl: single: call pcs_soc->rearm() whenever IRQ mask is changed
    ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
    MAINTAINERS: drop discontinued mailing list
    ARM: dts: i.MX51: Fix OTG PHY clock
    ARM: imx: set up pllv3 POWER and BYPASS sequentially
    ARM: imx: pllv3 needs relock in .set_rate() call
    ...

    Linus Torvalds
     
  • …ierry.reding/linux-pwm

    Pull pwm changes from Thierry Reding:
    "Mostly bug fixes and clean up. There is a new driver, which is
    actually moving a custom PWM driver from drivers/misc.

    The majority of the patches are enhancements to the device tree
    support in the pwm-backlight driver. Backlights can now additionally
    be powered using a regulator and enabled using a GPIO in addition to
    just the PWM input"

    * tag 'pwm/for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (30 commits)
    Documentation/pwm: Update supported SoC name for pwm-samsung
    pwm: samsung: Fix kernel warning while unexporting a channel
    MAINTAINERS: Move PWM subsystem tree to kernel.org
    Documentation/pwm: Fix trivial typos
    pwm-backlight: Remove unused variable
    pwm_backlight: avoid short blank screen while doing hibernation
    pwm-backlight: Fix brightness adjustment
    pwm: add ep93xx PWM support
    pwm-backlight: Allow for non-increasing brightness levels
    pwm-backlight: Add power supply support
    pwm-backlight: Use new enable_gpio field
    unicore32: Initialize PWM backlight enable_gpio field
    ARM: shmobile: Initialize PWM backlight enable_gpio field
    ARM: SAMSUNG: Initialize PWM backlight enable_gpio field
    ARM: pxa: Initialize PWM backlight enable_gpio field
    ARM: OMAP: Initialize PWM backlight enable_gpio field
    pwm-backlight: Add optional enable GPIO
    pwm-backlight: Track enable state
    pwm-backlight: Refactor backlight power on/off
    pwm-backlight: Improve readability
    ...

    Linus Torvalds
     

16 Nov, 2013

4 commits

  • The diff is against latest 'net' repository;

    Signed-off-by: Petko Manolov
    Signed-off-by: David S. Miller

    Petko Manolov
     
  • Pull hwmon fixes and updates from Jean Delvare:
    "All lm90 driver fixes and improvements"

    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    Documentation: dt: hwmon: Add OF document for LM90
    hwmon: (lm90) Add power control
    hwmon: (lm90) Add support for TI TMP451
    hwmon: (lm90) Use enums for the indexes of temp8 and temp11
    hwmon: (lm90) Add support to handle IRQ
    hwmon: (lm90) Define status bits
    hwmon: (lm90) Fix max6696 alarm handling

    Linus Torvalds
     
  • …pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

    Few clock fixes, a runtime PM fix, and pinctrl-single fix along
    with few other fixes that popped up during the merge window.

    * tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: OMAP2+: Fix build for dra7xx without omap4 and 5
    ARM: OMAP2+: omap_device: maintain sane runtime pm status around suspend/resume
    doc: devicetree: Add bindings documentation for omap-des driver
    ARM: dts: doc: Document missing compatible property for omap-sham driver
    ARM: OMAP3: Beagle: fix return value check in beagle_opp_init()
    ARM: OMAP: devicetree: fix SPI node compatible property syntax items
    pinctrl: single: call pcs_soc->rearm() whenever IRQ mask is changed
    ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
    + sync with newer trunk

    Olof Johansson
     
  • Pull kconfig changes from Michal Marek:
    - xconfig stores its setting in a meaningful path
    (~/.config/kernel.org/qconf.conf)
    - kconfig symbol search fix
    - documentation fixes
    - cleanup & comment update
    - fix warning when a kconfig symbol is defined with two different types
    - Yann is now officially listed as maintainer of kconfig, but he
    prefers me to send pull requests for now

    * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    MAINTAINERS: New kconfig maintainer
    xconfig: Fix the filename for GUI settings
    kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len
    kconfig: remove unused definition from scanner
    kconfig: adjust warning message for conflicting types
    kconfig: fix trivial typos and update mconf documentation
    kconfig: add short explanation to SYMBOL_WRITE
    Documentation/kbuild/kconfig.txt: 'make listnewconfig' replaces: yes "" | make oldconfig

    Linus Torvalds
     

15 Nov, 2013

5 commits

  • Add OF document for LM90 in Documentation/devicetree/.

    [JD: Add this new file to the LM90 MAINTAINERS entry.]

    Signed-off-by: Wei Ni
    Signed-off-by: Jean Delvare

    Wei Ni
     
  • Propagate the file movement effects of the following commits:

    7a6354e241d8 sched: Move wait.c into kernel/sched/
    8eddac3f1037 locking: Move the lockdep code to kernel/locking/

    Signed-off-by: Joe Perches
    Cc: Peter Zijlstra
    Link: http://lkml.kernel.org/r/1384469985.2897.32.camel@joe-AO722
    Signed-off-by: Ingo Molnar

    Joe Perches
     
  • Pull drm updates from Dave Airlie:
    "This is a combo of -next and some -fixes that came in in the
    intervening time.

    Highlights:

    New drivers:
    ARM Armada driver for Marvell Armada 510 SOCs

    Intel:
    Broadwell initial support under a default off switch,
    Stereo/3D HDMI mode support
    Valleyview improvements
    Displayport improvements
    Haswell fixes
    initial mipi dsi panel support
    CRC support for debugging
    build with CONFIG_FB=n

    Radeon:
    enable DPM on a number of GPUs by default
    secondary GPU powerdown support
    enable HDMI audio by default
    Hawaii support

    Nouveau:
    dynamic pm code infrastructure reworked, does nothing major yet
    GK208 modesetting support
    MSI fixes, on by default again
    PMPEG improvements
    pageflipping fixes

    GMA500:
    minnowboard SDVO support

    VMware:
    misc fixes

    MSM:
    prime, plane and rendernodes support

    Tegra:
    rearchitected to put the drm driver into the drm subsystem.
    HDMI and gr2d support for tegra 114 SoC

    QXL:
    oops fix, and multi-head fixes

    DRM core:
    sysfs lifetime fixes
    client capability ioctl
    further cleanups to device midlayer
    more vblank timestamp fixes"

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (789 commits)
    drm/nouveau: do not map evicted vram buffers in nouveau_bo_vma_add
    drm/nvc0-/gr: shift wrapping bug in nvc0_grctx_generate_r406800
    drm/nouveau/pwr: fix missing mutex unlock in a failure path
    drm/nv40/therm: fix slowing down fan when pstate undefined
    drm/nv11-: synchronise flips to vblank, unless async flip requested
    drm/nvc0-: remove nasty fifo swmthd hack for flip completion method
    drm/nv10-: we no longer need to create nvsw object on user channels
    drm/nouveau: always queue flips relative to kernel channel activity
    drm/nouveau: there is no need to reserve/fence the new fb when flipping
    drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence
    drm/nouveau: allow nouveau_fence_ref() to be a noop
    drm/nvc8/mc: msi rearm is via the nvc0 method
    drm/ttm: Fix vma page_prot bit manipulation
    drm/vmwgfx: Fix a couple of compile / sparse warnings and errors
    drm/vmwgfx: Resource evict fixes
    drm/edid: compare actual vrefresh for all modes for quirks
    drm: shmob_drm: Convert to clk_prepare/unprepare
    drm/nouveau: fix 32-bit build
    drm/i915/opregion: fix build error on CONFIG_ACPI=n
    Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"
    ...

    Linus Torvalds
     
  • Pull KVM changes from Paolo Bonzini:
    "Here are the 3.13 KVM changes. There was a lot of work on the PPC
    side: the HV and emulation flavors can now coexist in a single kernel
    is probably the most interesting change from a user point of view.

    On the x86 side there are nested virtualization improvements and a few
    bugfixes.

    ARM got transparent huge page support, improved overcommit, and
    support for big endian guests.

    Finally, there is a new interface to connect KVM with VFIO. This
    helps with devices that use NoSnoop PCI transactions, letting the
    driver in the guest execute WBINVD instructions. This includes some
    nVidia cards on Windows, that fail to start without these patches and
    the corresponding userspace changes"

    * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (146 commits)
    kvm, vmx: Fix lazy FPU on nested guest
    arm/arm64: KVM: PSCI: propagate caller endianness to the incoming vcpu
    arm/arm64: KVM: MMIO support for BE guest
    kvm, cpuid: Fix sparse warning
    kvm: Delete prototype for non-existent function kvm_check_iopl
    kvm: Delete prototype for non-existent function complete_pio
    hung_task: add method to reset detector
    pvclock: detect watchdog reset at pvclock read
    kvm: optimize out smp_mb after srcu_read_unlock
    srcu: API for barrier after srcu read unlock
    KVM: remove vm mmap method
    KVM: IOMMU: hva align mapping page size
    KVM: x86: trace cpuid emulation when called from emulator
    KVM: emulator: cleanup decode_register_operand() a bit
    KVM: emulator: check rex prefix inside decode_register()
    KVM: x86: fix emulation of "movzbl %bpl, %eax"
    kvm_host: typo fix
    KVM: x86: emulate SAHF instruction
    MAINTAINERS: add tree for kvm.git
    Documentation/kvm: add a 00-INDEX file
    ...

    Linus Torvalds
     
  • Add Dave as maintainer of XFS.

    Signed-off-by: Ben Myers
    Reviewed-by: Ric Wheeler
    Reviewed-by: Dave Chinner
    Reviewed-by: Alex Elder

    Ben Myers
     

14 Nov, 2013

5 commits

  • Santosh raspatur is taking over the maintenance of cxgb3.

    Signed-off-by: Divy Le Ray
    Signed-off-by: David S. Miller

    Divy Le Ray
     
  • Pull PCI changes from Bjorn Helgaas:
    "Resource management
    - Fix host bridge window coalescing (Alexey Neyman)
    - Pass type, width, and prefetchability for window alignment (Wei Yang)

    PCI device hotplug
    - Convert acpiphp, acpiphp_ibm to dynamic debug (Lan Tianyu)

    Power management
    - Remove pci_pm_complete() (Liu Chuansheng)

    MSI
    - Fail initialization if device is not in PCI_D0 (Yijing Wang)

    MPS (Max Payload Size)
    - Use pcie_get_mps() and pcie_set_mps() to simplify code (Yijing Wang)
    - Use pcie_set_readrq() to simplify code (Yijing Wang)
    - Use cached pci_dev->pcie_mpss to simplify code (Yijing Wang)

    SR-IOV
    - Enable upstream bridges even for VFs on virtual buses (Bjorn Helgaas)
    - Use pci_is_root_bus() to avoid catching virtual buses (Wei Yang)

    Virtualization
    - Add x86 MSI masking ops (Konrad Rzeszutek Wilk)

    Freescale i.MX6
    - Support i.MX6 PCIe controller (Sean Cross)
    - Increase link startup timeout (Marek Vasut)
    - Probe PCIe in fs_initcall() (Marek Vasut)
    - Fix imprecise abort handler (Tim Harvey)
    - Remove redundant of_match_ptr (Sachin Kamat)

    Renesas R-Car
    - Support Gen2 internal PCIe controller (Valentine Barshak)

    Samsung Exynos
    - Add MSI support (Jingoo Han)
    - Turn off power when link fails (Jingoo Han)
    - Add Jingoo Han as maintainer (Jingoo Han)
    - Add clk_disable_unprepare() on error path (Wei Yongjun)
    - Remove redundant of_match_ptr (Sachin Kamat)

    Synopsys DesignWare
    - Add irq_create_mapping() (Pratyush Anand)
    - Add header guards (Seungwon Jeon)

    Miscellaneous
    - Enable native PCIe services by default on non-ACPI (Andrew Murray)
    - Cleanup _OSC usage and messages (Bjorn Helgaas)
    - Remove pcibios_last_bus boot option on non-x86 (Bjorn Helgaas)
    - Convert bus code to use bus_, drv_, and dev_groups (Greg Kroah-Hartman)
    - Remove unused pci_mem_start (Myron Stowe)
    - Make sysfs functions static (Sachin Kamat)
    - Warn on invalid return from driver probe (Stephen M. Cameron)
    - Remove Intel Haswell D3 delays (Todd E Brandt)
    - Call pci_set_master() in core if driver doesn't do it (Yinghai Lu)
    - Use pci_is_pcie() to simplify code (Yijing Wang)
    - Use PCIe capability accessors to simplify code (Yijing Wang)
    - Use cached pci_dev->pcie_cap to simplify code (Yijing Wang)
    - Removed unused "is_pcie" from struct pci_dev (Yijing Wang)
    - Simplify sysfs CPU affinity implementation (Yijing Wang)"

    * tag 'pci-v3.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (79 commits)
    PCI: Enable upstream bridges even for VFs on virtual buses
    PCI: Add pci_upstream_bridge()
    PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()
    PCI: Warn on driver probe return value greater than zero
    PCI: Drop warning about drivers that don't use pci_set_master()
    PCI: Workaround missing pci_set_master in pci drivers
    powerpc/pci: Use pci_is_pcie() to simplify code [fix]
    PCI: Update pcie_ports 'auto' behavior for non-ACPI platforms
    PCI: imx6: Probe the PCIe in fs_initcall()
    PCI: Add R-Car Gen2 internal PCI support
    PCI: imx6: Remove redundant of_match_ptr
    PCI: Report pci_pme_active() kmalloc failure
    mn10300/PCI: Remove useless pcibios_last_bus
    frv/PCI: Remove pcibios_last_bus
    PCI: imx6: Increase link startup timeout
    PCI: exynos: Remove redundant of_match_ptr
    PCI: imx6: Fix imprecise abort handler
    PCI: Fail MSI/MSI-X initialization if device is not in PCI_D0
    PCI: imx6: Remove redundant dev_err() in imx6_pcie_probe()
    x86/PCI: Coalesce multiple overlapping host bridge windows
    ...

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

    - New power capping framework and the the Intel Running Average Power
    Limit (RAPL) driver using it from Srinivas Pandruvada and Jacob Pan.

    - Addition of the in-kernel switching feature to the arm_big_little
    cpufreq driver from Viresh Kumar and Nicolas Pitre.

    - cpufreq support for iMac G5 from Aaro Koskinen.

    - Baytrail processors support for intel_pstate from Dirk Brandewie.

    - cpufreq support for Midway/ECX-2000 from Mark Langsdorf.

    - ARM vexpress/TC2 cpufreq support from Sudeep KarkadaNagesha.

    - ACPI power management support for the I2C and SPI bus types from Mika
    Westerberg and Lv Zheng.

    - cpufreq core fixes and cleanups from Viresh Kumar, Srivatsa S Bhat,
    Stratos Karafotis, Xiaoguang Chen, Lan Tianyu.

    - cpufreq drivers updates (mostly fixes and cleanups) from Viresh
    Kumar, Aaro Koskinen, Jungseok Lee, Sudeep KarkadaNagesha, Lukasz
    Majewski, Manish Badarkhe, Hans-Christian Egtvedt, Evgeny Kapaev.

    - intel_pstate updates from Dirk Brandewie and Adrian Huang.

    - ACPICA update to version 20130927 includig fixes and cleanups and
    some reduction of divergences between the ACPICA code in the kernel
    and ACPICA upstream in order to improve the automatic ACPICA patch
    generation process. From Bob Moore, Lv Zheng, Tomasz Nowicki, Naresh
    Bhat, Bjorn Helgaas, David E Box.

    - ACPI IPMI driver fixes and cleanups from Lv Zheng.

    - ACPI hotplug fixes and cleanups from Bjorn Helgaas, Toshi Kani, Zhang
    Yanfei, Rafael J Wysocki.

    - Conversion of the ACPI AC driver to the platform bus type and
    multiple driver fixes and cleanups related to ACPI from Zhang Rui.

    - ACPI processor driver fixes and cleanups from Hanjun Guo, Jiang Liu,
    Bartlomiej Zolnierkiewicz, Mathieu Rhéaume, Rafael J Wysocki.

    - Fixes and cleanups and new blacklist entries related to the ACPI
    video support from Aaron Lu, Felipe Contreras, Lennart Poettering,
    Kirill Tkhai.

    - cpuidle core cleanups from Viresh Kumar and Lorenzo Pieralisi.

    - cpuidle drivers fixes and cleanups from Daniel Lezcano, Jingoo Han,
    Bartlomiej Zolnierkiewicz, Prarit Bhargava.

    - devfreq updates from Sachin Kamat, Dan Carpenter, Manish Badarkhe.

    - Operation Performance Points (OPP) core updates from Nishanth Menon.

    - Runtime power management core fix from Rafael J Wysocki and update
    from Ulf Hansson.

    - Hibernation fixes from Aaron Lu and Rafael J Wysocki.

    - Device suspend/resume lockup detection mechanism from Benoit Goby.

    - Removal of unused proc directories created for various ACPI drivers
    from Lan Tianyu.

    - ACPI LPSS driver fix and new device IDs for the ACPI platform scan
    handler from Heikki Krogerus and Jarkko Nikula.

    - New ACPI _OSI blacklist entry for Toshiba NB100 from Levente Kurusa.

    - Assorted fixes and cleanups related to ACPI from Andy Shevchenko, Al
    Stone, Bartlomiej Zolnierkiewicz, Colin Ian King, Dan Carpenter,
    Felipe Contreras, Jianguo Wu, Lan Tianyu, Yinghai Lu, Mathias Krause,
    Liu Chuansheng.

    - Assorted PM fixes and cleanups from Andy Shevchenko, Thierry Reding,
    Jean-Christophe Plagniol-Villard.

    * tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (386 commits)
    cpufreq: conservative: fix requested_freq reduction issue
    ACPI / hotplug: Consolidate deferred execution of ACPI hotplug routines
    PM / runtime: Use pm_runtime_put_sync() in __device_release_driver()
    ACPI / event: remove unneeded NULL pointer check
    Revert "ACPI / video: Ignore BIOS initial backlight value for HP 250 G1"
    ACPI / video: Quirk initial backlight level 0
    ACPI / video: Fix initial level validity test
    intel_pstate: skip the driver if ACPI has power mgmt option
    PM / hibernate: Avoid overflow in hibernate_preallocate_memory()
    ACPI / hotplug: Do not execute "insert in progress" _OST
    ACPI / hotplug: Carry out PCI root eject directly
    ACPI / hotplug: Merge device hot-removal routines
    ACPI / hotplug: Make acpi_bus_hot_remove_device() internal
    ACPI / hotplug: Simplify device ejection routines
    ACPI / hotplug: Fix handle_root_bridge_removal()
    ACPI / hotplug: Refuse to hot-remove all objects with disabled hotplug
    ACPI / scan: Start matching drivers after trying scan handlers
    ACPI: Remove acpi_pci_slot_init() headers from internal.h
    ACPI / blacklist: fix name of ThinkPad Edge E530
    PowerCap: Fix build error with option -Werror=format-security
    ...

    Conflicts:
    arch/arm/mach-omap2/opp.c
    drivers/Kconfig
    drivers/spi/spi.c

    Linus Torvalds
     
  • Pull device mapper changes from Mike Snitzer:
    "A set of device-mapper changes for 3.13.

    Improve reliability of buffer allocations for dm messages with a small
    number of arguments, a couple path group initialization fixes for dm
    multipath, a fix for resizing a dm array, various fixes and
    optimizations for dm cache, a fix for device mapper's Kconfig menu
    indentation.

    Features added include:
    - dm crypt support for activating legacy CBC TrueCrypt containers
    (useful for forensics of these old TCRYPT containers)
    - reduced dm-cache memory requirements for each block in the cache
    - basic support for shrinking a dm-cache's cache (fast) device
    - most notably, dm-cache support for managing cache coherency when
    deploying dm-cache with sophisticated origin volumes (that support
    hardware snapshots and/or clustering): these changes come in the
    form of a new passthrough operation mode and a cache block
    invalidation interface"

    * tag 'dm-3.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (32 commits)
    dm cache: resolve small nits and improve Documentation
    dm cache: add cache block invalidation support
    dm cache: add remove_cblock method to policy interface
    dm cache policy mq: reduce memory requirements
    dm cache metadata: check the metadata version when reading the superblock
    dm cache: add passthrough mode
    dm cache: cache shrinking support
    dm cache: promotion optimisation for writes
    dm cache: be much more aggressive about promoting writes to discarded blocks
    dm cache policy mq: implement writeback_work() and mq_{set,clear}_dirty()
    dm cache: optimize commit_if_needed
    dm space map disk: optimise sm_disk_dec_block
    MAINTAINERS: add reference to device-mapper's linux-dm.git tree
    dm: fix Kconfig menu indentation
    dm: allow remove to be deferred
    dm table: print error on preresume failure
    dm crypt: add TCW IV mode for old CBC TCRYPT containers
    dm crypt: properly handle extra key string in initialization
    dm cache: log error message if dm_kcopyd_copy() fails
    dm cache: use cell_defer() boolean argument consistently
    ...

    Linus Torvalds
     
  • Pull first round of SCSI updates from James Bottomley:
    "This patch set is driver updates for qla4xxx, scsi_debug, pm80xx,
    fcoe/libfc, eas2r, lpfc, be2iscsi and megaraid_sas plus some assorted
    bug fixes and cleanups"

    * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (106 commits)
    [SCSI] scsi_error: Escalate to LUN reset if abort fails
    [SCSI] Add 'eh_deadline' to limit SCSI EH runtime
    [SCSI] remove check for 'resetting'
    [SCSI] dc395: Move 'last_reset' into internal host structure
    [SCSI] tmscsim: Move 'last_reset' into host structure
    [SCSI] advansys: Remove 'last_reset' references
    [SCSI] dpt_i2o: return SCSI_MLQUEUE_HOST_BUSY when in reset
    [SCSI] dpt_i2o: Remove DPTI_STATE_IOCTL
    [SCSI] megaraid_sas: Fix synchronization problem between sysPD IO path and AEN path
    [SCSI] lpfc: Fix typo on NULL assignment
    [SCSI] scsi_dh_alua: ALUA handler attach should succeed while TPG is transitioning
    [SCSI] scsi_dh_alua: ALUA check sense should retry device internal reset unit attention
    [SCSI] esas2r: Cleanup snprinf formatting of firmware version
    [SCSI] esas2r: Remove superfluous mask of pcie_cap_reg
    [SCSI] esas2r: Fixes for big-endian platforms
    [SCSI] esas2r: Directly call kernel functions for atomic bit operations
    [SCSI] lpfc 8.3.43: Update lpfc version to driver version 8.3.43
    [SCSI] lpfc 8.3.43: Fixed not processing task management IOCB response status
    [SCSI] lpfc 8.3.43: Fixed spinlock hang.
    [SCSI] lpfc 8.3.43: Fixed invalid Total_Data_Placed value received for els and ct command responses
    ...

    Linus Torvalds
     

13 Nov, 2013

4 commits

  • Pull networking updates from David Miller:

    1) The addition of nftables. No longer will we need protocol aware
    firewall filtering modules, it can all live in userspace.

    At the core of nftables is a, for lack of a better term, virtual
    machine that executes byte codes to inspect packet or metadata
    (arriving interface index, etc.) and make verdict decisions.

    Besides support for loading packet contents and comparing them, the
    interpreter supports lookups in various datastructures as
    fundamental operations. For example sets are supports, and
    therefore one could create a set of whitelist IP address entries
    which have ACCEPT verdicts attached to them, and use the appropriate
    byte codes to do such lookups.

    Since the interpreted code is composed in userspace, userspace can
    do things like optimize things before giving it to the kernel.

    Another major improvement is the capability of atomically updating
    portions of the ruleset. In the existing netfilter implementation,
    one has to update the entire rule set in order to make a change and
    this is very expensive.

    Userspace tools exist to create nftables rules using existing
    netfilter rule sets, but both kernel implementations will need to
    co-exist for quite some time as we transition from the old to the
    new stuff.

    Kudos to Patrick McHardy, Pablo Neira Ayuso, and others who have
    worked so hard on this.

    2) Daniel Borkmann and Hannes Frederic Sowa made several improvements
    to our pseudo-random number generator, mostly used for things like
    UDP port randomization and netfitler, amongst other things.

    In particular the taus88 generater is updated to taus113, and test
    cases are added.

    3) Support 64-bit rates in HTB and TBF schedulers, from Eric Dumazet
    and Yang Yingliang.

    4) Add support for new 577xx tigon3 chips to tg3 driver, from Nithin
    Sujir.

    5) Fix two fatal flaws in TCP dynamic right sizing, from Eric Dumazet,
    Neal Cardwell, and Yuchung Cheng.

    6) Allow IP_TOS and IP_TTL to be specified in sendmsg() ancillary
    control message data, much like other socket option attributes.
    From Francesco Fusco.

    7) Allow applications to specify a cap on the rate computed
    automatically by the kernel for pacing flows, via a new
    SO_MAX_PACING_RATE socket option. From Eric Dumazet.

    8) Make the initial autotuned send buffer sizing in TCP more closely
    reflect actual needs, from Eric Dumazet.

    9) Currently early socket demux only happens for TCP sockets, but we
    can do it for connected UDP sockets too. Implementation from Shawn
    Bohrer.

    10) Refactor inet socket demux with the goal of improving hash demux
    performance for listening sockets. With the main goals being able
    to use RCU lookups on even request sockets, and eliminating the
    listening lock contention. From Eric Dumazet.

    11) The bonding layer has many demuxes in it's fast path, and an RCU
    conversion was started back in 3.11, several changes here extend the
    RCU usage to even more locations. From Ding Tianhong and Wang
    Yufen, based upon suggestions by Nikolay Aleksandrov and Veaceslav
    Falico.

    12) Allow stackability of segmentation offloads to, in particular, allow
    segmentation offloading over tunnels. From Eric Dumazet.

    13) Significantly improve the handling of secret keys we input into the
    various hash functions in the inet hashtables, TCP fast open, as
    well as syncookies. From Hannes Frederic Sowa. The key fundamental
    operation is "net_get_random_once()" which uses static keys.

    Hannes even extended this to ipv4/ipv6 fragmentation handling and
    our generic flow dissector.

    14) The generic driver layer takes care now to set the driver data to
    NULL on device removal, so it's no longer necessary for drivers to
    explicitly set it to NULL any more. Many drivers have been cleaned
    up in this way, from Jingoo Han.

    15) Add a BPF based packet scheduler classifier, from Daniel Borkmann.

    16) Improve CRC32 interfaces and generic SKB checksum iterators so that
    SCTP's checksumming can more cleanly be handled. Also from Daniel
    Borkmann.

    17) Add a new PMTU discovery mode, IP_PMTUDISC_INTERFACE, which forces
    using the interface MTU value. This helps avoid PMTU attacks,
    particularly on DNS servers. From Hannes Frederic Sowa.

    18) Use generic XPS for transmit queue steering rather than internal
    (re-)implementation in virtio-net. From Jason Wang.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1622 commits)
    random32: add test cases for taus113 implementation
    random32: upgrade taus88 generator to taus113 from errata paper
    random32: move rnd_state to linux/random.h
    random32: add prandom_reseed_late() and call when nonblocking pool becomes initialized
    random32: add periodic reseeding
    random32: fix off-by-one in seeding requirement
    PHY: Add RTL8201CP phy_driver to realtek
    xtsonic: add missing platform_set_drvdata() in xtsonic_probe()
    macmace: add missing platform_set_drvdata() in mace_probe()
    ethernet/arc/arc_emac: add missing platform_set_drvdata() in arc_emac_probe()
    ipv6: protect for_each_sk_fl_rcu in mem_check with rcu_read_lock_bh
    vlan: Implement vlan_dev_get_egress_qos_mask as an inline.
    ixgbe: add warning when max_vfs is out of range.
    igb: Update link modes display in ethtool
    netfilter: push reasm skb through instead of original frag skbs
    ip6_output: fragment outgoing reassembled skb properly
    MAINTAINERS: mv643xx_eth: take over maintainership from Lennart
    net_sched: tbf: support of 64bit rates
    ixgbe: deleting dfwd stations out of order can cause null ptr deref
    ixgbe: fix build err, num_rx_queues is only available with CONFIG_RPS
    ...

    Linus Torvalds
     
  • Zwane Mwaikambo's @arm.linux.org.uk address no longer works. In February
    2013 he asked for his gmail address to be used instead [1] so let's just
    do that.

    [1] http://marc.info/?l=linux-kernel&m=136079068903214&w=2

    Signed-off-by: Jean Delvare
    Cc: Russell King
    Cc: Zwane Mwaikambo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jean Delvare
     
  • Remove Richard Purdie as backlight subsystem maintainer,

    akpm: Richard is still responsive and is reviewing some of the patches,
    but appears to agree that listing him as the maintainer is no longer
    appropriate.

    [akpm@linux-foundation.org: s/USA/UK/]
    Signed-off-by: Jingoo Han
    Acked-by: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jingoo Han
     
  • Who needs cramfs when you have squashfs? At least, we should warn people
    that cramfs is obsolete.

    Signed-off-by: Michael Opdenacker
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Opdenacker