iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3268c63ede
linux/drivers/staging
History
Linus Torvalds 9f3938346a Merge branch 'kmap_atomic' of git://github.com/congwang/linux 
Pull kmap_atomic cleanup from Cong Wang.

It's been in -next for a long time, and it gets rid of the (no longer
used) second argument to k[un]map_atomic().

Fix up a few trivial conflicts in various drivers, and do an "evil
merge" to catch some new uses that have come in since Cong's tree.

* 'kmap_atomic' of git://github.com/congwang/linux: (59 commits)
  feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal
  highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]
  drbd: remove the second argument of k[un]map_atomic()
  zcache: remove the second argument of k[un]map_atomic()
  gma500: remove the second argument of k[un]map_atomic()
  dm: remove the second argument of k[un]map_atomic()
  tomoyo: remove the second argument of k[un]map_atomic()
  sunrpc: remove the second argument of k[un]map_atomic()
  rds: remove the second argument of k[un]map_atomic()
  net: remove the second argument of k[un]map_atomic()
  mm: remove the second argument of k[un]map_atomic()
  lib: remove the second argument of k[un]map_atomic()
  power: remove the second argument of k[un]map_atomic()
  kdb: remove the second argument of k[un]map_atomic()
  udf: remove the second argument of k[un]map_atomic()
  ubifs: remove the second argument of k[un]map_atomic()
  squashfs: remove the second argument of k[un]map_atomic()
  reiserfs: remove the second argument of k[un]map_atomic()
  ocfs2: remove the second argument of k[un]map_atomic()
  ntfs: remove the second argument of k[un]map_atomic()
  ...
2012-03-21 09:40:26 -07:00
..
android Staging: android: ram_console.c: 2012-03-15 16:38:14 -07:00
asus_oled staging: asus_oled: Remove superfluous loop 2012-02-29 15:43:21 -08:00
bcm Staging: bcm: fix possible memory leak of 'pstAddIndication' in CmHost.c and removes a whitespace 2012-03-02 16:36:55 -08:00
comedi staging/comedi/drivers fix spelling errors 2012-03-09 13:14:08 -08:00
cptm1217
crystalhd staging: crystalhd: Fix typo in crystalhd_hw.c 2012-03-08 09:57:38 -08:00
cxt1e1
echo
et131x Staging: et131x: unify return value of .ndo_set_mac_address if address is invalid 2012-02-24 12:03:13 -08:00
frontier Staging: frontier: Fix checkpatch.pl issue. 2012-02-24 12:03:12 -08:00
ft1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-03-20 21:04:47 -07:00
iio Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-03-20 21:12:50 -07:00
keucr USB merge for 3.4-rc1 2012-03-20 11:26:30 -07:00
line6
media Staging: media: lirc: lirc_sasem.c: fixed long line coding style issue 2012-02-29 15:52:53 -08:00
mei staging: mei: remove driver internal versioning 2012-03-14 12:17:45 -07:00
nvec
octeon staging/octeon: Fix PHY binding in octeon-ethernet driver. 2012-02-24 12:03:15 -08:00
olpc_dcon
omapdrm staging: drm/omap: use current time for page-flip event 2012-03-13 15:44:44 -07:00
ozwpan staging: ozwpan depends on NET 2012-03-14 12:14:26 -07:00
panel
phison
quatech_usb2 USB: serial: quatech_usb2.c: use module_usb_serial_driver 2012-02-28 13:11:27 -08:00
quickstart Staging: quickstart: Fix compilation warning on 64 bit arch 2012-02-13 20:08:56 -08:00
ramster Merge branch 'kmap_atomic' of git://github.com/congwang/linux 2012-03-21 09:40:26 -07:00
rtl8187se Staging: rtl8187se: r8180_wx.c: Cleaned up comments 2012-03-15 16:46:55 -07:00
rtl8192e Staging, rtl8192e, softmac: remove redundant memset and fix mem leak 2012-02-15 17:21:43 -08:00
rtl8192u Merge branch 'kmap_atomic' of git://github.com/congwang/linux 2012-03-21 09:40:26 -07:00
rtl8712 staging: r8712u: Fix Smatch warning 2012-03-07 13:36:45 -08:00
rts5139 staging: Update TODO for rts5139 and rts_pstor 2012-02-24 12:03:14 -08:00
rts_pstor staging: Update TODO for rts5139 and rts_pstor 2012-02-24 12:03:14 -08:00
sbe-2t3e3
sep staging: Fix SEP build 2012-02-13 14:42:02 -08:00
serial
serqt_usb2 USB: serial: serqt_usb2.c: use module_usb_serial_driver 2012-02-28 13:11:30 -08:00
slicoss staging: clean up Greg's email address in some TODO files 2012-02-15 14:45:40 -08:00
sm7xx Staging: sm7xx/smtcfb.c included linux/module.h twice 2012-02-15 17:21:43 -08:00
speakup TTY: speakup, do not use serialP 2012-03-08 11:47:02 -08:00
ste_rmi4
telephony
tidspbridge staging: tidspbridge: remove nldr_init() and nldr_exit() 2012-03-09 13:21:08 -08:00
usbip Staging: usbip: Remove commented code. 2012-02-24 11:59:57 -08:00
vme staging: vme: fix section mismatches in linux-next 20120314 2012-03-15 14:04:34 -07:00
vt6655 staging: Fix typo in bssdb.c 2012-02-24 12:05:37 -08:00
vt6656 staging: Fix typo in bssdb.c 2012-02-24 12:05:37 -08:00
winbond
wlags49_h2 Staging: wlags49_h2: print MAC via printk format specifier 2012-02-24 15:41:41 -05:00
wlags49_h25
wlan-ng Staging: wlan-ng: still setting wrong data 2012-02-29 15:55:52 -08:00
xgifb staging/xgifb: remove remaining duplicate initdef.h defines 2012-02-10 09:56:25 -08:00
zcache Merge branch 'kmap_atomic' of git://github.com/congwang/linux 2012-03-21 09:40:26 -07:00
zram Merge branch 'kmap_atomic' of git://github.com/congwang/linux 2012-03-21 09:40:26 -07:00
zsmalloc staging: zsmalloc: remove SPARSEMEM dep from Kconfig 2012-03-07 13:31:28 -08:00
Kconfig staging: ozwpan: Plumbed in Kconfig and Kbuild 2012-02-24 09:29:24 -08:00
Makefile staging: ozwpan: Plumbed in Kconfig and Kbuild 2012-02-24 09:29:24 -08:00
staging.c