From: David S. Miller Date: Sat, 23 Jan 2010 06:45:46 +0000 (-0800) Subject: Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ X-Git-Tag: v2.6.33-rc6~29^2~18 X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=6be325719b3e54624397e413efd4b33a997e55a3;hp=-c Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ --- 6be325719b3e54624397e413efd4b33a997e55a3 diff --combined MAINTAINERS index ef40d2c,1858646..4067c2e --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -410,9 -410,8 +410,8 @@@ F: drivers/i2c/busses/i2c-ali1563. ALPHA PORT M: Richard Henderson - S: Odd Fixes for 2.4; Maintained for 2.6. M: Ivan Kokshaysky - S: Maintained for 2.4; PCI support for 2.6. + M: Matt Turner L: linux-alpha@vger.kernel.org F: arch/alpha/ @@@ -801,6 -800,19 +800,19 @@@ L: openmoko-kernel@lists.openmoko.org ( W: http://wiki.openmoko.org/wiki/Neo_FreeRunner S: Supported + ARM/QUALCOMM MSM MACHINE SUPPORT + M: David Brown + M: Daniel Walker + M: Bryan Huntsman + F: arch/arm/mach-msm/ + F: drivers/video/msm/ + F: drivers/mmc/host/msm_sdcc.c + F: drivers/mmc/host/msm_sdcc.h + F: drivers/serial/msm_serial.h + F: drivers/serial/msm_serial.c + T: git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git + S: Maintained + ARM/TOSA MACHINE SUPPORT M: Dmitry Eremin-Solenikov M: Dirk Opfer @@@ -822,13 -834,13 +834,13 @@@ F: arch/arm/mach-pxa/palmte2. F: arch/arm/mach-pxa/include/mach/palmtc.h F: arch/arm/mach-pxa/palmtc.c - ARM/PALM TREO 680 SUPPORT + ARM/PALM TREO SUPPORT M: Tomas Cech L: linux-arm-kernel@lists.infradead.org W: http://hackndev.com S: Maintained - F: arch/arm/mach-pxa/include/mach/treo680.h - F: arch/arm/mach-pxa/treo680.c + F: arch/arm/mach-pxa/include/mach/palmtreo.h + F: arch/arm/mach-pxa/palmtreo.c ARM/PALMZ72 SUPPORT M: Sergey Lapin @@@ -975,6 -987,7 +987,6 @@@ F: drivers/platform/x86/asus-laptop. ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API M: Dan Williams -M: Maciej Sosnowski W: http://sourceforge.net/projects/xscaleiop S: Supported F: Documentation/crypto/async-tx-api.txt @@@ -1388,6 -1401,8 +1400,8 @@@ L: linux-usb@vger.kernel.or S: Supported F: Documentation/usb/WUSB-Design-overview.txt F: Documentation/usb/wusb-cbaf + F: drivers/usb/host/hwa-hc.c + F: drivers/usb/host/whci/ F: drivers/usb/wusbcore/ F: include/linux/usb/wusb* @@@ -1456,6 -1471,12 +1470,12 @@@ L: linux-scsi@vger.kernel.or S: Supported F: drivers/scsi/fnic/ + CMPC ACPI DRIVER + M: Thadeu Lima de Souza Cascardo + M: Daniel Oliveira Nascimento + S: Supported + F: drivers/platform/x86/classmate-laptop.c + CODA FILE SYSTEM M: Jan Harkes M: coda@cs.cmu.edu @@@ -1468,8 -1489,8 +1488,8 @@@ F: include/linux/coda*. COMMON INTERNET FILE SYSTEM (CIFS) M: Steve French - L: linux-cifs-client@lists.samba.org - L: samba-technical@lists.samba.org + L: linux-cifs-client@lists.samba.org (moderated for non-subscribers) + L: samba-technical@lists.samba.org (moderated for non-subscribers) W: http://linux-cifs.samba.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git S: Supported @@@ -1616,9 -1637,8 +1636,8 @@@ S: Maintaine F: sound/pci/cs5535audio/ CX18 VIDEO4LINUX DRIVER - M: Hans Verkuil M: Andy Walls - L: ivtv-devel@ivtvdriver.org + L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) L: linux-media@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git W: http://linuxtv.org @@@ -1803,6 -1823,7 +1822,6 @@@ S: Supporte F: fs/dlm/ DMA GENERIC OFFLOAD ENGINE SUBSYSTEM -M: Maciej Sosnowski M: Dan Williams S: Supported F: drivers/dma/ @@@ -2146,10 -2167,9 +2165,9 @@@ F: drivers/hwmon/f75375s. F: include/linux/f75375s.h FIREWIRE SUBSYSTEM - M: Kristian Hoegsberg M: Stefan Richter L: linux1394-devel@lists.sourceforge.net - W: http://www.linux1394.org/ + W: http://ieee1394.wiki.kernel.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git S: Maintained F: drivers/firewire/ @@@ -2362,6 -2382,15 +2380,15 @@@ W: http://www.kernel.org/pub/linux/kern S: Maintained F: drivers/hwmon/hdaps.c + HWPOISON MEMORY FAILURE HANDLING + M: Andi Kleen + L: linux-mm@kvack.org + L: linux-kernel@vger.kernel.org + T: git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison + S: Maintained + F: mm/memory-failure.c + F: mm/hwpoison-inject.c + HYPERVISOR VIRTUAL CONSOLE DRIVER L: linuxppc-dev@ozlabs.org S: Odd Fixes @@@ -2673,22 -2702,14 +2700,14 @@@ S: Supporte F: drivers/idle/i7300_idle.c IEEE 1394 SUBSYSTEM - M: Ben Collins M: Stefan Richter L: linux1394-devel@lists.sourceforge.net - W: http://www.linux1394.org/ + W: http://ieee1394.wiki.kernel.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git - S: Maintained + S: Obsolete F: Documentation/debugging-via-ohci1394.txt F: drivers/ieee1394/ - IEEE 1394 RAW I/O DRIVER - M: Dan Dennedy - M: Stefan Richter - L: linux1394-devel@lists.sourceforge.net - S: Maintained - F: drivers/ieee1394/raw1394* - IEEE 802.15.4 SUBSYSTEM M: Dmitry Eremin-Solenikov M: Sergey Lapin @@@ -2765,7 -2786,7 +2784,7 @@@ F: arch/x86/kernel/microcode_core. F: arch/x86/kernel/microcode_intel.c INTEL I/OAT DMA DRIVER -M: Maciej Sosnowski +M: Dan Williams S: Supported F: drivers/dma/ioat* @@@ -2989,8 -3010,8 +3008,8 @@@ S: Maintaine F: drivers/isdn/hardware/eicon/ IVTV VIDEO4LINUX DRIVER - M: Hans Verkuil - L: ivtv-devel@ivtvdriver.org + M: Andy Walls + L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) L: linux-media@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git W: http://www.ivtvdriver.org @@@ -3066,8 -3087,11 +3085,11 @@@ S: Maintaine F: fs/autofs4/ KERNEL BUILD + M: Michal Marek + T: git git://repo.or.cz/linux-kbuild.git for-next + T: git git://repo.or.cz/linux-kbuild.git for-linus L: linux-kbuild@vger.kernel.org - S: Orphan + S: Maintained F: Documentation/kbuild/ F: Makefile F: scripts/Makefile.* @@@ -3109,7 -3133,6 +3131,6 @@@ L: kvm@vger.kernel.or W: http://kvm.qumranet.com S: Supported F: arch/x86/include/asm/svm.h - F: arch/x86/kvm/kvm_svm.h F: arch/x86/kvm/svm.c KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC @@@ -3245,6 -3268,7 +3266,7 @@@ LINUX FOR IBM pSERIES (RS/6000 M: Paul Mackerras W: http://www.ibm.com/linux/ltc/projects/ppc S: Supported + F: arch/powerpc/boot/rs6000.h LINUX FOR POWERPC (32-BIT AND 64-BIT) M: Benjamin Herrenschmidt @@@ -3253,18 -3277,24 +3275,24 @@@ W: http://www.penguinppc.org L: linuxppc-dev@ozlabs.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git S: Supported + F: Documentation/powerpc/ + F: arch/powerpc/ LINUX FOR POWER MACINTOSH M: Benjamin Herrenschmidt W: http://www.penguinppc.org/ L: linuxppc-dev@ozlabs.org S: Maintained + F: arch/powerpc/platforms/powermac/ + F: drivers/macintosh/ LINUX FOR POWERPC EMBEDDED MPC5XXX M: Grant Likely L: linuxppc-dev@ozlabs.org T: git git://git.secretlab.ca/git/linux-2.6.git S: Maintained + F: arch/powerpc/platforms/512x/ + F: arch/powerpc/platforms/52xx/ LINUX FOR POWERPC EMBEDDED PPC4XX M: Josh Boyer @@@ -3273,6 -3303,8 +3301,8 @@@ W: http://www.penguinppc.org L: linuxppc-dev@ozlabs.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git S: Maintained + F: arch/powerpc/platforms/40x/ + F: arch/powerpc/platforms/44x/ LINUX FOR POWERPC EMBEDDED XILINX VIRTEX M: Grant Likely @@@ -3280,6 -3312,8 +3310,8 @@@ W: http://wiki.secretlab.ca/index.php/L L: linuxppc-dev@ozlabs.org T: git git://git.secretlab.ca/git/linux-2.6.git S: Maintained + F: arch/powerpc/*/*virtex* + F: arch/powerpc/*/*/*virtex* LINUX FOR POWERPC EMBEDDED PPC8XX M: Vitaly Bordug @@@ -3293,12 -3327,16 +3325,16 @@@ M: Kumar Gala W: http://www.pasemi.com/ L: linuxppc-dev@ozlabs.org S: Supported + F: arch/powerpc/platforms/pasemi/ + F: drivers/*/*pasemi* + F: drivers/*/*/*pasemi* LINUX SECURITY MODULE (LSM) FRAMEWORK M: Chris Wright @@@ -3603,6 -3641,11 +3639,11 @@@ W: http://0pointer.de/lennart/tchibo.ht S: Maintained F: drivers/platform/x86/msi-laptop.c + MSI WMI SUPPORT + M: Anisse Astier + S: Supported + F: drivers/platform/x86/msi-wmi.c + MULTIFUNCTION DEVICES (MFD) M: Samuel Ortiz T: git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git @@@ -3636,7 -3679,7 +3677,7 @@@ F: include/linux/isicom. MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER M: Felipe Balbi L: linux-usb@vger.kernel.org - T: git git://gitorious.org/musb/mainline.git + T: git git://gitorious.org/usb/usb.git S: Maintained F: drivers/usb/musb/ @@@ -3828,7 -3871,7 +3869,7 @@@ F: drivers/net/ni5010. NILFS2 FILESYSTEM M: KONISHI Ryusuke - L: users@nilfs.org + L: linux-nilfs@vger.kernel.org W: http://www.nilfs.org/en/ S: Supported F: Documentation/filesystems/nilfs2.txt @@@ -3895,29 -3938,20 +3936,20 @@@ S: Maintaine F: sound/soc/omap/ OMAP FRAMEBUFFER SUPPORT - M: Imre Deak + M: Tomi Valkeinen L: linux-fbdev@vger.kernel.org L: linux-omap@vger.kernel.org S: Maintained F: drivers/video/omap/ - OMAP DISPLAY SUBSYSTEM SUPPORT (DSS2) + OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2) M: Tomi Valkeinen L: linux-omap@vger.kernel.org - L: linux-fbdev@vger.kernel.org (moderated for non-subscribers) + L: linux-fbdev@vger.kernel.org S: Maintained - F: drivers/video/omap2/dss/ - F: drivers/video/omap2/vrfb.c - F: drivers/video/omap2/vram.c + F: drivers/video/omap2/ F: Documentation/arm/OMAP/DSS - OMAP FRAMEBUFFER SUPPORT (FOR DSS2) - M: Tomi Valkeinen - L: linux-omap@vger.kernel.org - L: linux-fbdev@vger.kernel.org (moderated for non-subscribers) - S: Maintained - F: drivers/video/omap2/omapfb/ - OMAP MMC SUPPORT M: Jarkko Lavinen L: linux-omap@vger.kernel.org @@@ -5050,6 -5084,7 +5082,7 @@@ F: drivers/char/specialix SPI SUBSYSTEM M: David Brownell + M: Grant Likely L: spi-devel-general@lists.sourceforge.net S: Maintained F: Documentation/spi/ @@@ -5388,10 -5423,19 +5421,19 @@@ ULTRA-WIDEBAND (UWB) SUBSYSTEM M: David Vrabel L: linux-usb@vger.kernel.org S: Supported - F: drivers/uwb/* + F: drivers/uwb/ + X: drivers/uwb/wlp/ + X: drivers/uwb/i1480/i1480u-wlp/ + X: drivers/uwb/i1480/i1480-wlp.h F: include/linux/uwb.h F: include/linux/uwb/ + UNIFDEF + M: Tony Finch + W: http://dotat.at/prog/unifdef + S: Maintained + F: scripts/unifdef.c + UNIFORM CDROM DRIVER M: Jens Axboe W: http://www.kernel.dk @@@ -5895,9 -5939,12 +5937,12 @@@ W: http://linuxwimax.or WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM M: David Vrabel + L: netdev@vger.kernel.org S: Maintained F: include/linux/wlp.h F: drivers/uwb/wlp/ + F: drivers/uwb/i1480/i1480u-wlp/ + F: drivers/uwb/i1480/i1480-wlp.h WISTRON LAPTOP BUTTON DRIVER M: Miloslav Trmac @@@ -5943,6 -5990,7 +5988,7 @@@ M: Mark Brown diff --combined net/dccp/probe.c index 6fcfe87,a1362dc..bace1d8 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c @@@ -43,7 -43,7 +43,7 @@@ static int bufsize = 64 * 1024 static const char procname[] = "dccpprobe"; static struct { - struct kfifo *fifo; + struct kfifo fifo; spinlock_t lock; wait_queue_head_t wait; struct timespec tstart; @@@ -67,7 -67,7 +67,7 @@@ static void printl(const char *fmt, ... len += vscnprintf(tbuf+len, sizeof(tbuf)-len, fmt, args); va_end(args); - kfifo_put(dccpw.fifo, tbuf, len); + kfifo_in_locked(&dccpw.fifo, tbuf, len, &dccpw.lock); wake_up(&dccpw.wait); } @@@ -109,7 -109,7 +109,7 @@@ static struct jprobe dccp_send_probe = static int dccpprobe_open(struct inode *inode, struct file *file) { - kfifo_reset(dccpw.fifo); + kfifo_reset(&dccpw.fifo); getnstimeofday(&dccpw.tstart); return 0; } @@@ -131,11 -131,11 +131,11 @@@ static ssize_t dccpprobe_read(struct fi return -ENOMEM; error = wait_event_interruptible(dccpw.wait, - __kfifo_len(dccpw.fifo) != 0); + kfifo_len(&dccpw.fifo) != 0); if (error) goto out_free; - cnt = kfifo_get(dccpw.fifo, tbuf, len); + cnt = kfifo_out_locked(&dccpw.fifo, tbuf, len, &dccpw.lock); error = copy_to_user(buf, tbuf, cnt) ? -EFAULT : 0; out_free: @@@ -156,15 -156,12 +156,13 @@@ static __init int dccpprobe_init(void init_waitqueue_head(&dccpw.wait); spin_lock_init(&dccpw.lock); - dccpw.fifo = kfifo_alloc(bufsize, GFP_KERNEL, &dccpw.lock); - if (IS_ERR(dccpw.fifo)) - return PTR_ERR(dccpw.fifo); - + if (kfifo_alloc(&dccpw.fifo, bufsize, GFP_KERNEL)) + return ret; if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops)) goto err0; - ret = register_jprobe(&dccp_send_probe); + ret = try_then_request_module((register_jprobe(&dccp_send_probe) == 0), + "dccp"); if (ret) goto err1; @@@ -173,14 -170,14 +171,14 @@@ err1: proc_net_remove(&init_net, procname); err0: - kfifo_free(dccpw.fifo); + kfifo_free(&dccpw.fifo); return ret; } module_init(dccpprobe_init); static __exit void dccpprobe_exit(void) { - kfifo_free(dccpw.fifo); + kfifo_free(&dccpw.fifo); proc_net_remove(&init_net, procname); unregister_jprobe(&dccp_send_probe);