24 Feb, 2014

1 commit

  • Pull ARM SoC fixes from Olof Johansson:
    "A collection of fixes for ARM platforms. Most are fixes for DTS
    files, mostly from DT conversion on OMAP which is still finding a few
    issues here and there.

    There's a couple of small stale code removal patches that we usually
    queue for the next release instead, but they seemed harmless enough to
    bring in now.

    Also, a fix for backlight on some PXA platforms, and a cache
    configuration fix for Tegra, etc"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (25 commits)
    MAINTAINERS: add additional ARM BCM281xx/BCM11xxx maintainer
    ARM: tegra: only run PL310 init on systems with one
    ARM: tegra: Add head numbers to display controllers
    ARM: imx6: build pm-imx6q.c independently of CONFIG_PM
    ARM: tegra: fix RTC0 alias for Cardhu
    ARM: dove: dt: revert PMU interrupt controller node
    Documentation: dt: OMAP: Update Overo/Tobi
    ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
    ARM: dts: omap3-tobi: Use the correct vendor prefix
    ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
    ARM: OMAP2+: Remove legacy macros for zoom platforms
    ARM: OMAP2+: Remove MACH_NOKIA_N800
    ARM: dts: N900: add missing compatible property
    ARM: dts: N9/N950: fix boot hang with 3.14-rc1
    ARM: OMAP1: nokia770: enable tahvo-usb
    ARM: OMAP2+: gpmc: fix: DT ONENAND child nodes not probed when MTD_ONENAND is built as module
    ARM: OMAP2+: gpmc: fix: DT NAND child nodes not probed when MTD_NAND is built as module
    ARM: dts: omap3-gta04: Fix mmc1 properties.
    ARM: dts: omap3-gta04: Fix 'aux' gpio key flags.
    ARM: OMAP2+: add missing ARCH_HAS_OPP
    ...

    Linus Torvalds
     

23 Feb, 2014

2 commits

  • Add myself as an additional maintainer for the Broadcom mobile
    SoCs.

    Signed-off-by: Matt Porter
    Acked-by: Christian Daudt
    Signed-off-by: Olof Johansson

    Matt Porter
     
  • Pull xfs fixes from Dave Chinner:
    "This is the first pull request I've had to do for you, so I'm still
    sorting things out. The reason I'm sending this and not Ben should be
    obvious from the first commit below - SGI has stepped down from the
    XFS maintainership role. As such, I'd like to take another
    opportunity to thank them for their many years of effort maintaining
    XFS and supporting the XFS community that they developed from the
    ground up.

    So I haven't had time to work things like signed tags into my
    workflows yet, so this is just a repo branch I'm asking you to pull
    from. And yes, I named the branch -rc4 because I wanted the fixes in
    rc4, not because the branch was for merging into -rc3. Probably not
    right, either.

    Anyway, I should have everything sorted out by the time the next merge
    window comes around. If there's anything that you don't like in the
    pull req, feel free to flame me unmercifully.

    The changes are fixes for recent regressions and important thinkos in
    verification code:

    - a log vector buffer alignment issue on ia32
    - timestamps on truncate got mangled
    - primary superblock CRC validation fixes and error message
    sanitisation"

    * 'xfs-fixes-for-3.14-rc4' of git://oss.sgi.com/xfs/xfs:
    xfs: limit superblock corruption errors to actual corruption
    xfs: skip verification on initial "guess" superblock read
    MAINTAINERS: SGI no longer maintaining XFS
    xfs: xfs_sb_read_verify() doesn't flag bad crcs on primary sb
    xfs: ensure correct log item buffer alignment
    xfs: ensure correct timestamp updates from truncate

    Linus Torvalds
     

21 Feb, 2014

1 commit

  • Pull cgroup fixes from Tejun Heo:
    "Quite a few fixes this time.

    Three locking fixes, all marked for -stable. A couple error path
    fixes and some misc fixes. Hugh found a bug in memcg offlining
    sequence and we thought we could fix that from cgroup core side but
    that turned out to be insufficient and got reverted. A different fix
    has been applied to -mm"

    * 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
    cgroup: update cgroup_enable_task_cg_lists() to grab siglock
    Revert "cgroup: use an ordered workqueue for cgroup destruction"
    cgroup: protect modifications to cgroup_idr with cgroup_mutex
    cgroup: fix locking in cgroup_cfts_commit()
    cgroup: fix error return from cgroup_create()
    cgroup: fix error return value in cgroup_mount()
    cgroup: use an ordered workqueue for cgroup destruction
    nfs: include xattr.h from fs/nfs/nfs3proc.c
    cpuset: update MAINTAINERS entry
    arm, pm, vmpressure: add missing slab.h includes

    Linus Torvalds
     

19 Feb, 2014

3 commits

  • SGI is stepping out of maintainer roles for xfs, xfsprogs, xfsdump, and
    xfstests. This removes me from the MAINTAINERS entry.

    Signed-off-by: Ben Myers
    Signed-off-by: Dave Chinner

    Ben Myers
     
  • Pull networking fixes from David Miller:

    1) kvaser CAN driver has fixed limits of some of it's table, validate
    that we won't exceed those limits at probe time. Fix from Olivier
    Sobrie.

    2) Fix rtl8192ce disabling interrupts for too long, from Olivier
    Langlois.

    3) Fix botched shift in ath5k driver, from Dan Carpenter.

    4) Fix corruption of deferred packets in TIPC, from Erik Hugne.

    5) Fix newlink error path in macvlan driver, from Cong Wang.

    6) Fix netpoll deadlock in bonding, from Ding Tianhong.

    7) Handle GSO packets properly in forwarding path when fragmentation is
    necessary on egress, from Florian Westphal.

    8) Fix axienet build errors, from Michal Simek.

    9) Fix refcounting of ubufs on tx in vhost net driver, from Michael S
    Tsirkin.

    10) Carrier status isn't set properly in hyperv driver, from Haiyang
    Zhang.

    11) Missing pci_disable_device() in tulip_remove_one), from Ingo Molnar.

    12) AF_PACKET qdisc bypass mode doesn't adhere to driver provided TX
    queue selection method. Add a fallback method mechanism to fix this
    bug, from Daniel Borkmann.

    13) Fix regression in link local route handling on GRE tunnels, from
    Nicolas Dichtel.

    14) Bonding can assign dup aggregator IDs in some sequences of
    configuration, fix by making the allocation counter per-bond instead
    of global. From Jiri Bohac.

    15) sctp_connectx() needs compat translations, from Daniel Borkmann.

    16) Fix of_mdio PHY interrupt parsing, from Ben Dooks

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (62 commits)
    MAINTAINERS: add entry for the PHY library
    of_mdio: fix phy interrupt passing
    net: ethernet: update dependency and help text of mvneta
    NET: fec: only enable napi if we are successful
    af_packet: remove a stray tab in packet_set_ring()
    net: sctp: fix sctp_connectx abi for ia32 emulation/compat mode
    ipv4: fix counter in_slow_tot
    irtty-sir.c: Do not set_termios() on irtty_close()
    bonding: 802.3ad: make aggregator_identifier bond-private
    usbnet: remove generic hard_header_len check
    gre: add link local route when local addr is any
    batman-adv: fix potential kernel paging error for unicast transmissions
    batman-adv: avoid double free when orig_node initialization fails
    batman-adv: free skb on TVLV parsing success
    batman-adv: fix TT CRC computation by ensuring byte order
    batman-adv: fix potential orig_node reference leak
    batman-adv: avoid potential race condition when adding a new neighbour
    batman-adv: properly check pskb_may_pull return value
    batman-adv: release vlan object after checking the CRC
    batman-adv: fix TT-TVLV parsing on OGM reception
    ...

    Linus Torvalds
     
  • The PHY library has been subject to some changes, new drivers and DT
    interactions over the past few months. Add myself as a maintainer for
    the core PHY library parts and drivers. Make sure the PHY library entry
    also covers the Device Tree files which have a close interaction with
    the MDIO bus, PHY connection and Ethernet PHY mode parsing.

    CC: Grant Likely
    CC: Shaohui Xie
    CC: Andy Fleming
    Signed-off-by: Florian Fainelli
    Signed-off-by: David S. Miller

    Florian Fainelli
     

15 Feb, 2014

1 commit

  • Pull ACPI and power management fixes from Rafael Wysocki:
    "These include a fix for a recent intel_pstate regression, a fix for a
    regression in the ACPI-based PCI hotplug (ACPIPHP) code introduced
    during the 3.12 cycle, fixes for two bugs in the ACPI core introduced
    recently and a MAINTAINERS update related to cpufreq.

    Specifics:

    - Fix for a recent regression in the intel_pstate driver that
    introduced a race condition causing systems to crash during
    initialization in some situations. This removes the affected code
    altogether. From Dirk Brandewie.

    - ACPIPHP fix for a regression introduced during the 3.12 cycle
    causing devices to be dropped as a result of bus check
    notifications after system resume on some systems due to the way
    ACPIPHP interprets _STA return values (arguably incorrectly). From
    Mika Westerberg.

    - ACPI dock driver fix for a problem causing docking to fail due to a
    check that always fails after recent ACPI core changes (found by
    code inspection).

    - ACPI container driver fix to prevent memory from being leaked in an
    error code path after device_register() failures.

    - Update of the arm_big_little cpufreq driver maintainer's e-mail
    address"

    * tag 'pm+acpi-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    MAINTAINERS / cpufreq: update Sudeep's email address
    intel_pstate: Remove energy reporting from pstate_sample tracepoint
    ACPI / container: Fix error code path in container_device_attach()
    ACPI / hotplug / PCI: Relax the checking of _STA return values
    ACPI / dock: Use acpi_device_enumerated() to check if dock is present

    Linus Torvalds
     

13 Feb, 2014

2 commits

  • Though my old email address continues to work as alias, updating
    to the new address as it's shorter, easier and more appropriate.

    Signed-off-by: Sudeep Holla
    Signed-off-by: Rafael J. Wysocki

    Sudeep Holla
     
  • Pull drm fixes from Dave Airlie:
    "Nothing too crazy.

    Radeon irq fixes, i915 regression fixes, exynos fixes, tda998x chip
    fixes, and a bunch of msm fixes"

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (31 commits)
    drm/i915: Pair va_copy with va_end in i915_error_vprintf
    drm/i915: Fix intel_pipe_to_cpu_transcoder for UMS
    drm/i915: Disable dp aux irq on g4x
    drm/msm: bigger synchronization hammer
    drm/exynos: Convert to use the standard hdmi.h header
    drm/exynos: Fix trivial typo
    drm/exynos: Remove unnecessary semicolon
    drm/exynos: Fix multiplatform breakage for ipp/gsc
    drm/exynos: Fix freeing issues in exynos_drm_drv.c
    drm/radeon: add missing include in btc_dpm.c
    drm/radeon/dpm: fix uninitialized read from stack in kv_dpm_late_enable
    drm/radeon: remove useless return
    drm/radeon/dpm: use stored max_vddc rather than looking it up
    drm/radeon/dpm: use the driver state for dpm debugfs
    drm/radeon: fix UVD IRQ support on 7xx
    drm/radeon: fix UVD IRQ support on SI
    drm/msm: fix deadlock in bo create fail path
    drm/msm/mdp4: cursor fixes
    drm/msm/mdp4: pageflip fixes
    drm/msm/mdp5: fix ref leaks in error paths
    ...

    Linus Torvalds
     

12 Feb, 2014

1 commit

  • Pull networking updates from David Miller:

    1) Fix flexcan build on big endian, from Arnd Bergmann

    2) Correctly attach cpsw to GPIO bitbang MDIO drive, from Stefan Roese

    3) udp_add_offload has to use GFP_ATOMIC since it can be invoked from
    non-sleepable contexts. From Or Gerlitz

    4) vxlan_gro_receive() does not iterate over all possible flows
    properly, fix also from Or Gerlitz

    5) CAN core doesn't use a proper SKB destructor when it hooks up
    sockets to SKBs. Fix from Oliver Hartkopp

    6) ip_tunnel_xmit() can use an uninitialized route pointer, fix from
    Eric Dumazet

    7) Fix address family assignment in IPVS, from Michal Kubecek

    8) Fix ath9k build on ARM, from Sujith Manoharan

    9) Make sure fail_over_mac only applies for the correct bonding modes,
    from Ding Tianhong

    10) The udp offload code doesn't use RCU correctly, from Shlomo Pongratz

    11) Handle gigabit features properly in generic PHY code, from Florian
    Fainelli

    12) Don't blindly invoke link operations in
    rtnl_link_get_slave_info_data_size, they are optional. Fix from
    Fernando Luis Vazquez Cao

    13) Add USB IDs for Netgear Aircard 340U, from Bjørn Mork

    14) Handle netlink packet padding properly in openvswitch, from Thomas
    Graf

    15) Fix oops when deleting chains in nf_tables, from Patrick McHardy

    16) Fix RX stalls in xen-netback driver, from Zoltan Kiss

    17) Fix deadlock in mac80211 stack, from Emmanuel Grumbach

    18) inet_nlmsg_size() forgets to consider ifa_cacheinfo, fix from Geert
    Uytterhoeven

    19) tg3_change_mtu() can deadlock, fix from Nithin Sujir

    20) Fix regression in setting SCTP local source addresses on accepted
    sockets, caused by some generic ipv6 socket changes. Fix from
    Matija Glavinic Pecotic

    21) IPPROTO_* must be pure defines, otherwise module aliases don't get
    constructed properly. Fix from Jan Moskyto

    22) IPV6 netconsole setup doesn't work properly unless an explicit
    source address is specified, fix from Sabrina Dubroca

    23) Use __GFP_NORETRY for high order skb page allocations in
    sock_alloc_send_pskb and skb_page_frag_refill. From Eric Dumazet

    24) Fix a regression added in netconsole over bridging, from Cong Wang

    25) TCP uses an artificial offset of 1ms for SRTT, but this doesn't jive
    well with TCP pacing which needs the SRTT to be accurate. Fix from
    Eric Dumazet

    26) Several cases of missing header file includes from Rashika Kheria

    27) Add ZTE MF667 device ID to qmi_wwan driver, from Raymond Wanyoike

    28) TCP Small Queues doesn't handle nonagle properly in some corner
    cases, fix from Eric Dumazet

    29) Remove extraneous read_unlock in bond_enslave, whoops. From Ding
    Tianhong

    30) Fix 9p trans_virtio handling of vmalloc buffers, from Richard Yao

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (136 commits)
    6lowpan: fix lockdep splats
    alx: add missing stats_lock spinlock init
    9p/trans_virtio.c: Fix broken zero-copy on vmalloc() buffers
    bonding: remove unwanted bond lock for enslave processing
    USB2NET : SR9800 : One chip USB2.0 USB2NET SR9800 Device Driver Support
    tcp: tsq: fix nonagle handling
    bridge: Prevent possible race condition in br_fdb_change_mac_address
    bridge: Properly check if local fdb entry can be deleted when deleting vlan
    bridge: Properly check if local fdb entry can be deleted in br_fdb_delete_by_port
    bridge: Properly check if local fdb entry can be deleted in br_fdb_change_mac_address
    bridge: Fix the way to check if a local fdb entry can be deleted
    bridge: Change local fdb entries whenever mac address of bridge device changes
    bridge: Fix the way to find old local fdb entries in br_fdb_change_mac_address
    bridge: Fix the way to insert new local fdb entries in br_fdb_changeaddr
    bridge: Fix the way to find old local fdb entries in br_fdb_changeaddr
    tcp: correct code comment stating 3 min timeout for FIN_WAIT2, we only do 1 min
    net: vxge: Remove unused device pointer
    net: qmi_wwan: add ZTE MF667
    3c59x: Remove unused pointer in vortex_eisa_cleanup()
    net: fix 'ip rule' iif/oif device rename
    ...

    Linus Torvalds
     

11 Feb, 2014

1 commit

  • Just minor stuff really, on vlv dp fix and two patches to tune down some
    opregion sanity check. Plus MAINTAINERS update for the new git repo, which
    is the only reason I've really bothered with this pull request.

    * tag 'drm-intel-fixes-2014-02-06' of ssh://git.freedesktop.org/git/drm-intel:
    drm/i915: demote opregion excessive timeout WARN_ONCE to DRM_INFO_ONCE
    drm: add DRM_INFO_ONCE() to print a one-time DRM_INFO() message
    MAINTAINERS: Update drm/i915 git repo
    drm/i915: vlv: fix DP PHY lockup due to invalid PP sequencer setup

    Dave Airlie
     

05 Feb, 2014

1 commit

  • Moved to a common location so that Jani also can push to it, to avoid
    moving it every time I go on vacation. Please update autobuilders and
    everything else pointing at the drm-intel.git repo, the old one won't
    be updated any more.

    Cc: Dave Airlie
    Cc: Jani Nikula
    Signed-off-by: Daniel Vetter

    Daniel Vetter
     

04 Feb, 2014

1 commit


03 Feb, 2014

1 commit

  • Pull ARM SoC fixes from Olof Johansson:
    "Here's a set of patches for (hopefully) -rc1. Some of them are fixes,
    but a good number of them also do things such as enable new drivers in
    the defconfigs for platforms that have such devices, increases
    coverage of the multiplatform defconfig and some DTS changes that
    plumbs up some of the devices that now have bindings and driver
    support.

    The commit dates are recent; we've mostly collected these fixes in the
    last few days but I also had to rebuild the branch yesterday to sort
    out some internal conflicts which reset the timestamps. The changes
    should have been tested by each platform maintainer already (and few
    of them have cross-platform impact) so I'm personally not too
    concerned by it at this time"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
    ARM: multi_v7_defconfig: remove redundant entries and re-enable TI_EDMA
    ARM: multi_v7_defconfig: add mvebu drivers
    clocksource: kona: Add basic use of external clock
    drivers: bus: fix CCI driver kcalloc call parameters swap
    ARM: dts: bcm28155-ap: Fix Card Detection GPIO
    ARM: multi_v7_defconfig: Select CONFIG_AT803X_PHY
    ARM: keystone: config: fix build warning when CONFIG_DMADEVICES is not set
    MAINTAINERS: ARM: SiRF: use regex patterns to involve all SiRF drivers
    ARM: dts: zynq: Add SDHCI nodes
    ARM: hisi: don't select SMP
    ARM: tegra: rebuild tegra_defconfig to add DEBUG_FS
    ARM: multi_v7: copy most options from tegra_defconfig
    ARM: iop32x: fix power off handling for the EM7210 board
    ARM: integrator: restore static map on the CP
    ARM: msm_defconfig: Enable MSM clock drivers
    ARM: dts: msm: Add clock controller nodes and hook into uart
    ARM: OMAP4+: move errata initialization to omap4_pm_init_early
    ARM: OMAP4460: cpuidle: Extend PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD on cpuidle
    ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)
    ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference
    ...

    Linus Torvalds
     

01 Feb, 2014

3 commits

  • instead of listing drivers one by one, use regex patterns to involve all
    SiRF drivers directly.
    this also adds sirf UART and watchdog drivers automatically from:
    drivers/tty/serial/sirfsoc_uart.*
    drivers/watchdog/sirfsoc_wdt.c

    Cc: Uwe Kleine-König
    Cc: Wim Van Sebroeck
    Cc: Greg Kroah-Hartman
    Signed-off-by: Barry Song
    Signed-off-by: Olof Johansson

    Barry Song
     
  • Pull media updates from Mauro Carvalho Chehab:
    - a new jpeg codec driver for Samsung Exynos (jpeg-hw-exynos4)
    - a new dvb frontend for ds2103 chipset (m88ds2103)
    - a new sensor driver for Samsung S5K5BAF UXGA (s5k5baf)
    - new drivers for R-Car VSP1
    - a new radio driver: radio-raremono
    - a new tuner driver for ts2022 chipset (m88ts2022)
    - the analog part of em28xx is now a separate module that only
    load/runs if the device is not a pure digital TV device
    - added a staging driver for bcm2048 radio devices
    - the omap 2 video driver (omap24xx) was moved to staging. This driver
    is for an old hardware and uses a deprecated Kernel internal API. If
    nobody cares enough to fix it, it would be removed on a couple Kernel
    releases
    - the sn9c102 driver was moved to staging. This driver was replaced by
    gspca, and disabled on some distros, as almost all devices are known
    to work properly with gspca. It should be removed from kernel on a
    couple Kernel releases
    - lots of driver fixes, improvements and cleanups

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (421 commits)
    [media] media: v4l2-dev: fix video device index assignment
    [media] rc-core: reuse device numbers
    [media] em28xx-cards: properly initialize the device bitmap
    [media] Staging: media: Fix line length exceeding 80 characters in as102_drv.c
    [media] Staging: media: Fix line length exceeding 80 characters in as102_fe.c
    [media] Staging: media: Fix quoted string split across line in as102_fe.c
    [media] media: st-rc: Add reset support
    [media] m2m-deinterlace: fix allocated struct type
    [media] radio-usb-si4713: fix sparse non static symbol warnings
    [media] em28xx-audio: remove needless check before usb_free_coherent()
    [media] au0828: Fix sparse non static symbol warning
    Revert "[media] go7007-usb: only use go->dev after allocated"
    [media] em28xx-audio: provide an error code when URB submit fails
    [media] em28xx: fix check for audio only usb interfaces when changing the usb alternate setting
    [media] em28xx: fix usb alternate setting for analog and digital video endpoints > 0
    [media] em28xx: make 'em28xx_ctrl_ops' static
    em28xx-alsa: Fix error patch for init/fini
    [media] em28xx-audio: flush work at .fini
    [media] drxk: remove the option to load firmware asynchronously
    [media] em28xx: adjust period size at runtime
    ...

    Linus Torvalds
     
  • Pull core debug changes from Ingo Molnar:
    "This contains mostly kernel debugging related updates:

    - make hung_task detection more configurable to distros
    - add final bits for x86 UV NMI debugging, with related KGDB changes
    - update the mailing-list of MAINTAINERS entries I'm involved with"

    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    hung_task: Display every hung task warning
    sysctl: Add neg_one as a standard constraint
    x86/uv/nmi, kgdb/kdb: Fix UV NMI handler when KDB not configured
    x86/uv/nmi: Fix Sparse warnings
    kgdb/kdb: Fix no KDB config problem
    MAINTAINERS: Restore "L: linux-kernel@vger.kernel.org" entries

    Linus Torvalds
     

31 Jan, 2014

4 commits


30 Jan, 2014

3 commits


29 Jan, 2014

2 commits

  • Pull MTD updates from Brian Norris:
    - Add me (Brian Norris) as an additional MTD maintainer (it'd be nice to get
    David's "ack" for this; I'm sure he approves, but he's been pretty silent
    lately)
    - Add Ezequiel Garcie as maintainer for the pxa3xx NAND driver
    - Last (?) round of pxa3xx improvements for supporting Armada 370/XP
    - Typical churn in driver boilerplate (OOM messages, printk()'s, devm_*, etc.)
    - Quad read mode support for SPI NOR driver (m25p80)
    - Update Davinci NAND driver to prepare for use on new platforms
    - Begin to kill off NAND_MAX_{PAGE,OOB}SIZE macros; more work is pending
    - Miscellaneous NAND device support (new IDs)
    - Add READ RETRY support for Micron MLC NAND
    - Support new GPMI NAND ECC layout device-tree binding
    - Avoid mapping stack/vmalloc() memory for GPMI NAND DMA

    * tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd: (151 commits)
    mtd: gpmi: add sanity check when mapping DMA for read_buf/write_buf
    mtd: gpmi: allocate a proper buffer for non ECC read/write
    mtd: m25p80: Set rx_nbits for Quad SPI transfers
    mtd: m25p80: Enable Quad SPI read transfers for s25fl512s
    mtd: s3c2410: Merge plat/regs-nand.h into s3c2410.c
    mtd: mtdram: add missing 'const'
    mtd: m25p80: assign default read command
    mtd: nuc900_nand: remove redundant return value check of platform_get_resource()
    mtd: plat_nand: remove redundant return value check of platform_get_resource()
    mtd: nand: add Intel manufacturer ID
    mtd: nand: add SanDisk manufacturer ID
    mtd: nand: add support for Samsung K9LCG08U0B
    mtd: nand: pxa3xx: Add support for 2048 bytes page size devices
    mtd: m25p80: Use OPCODE_QUAD_READ_4B for 4-byte addressing
    mtd: nand: don't use {read,write}_buf for 8-bit transfers
    mtd: nand: use __packed shorthand
    mtd: nand: support Micron READ RETRY
    mtd: nand: add generic READ RETRY support
    mtd: nand: add ONFI vendor block for Micron
    mtd: nand: localize ECC failures per page
    ...

    Linus Torvalds
     
  • Pull ceph updates from Sage Weil:
    "This is a big batch. From Ilya we have:

    - rbd support for more than ~250 mapped devices (now uses same scheme
    that SCSI does for device major/minor numbering)
    - crush updates for new mapping behaviors (will be needed for coming
    erasure coding support, among other things)
    - preliminary support for tiered storage pools

    There is also a big series fixing a pile cephfs bugs with clustered
    MDSs from Yan Zheng, ACL support for cephfs from Guangliang Zhao, ceph
    fscache improvements from Li Wang, improved behavior when we get
    ENOSPC from Josh Durgin, some readv/writev improvements from
    Majianpeng, and the usual mix of small cleanups"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (76 commits)
    ceph: cast PAGE_SIZE to size_t in ceph_sync_write()
    ceph: fix dout() compile warnings in ceph_filemap_fault()
    libceph: support CEPH_FEATURE_OSD_CACHEPOOL feature
    libceph: follow redirect replies from osds
    libceph: rename ceph_osd_request::r_{oloc,oid} to r_base_{oloc,oid}
    libceph: follow {read,write}_tier fields on osd request submission
    libceph: add ceph_pg_pool_by_id()
    libceph: CEPH_OSD_FLAG_* enum update
    libceph: replace ceph_calc_ceph_pg() with ceph_oloc_oid_to_pg()
    libceph: introduce and start using oid abstraction
    libceph: rename MAX_OBJ_NAME_SIZE to CEPH_MAX_OID_NAME_LEN
    libceph: move ceph_file_layout helpers to ceph_fs.h
    libceph: start using oloc abstraction
    libceph: dout() is missing a newline
    libceph: add ceph_kv{malloc,free}() and switch to them
    libceph: support CEPH_FEATURE_EXPORT_PEER
    ceph: add imported caps when handling cap export message
    ceph: add open export target session helper
    ceph: remove exported caps when handling cap import message
    ceph: handle session flush message
    ...

    Linus Torvalds
     

27 Jan, 2014

1 commit

  • Pull MMC updates from Chris Ball:
    "MMC highlights for 3.14:

    Core:
    - Avoid get_cd() on cards marked nonremovable

    Drivers:
    - arasan: New driver for controllers found in e.g. Xilinx Zynq SoC
    - dwmmc: Support Hisilicon K3 SoC controllers
    - esdhc-imx: Support for HS200 mode, DDR modes on MX6, runtime PM
    - sdhci-pci: Support O2Micro/BayHubTech controllers used in laptops
    like Lenovo ThinkPad W540, Dell Latitude E5440, Dell Latitude E6540
    - tegra: Support Tegra124 SoCs"

    * tag 'mmc-updates-for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (55 commits)
    mmc: sdhci-pci: Fix possibility of chip->fixes being null
    mmc: sdhci-pci: Fix BYT sd card getting stuck in runtime suspend
    mmc: sdhci: Allow for long command timeouts
    mmc: sdio: add a quirk for broken SDIO_CCCR_INTx polling
    mmc: sdhci: fix lockdep error in tuning routine
    mmc: dw_mmc: k3: remove clk_table
    mmc: dw_mmc: fix dw_mci_get_cd
    mmc: dw_mmc: fix sparse non static symbol warning
    mmc: sdhci-esdhc-imx: fix warning during module remove function
    mmc: sdhci-esdhc-imx: fix access hardirq-unsafe lock in atomic context
    mmc: core: sd: implement proper support for sd3.0 au sizes
    mmc: atmel-mci: add vmmc-supply support
    mmc: sdhci-pci: add broken HS200 quirk for Intel Merrifield
    mmc: sdhci: add quirk for broken HS200 support
    mmc: arasan: Add driver for Arasan SDHCI
    mmc: dw_mmc: add dw_mmc-k3 for k3 platform
    mmc: dw_mmc: use slot-gpio to handle cd pin
    mmc: sdhci-pci: add support of O2Micro/BayHubTech SD hosts
    mmc: sdhci-pci: break out definitions to header file
    mmc: tmio: fixup compile error
    ...

    Conflicts:
    MAINTAINERS

    Linus Torvalds
     

26 Jan, 2014

1 commit

  • Pull networking updates from David Miller:

    1) BPF debugger and asm tool by Daniel Borkmann.

    2) Speed up create/bind in AF_PACKET, also from Daniel Borkmann.

    3) Correct reciprocal_divide and update users, from Hannes Frederic
    Sowa and Daniel Borkmann.

    4) Currently we only have a "set" operation for the hw timestamp socket
    ioctl, add a "get" operation to match. From Ben Hutchings.

    5) Add better trace events for debugging driver datapath problems, also
    from Ben Hutchings.

    6) Implement auto corking in TCP, from Eric Dumazet. Basically, if we
    have a small send and a previous packet is already in the qdisc or
    device queue, defer until TX completion or we get more data.

    7) Allow userspace to manage ipv6 temporary addresses, from Jiri Pirko.

    8) Add a qdisc bypass option for AF_PACKET sockets, from Daniel
    Borkmann.

    9) Share IP header compression code between Bluetooth and IEEE802154
    layers, from Jukka Rissanen.

    10) Fix ipv6 router reachability probing, from Jiri Benc.

    11) Allow packets to be captured on macvtap devices, from Vlad Yasevich.

    12) Support tunneling in GRO layer, from Jerry Chu.

    13) Allow bonding to be configured fully using netlink, from Scott
    Feldman.

    14) Allow AF_PACKET users to obtain the VLAN TPID, just like they can
    already get the TCI. From Atzm Watanabe.

    15) New "Heavy Hitter" qdisc, from Terry Lam.

    16) Significantly improve the IPSEC support in pktgen, from Fan Du.

    17) Allow ipv4 tunnels to cache routes, just like sockets. From Tom
    Herbert.

    18) Add Proportional Integral Enhanced packet scheduler, from Vijay
    Subramanian.

    19) Allow openvswitch to mmap'd netlink, from Thomas Graf.

    20) Key TCP metrics blobs also by source address, not just destination
    address. From Christoph Paasch.

    21) Support 10G in generic phylib. From Andy Fleming.

    22) Try to short-circuit GRO flow compares using device provided RX
    hash, if provided. From Tom Herbert.

    The wireless and netfilter folks have been busy little bees too.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2064 commits)
    net/cxgb4: Fix referencing freed adapter
    ipv6: reallocate addrconf router for ipv6 address when lo device up
    fib_frontend: fix possible NULL pointer dereference
    rtnetlink: remove IFLA_BOND_SLAVE definition
    rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info
    qlcnic: update version to 5.3.55
    qlcnic: Enhance logic to calculate msix vectors.
    qlcnic: Refactor interrupt coalescing code for all adapters.
    qlcnic: Update poll controller code path
    qlcnic: Interrupt code cleanup
    qlcnic: Enhance Tx timeout debugging.
    qlcnic: Use bool for rx_mac_learn.
    bonding: fix u64 division
    rtnetlink: add missing IFLA_BOND_AD_INFO_UNSPEC
    sfc: Use the correct maximum TX DMA ring size for SFC9100
    Add Shradha Shah as the sfc driver maintainer.
    net/vxlan: Share RX skb de-marking and checksum checks with ovs
    tulip: cleanup by using ARRAY_SIZE()
    ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called
    net/cxgb4: Don't retrieve stats during recovery
    ...

    Linus Torvalds
     

25 Jan, 2014

3 commits

  • Pull infiniband updates from Roland Dreier:
    "Main batch of InfiniBand/RDMA changes for 3.14:
    - Flow steering for InfiniBand UD traffic
    - IP-based addressing for IBoE aka RoCE
    - Pass SRP submaintainership from Dave to Bart
    - SRP transport fixes from Bart
    - Add the new Cisco usNIC low-level device driver
    - Various other fixes"

    * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (75 commits)
    IB/mlx5: Verify reserved fields are cleared
    IB/mlx5: Remove old field for create mkey mailbox
    IB/mlx5: Abort driver cleanup if teardown hca fails
    IB/mlx5: Allow creation of QPs with zero-length work queues
    mlx5_core: Fix PowerPC support
    mlx5_core: Improve debugfs readability
    IB/mlx5: Add support for resize CQ
    IB/mlx5: Implement modify CQ
    IB/mlx5: Make sure doorbell record is visible before doorbell
    mlx5_core: Use mlx5 core style warning
    IB/mlx5: Clear out struct before create QP command
    mlx5_core: Fix out arg size in access_register command
    RDMA/nes: Slight optimization of Ethernet address compare
    IB/qib: Fix QP check when looping back to/from QP1
    RDMA/cxgb4: Fix gcc warning on 32-bit arch
    IB/usnic: Remove unused includes of
    RDMA/amso1100: Add check if cache memory was allocated before freeing it
    IPoIB: Report operstate consistently when brought up without a link
    IB/core: Fix unused variable warning
    RDMA/cma: Handle global/non-linklocal IPv6 addresses in cma_check_linklocal()
    ...

    Linus Torvalds
     
  • Pull thermal management updates from Zhang Rui:
    "This time, the biggest change is the work of representing hardware
    thermal properties in device tree infrastructure.

    This work includes the introduction of a device tree bindings for
    describing the hardware thermal behavior and limits, and also a parser
    to read and interpret the data, and build thermal zones and thermal
    binding parameters. It also contains three examples on how to use the
    new representation on sensor devices, using three different drivers to
    accomplish it. One driver is in thermal subsystem, the TI SoC
    thermal, and the other two drivers are in hwmon subsystem.

    Actually, this would be the first step of the complete work because we
    still need to check other potential drivers to be converted and then
    validate the proposed API. But the reason why I include it in this
    pull request is that, first, this change does not hurt any others
    without using this approach, second, the principle and concept of this
    change would not break after converting the remaining drivers. BTW,
    as you can see, there are several points in this change that do not
    belong to thermal subsystem. Because it has been suggested by Guenter
    R that in such cases, it is recommended to send the complete series
    via one single subsystem.

    Specifics:

    - representing hardware thermal properties in device tree
    infrastructure

    - fix a regression that the imx thermal driver breaks system suspend.

    - introduce ACPI INT3403 thermal driver to retrieve temperature data
    from the INT3403 ACPI device object present on some systems.

    - introduce debug statement for thermal core and step_wise governor.

    - assorted fixes and cleanups for thermal core, cpu cooling, exynos
    thrmal, intel powerclamp and imx thermal driver"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (34 commits)
    thermal: remove const flag from .ops of imx thermal
    Thermal: update thermal zone device after setting emul_temp
    intel_powerclamp: Fix cstate counter detection.
    thermal: imx: add necessary clk operation
    Thermal cpu cooling: return error if no valid cpu frequency entry
    thermal: fix cpu_cooling max_level behavior
    thermal: rcar-thermal: Enable driver compilation with COMPILE_TEST
    thermal: debug: add debug statement for core and step_wise
    thermal: imx_thermal: add module device table
    drivers: thermal: Mark function as static in x86_pkg_temp_thermal.c
    thermal:samsung: fix compilation warning
    thermal: imx: correct suspend/resume flow
    thermal: exynos: fix error return code
    Thermal: ACPI INT3403 thermal driver
    MAINTAINERS: add thermal bindings entry in thermal domain
    arm: dts: make OMAP4460 bandgap node to belong to OCP
    arm: dts: make OMAP443x bandgap node to belong to OCP
    arm: dts: add cooling properties on omap5 cpu node
    arm: dts: add omap5 thermal data
    arm: dts: add omap5 CORE thermal data
    ...

    Linus Torvalds
     
  • Pull ACPI and power management updates from Rafael Wysocki:
    "As far as the number of commits goes, the top spot belongs to ACPI
    this time with cpufreq in the second position and a handful of PM
    core, PNP and cpuidle updates. They are fixes and cleanups mostly, as
    usual, with a couple of new features in the mix.

    The most visible change is probably that we will create struct
    acpi_device objects (visible in sysfs) for all devices represented in
    the ACPI tables regardless of their status and there will be a new
    sysfs attribute under those objects allowing user space to check that
    status via _STA.

    Consequently, ACPI device eject or generally hot-removal will not
    delete those objects, unless the table containing the corresponding
    namespace nodes is unloaded, which is extremely rare. Also ACPI
    container hotplug will be handled quite a bit differently and cpufreq
    will support CPU boost ("turbo") generically and not only in the
    acpi-cpufreq driver.

    Specifics:

    - ACPI core changes to make it create a struct acpi_device object for
    every device represented in the ACPI tables during all namespace
    scans regardless of the current status of that device. In
    accordance with this, ACPI hotplug operations will not delete those
    objects, unless the underlying ACPI tables go away.

    - On top of the above, new sysfs attribute for ACPI device objects
    allowing user space to check device status by triggering the
    execution of _STA for its ACPI object. From Srinivas Pandruvada.

    - ACPI core hotplug changes reducing code duplication, integrating
    the PCI root hotplug with the core and reworking container hotplug.

    - ACPI core simplifications making it use ACPI_COMPANION() in the
    code "glueing" ACPI device objects to "physical" devices.

    - ACPICA update to upstream version 20131218. This adds support for
    the DBG2 and PCCT tables to ACPICA, fixes some bugs and improves
    debug facilities. From Bob Moore, Lv Zheng and Betty Dall.

    - Init code change to carry out the early ACPI initialization
    earlier. That should allow us to use ACPI during the timekeeping
    initialization and possibly to simplify the EFI initialization too.
    From Chun-Yi Lee.

    - Clenups of the inclusions of ACPI headers in many places all over
    from Lv Zheng and Rashika Kheria (work in progress).

    - New helper for ACPI _DSM execution and rework of the code in
    drivers that uses _DSM to execute it via the new helper. From
    Jiang Liu.

    - New Win8 OSI blacklist entries from Takashi Iwai.

    - Assorted ACPI fixes and cleanups from Al Stone, Emil Goode, Hanjun
    Guo, Lan Tianyu, Masanari Iida, Oliver Neukum, Prarit Bhargava,
    Rashika Kheria, Tang Chen, Zhang Rui.

    - intel_pstate driver updates, including proper Baytrail support,
    from Dirk Brandewie and intel_pstate documentation from Ramkumar
    Ramachandra.

    - Generic CPU boost ("turbo") support for cpufreq from Lukasz
    Majewski.

    - powernow-k6 cpufreq driver fixes from Mikulas Patocka.

    - cpufreq core fixes and cleanups from Viresh Kumar, Jane Li, Mark
    Brown.

    - Assorted cpufreq drivers fixes and cleanups from Anson Huang, John
    Tobias, Paul Bolle, Paul Walmsley, Sachin Kamat, Shawn Guo, Viresh
    Kumar.

    - cpuidle cleanups from Bartlomiej Zolnierkiewicz.

    - Support for hibernation APM events from Bin Shi.

    - Hibernation fix to avoid bringing up nonboot CPUs with ACPI EC
    disabled during thaw transitions from Bjørn Mork.

    - PM core fixes and cleanups from Ben Dooks, Leonardo Potenza, Ulf
    Hansson.

    - PNP subsystem fixes and cleanups from Dmitry Torokhov, Levente
    Kurusa, Rashika Kheria.

    - New tool for profiling system suspend from Todd E Brandt and a
    cpupower tool cleanup from One Thousand Gnomes"

    * tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (153 commits)
    thermal: exynos: boost: Automatic enable/disable of BOOST feature (at Exynos4412)
    cpufreq: exynos4x12: Change L0 driver data to CPUFREQ_BOOST_FREQ
    Documentation: cpufreq / boost: Update BOOST documentation
    cpufreq: exynos: Extend Exynos cpufreq driver to support boost
    cpufreq / boost: Kconfig: Support for software-managed BOOST
    acpi-cpufreq: Adjust the code to use the common boost attribute
    cpufreq: Add boost frequency support in core
    intel_pstate: Add trace point to report internal state.
    cpufreq: introduce cpufreq_generic_get() routine
    ARM: SA1100: Create dummy clk_get_rate() to avoid build failures
    cpufreq: stats: create sysfs entries when cpufreq_stats is a module
    cpufreq: stats: free table and remove sysfs entry in a single routine
    cpufreq: stats: remove hotplug notifiers
    cpufreq: stats: handle cpufreq_unregister_driver() and suspend/resume properly
    cpufreq: speedstep: remove unused speedstep_get_state
    platform: introduce OF style 'modalias' support for platform bus
    PM / tools: new tool for suspend/resume performance optimization
    ACPI: fix module autoloading for ACPI enumerated devices
    ACPI: add module autoloading support for ACPI enumerated devices
    ACPI: fix create_modalias() return value handling
    ...

    Linus Torvalds
     

24 Jan, 2014

8 commits

  • Merge second patch-bomb from Andrew Morton:
    - various misc bits
    - the rest of MM
    - add generic fixmap.h, use it
    - backlight updates
    - dynamic_debug updates
    - printk() updates
    - checkpatch updates
    - binfmt_elf
    - ramfs
    - init/
    - autofs4
    - drivers/rtc
    - nilfs
    - hfsplus
    - Documentation/
    - coredump
    - procfs
    - fork
    - exec
    - kexec
    - kdump
    - partitions
    - rapidio
    - rbtree
    - userns
    - memstick
    - w1
    - decompressors

    * emailed patches from Andrew Morton : (197 commits)
    lib/decompress_unlz4.c: always set an error return code on failures
    romfs: fix returm err while getting inode in fill_super
    drivers/w1/masters/w1-gpio.c: add strong pullup emulation
    drivers/memstick/host/rtsx_pci_ms.c: fix ms card data transfer bug
    userns: relax the posix_acl_valid() checks
    arch/sh/kernel/dwarf.c: use rbtree postorder iteration helper instead of solution using repeated rb_erase()
    fs-ext3-use-rbtree-postorder-iteration-helper-instead-of-opencoding-fix
    fs/ext3: use rbtree postorder iteration helper instead of opencoding
    fs/jffs2: use rbtree postorder iteration helper instead of opencoding
    fs/ext4: use rbtree postorder iteration helper instead of opencoding
    fs/ubifs: use rbtree postorder iteration helper instead of opencoding
    net/netfilter/ipset/ip_set_hash_netiface.c: use rbtree postorder iteration instead of opencoding
    rbtree/test: test rbtree_postorder_for_each_entry_safe()
    rbtree/test: move rb_node to the middle of the test struct
    rapidio: add modular rapidio core build into powerpc and mips branches
    partitions/efi: complete documentation of gpt kernel param purpose
    kdump: add /sys/kernel/vmcoreinfo ABI documentation
    kdump: fix exported size of vmcoreinfo note
    kexec: add sysctl to disable kexec_load
    fs/exec.c: call arch_pick_mmap_layout() only once
    ...

    Linus Torvalds
     
  • Pull clk framework changes from Mike Turquette:
    "The first half of the clk framework pull request is made up almost
    entirely of new platform/driver support. There are some conversions
    of existing drivers to the common-clock Device Tree binding, and a few
    non-critical fixes to the framework.

    Due to an entirely unnecessary cyclical dependency with the arm-soc
    tree this pull request is broken into two pieces. The second piece
    will be sent out after arm-soc sends you the pull request that merged
    in core support for the HiSilicon 3620 platform. That same pull
    request from arm-soc depends on this pull request to merge in those
    HiSilicon bits without causing build failures"

    [ Just did the ARM SoC merges, so getting ready for the second clk tree
    pull request - Linus ]

    * tag 'clk-for-linus-3.14-part1' of git://git.linaro.org/people/mike.turquette/linux: (97 commits)
    devicetree: bindings: Document qcom,mmcc
    devicetree: bindings: Document qcom,gcc
    clk: qcom: Add support for MSM8660's global clock controller (GCC)
    clk: qcom: Add support for MSM8974's multimedia clock controller (MMCC)
    clk: qcom: Add support for MSM8974's global clock controller (GCC)
    clk: qcom: Add support for MSM8960's multimedia clock controller (MMCC)
    clk: qcom: Add support for MSM8960's global clock controller (GCC)
    clk: qcom: Add reset controller support
    clk: qcom: Add support for branches/gate clocks
    clk: qcom: Add support for root clock generators (RCGs)
    clk: qcom: Add support for phase locked loops (PLLs)
    clk: qcom: Add a regmap type clock struct
    clk: Add set_rate_and_parent() op
    reset: Silence warning in reset-controller.h
    clk: sirf: re-arch to make the codes support both prima2 and atlas6
    clk: composite: pass mux_hw into determine_rate
    clk: shmobile: Fix MSTP clock array initialization
    clk: shmobile: Fix MSTP clock index
    ARM: dts: Add clock provider specific properties to max77686 node
    clk: max77686: Register OF clock provider
    ...

    Linus Torvalds
     
  • Pull ARM SoC platform changes from Olof Johansson:
    "New core SoC-specific changes.

    New platforms:
    * Introduction of a vendor, Hisilicon, and one of their SoCs with
    some random numerical product name.
    * Introduction of EFM32, embedded platform from Silicon Labs (ARMv7m,
    i.e. !MMU).
    * Marvell Berlin series of SoCs, which include the one in Chromecast.
    * MOXA platform support, ARM9-based platform used mostly in
    industrial products
    * Support for Freescale's i.MX50 SoC.

    Other work:
    * Renesas work for new platforms and drivers, and conversion over to
    more multiplatform-friendly device registration schemes.
    * SMP support for Allwinner sunxi platforms.
    * ... plus a bunch of other stuff across various platforms"

    * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (201 commits)
    ARM: tegra: fix tegra_powergate_sequence_power_up() inline
    ARM: msm_defconfig: Update for multi-platform
    ARM: msm: Move MSM's DT based hardware to multi-platform support
    ARM: msm: Only build timer.c if required
    ARM: msm: Only build clock.c on proc_comm based platforms
    ARM: ux500: Enable system suspend with WFI support
    ARM: ux500: turn on PRINTK_TIME in u8500_defconfig
    ARM: shmobile: r8a7790: Fix I2C controller names
    ARM: msm: Simplify ARCH_MSM_DT config
    ARM: msm: Add support for MSM8974 SoC
    ARM: sunxi: select ARM_PSCI
    MAINTAINERS: Update Allwinner sunXi maintainer files
    ARM: sunxi: Select RESET_CONTROLLER
    ARM: imx: improve the comment of CCM lpm SW workaround
    ARM: imx: improve status check of clock gate
    ARM: imx: add necessary interface for pfd
    ARM: imx_v6_v7_defconfig: Select CONFIG_REGULATOR_PFUZE100
    ARM: imx_v6_v7_defconfig: Select MX35 and MX50 device tree support
    ARM: imx: Add cpu frequency scaling support
    ARM i.MX35: Add devicetree support.
    ...

    Linus Torvalds
     
  • Pull crypto update from Herbert Xu:
    "Here is the crypto update for 3.14:

    - Improved crypto_memneq helper
    - Use cyprto_memneq in arch-specific crypto code
    - Replaced orphaned DCP driver with Freescale MXS DCP driver
    - Added AVX/AVX2 version of AESNI-GCM encode and decode
    - Added AMD Cryptographic Coprocessor (CCP) driver
    - Misc fixes"

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (41 commits)
    crypto: aesni - fix build on x86 (32bit)
    crypto: mxs - Fix sparse non static symbol warning
    crypto: ccp - CCP device enabled/disabled changes
    crypto: ccp - Cleanup hash invocation calls
    crypto: ccp - Change data length declarations to u64
    crypto: ccp - Check for caller result area before using it
    crypto: ccp - Cleanup scatterlist usage
    crypto: ccp - Apply appropriate gfp_t type to memory allocations
    crypto: drivers - Sort drivers/crypto/Makefile
    ARM: mxs: dts: Enable DCP for MXS
    crypto: mxs - Add Freescale MXS DCP driver
    crypto: mxs - Remove the old DCP driver
    crypto: ahash - Fully restore ahash request before completing
    crypto: aesni - fix build on x86 (32bit)
    crypto: talitos - Remove redundant dev_set_drvdata
    crypto: ccp - Remove redundant dev_set_drvdata
    crypto: crypto4xx - Remove redundant dev_set_drvdata
    crypto: caam - simplify and harden key parsing
    crypto: omap-sham - Fix Polling mode for larger blocks
    crypto: tcrypt - Added speed tests for AEAD crypto alogrithms in tcrypt test suite
    ...

    Linus Torvalds
     
  • Pull audit update from Eric Paris:
    "Again we stayed pretty well contained inside the audit system.
    Venturing out was fixing a couple of function prototypes which were
    inconsistent (didn't hurt anything, but we used the same value as an
    int, uint, u32, and I think even a long in a couple of places).

    We also made a couple of minor changes to when a couple of LSMs called
    the audit system. We hoped to add aarch64 audit support this go
    round, but it wasn't ready.

    I'm disappearing on vacation on Thursday. I should have internet
    access, but it'll be spotty. If anything goes wrong please be sure to
    cc rgb@redhat.com. He'll make fixing things his top priority"

    * git://git.infradead.org/users/eparis/audit: (50 commits)
    audit: whitespace fix in kernel-parameters.txt
    audit: fix location of __net_initdata for audit_net_ops
    audit: remove pr_info for every network namespace
    audit: Modify a set of system calls in audit class definitions
    audit: Convert int limit uses to u32
    audit: Use more current logging style
    audit: Use hex_byte_pack_upper
    audit: correct a type mismatch in audit_syscall_exit()
    audit: reorder AUDIT_TTY_SET arguments
    audit: rework AUDIT_TTY_SET to only grab spin_lock once
    audit: remove needless switch in AUDIT_SET
    audit: use define's for audit version
    audit: documentation of audit= kernel parameter
    audit: wait_for_auditd rework for readability
    audit: update MAINTAINERS
    audit: log task info on feature change
    audit: fix incorrect set of audit_sock
    audit: print error message when fail to create audit socket
    audit: fix dangling keywords in audit_log_set_loginuid() output
    audit: log on errors from filter user rules
    ...

    Linus Torvalds
     
  • Remove unnecessary pattern for Exynos DP header from MAINTAINERS file.
    After commit f9b1e013f1c6 ("video: exynos_dp: remove non-DT support for
    Exynos Display Port"), 'exynos_dp.h' has not been used.

    Signed-off-by: Jingoo Han
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jingoo Han
     
  • There is a difference in how scripts/get_maintainer.pl treats
    F: and N: file pattern matches.

    Describe those differences in the MAINTAINERS file.

    Signed-off-by: Joe Perches
    Cc: Greg Kroah-Hartman
    Cc: Mark Brown
    Cc: Uwe Kleine-König
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • To make scripts/get_maintainer.pl output something sensible.

    Signed-off-by: Geert Uytterhoeven
    Cc: Alan Cox
    Cc: Christoph Hellwig
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven