[prev in list] [next in list] [prev in thread] [next in thread]
List: linux-mips-cvs
Subject: Merge tag 'v4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
From: linux-mips () linux-mips ! org
Date: 2015-03-11 11:50:07
Message-ID: S27013382AbbCKLuJkxC3Z/20150311115010Z+2858 () eddie ! linux-mips ! org
[Download RAW message or body]
Author: Ralf Baechle <ralf@linux-mips.org> Mon Mar 9 15:51:49 2015 +0100
Commit: 5a86f0f466e630bd7e03f71d7e69de748f031f07
Gitweb: http://git.linux-mips.org/g/ralf/linux/5a86f0f466e6
Branch: master
---
Documentation/CodeOfConflict | 27 ++
Documentation/devicetree/bindings/i2c/i2c-imx.txt | 1
.../devicetree/bindings/net/amd-xgbe-phy.txt | 4
.../bindings/serial/snps-dw-apb-uart.txt | 16 +
Documentation/power/suspend-and-interrupts.txt | 22 +-
MAINTAINERS | 10 +
Makefile | 2
arch/arc/include/asm/processor.h | 14 +
arch/arc/include/asm/stacktrace.h | 37 +++
arch/arc/kernel/process.c | 23 --
arch/arc/kernel/stacktrace.c | 21 +-
arch/arc/kernel/unaligned.c | 2
arch/arc/mm/fault.c | 12 +
arch/arm/include/asm/kvm_mmu.h | 2
arch/arm/kvm/arm.c | 2
arch/arm/kvm/trace.h | 10 +
arch/arm/mach-msm/board-halibut.c | 8 +
arch/arm/mach-msm/board-qsd8x50.c | 8 +
arch/arm/mach-pxa/idp.c | 5
arch/arm/mach-pxa/lpd270.c | 8 +
arch/arm/mach-realview/core.c | 7 +
arch/arm/mach-realview/realview_eb.c | 2
arch/arm/mach-sa1100/neponset.c | 6
arch/arm/mach-sa1100/pleb.c | 7 +
arch/arm64/mm/pageattr.c | 5
arch/mips/kvm/tlb.c | 1
arch/mips/kvm/trace.h | 6
arch/powerpc/include/asm/iommu.h | 6
arch/powerpc/include/asm/irq_work.h | 9 +
arch/powerpc/kernel/iommu.c | 26 ++
arch/powerpc/kernel/smp.c | 4
arch/powerpc/platforms/powernv/pci.c | 26 --
arch/powerpc/platforms/pseries/iommu.c | 2
arch/x86/Kconfig | 1
arch/x86/include/asm/xsave.h | 28 +-
arch/x86/kernel/entry_64.S | 13 +
arch/x86/kvm/emulate.c | 3
arch/x86/kvm/lapic.c | 4
arch/x86/kvm/svm.c | 6
arch/x86/kvm/vmx.c | 23 +-
arch/x86/pci/acpi.c | 11 +
drivers/acpi/resource.c | 4
drivers/acpi/video.c | 20 +-
drivers/android/binder.c | 10 -
drivers/base/power/domain.c | 24 +-
drivers/base/power/wakeup.c | 1
drivers/bluetooth/btusb.c | 1
drivers/clk/at91/pmc.c | 20 ++
drivers/clk/at91/pmc.h | 1
drivers/cpufreq/exynos-cpufreq.c | 21 --
drivers/cpufreq/ppc-corenet-cpufreq.c | 2
drivers/cpuidle/cpuidle.c | 61 ++---
drivers/dma-buf/fence.c | 3
drivers/dma-buf/reservation.c | 5
drivers/dma/at_xdmac.c | 7 -
drivers/dma/dw/core.c | 2
drivers/dma/ioat/dma_v3.c | 4
drivers/dma/mmp_pdma.c | 10 +
drivers/dma/mmp_tdma.c | 31 ++-
drivers/dma/qcom_bam_dma.c | 10 +
drivers/dma/sh/shdmac.c | 15 +
drivers/firmware/dmi_scan.c | 17 +
drivers/firmware/efi/libstub/efi-stub-helper.c | 8 -
drivers/gpu/drm/drm_mm.c | 152 ++++++------
drivers/gpu/drm/i915/i915_debugfs.c | 4
drivers/gpu/drm/i915/i915_drv.c | 30 ++
drivers/gpu/drm/i915/i915_gem_gtt.c | 6
drivers/gpu/drm/i915/intel_fifo_underrun.c | 18 +
drivers/gpu/drm/imx/dw_hdmi-imx.c | 36 +++
drivers/gpu/drm/imx/imx-ldb.c | 28 +-
drivers/gpu/drm/imx/parallel-display.c | 5
drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c | 5
drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 15 -
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 99 +++++---
drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 6
drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 5
drivers/gpu/drm/msm/msm_atomic.c | 4
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2
drivers/gpu/drm/radeon/atombios_crtc.c | 3
drivers/gpu/drm/radeon/atombios_encoders.c | 30 +-
drivers/gpu/drm/radeon/cik.c | 3
drivers/gpu/drm/radeon/dce6_afmt.c | 68 +++---
drivers/gpu/drm/radeon/evergreen.c | 3
drivers/gpu/drm/radeon/evergreen_hdmi.c | 59 ++---
drivers/gpu/drm/radeon/r100.c | 4
drivers/gpu/drm/radeon/r600.c | 3
drivers/gpu/drm/radeon/r600_hdmi.c | 11 -
drivers/gpu/drm/radeon/radeon_audio.c | 50 ++--
drivers/gpu/drm/radeon/radeon_cs.c | 4
drivers/gpu/drm/radeon/rs600.c | 4
drivers/gpu/drm/radeon/si.c | 3
drivers/gpu/drm/radeon/sid.h | 4
drivers/gpu/drm/ttm/ttm_bo.c | 2
drivers/gpu/ipu-v3/ipu-di.c | 2
drivers/i2c/busses/i2c-designware-baytrail.c | 40 ++-
drivers/iio/adc/mcp3422.c | 17 -
drivers/iio/adc/qcom-spmi-iadc.c | 3
drivers/iio/common/ssp_sensors/ssp_dev.c | 2
drivers/iio/dac/ad5686.c | 2
drivers/iio/humidity/dht11.c | 69 +++---
drivers/iio/humidity/si7020.c | 6
drivers/iio/imu/adis16400_core.c | 3
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 6
drivers/iio/light/Kconfig | 2
drivers/iio/magnetometer/Kconfig | 2
drivers/isdn/hardware/mISDN/hfcpci.c | 2
drivers/misc/mei/init.c | 2
drivers/net/Kconfig | 2
drivers/net/appletalk/Kconfig | 2
drivers/net/dsa/bcm_sf2.h | 2
drivers/net/ethernet/8390/axnet_cs.c | 7 -
drivers/net/ethernet/8390/pcnet_cs.c | 7 -
drivers/net/ethernet/altera/altera_tse_main.c | 47 ++--
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 175 ++++++++------
drivers/net/ethernet/broadcom/bcmsysport.c | 7 -
drivers/net/ethernet/broadcom/bcmsysport.h | 2
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 122 +++++++---
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2
drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 57 ++---
drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h | 6
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 54 ++++
drivers/net/ethernet/cisco/enic/enic_main.c | 4
drivers/net/ethernet/freescale/gianfar.c | 4
drivers/net/ethernet/ibm/ehea/ehea_main.c | 246 +++++++++++---------
drivers/net/ethernet/ibm/ibmveth.c | 24 ++
drivers/net/ethernet/intel/i40e/i40e_common.c | 7 -
drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 2
drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4
drivers/net/ethernet/intel/i40e/i40e_main.c | 44 +++-
drivers/net/ethernet/intel/i40e/i40e_nvm.c | 35 +++
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 119 ++++++++--
drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1
drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 143 +++++++++---
drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 1
drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 8 +
drivers/net/ethernet/mellanox/mlx4/qp.c | 1
.../net/ethernet/mellanox/mlx4/resource_tracker.c | 9 -
drivers/net/ethernet/pasemi/pasemi_mac.c | 8 -
drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 4
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 2
drivers/net/ethernet/realtek/r8169.c | 32 +--
drivers/net/ethernet/renesas/sh_eth.c | 18 +
drivers/net/ethernet/rocker/rocker.c | 6
drivers/net/ethernet/smsc/smc91c92_cs.c | 7 -
drivers/net/ethernet/smsc/smc91x.c | 9 +
drivers/net/ethernet/smsc/smc91x.h | 114 ---------
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 -
drivers/net/ethernet/sun/niu.c | 6
drivers/net/ethernet/ti/cpsw.c | 9 -
drivers/net/ethernet/ti/davinci_mdio.c | 5
drivers/net/ethernet/xscale/ixp4xx_eth.c | 2
drivers/net/macvtap.c | 7 -
drivers/net/phy/amd-xgbe-phy.c | 82 +++++++
drivers/net/phy/phy.c | 23 ++
drivers/net/team/team.c | 4
drivers/net/usb/Kconfig | 1
drivers/net/usb/asix_devices.c | 4
drivers/net/usb/hso.c | 2
drivers/net/usb/plusb.c | 5
drivers/net/wan/cosa.c | 12 -
drivers/net/wireless/mac80211_hwsim.c | 5
drivers/net/xen-netback/netback.c | 29 ++
drivers/pci/host/pci-versatile.c | 2
drivers/rtc/rtc-at91rm9200.c | 62 ++++-
drivers/rtc/rtc-at91sam9.c | 73 +++++-
drivers/staging/comedi/drivers/adv_pci1710.c | 3
drivers/staging/comedi/drivers/comedi_isadma.c | 5
drivers/staging/comedi/drivers/vmk80xx.c | 71 ------
drivers/staging/iio/adc/mxs-lradc.c | 207 +++++++++--------
drivers/staging/iio/resolver/ad2s1200.c | 3
.../thermal/int340x_thermal/int340x_thermal_zone.c | 10 -
drivers/thermal/samsung/exynos_tmu.c | 3
drivers/thermal/thermal_core.c | 37 +--
drivers/tty/bfin_jtag_comm.c | 13 -
drivers/tty/serial/8250/8250_core.c | 11 -
drivers/tty/serial/8250/8250_dw.c | 32 +++
drivers/tty/serial/8250/8250_pci.c | 20 --
drivers/tty/serial/atmel_serial.c | 49 ++++
drivers/tty/serial/of_serial.c | 4
drivers/tty/serial/sprd_serial.c | 4
drivers/tty/tty_io.c | 4
drivers/tty/tty_ioctl.c | 16 +
drivers/usb/class/cdc-acm.c | 2
drivers/usb/core/devio.c | 2
drivers/usb/dwc3/dwc3-omap.c | 30 ++
drivers/usb/gadget/configfs.c | 2
drivers/usb/gadget/function/f_hid.c | 2
drivers/usb/gadget/function/f_phonet.c | 5
drivers/usb/gadget/function/f_sourcesink.c | 4
drivers/usb/gadget/function/f_uac2.c | 34 +--
drivers/usb/gadget/function/uvc_v4l2.c | 1
drivers/usb/gadget/function/uvc_video.c | 1
drivers/usb/gadget/legacy/g_ffs.c | 6
drivers/usb/host/xhci-pci.c | 30 ++
drivers/usb/host/xhci-plat.c | 19 +-
drivers/usb/host/xhci-ring.c | 12 +
drivers/usb/host/xhci.c | 100 +++++++-
drivers/usb/host/xhci.h | 11 +
drivers/usb/isp1760/isp1760-hcd.c | 6
drivers/usb/musb/musb_core.c | 10 -
drivers/usb/musb/musb_dsps.c | 32 ++-
drivers/usb/musb/musb_host.c | 2
drivers/usb/musb/omap2430.c | 7 -
drivers/usb/renesas_usbhs/Kconfig | 1
drivers/usb/serial/bus.c | 45 ++--
drivers/usb/serial/ch341.c | 15 -
drivers/usb/serial/console.c | 2
drivers/usb/serial/cp210x.c | 2
drivers/usb/serial/ftdi_sio.c | 19 ++
drivers/usb/serial/ftdi_sio_ids.h | 23 ++
drivers/usb/serial/generic.c | 5
drivers/usb/serial/mxuport.c | 3
drivers/usb/serial/pl2303.c | 18 +
drivers/usb/serial/usb-serial.c | 21 ++
drivers/usb/storage/unusual_uas.h | 7 +
drivers/usb/storage/usb.c | 6
drivers/vhost/net.c | 25 +-
drivers/watchdog/at91sam9_wdt.c | 3
fs/btrfs/ctree.c | 8 -
fs/btrfs/extent-tree.c | 16 +
fs/btrfs/file.c | 87 +++++--
fs/btrfs/inode.c | 1
fs/btrfs/ordered-data.c | 7 -
fs/btrfs/send.c | 171 +++++++++++++-
fs/btrfs/transaction.c | 3
fs/btrfs/tree-log.c | 2
fs/btrfs/xattr.c | 8 -
fs/ecryptfs/ecryptfs_kernel.h | 4
fs/ecryptfs/file.c | 34 ++-
fs/ecryptfs/keystore.c | 2
fs/ecryptfs/main.c | 2
fs/locks.c | 3
fs/nfs/client.c | 2
fs/nfs/delegation.c | 45 +++-
fs/nfs/dir.c | 22 ++
fs/nfs/file.c | 11 +
fs/nfs/inode.c | 111 +++++++--
fs/nfs/internal.h | 1
fs/nfs/nfs3proc.c | 4
fs/nfs/nfs3xdr.c | 5
fs/nfs/nfs4client.c | 9 -
fs/nfs/nfs4proc.c | 31 ++-
fs/nfs/nfs4session.h | 1
fs/nfs/nfs4state.c | 18 +
fs/nfs/proc.c | 6
fs/nfs/write.c | 30 ++
fs/nfsd/nfs4state.c | 2
include/drm/drm_mm.h | 52 ++--
include/drm/ttm/ttm_bo_api.h | 2
include/drm/ttm/ttm_bo_driver.h | 2
include/linux/cpuidle.h | 17 +
include/linux/interrupt.h | 9 +
include/linux/irqdesc.h | 1
include/linux/mlx4/qp.h | 2
include/linux/netdevice.h | 1
include/linux/nfs_fs.h | 5
include/linux/rhashtable.h | 22 --
include/linux/serial_core.h | 14 +
include/linux/usb/serial.h | 3
include/net/caif/cfpkt.h | 2
include/uapi/linux/serial.h | 4
include/uapi/linux/tc_act/Kbuild | 1
kernel/irq/manage.c | 7 -
kernel/irq/pm.c | 7 -
kernel/livepatch/core.c | 3
kernel/module.c | 2
kernel/printk/console_cmdline.h | 2
kernel/printk/printk.c | 1
kernel/sched/idle.c | 54 +++-
lib/rhashtable.c | 62 ++---
lib/test_rhashtable.c | 11 +
net/bridge/br.c | 2
net/caif/cffrml.c | 2
net/caif/cfpkt_skbuff.c | 6
net/compat.c | 9 -
net/core/dev.c | 2
net/core/ethtool.c | 1
net/core/gen_stats.c | 15 +
net/core/pktgen.c | 3
net/core/rtnetlink.c | 15 +
net/core/skbuff.c | 5
net/decnet/dn_route.c | 2
net/hsr/hsr_device.c | 3
net/hsr/hsr_main.c | 4
net/hsr/hsr_slave.c | 10 +
net/ipv4/ip_fragment.c | 2
net/ipv4/ip_output.c | 3
net/ipv4/tcp_input.c | 2
net/ipv6/addrconf.c | 17 +
net/ipv6/ip6_output.c | 3
net/irda/ircomm/ircomm_tty.c | 6
net/irda/irnet/irnet_ppp.c | 4
net/mac80211/chan.c | 5
net/mac80211/rc80211_minstrel.c | 2
net/mac80211/tx.c | 1
net/netfilter/ipvs/ip_vs_ctl.c | 2
net/netfilter/nft_compat.c | 12 +
net/netfilter/nft_hash.c | 2
net/netfilter/xt_recent.c | 11 -
net/netfilter/xt_socket.c | 21 +-
net/netlink/af_netlink.c | 2
net/openvswitch/datapath.c | 45 +++-
net/openvswitch/flow_netlink.c | 8 +
net/openvswitch/vport.h | 2
net/packet/af_packet.c | 20 +-
net/rxrpc/ar-ack.c | 9 -
net/sched/ematch.c | 1
net/sunrpc/auth_gss/gss_rpc_upcall.c | 2
net/sunrpc/auth_gss/svcauth_gss.c | 2
net/sunrpc/cache.c | 2
net/sunrpc/xprtrdma/rpc_rdma.c | 3
net/sunrpc/xprtrdma/xprt_rdma.h | 2
net/tipc/socket.c | 2
net/wireless/core.c | 1
net/wireless/nl80211.c | 12 -
net/wireless/reg.c | 2
sound/drivers/opl3/opl3_midi.c | 2
sound/firewire/dice/dice-interface.h | 18 +
sound/firewire/dice/dice-proc.c | 4
sound/firewire/oxfw/oxfw-stream.c | 5
sound/isa/msnd/msnd_pinnacle_mixer.c | 3
sound/pci/hda/patch_realtek.c | 7 +
sound/soc/atmel/sam9g20_wm8731.c | 68 +++---
sound/soc/cirrus/Kconfig | 2
sound/soc/codecs/Kconfig | 2
sound/soc/codecs/max98357a.c | 12 +
sound/soc/codecs/rt5670.c | 7 -
sound/soc/codecs/rt5677.c | 32 +--
sound/soc/codecs/sta32x.c | 6
sound/soc/fsl/fsl_ssi.c | 11 +
sound/soc/generic/simple-card.c | 5
sound/soc/intel/sst-atom-controls.h | 2
sound/soc/intel/sst/sst.c | 10 +
sound/soc/omap/omap-hdmi-audio.c | 3
sound/soc/omap/omap-mcbsp.c | 11 +
sound/soc/omap/omap-pcm.c | 2
sound/soc/samsung/Kconfig | 10 -
sound/soc/sh/rcar/core.c | 4
sound/usb/line6/playback.c | 6
340 files changed, 3657 insertions(+), 2019 deletions(-)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic