Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge pull request #2 from torvalds/master #88

Merged
merged 321 commits into from
Apr 21, 2014
Merged
Changes from 1 commit
Commits
Show all changes
321 commits
Select commit Hold shift + click to select a range
a438311
of: add vendor prefix for I2SE GmbH
lategoodbye Apr 3, 2014
e7d2e3a
dt-bindings: add vendor-prefix for Newhaven Display
Apr 3, 2014
401a97d
DT: bindings: add missing Marvell Kirkwood SoC documentation
lunn Mar 22, 2014
552481a
DT: Vendor: Add prefixes used by Kirkwood devices
lunn Mar 22, 2014
3443dd1
DT: I2C: Add trivial bindings used by kirkwood boards
lunn Mar 22, 2014
42dc102
of: Add vendor prefix for Digi International Inc.
shcgit Apr 3, 2014
5b62411
of: Fix the section mismatch warnings.
Apr 8, 2014
f3afa22
DT: add vendor prefix for EBV Elektronik
strumtrar Mar 31, 2014
08e22e1
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/…
linvjw Apr 14, 2014
0215f4c
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/…
linvjw Apr 14, 2014
af64dc7
rsi: Add missing initialization of ii
geertu Apr 6, 2014
98ddcbe
rsi: Fix a potential memory leak in rsi_set_channel()
Apr 9, 2014
69aa167
wlcore: ignore dummy packet events in PLT mode
lucacoelho Apr 10, 2014
2004dab
cw1200: Fix cw1200_debug_link_id
Apr 10, 2014
61698b7
rsi: Fix a potential memory leak in rsi_send_auto_rate_request()
Apr 10, 2014
c0da71f
wl18xx: align event mailbox with current fw
elp Apr 13, 2014
140ab64
powerpc/PCI: Fix NULL dereference in sys_pciconfig_iobase() list trav…
QiuMike Apr 14, 2014
9f05d3f
iommu/vt-d: Fix get_domain_for_dev() handling of upstream PCIe bridges
Apr 15, 2014
5ae0566
iommu/vt-d: fix bug in matching PCI devices with DRHD/RMRR descriptors
Apr 15, 2014
5ac9634
drm/omap: print warning when rotating non-TILER fb
tomba Apr 8, 2014
772cdc9
drm/omap: remove extra plane->destroy from crtc destroy
tomba Apr 9, 2014
b841aed
drm/omap: remove warn from debugfs
tomba Apr 10, 2014
15ec2ca
drm/omap: Fix memory leak in omap_gem_op_async
Apr 11, 2014
f2cff0f
drm/omap: gem sync: wait on correct events
Apr 11, 2014
71b6667
drm/omap: Fix crash when using LCD3 overlay manager
Apr 11, 2014
bc905ac
drm/omap: Use old_fb to synchronize between successive page flips
Apr 11, 2014
38e5597
drm/omap: protect omap_crtc's event with event_lock spinlock
Apr 11, 2014
16c50dc
iommu/arm-smmu: Return 0 on unmap failure
Feb 28, 2014
aca1bc4
iommu/arm-smmu: fix panic in arm_smmu_alloc_init_pte
Mar 21, 2014
f2d022a
drm/omap: fix the handling of fb ref counts
tomba Apr 15, 2014
4461bbc
x86/xen: Fix 32-bit PV guests's usage of kernel_stack
Apr 10, 2014
cea37f8
xen: fix memory leak in __xen_pcibk_add_pci_dev()
daeseokyoun Apr 1, 2014
c0914e6
xen-pciback: silence an unwanted debug printk
Mar 28, 2014
e0fc17a
xen/spinlock: Don't enable them unconditionally.
konradwilk Apr 4, 2014
027bd7e
xen/xenbus: Avoid synchronous wait on XenBus stalling shutdown/restart.
konradwilk Apr 4, 2014
eb47f71
xen/manage: Poweroff forcefully if user-space is not yet up.
konradwilk Apr 4, 2014
2047412
mwifiex: process event before command response
Apr 14, 2014
f8d2b92
mwifiex: fix hung task on command timeout
Apr 14, 2014
521c429
tick-common: Fix wrong check in tick_check_replacement()
vireshk Apr 15, 2014
03e6bdc
tick-sched: Don't call update_wall_time() when delta is lesser than t…
vireshk Apr 15, 2014
2763053
tick-sched: Check tick_nohz_enabled in tick_nohz_switch_to_nohz()
vireshk Apr 15, 2014
29d1e72
staging/rtl8821ae: Fix OOM handling in _rtl_init_deferred_work()
richardweinberger Mar 20, 2014
e7a62df
of: Clean up of_update_property
groeck Apr 15, 2014
ec03ab7
staging: rtl8188eu: remove spaces, correct counts to unbreak P2P ioctls
Mar 25, 2014
21c5e84
staging/usbip: userspace - fix usbipd SIGSEGV from refresh_exported_d…
Mar 24, 2014
de4734b
staging/usbip: fix store_attach() sscanf return value check
Mar 25, 2014
d06fb58
staging: fpgaboot: clean up Makefile
pebolle Apr 3, 2014
1a52489
staging: vme: fix memory leak in vme_user_probe()
daeseokyoun Mar 26, 2014
14e6e35
staging: gs_fpgaboot: remove __TIMESTAMP__ macro
arndb Mar 25, 2014
f5d197b
staging: rtl8723au: Fix buffer overflow in rtw_get_wfd_ie()
Apr 15, 2014
5df5242
Merge tag 'drm-intel-fixes-2014-04-11' of git://anongit.freedesktop.o…
airlied Apr 16, 2014
67807ce
ALSA: hda - add headset mic detect quirk for a Dell laptop
jason77-wang Apr 16, 2014
2dda47d
platform: Fix timberdale dependencies
jdelvare Apr 3, 2014
f3817e7
dmaengine: sirf: off by one in of_dma_sirfsoc_xlate()
Apr 3, 2014
8edc51c
dma: fix eDMA driver as a subsys_initcall
Apr 4, 2014
8dc9abb
ALSA: hda/realtek - Add headset Mic support for Dell machine
KailangYang Apr 16, 2014
3426cb3
Merge git://git.infradead.org/iommu-2.6 into iommu/fixes
joergroedel Apr 16, 2014
22bbd5d
gpu: host1x: handle the correct # of syncpt regs
nvswarren Apr 4, 2014
cbfbbab
drm/tegra: Remove gratuitous pad field
thierryreding Apr 9, 2014
c23fdc7
PCI: designware: Fix comment for setting number of lanes
Apr 16, 2014
017fcdc
PCI: designware: Fix iATU programming for cfg1, io and mem viewport
Apr 16, 2014
f86b3e3
PCI: designware: Use new OF interrupt mapping when possible
lynxeye-dev Apr 16, 2014
f8f2fe7
PCI: rcar: Use new OF interrupt mapping when possible
lynxeye-dev Apr 16, 2014
f5d3352
PCI: tegra: Use new OF interrupt mapping when possible
lynxeye-dev Apr 16, 2014
e283546
sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)
ecree-solarflare Apr 16, 2014
5ed0a8e
staging: delete rtl8187se wireless driver
gregkh Apr 16, 2014
b9d1208
net: phy: add minimal support for QSGMII PHY
tpetazzoni Apr 15, 2014
3f1dd4b
net: mvneta: properly configure the MAC <-> PHY connection in all sit…
tpetazzoni Apr 15, 2014
b07afe0
Merge branch 'mvneta_qsgmii'
davem330 Apr 16, 2014
ff8ebe6
staging: goldfish: Call free_irq in error path
dezgeg Apr 8, 2014
ef35a4f
staging: speakup: fix misuse of kstrtol() in handle_goto()
daeseokyoun Apr 9, 2014
d21bb45
staging: unisys: use after free in error messages
Apr 10, 2014
e6b1ea7
Staging: unisys: use after free in list_for_each()
Apr 10, 2014
2c33d7c
staging: r8723au: Add missing initialization of change_inx in sort al…
geertu Apr 10, 2014
b34aa86
staging: comedi: fix circular locking dependency in comedi_mmap()
ian-abbott Apr 10, 2014
9452bf5
staging: r8188eu: Calling rtw_get_stainfo() with a NULL sta_addr will…
lwfinger Apr 9, 2014
c11f1df
cifs: Wait for writebacks to complete before attempting write.
spuiuk Mar 11, 2014
60977fc
Return correct error on query of xattr on file with empty xattrs
smfrench Mar 26, 2014
8e3ecc8
fs: cifs: remove unused variable.
Steap Apr 3, 2014
a2a4dc4
fs: Don't return 0 from get_anon_bdev
brain0 Apr 3, 2014
4afddd6
kernfs: protect lazy kernfs_iattrs allocation with mutex
htejun Apr 2, 2014
33ac125
sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_ow…
htejun Jan 10, 2014
c98235c
mlx4_en: don't use napi_synchronize inside mlx4_en_netpoll
masoncl Apr 15, 2014
6a66271
ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iif
congwang1986 Apr 15, 2014
0d5edc6
ipv4, route: pass 0 instead of LOOPBACK_IFINDEX to fib_validate_source()
congwang1986 Apr 15, 2014
bc383ea
Merge branch 'fib_validate_loopback'
davem330 Apr 16, 2014
78cdb07
net: mdio-gpio: Use devm_ functions where possible
groeck Apr 16, 2014
1d25148
net: mdio-gpio: Add support for active low gpio pins
groeck Apr 16, 2014
f1d54c4
net: mdio-gpio: Add support for separate MDI and MDO gpio pins
groeck Apr 16, 2014
c3206e6
Merge branch 'mdio-gpio'
davem330 Apr 16, 2014
5c5e058
GenWQE: Enable access to VPD flash area
fhaverkamp Mar 20, 2014
68fe8ac
GenWQE: Add wmb before DDCB is started
fhaverkamp Mar 20, 2014
ebb2c96
GenWQE: Ensure rc is not returning an uninitialized value
Mar 20, 2014
718f762
GenWQE: Fix multithreading problems
fhaverkamp Mar 20, 2014
73590a2
GenWQE: Increase driver version number
fhaverkamp Mar 20, 2014
b7c0ddf
net: use SYSCALL_DEFINEx for sys_recv
el8 Apr 16, 2014
8c923ce
ip_tunnel: use the right netns in ioctl handler
NicolasDichtel Apr 16, 2014
9aad77c
sit: use the right netns in ioctl handler
NicolasDichtel Apr 16, 2014
74462f0
ip6_tunnel: use the right netns in ioctl handler
NicolasDichtel Apr 16, 2014
b7a3140
isdn: icn: buffer overflow in icn_command()
Apr 16, 2014
5e6533a
mei: me: do not load the driver if the FW doesn't support MEI interface
Mar 25, 2014
34ec436
mei: ignore client writing state during cb completion
ausyskin Apr 1, 2014
0acf07d
seccomp: fix memory leak on filter attach
kees Apr 16, 2014
7c73528
drivers: mcb: fix memory leak in chameleon_parse_cells() error path
Apr 11, 2014
a82cb8b
misc: Grammar s/addition/additional/
geertu Apr 14, 2014
f764cd6
staging: r8712u: Fix case where ethtype was never obtained and always…
lwfinger Apr 16, 2014
33c84bc
staging: r8188eu: Fix case where ethtype was never obtained and alway…
lwfinger Apr 16, 2014
efe26e1
USB: serial: ftdi_sio: add id for Brainboxes serial cards
mbaldessari Mar 31, 2014
2e01280
Revert "USB: serial: add usbid for dell wwan card to sierra.c"
jhovold Mar 28, 2014
d6de486
usb: option driver, add support for Telit UE910v2
dnlplm Apr 2, 2014
72b3007
USB: cp210x: Add 8281 (Nanotec Plug & Drive)
Apr 13, 2014
b16c02f
USB: pl2303: add ids for Hewlett-Packard HP POS pole displays
Mar 31, 2014
bd73bd8
USB: usb_wwan: fix handling of missing bulk endpoints
jhovold Apr 3, 2014
f9076e2
usb: usb-common: fix typo for usb_state_string
Apr 9, 2014
070c0b1
USB: cdc-acm: fix double usb_autopm_put_interface() in acm_port_activ…
khoroshilov Apr 11, 2014
a2ff864
USB: fix crash during hotplug of PCI USB controller card
AlanStern Apr 14, 2014
d721751
usb: ehci-exynos: Return immediately from suspend if ehci_suspend fails
Apr 10, 2014
e155b5b
usb: ehci-platform: Return immediately from suspend if ehci_suspend f…
Apr 10, 2014
4f2fe2d
USB: EHCI: tegra: set txfill_tuning
nvswarren Apr 14, 2014
4d6b516
USB: ohci-jz4740: Fix uninitialized variable warning
pinchartl Apr 14, 2014
166cf4a
USB: ohci-jz4740: FEAT_POWER is a port feature, not a hub feature
pinchartl Apr 14, 2014
895d240
USB: cdc-acm: Remove Motorola/Telit H24 serial interfaces from ACM dr…
Mar 25, 2014
f7a8719
uwb: adds missing error handling
daeseokyoun Apr 16, 2014
e7eda93
uas: fix GFP_NOIO under spinlock
Mar 28, 2014
c637f1f
uas: fix error handling during scsi_scan()
Mar 28, 2014
94d72f0
uas: fix deadlocky memory allocations
Mar 28, 2014
593ceb0
w1: fix netlink refcnt leak on error path
dfries Apr 9, 2014
18d7f89
w1: avoid recursive device_add
dfries Apr 16, 2014
098ced8
vme_tsi148: Fix typo in tsi148_slave_get()
Apr 3, 2014
226572b
vme_tsi148: Fix PCI address mapping assumption
Apr 3, 2014
177581f
vme_tsi148: Utilize to_pci_dev() macro
Apr 3, 2014
314672a
Tools: hv: Handle the case when the target file exists correctly
kattisrinivasan Apr 10, 2014
4080659
stable_kernel_rules: spelling/word usage
computersforpeace Apr 2, 2014
06d96c0
Chinese: add translation of io_ordering.txt
ivanalgo Apr 16, 2014
53974e0
topology: Fix compilation warning when not in SMP
vstehle Apr 4, 2014
98b0f81
Documentation: Update stable address in Chinese and Japanese translat…
geertu Apr 14, 2014
03367ef
Drivers: hv: vmbus: Negotiate version 3.0 when running on ws2012r2 hosts
kattisrinivasan Apr 4, 2014
93a2e47
serial: omap: free the wakeup settings in remove
Mar 21, 2014
4ea8daf
serial: efm32: use $vendor,$device scheme for compatible string
Mar 25, 2014
717f3bb
serial_core: Fix conditional start_tx on ring buffer not empty
digi-sethb Mar 25, 2014
2f310b8
Revert "serial: clps711x: Give a chance to perform useful tasks durin…
shcgit Mar 27, 2014
c3c00b6
serial: st-asc: Fix SysRq char handling
daniel-thompson Mar 28, 2014
e55c2a0
serial: timberdale: Depend on X86_32
jdelvare Apr 3, 2014
b2aeb77
serial: pl011: change Rx burst size to half of trigger level
lyakh Apr 12, 2014
bf903c0
serial_core: Fix pm imbalance on unbind
geertu Mar 27, 2014
d758c9c
serial: omap: Fix missing pm_runtime_resume handling by simplifying code
tmlind Mar 25, 2014
3053075
Documentation/serial: Delete obsolete driver documentation
jdelvare Mar 31, 2014
f4f653e
serial: 8250, disable "too much work" messages
Apr 1, 2014
7d1c285
ttyprintk: Fix wrong tty_unregister_driver() call in the error path
tiwai Apr 2, 2014
b24313a
ttyprintk: Allow built as a module
tiwai Apr 2, 2014
c70dbb1
tty: fix memleak in alloc_pid
silverhandy Apr 15, 2014
9ca83fd
tty: Fix help text of SYNCLINK_CS
jdelvare Apr 14, 2014
1e7da05
serial: amba-pl011: fix regression, causing an Oops on rmmod
lyakh Apr 5, 2014
0e1f789
xfs: don't map ranges that span EOF for direct IO
Apr 16, 2014
d39a2ce
xfs: collapse range is delalloc challenged
Apr 16, 2014
9c23ecc
xfs: unmount does not wait for shutdown during unmount
Apr 16, 2014
07d5035
xfs: wrong error sign conversion during failed DIO writes
Apr 16, 2014
8d6c121
xfs: fix buffer use after free on IO error
Apr 16, 2014
330033d
xfs: fix tmpfile/selinux deadlock and initialize security
Apr 16, 2014
5d6c97c
tracing: Do not try to recreated toplevel set_ftrace_* files
rostedt Apr 16, 2014
94f8cc0
drivers/base/dd.c incorrect pr_debug() parameters
frowand Apr 17, 2014
bae9f74
cifs: fix error handling cifs_user_readv
jtlayton Apr 15, 2014
1f80c0c
cif: fix dead code
Apr 15, 2014
f7018c2
video: move fbdev to drivers/video/fbdev
tomba Feb 13, 2014
19757fc
fbdev: move fbdev core files to separate directory
tomba Feb 13, 2014
776bbb9
video: Kconfig: move drm and fb into separate menus
tomba Feb 13, 2014
c7a6d35
raid5: fix a race of stripe count check
Apr 15, 2014
ea43164
x86/mce: Fix CMCI preemption bugs
Apr 17, 2014
a1d9a32
sched: Check for stop task appearance when balancing happens
tkhai Apr 10, 2014
57700ad
drm/radeon: disable mclk dpm on R7 260X
agd5f Apr 11, 2014
90c4cde
drm/radeon: fix runpm handling on APUs (v4)
agd5f Apr 11, 2014
6abc6d5
drm/radeon: update CI DPM powertune settings
agd5f Apr 11, 2014
5fb9cc4
drm/radeon: apply more strict limits for PLL params v2
ChristianKoenigAMD Apr 4, 2014
1ebe928
drm/radeon: add support for newer mc ucode on SI (v2)
agd5f Apr 11, 2014
277babc
drm/radeon: add support for newer mc ucode on CI (v2)
agd5f Apr 11, 2014
7e1858f
drm/radeon: re-enable mclk dpm on R7 260X asics
agd5f Apr 11, 2014
681941c
drm/radeon: fix VCE fence command
Apr 14, 2014
74073c9
drm/radeon: memory leak on bo reservation failure. v2
Mar 18, 2014
f8a2645
drm/radeon: improve PLL params if we don't match exactly v2
ChristianKoenigAMD Apr 16, 2014
8c79bae
drm/radeon/si: make sure mc ucode is loaded before checking the size
agd5f Apr 16, 2014
bcddee2
drm/radeon/ci: make sure mc ucode is loaded before checking the size
agd5f Apr 16, 2014
4a0c3d9
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…
linvjw Apr 17, 2014
6ea6215
tracing/uprobes: Fix uprobe_cpu_buffer memory leak
Apr 17, 2014
12de375
Revert "serial: 8250, disable "too much work" messages"
gregkh Apr 17, 2014
09df694
Merge tag 'fbdev-reorder-3.15' of git://git.kernel.org/pub/scm/linux/…
torvalds Apr 17, 2014
23c1a60
Merge tag '3.15-fixes' of git://neil.brown.name/md
torvalds Apr 17, 2014
88764e0
Merge tag 'stable/for-linus-3.15-rc1-tag' of git://git.kernel.org/pub…
torvalds Apr 17, 2014
a94cdd1
Char: ipmi_bt_sm, fix infinite loop
Apr 14, 2014
48e8ac2
ipmi: Fix a race restarting the timer
BStroesser Apr 14, 2014
eb6d78e
ipmi: Reset the KCS timeout when starting error recovery
cminyard Apr 14, 2014
0dfe6e7
ipmi: Turn off default probing of interfaces
cminyard Apr 14, 2014
8998649
ipmi: Turn off all activity on an idle ipmi interface
cminyard Apr 14, 2014
7aefac2
ipmi: boolify some things
cminyard Apr 14, 2014
c2896de
Merge branch 'ipmi' (emailed ipmi fixes)
torvalds Apr 17, 2014
81cef0f
Merge branch 'parisc-3.15' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Apr 17, 2014
87a54ca
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/sc…
torvalds Apr 17, 2014
95c7d35
Merge tag 'drm/tegra/for-3.15-rc2' of git://anongit.freedesktop.org/t…
airlied Apr 18, 2014
90e4897
Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deaths…
airlied Apr 18, 2014
d62c3e7
Merge tag 'omapdrm-fixes-3.15' of git://git.kernel.org/pub/scm/linux/…
airlied Apr 18, 2014
9a11843
drm/nouveau/bios: fix a bit shift error introduced by 457e77b
saproj Apr 15, 2014
a82049b
drm/ast: fix value check in cbr_scan2
airlied Apr 16, 2014
b6ccd7b
drm/plane-helper: Don't fake-implement primary plane disabling
danvet Apr 15, 2014
8d75454
drm: Split out drm_probe_helper.c from drm_crtc_helper.c
danvet Apr 10, 2014
2f1e800
drm: cirrus: add power management support
kraxel Apr 14, 2014
b8ccd70
drm: bochs: add power management support
kraxel Apr 14, 2014
c044330
drm: bochs: drop unused struct fields
kraxel Apr 14, 2014
20cd477
of: add empty of_find_node_by_path() for !OF
shcgit Apr 16, 2014
7d77879
Merge tag 'trace-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/lin…
torvalds Apr 18, 2014
962bf3e
Merge tag 'xfs-for-linus-3.15-rc2' of git://oss.sgi.com/xfs/xfs
torvalds Apr 18, 2014
345ef87
Merge tag 'dt-fixes-for-3.15' of git://git.kernel.org/pub/scm/linux/k…
torvalds Apr 18, 2014
2f3e12b
Merge tag 'sound-3.15-rc2' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Apr 18, 2014
b81fd5b
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Apr 18, 2014
674366e
Merge tag 'pci-v3.15-fixes-1' of git://git.kernel.org/pub/scm/linux/k…
torvalds Apr 18, 2014
64ee9f3
ARC: Delete stale barrier.h
Apr 18, 2014
38137a5
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Apr 18, 2014
dc8eaaa
vlan: Fix lockdep warning when vlan dev handle notification
dingtianhong Apr 17, 2014
ba67b51
tg3: update rx_jumbo_pending ring param only when jumbo frames are en…
Apr 17, 2014
5a292f7
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel…
davem330 Apr 18, 2014
b14878c
net: sctp: cache auth_enable per endpoint
Apr 17, 2014
83da751
vmscan: reclaim_clean_pages_from_list() must use mod_zone_page_state()
Apr 18, 2014
82c04ff
init/Kconfig: move the trusted keyring config option to general setup
pefoley2 Apr 18, 2014
7861144
kernel/watchdog.c:touch_softlockup_watchdog(): use raw_cpu_write()
akpm00 Apr 18, 2014
12c743e
powerpc/mm: fix ".__node_distance" undefined
QiuMike Apr 18, 2014
8f28ed9
Documentation/vm/numa_memory_policy.txt: fix wrong document in numa_m…
tang-chen Apr 18, 2014
9cc2368
Shiraz has moved
vireshk Apr 18, 2014
8b32201
wait: explain the shadowing and type inconsistencies
Apr 18, 2014
7848a4b
mm/hugetlb.c: add cond_resched_lock() in return_unused_surplus_pages()
mmizuma Apr 18, 2014
8229f1a
mips: export flush_icache_range
kees Apr 18, 2014
29c7787
mm: use paravirt friendly ops for NUMA hinting ptes
Apr 18, 2014
a663dad
mm: fix CONFIG_DEBUG_VM_RB description
Apr 18, 2014
b59b8cb
mm: fix new kernel-doc warning in filemap.c
rddunlap Apr 18, 2014
b5a8cad
thp: close race between split and zap huge pages
kiryl Apr 18, 2014
ea2388f
Merge branch 'akpm' (incoming from Andrew)
torvalds Apr 18, 2014
7e55f81
Merge tag 'usb-3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Apr 18, 2014
575a292
Merge tag 'tty-3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Apr 18, 2014
8cb652b
Merge tag 'staging-3.15-rc2' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Apr 18, 2014
60fbf2b
Merge tag 'driver-core-3.15-rc2' of git://git.kernel.org/pub/scm/linu…
torvalds Apr 18, 2014
25bfe4f
Merge tag 'char-misc-3.15-rc2' of git://git.kernel.org/pub/scm/linux/…
torvalds Apr 19, 2014
6e66d5d
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
torvalds Apr 19, 2014
ebfc45e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
torvalds Apr 19, 2014
a42892e
Merge branch 'drm-next-3.15-wip' of git://people.freedesktop.org/~dea…
airlied Apr 19, 2014
b931242
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
torvalds Apr 19, 2014
8de3f7a
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/…
torvalds Apr 19, 2014
8f98f6f
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm…
torvalds Apr 19, 2014
6d45969
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/l…
torvalds Apr 19, 2014
404ca80
coredump: fix va_list corruption
Apr 19, 2014
200bde2
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/…
torvalds Apr 20, 2014
5269519
Merge tag 'iommu-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/lin…
torvalds Apr 20, 2014
372feac
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
torvalds Apr 20, 2014
a798c10
Linux 3.15-rc2
torvalds Apr 20, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
drm/omap: gem sync: wait on correct events
A waiter of the type OMAP_GEM_READ should wait for a buffer to be completely
written, and only then proceed with reading it. A similar logic applies for
waiters with OMAP_GEM_WRITE flag.

Currently the function is_waiting() waits on the read_complete/read_target
counts in the sync object.

This should be the other way round, as a reader should wait for users who are
'writing' to this buffer, and vice versa.

Make readers of the buffer(OMAP_GEM_READ) wait on the write counters, and
writers to the buffer(OMAP_GEM_WRITE) wait on the read counters in is_waiting()

Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Archit Taneja authored and tomba committed Apr 15, 2014
commit f2cff0f34ff2c51f703880a2b883ea0c9de4a5ac
4 changes: 2 additions & 2 deletions drivers/gpu/drm/omapdrm/omap_gem.c
Original file line number Diff line number Diff line change
@@ -1047,10 +1047,10 @@ static inline bool is_waiting(struct omap_gem_sync_waiter *waiter)
{
struct omap_gem_object *omap_obj = waiter->omap_obj;
if ((waiter->op & OMAP_GEM_READ) &&
(omap_obj->sync->read_complete < waiter->read_target))
(omap_obj->sync->write_complete < waiter->write_target))
return true;
if ((waiter->op & OMAP_GEM_WRITE) &&
(omap_obj->sync->write_complete < waiter->write_target))
(omap_obj->sync->read_complete < waiter->read_target))
return true;
return false;
}