Merge branch 'linus' into sched/locking

Browse source

Merge reason: Pick up this upstream commit:

  6631e635c6: block: don't flush plugged IO on forced preemtion scheduling

As it modifies the scheduler and we'll queue up dependent patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2011-04-14 08:50:37 +02:00

parent f4ad9bd208 85f2e689a5

commit a4c98f8bbe

178 changed files with 1587 additions and 2083 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

20

Documentation/feature-removal-schedule.txt

View file

7

MAINTAINERS

View file

2

Makefile

View file

9

arch/avr32/include/asm/setup.h

View file

15

arch/avr32/kernel/setup.c

View file

22

arch/avr32/kernel/traps.c

View file

32

arch/avr32/mach-at32ap/clock.c

View file

22

arch/avr32/mach-at32ap/extint.c

View file

2

arch/avr32/mach-at32ap/pio.c

View file

2

arch/avr32/mach-at32ap/pm-at32ap700x.S

View file

6

arch/m68k/include/asm/unistd.h

View file

4

arch/m68k/kernel/entry_mm.S

View file

4

arch/m68k/kernel/syscalltable.S

View file

6

arch/powerpc/kernel/ibmebus.c

View file

1

arch/x86/xen/Kconfig

View file

21

arch/x86/xen/enlighten.c

View file

4

arch/x86/xen/mmu.c

View file

6

drivers/amba/bus.c

View file

7

drivers/base/platform.c

View file

8

drivers/base/power/main.c

View file

2

drivers/dma/fsldma.c

View file

1

drivers/gpio/ml_ioh_gpio.c

View file

5

drivers/gpio/pca953x.c

View file

1

drivers/gpio/pch_gpio.c

View file

1

drivers/gpu/drm/Kconfig

View file

53

drivers/gpu/drm/nouveau/nouveau_bios.c

View file

2

drivers/gpu/drm/nouveau/nouveau_drv.h

View file

68

drivers/gpu/drm/nouveau/nouveau_mem.c

View file

2

drivers/gpu/drm/nouveau/nouveau_perf.c

View file

12

drivers/gpu/drm/nouveau/nouveau_state.c

View file

13

drivers/gpu/drm/nouveau/nv04_dfp.c

View file

3

drivers/gpu/drm/nouveau/nv50_crtc.c

View file

1

drivers/gpu/drm/nouveau/nv50_evo.c

View file

2

drivers/gpu/drm/nouveau/nv50_graph.c

View file

24

drivers/gpu/drm/nouveau/nvc0_vm.c

View file

6

drivers/gpu/drm/radeon/atom.c

View file

6

drivers/gpu/drm/radeon/atombios_crtc.c

View file

17

drivers/gpu/drm/radeon/evergreen.c

View file

6

drivers/gpu/drm/radeon/r600.c

View file

12

drivers/gpu/drm/radeon/radeon.h

View file

2

drivers/gpu/drm/radeon/radeon_asic.c

View file

30

drivers/gpu/drm/radeon/radeon_atombios.c

View file

2

drivers/gpu/drm/radeon/radeon_fence.c

View file

2

drivers/gpu/drm/radeon/radeon_gart.c

View file

4

drivers/gpu/drm/radeon/radeon_i2c.c

View file

2

drivers/gpu/drm/radeon/radeon_legacy_encoders.c

View file

11

drivers/gpu/drm/radeon/radeon_pm.c

View file

2

drivers/gpu/drm/radeon/radeon_ring.c

View file

2

drivers/gpu/drm/radeon/rs600.c

View file

6

drivers/gpu/drm/radeon/rv770.c

View file

26

drivers/gpu/drm/ttm/ttm_page_alloc.c

View file

1

drivers/gpu/stub/Kconfig

View file

16

drivers/mfd/mfd-core.c

View file

4

drivers/net/benet/be.h

View file

19

drivers/net/benet/be_main.c

View file

10

drivers/net/bna/bfa_ioc.c

View file

3

drivers/net/can/mcp251x.c

View file

4

drivers/net/mlx4/en_rx.c

View file

5

drivers/net/mlx4/main.c

View file

2

drivers/net/mlx4/mlx4.h

View file

4

drivers/net/mlx4/sense.c

View file

2

drivers/net/pppoe.c

View file

8

drivers/net/smsc911x.c

View file

15

drivers/net/usb/smsc95xx.c

View file

1

drivers/net/wireless/ath/ath9k/hw.c

View file

2

drivers/net/wireless/b43/dma.c

View file

2

drivers/net/wireless/b43/dma.h

View file

2

drivers/net/wireless/iwlwifi/iwl-eeprom.h

View file

2

drivers/net/wireless/p54/p54usb.c

View file

6

drivers/net/wireless/rt2x00/rt2x00dev.c

View file

2

drivers/net/wireless/rtlwifi/efuse.c

View file

2

drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c

View file

2

drivers/net/wireless/rtlwifi/usb.c

View file

2

drivers/net/wireless/wl12xx/sdio.c

View file

2

drivers/net/wireless/wl12xx/spi.c

View file

5

drivers/net/wireless/wl12xx/testmode.c

View file

20

drivers/net/wireless/zd1211rw/zd_usb.c

View file

1

drivers/net/wireless/zd1211rw/zd_usb.h

View file

6

drivers/pci/pci-driver.c

View file

4

drivers/pci/setup-bus.c

View file

3

drivers/platform/x86/Kconfig

View file

2

drivers/platform/x86/acer-wmi.c

View file

4

drivers/platform/x86/asus-wmi.c

View file

2

drivers/platform/x86/eeepc-wmi.c

View file

43

drivers/platform/x86/intel_pmic_gpio.c

View file

17

drivers/platform/x86/samsung-laptop.c

View file

65

drivers/platform/x86/sony-laptop.c

View file

3

drivers/platform/x86/thinkpad_acpi.c

View file

2

drivers/spi/amba-pl022.c

View file

2

drivers/spi/dw_spi.c

View file

2

drivers/spi/pxa2xx_spi.c

View file

2

drivers/spi/spi_bfin5xx.c

View file

2

drivers/staging/Kconfig

View file

1

drivers/staging/Makefile

View file

10

drivers/staging/samsung-laptop/Kconfig

View file

1

drivers/staging/samsung-laptop/Makefile

View file

5

drivers/staging/samsung-laptop/TODO

View file

843

drivers/staging/samsung-laptop/samsung-laptop.c

View file

6

drivers/xen/events.c

View file

6

drivers/xen/manage.c

View file

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