Merge 4.1-rc2 into staging-next

Browse source

We want the fixes in here to make merges and testing easier.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Greg Kroah-Hartman 2015-05-08 14:38:55 +02:00

parent d5a7d45fb5 5ebe6afaf0

commit b4da00601e

226 changed files with 2672 additions and 1645 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

Documentation/kernel-parameters.txt

View file

6

Documentation/module-signing.txt

View file

9

Documentation/networking/mpls-sysctl.txt

View file

2

Documentation/networking/scaling.txt

View file

32

Documentation/powerpc/transactional_memory.txt

View file

8

MAINTAINERS

View file

2

Makefile

View file

1

arch/arm64/Kconfig

View file

16

arch/arm64/include/asm/barrier.h

View file

9

arch/arm64/kernel/perf_event.c

View file

9

arch/arm64/mm/dma-mapping.c

View file

2

arch/powerpc/include/uapi/asm/tm.h

View file

11

arch/powerpc/kernel/eeh.c

View file

19

arch/powerpc/kernel/entry_64.S

View file

2

arch/powerpc/kernel/idle_power7.S

View file

2

arch/powerpc/kvm/book3s_xics.c

View file

2

arch/powerpc/platforms/powernv/pci-ioda.c

View file

10

arch/powerpc/platforms/pseries/dlpar.c

View file

2

arch/s390/Kconfig

View file

122

arch/s390/crypto/crypt_s390.h

View file

858

arch/s390/crypto/prng.c

View file

3

arch/s390/include/asm/kexec.h

View file

4

arch/s390/include/asm/mmu.h

View file

3

arch/s390/include/asm/mmu_context.h

View file

1

arch/s390/include/asm/pgalloc.h

View file

167

arch/s390/include/asm/pgtable.h

View file

66

arch/s390/mm/hugetlbpage.c

View file

142

arch/s390/mm/pgtable.c

View file

2

arch/tile/kernel/setup.c

View file

1

arch/x86/include/asm/pvclock.h

View file

44

arch/x86/kernel/pvclock.c

View file

33

arch/x86/kvm/x86.c

View file

34

arch/x86/vdso/vclock_gettime.c

View file

2

drivers/acpi/sbs.c

View file

5

drivers/block/rbd.c

View file

16

drivers/cpuidle/cpuidle.c

View file

1

drivers/dma/Kconfig

View file

4

drivers/dma/dmaengine.c

View file

2

drivers/dma/sh/usb-dmac.c

View file

2

drivers/gpu/drm/i915/i915_reg.h

View file

8

drivers/gpu/drm/i915/intel_uncore.c

View file

3

drivers/gpu/drm/radeon/atombios_crtc.c

View file

6

drivers/gpu/drm/radeon/atombios_encoders.c

View file

25

drivers/gpu/drm/radeon/dce6_afmt.c

View file

53

drivers/gpu/drm/radeon/evergreen_hdmi.c

View file

11

drivers/gpu/drm/radeon/r600_hdmi.c

View file

30

drivers/gpu/drm/radeon/radeon_audio.c

View file

8

drivers/gpu/drm/radeon/radeon_connectors.c

View file

4

drivers/gpu/drm/radeon/radeon_cs.c

View file

10

drivers/gpu/drm/radeon/radeon_mn.c

View file

36

drivers/gpu/drm/radeon/radeon_vm.c

View file

1

drivers/gpu/drm/radeon/si_dpm.c

View file

9

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

View file

17

drivers/md/dm-ioctl.c

View file

19

drivers/md/dm.c

View file

12

drivers/net/bonding/bond_main.c

View file

1

drivers/net/bonding/bond_procfs.c

View file

25

drivers/net/bonding/bonding_priv.h

View file

2

drivers/net/can/Kconfig

View file

2

drivers/net/can/usb/kvaser_usb.c

View file

2

drivers/net/ethernet/8390/etherh.c

View file

5

drivers/net/ethernet/altera/altera_msgdmahw.h

View file

43

drivers/net/ethernet/altera/altera_tse_main.c

View file

2

drivers/net/ethernet/amd/Kconfig

View file

5

drivers/net/ethernet/arc/Kconfig

View file

2

drivers/net/ethernet/atheros/atl1e/atl1e_hw.h

View file

2

drivers/net/ethernet/broadcom/bcmsysport.h

View file

2

drivers/net/ethernet/broadcom/bgmac.c

View file

4

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

View file

116

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

View file

2

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h

View file

17

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

View file

17

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

View file

2

drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c

View file

4

drivers/net/ethernet/broadcom/tg3.c

View file

7

drivers/net/ethernet/cadence/macb.c

View file

2

drivers/net/ethernet/chelsio/cxgb4/t4_hw.c

View file

5

drivers/net/ethernet/emulex/benet/be_main.c

View file

5

drivers/net/ethernet/freescale/fec_main.c

View file

6

drivers/net/ethernet/ibm/ehea/ehea_main.c

View file

4

drivers/net/ethernet/ibm/ibmveth.c

View file

7

drivers/net/ethernet/intel/i40e/i40e_main.c

View file

4

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

View file

16

drivers/net/ethernet/marvell/pxa168_eth.c

View file

29

drivers/net/ethernet/mellanox/mlx4/en_ethtool.c

View file

3

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

View file

26

drivers/net/ethernet/mellanox/mlx4/en_rx.c

View file

8

drivers/net/ethernet/mellanox/mlx4/en_tx.c

View file

18

drivers/net/ethernet/mellanox/mlx4/fw.c

View file

1

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

View file

38

drivers/net/ethernet/myricom/myri10ge/myri10ge.c

View file

4

drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c

View file

5

drivers/net/ethernet/rocker/rocker.c

View file

8

drivers/net/ethernet/ti/netcp_ethss.c

View file

13

drivers/net/hyperv/hyperv_net.h

View file

8

drivers/net/hyperv/netvsc.c

View file

47

drivers/net/hyperv/netvsc_drv.c

View file

3

drivers/net/hyperv/rndis_filter.c

View file

14

drivers/net/phy/mdio-gpio.c

View file

60

drivers/net/phy/mdio-mux-gpio.c

View file

Some files were not shown because too many files have changed in this diff Show more