Merge remote-tracking branch 'upstream' into next

Browse source

- bring back critical fixes (esp. aa67f6096c)
 - provide an updated base for development

* upstream: (4334 commits)
  missed mnt_drop_write() in do_dentry_open()
  UBIFS: nuke pdflush from comments
  gfs2: nuke pdflush from comments
  drbd: nuke pdflush from comments
  nilfs2: nuke write_super from comments
  hfs: nuke write_super from comments
  vfs: nuke pdflush from comments
  jbd/jbd2: nuke write_super from comments
  btrfs: nuke pdflush from comments
  btrfs: nuke write_super from comments
  ext4: nuke pdflush from comments
  ext4: nuke write_super from comments
  ext3: nuke write_super from comments
  Documentation: fix the VM knobs descritpion WRT pdflush
  Documentation: get rid of write_super
  vfs: kill write_super and sync_supers
  ACPI processor: Fix tick_broadcast_mask online/offline regression
  ACPI: Only count valid srat memory structures
  ACPI: Untangle a return statement for better readability
  Linux 3.6-rc1
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>

...

This commit is contained in:

Avi Kivity 2012-08-05 13:25:10 +03:00

parent e115676e04 e7882d6c40

commit fe56097b23

3766 changed files with 289530 additions and 101117 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

5

Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads

View file

11

Documentation/ABI/stable/sysfs-bus-firewire

View file

15

Documentation/ABI/stable/sysfs-driver-w1_ds28e04

View file

29

Documentation/ABI/testing/dev-kmsg

View file

54

Documentation/ABI/testing/sysfs-bus-iio

View file

37

Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523

View file

21

Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350

View file

61

Documentation/ABI/testing/sysfs-bus-iio-light-lm3533-als

View file

10

Documentation/ABI/testing/sysfs-bus-rbd

View file

12

Documentation/ABI/testing/sysfs-bus-usb

View file

140

Documentation/ABI/testing/sysfs-devices-edac

View file

44

Documentation/ABI/testing/sysfs-devices-platform-sh_mobile_lcdc_fb

View file

7

Documentation/ABI/testing/sysfs-platform-asus-wmi

View file

42

Documentation/DMA-attributes.txt

View file

4

Documentation/DocBook/filesystems.tmpl

View file

2

Documentation/DocBook/media/v4l/biblio.xml

View file

17

Documentation/DocBook/media/v4l/common.xml

View file

42

Documentation/DocBook/media/v4l/compat.xml

View file

5

Documentation/DocBook/media/v4l/controls.xml

View file

36

Documentation/DocBook/media/v4l/dev-subdev.xml

View file

19

Documentation/DocBook/media/v4l/io.xml

View file

34

Documentation/DocBook/media/v4l/selection-api.xml

View file

164

Documentation/DocBook/media/v4l/selections-common.xml

View file

11

Documentation/DocBook/media/v4l/v4l2.xml

View file

12

Documentation/DocBook/media/v4l/vidioc-create-bufs.xml

View file

14

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

View file

179

Documentation/DocBook/media/v4l/vidioc-enum-freq-bands.xml

View file

13

Documentation/DocBook/media/v4l/vidioc-g-frequency.xml

View file

86

Documentation/DocBook/media/v4l/vidioc-g-selection.xml

View file

38

Documentation/DocBook/media/v4l/vidioc-g-tuner.xml

View file

9

Documentation/DocBook/media/v4l/vidioc-qbuf.xml

View file

13

Documentation/DocBook/media/v4l/vidioc-querycap.xml

View file

68

Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml

View file

79

Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml

View file

5

Documentation/IRQ-domain.txt

View file

7

Documentation/block/queue-sysfs.txt

View file

45

Documentation/cgroups/hugetlb.txt

View file

12

Documentation/cgroups/memory.txt

View file

26

Documentation/device-mapper/dm-raid.txt

View file

7

Documentation/device-mapper/striped.txt

View file

24

Documentation/device-mapper/thin-provisioning.txt

View file

15

Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt

View file

14

Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt

View file

20

Documentation/devicetree/bindings/arm/mrvl/intc.txt

View file

30

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

View file

16

Documentation/devicetree/bindings/ata/marvell.txt

View file

49

Documentation/devicetree/bindings/gpio/cavium-octeon-gpio.txt

View file

2

Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt

View file

9

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

View file

23

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

View file

34

Documentation/devicetree/bindings/i2c/cavium-i2c.txt

View file

0

Documentation/devicetree/bindings/gpio/gpio_i2c.txt → Documentation/devicetree/bindings/i2c/gpio-i2c.txt

View file

3

Documentation/devicetree/bindings/i2c/i2c-mxs.txt

View file

33

Documentation/devicetree/bindings/i2c/i2c-ocores.txt

View file

19

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

View file

28

Documentation/devicetree/bindings/input/lpc32xx-key.txt

View file

31

Documentation/devicetree/bindings/input/omap-keypad.txt

View file

37

Documentation/devicetree/bindings/input/twl6040-vibra.txt

View file

123

Documentation/devicetree/bindings/mfd/ab8500.txt

View file

59

Documentation/devicetree/bindings/mfd/max77686.txt

View file

2

Documentation/devicetree/bindings/mfd/tps65910.txt

View file

2

Documentation/devicetree/bindings/mfd/twl6040.txt

View file

126

Documentation/devicetree/bindings/mips/cavium/bootbus.txt

View file

26

Documentation/devicetree/bindings/mips/cavium/ciu.txt

View file

27

Documentation/devicetree/bindings/mips/cavium/ciu2.txt

View file

21

Documentation/devicetree/bindings/mips/cavium/dma-engine.txt

View file

46

Documentation/devicetree/bindings/mips/cavium/uctl.txt

View file

21

Documentation/devicetree/bindings/misc/at25.txt

View file

4

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

View file

27

Documentation/devicetree/bindings/net/cavium-mdio.txt

View file

39

Documentation/devicetree/bindings/net/cavium-mix.txt

View file

98

Documentation/devicetree/bindings/net/cavium-pip.txt

View file

12

Documentation/devicetree/bindings/pwm/lpc32xx-pwm.txt

View file

17

Documentation/devicetree/bindings/pwm/mxs-pwm.txt

View file

18

Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt

View file

57

Documentation/devicetree/bindings/pwm/pwm.txt

View file

19

Documentation/devicetree/bindings/serial/cavium-uart.txt

View file

19

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

View file

14

Documentation/devicetree/bindings/thermal/spear-thermal.txt

View file

1

Documentation/devicetree/bindings/tty/serial/of-serial.txt

View file

18

Documentation/devicetree/bindings/usb/ci13xxx-imx.txt

View file

13

Documentation/devicetree/bindings/usb/mxs-phy.txt

View file

28

Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt

View file

14

Documentation/devicetree/bindings/watchdog/marvel.txt

View file

1

Documentation/dontdiff

View file

42

Documentation/dvb/get_dvb_firmware

View file

112

Documentation/edac.txt

View file

27

Documentation/fault-injection/fault-injection.txt

View file

99

Documentation/fault-injection/notifier-error-inject.txt

View file

73

Documentation/feature-removal-schedule.txt

View file

21

Documentation/filesystems/Locking

View file

5

Documentation/filesystems/porting

View file

16

Documentation/filesystems/vfs.txt

View file

54

Documentation/input/edt-ft5x06.txt

View file

118

Documentation/input/multi-touch-protocol.txt

View file

1

Documentation/ioctl/ioctl-number.txt

View file

2

Documentation/kernel-parameters.txt

View file

12

Documentation/laptops/laptop-mode.txt

View file

2

Documentation/leds/00-INDEX

View file

80

Documentation/leds/leds-blinkm.txt

View file

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