Merge branch 'linus' into perf/core, to pick up fixes

Browse source

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2016-12-06 09:14:35 +01:00

parent e7af7b1512 d9d04527c7

commit 78987584de

163 changed files with 2679 additions and 1965 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

8

CREDITS

View file

24

Documentation/devicetree/bindings/net/ethernet.txt

View file

7

Documentation/networking/nf_conntrack-sysctl.txt

View file

13

MAINTAINERS

View file

11

Makefile

View file

2

arch/arm/boot/dts/Makefile

View file

16

arch/arm/boot/dts/stih407-family.dtsi

View file

2

arch/arm/boot/dts/ntc-gr8-evb.dts → arch/arm/boot/dts/sun5i-gr8-evb.dts

View file

0

arch/arm/boot/dts/ntc-gr8.dtsi → arch/arm/boot/dts/sun5i-gr8.dtsi

View file

2

arch/arm64/boot/dts/arm/juno-base.dtsi

View file

2

arch/arm64/boot/dts/arm/juno-r1.dts

View file

2

arch/arm64/boot/dts/arm/juno-r2.dts

View file

2

arch/arm64/boot/dts/arm/juno.dts

View file

3

arch/powerpc/boot/Makefile

View file

2

arch/powerpc/boot/opal.c

View file

4

arch/powerpc/kernel/eeh_driver.c

View file

9

arch/powerpc/kernel/vmlinux.lds.S

View file

2

arch/powerpc/mm/hash64_4k.c

View file

4

arch/powerpc/mm/hash64_64k.c

View file

1

crypto/Makefile

View file

29

crypto/drbg.c

View file

3

drivers/crypto/chelsio/chcr_algo.h

View file

11

drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c

View file

5

drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c

View file

2

drivers/gpu/drm/arm/hdlcd_drv.c

View file

10

drivers/gpu/drm/drm_ioctl.c

View file

5

drivers/gpu/drm/i915/i915_gem.c

View file

3

drivers/gpu/drm/i915/intel_display.c

View file

11

drivers/gpu/drm/radeon/radeon_atpx_handler.c

View file

4

drivers/i2c/busses/i2c-octeon-core.c

View file

27

drivers/i2c/busses/i2c-octeon-core.h

View file

37

drivers/net/can/usb/peak_usb/pcan_ucan.h

View file

2

drivers/net/can/usb/peak_usb/pcan_usb_core.c

View file

2

drivers/net/can/usb/peak_usb/pcan_usb_core.h

View file

104

drivers/net/can/usb/peak_usb/pcan_usb_fd.c

View file

21

drivers/net/ethernet/altera/altera_tse_main.c

View file

4

drivers/net/ethernet/amd/xgbe/xgbe-main.c

View file

9

drivers/net/ethernet/aurora/nb8800.c

View file

17

drivers/net/ethernet/broadcom/bcmsysport.c

View file

8

drivers/net/ethernet/broadcom/genet/bcmgenet.c

View file

10

drivers/net/ethernet/broadcom/genet/bcmmii.c

View file

5

drivers/net/ethernet/cadence/macb.c

View file

1

drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h

View file

2

drivers/net/ethernet/freescale/fec.h

View file

28

drivers/net/ethernet/freescale/fec_main.c

View file

3

drivers/net/ethernet/freescale/fman/fman_memac.c

View file

2

drivers/net/ethernet/freescale/fman/mac.c

View file

7

drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c

View file

8

drivers/net/ethernet/freescale/gianfar.c

View file

23

drivers/net/ethernet/freescale/ucc_geth.c

View file

8

drivers/net/ethernet/intel/igb/igb_main.c

View file

8

drivers/net/ethernet/intel/igbvf/netdev.c

View file

8

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

View file

8

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

View file

5

drivers/net/ethernet/marvell/mvneta.c

View file

4

drivers/net/ethernet/mediatek/mtk_eth_soc.c

View file

17

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

View file

5

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

View file

7

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

View file

1

drivers/net/ethernet/qualcomm/emac/emac-phy.c

View file

4

drivers/net/ethernet/qualcomm/emac/emac.c

View file

19

drivers/net/ethernet/renesas/ravb_main.c

View file

2

drivers/net/ethernet/renesas/sh_eth.c

View file

17

drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c

View file

25

drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c

View file

17

drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c

View file

23

drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c

View file

32

drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c

View file

21

drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c

View file

39

drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c

View file

23

drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c

View file

19

drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c

View file

26

drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c

View file

1

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

View file

33

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

View file

2

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h

View file

20

drivers/net/ethernet/synopsys/dwc_eth_qos.c

View file

20

drivers/net/ethernet/ti/cpsw.c

View file

10

drivers/net/ethernet/ti/davinci_emac.c

View file

14

drivers/net/geneve.c

View file

17

drivers/net/ipvlan/ipvlan_main.c

View file

4

drivers/net/irda/w83977af_ir.c

View file

19

drivers/net/macvtap.c

View file

20

drivers/net/phy/realtek.c

View file

10

drivers/net/tun.c

View file

6

drivers/net/usb/asix_devices.c

View file

38

drivers/net/usb/cdc_ether.c

View file

1

drivers/net/usb/qmi_wwan.c

View file

10

drivers/net/vxlan.c

View file

13

drivers/net/wireless/marvell/mwifiex/cfg80211.c

View file

15

drivers/of/of_mdio.c

View file

2

drivers/pci/host/pcie-designware-plat.c

View file

14

drivers/pci/pcie/aer/aer_inject.c

View file

28

drivers/pci/probe.c

View file

1

include/asm-generic/export.h

View file

2

include/crypto/drbg.h

View file

1

include/linux/mlx4/device.h

View file

4

include/linux/of_mdio.h

View file

14

include/linux/pci.h

View file

2

include/net/ipv6.h

View file

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