Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Browse source

I pushed a version of the crypto iov_iter bug fix that
Al Viro wrote, but Linus put in a different copy of the
same fix into his tree.

I then reverted my commit in net-next, and that's why we have a merge
when pulling in Linus's tree.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2015-02-11 19:48:14 -08:00

parent e09dcd2e79 59d53737a8

commit 855e7e7174

2891 changed files with 94272 additions and 64783 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

1

.mailmap

View file

28

Documentation/00-INDEX

View file

6

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

View file

22

Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7

View file

67

Documentation/ABI/testing/sysfs-class-cxl

View file

42

Documentation/ABI/testing/sysfs-class-power

View file

11

Documentation/ABI/testing/sysfs-driver-input-axp-pek

View file

44

Documentation/ABI/testing/sysfs-kernel-livepatch

View file

6

Documentation/Changes

View file

1

Documentation/CodingStyle

View file

2

Documentation/DocBook/Makefile

View file

2

Documentation/DocBook/crypto-API.tmpl

View file

81

Documentation/DocBook/kgdb.tmpl

View file

11

Documentation/DocBook/media/v4l/controls.xml

View file

2

Documentation/DocBook/media/v4l/pixfmt-srggb10.xml

View file

2

Documentation/DocBook/media/v4l/pixfmt-srggb10alaw8.xml

View file

2

Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml

View file

99

Documentation/DocBook/media/v4l/pixfmt-srggb10p.xml

View file

2

Documentation/DocBook/media/v4l/pixfmt-srggb12.xml

View file

1

Documentation/DocBook/media/v4l/pixfmt.xml

View file

8

Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml

View file

8

Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml

View file

16

Documentation/RCU/stallwarn.txt

View file

32

Documentation/RCU/trace.txt

View file

460

Documentation/SubmittingPatches

View file

2

Documentation/acpi/enumeration.txt

View file

12

Documentation/arm/00-INDEX

View file

12

Documentation/arm64/legacy_instructions.txt

View file

2

Documentation/blackfin/Makefile

View file

8

Documentation/cachetlb.txt

View file

2

Documentation/cgroups/00-INDEX

View file

79

Documentation/cgroups/unified-hierarchy.txt

View file

8

Documentation/cpu-freq/intel-pstate.txt

View file

4

Documentation/devicetree/bindings/arm/brcm-brcmstb.txt

View file

2

Documentation/devicetree/bindings/arm/msm/timer.txt

View file

9

Documentation/devicetree/bindings/ata/ahci-platform.txt

View file

2

Documentation/devicetree/bindings/ata/cavium-compact-flash.txt

View file

2

Documentation/devicetree/bindings/c6x/dscr.txt

View file

110

Documentation/devicetree/bindings/devfreq/event/exynos-ppmu.txt

View file

2

Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt

View file

20

Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.txt

View file

59

Documentation/devicetree/bindings/gpio/gpio-max732x.txt

View file

2

Documentation/devicetree/bindings/gpio/gpio-pcf857x.txt

View file

40

Documentation/devicetree/bindings/gpio/gpio-sx150x.txt

View file

32

Documentation/devicetree/bindings/gpio/gpio-xgene-sb.txt

View file

5

Documentation/devicetree/bindings/gpio/gpio.txt

View file

4

Documentation/devicetree/bindings/gpio/mrvl-gpio.txt

View file

2

Documentation/devicetree/bindings/iio/adc/xilinx-xadc.txt

View file

25

Documentation/devicetree/bindings/input/e3x0-button.txt

View file

21

Documentation/devicetree/bindings/input/regulator-haptic.txt

View file

62

Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt

View file

4

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt

View file

15

Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt

View file

17

Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt

View file

49

Documentation/devicetree/bindings/mailbox/altera-mailbox.txt

View file

63

Documentation/devicetree/bindings/media/i2c/nokia,smia.txt

View file

4

Documentation/devicetree/bindings/media/sunxi-ir.txt

View file

61

Documentation/devicetree/bindings/media/ti-am437x-vpfe.txt

View file

3

Documentation/devicetree/bindings/media/video-interfaces.txt

View file

14

Documentation/devicetree/bindings/mfd/max77686.txt

View file

45

Documentation/devicetree/bindings/mfd/max77693.txt

View file

25

Documentation/devicetree/bindings/mmc/mmc-pwrseq-emmc.txt

View file

25

Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.txt

View file

62

Documentation/devicetree/bindings/mmc/mmc.txt

View file

30

Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt

View file

15

Documentation/devicetree/bindings/mmc/sdhci-pxa.txt

View file

2

Documentation/devicetree/bindings/mtd/fsmc-nand.txt

View file

2

Documentation/devicetree/bindings/net/broadcom-systemport.txt

View file

59

Documentation/devicetree/bindings/pci/versatile.txt

View file

1

Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt

View file

186

Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt

View file

9

Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt

View file

12

Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt

View file

35

Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt

View file

104

Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.txt

View file

27

Documentation/devicetree/bindings/power/ltc2941.txt

View file

13

Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt

View file

2

Documentation/devicetree/bindings/power/rockchip-io-domain.txt

View file

70

Documentation/devicetree/bindings/powerpc/fsl/fman.txt

View file

7

Documentation/devicetree/bindings/regulator/da9211.txt

View file

4

Documentation/devicetree/bindings/regulator/isl9305.txt

View file

217

Documentation/devicetree/bindings/regulator/mt6397-regulator.txt

View file

94

Documentation/devicetree/bindings/regulator/pfuze100.txt

View file

23

Documentation/devicetree/bindings/serio/allwinner,sun4i-ps2.txt

View file

12

Documentation/devicetree/bindings/soc/fsl/bman.txt

View file

14

Documentation/devicetree/bindings/soc/fsl/qman.txt

View file

18

Documentation/devicetree/bindings/sound/cdns,xtfpga-i2s.txt

View file

31

Documentation/devicetree/bindings/sound/designware-i2s.txt

View file

23

Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt

View file

14

Documentation/devicetree/bindings/sound/max98357a.txt

View file

67

Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt

View file

28

Documentation/devicetree/bindings/sound/pcm512x.txt

View file

22

Documentation/devicetree/bindings/sound/samsung-i2s.txt

View file

5

Documentation/devicetree/bindings/sound/simple-card.txt

View file

92

Documentation/devicetree/bindings/sound/st,sta32x.txt

View file

10

Documentation/devicetree/bindings/sound/tlv320aic3x.txt

View file

5

Documentation/devicetree/bindings/sound/ts3a227e.txt

View file

2

Documentation/devicetree/bindings/sound/wm8904.txt

View file

16

Documentation/devicetree/bindings/spi/sh-msiof.txt

View file

41

Documentation/devicetree/bindings/spi/spi-sirf.txt

View file

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