Commit 08a4ecee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (23 commits)
  [PATCH] sysfs: fix a kobject leak in sysfs_add_link on the error path
  [PATCH] sysfs: don't export dir symbols
  [PATCH] get_cpu_sysdev() signedness fix
  [PATCH] kobject_add_dir
  [PATCH] debugfs: Add debugfs_create_blob() helper for exporting binary data
  [PATCH] sysfs: fix problem with duplicate sysfs directories and files
  [PATCH] Kobject: kobject.h: fix a typo
  [PATCH] Kobject: provide better warning messages when people do stupid things
  [PATCH] Driver core: add macros notice(), dev_notice()
  [PATCH] firmware: fix BUG: in fw_realloc_buffer
  [PATCH] sysfs: kzalloc conversion
  [PATCH] fix module sysfs files reference counting
  [PATCH] add EXPORT_SYMBOL_GPL_FUTURE() to USB subsystem
  [PATCH] add EXPORT_SYMBOL_GPL_FUTURE() to RCU subsystem
  [PATCH] add EXPORT_SYMBOL_GPL_FUTURE()
  [PATCH] Clean up module.c symbol searching logic
  [PATCH] kobj_map semaphore to mutex conversion
  [PATCH] kref: avoid an atomic operation in kref_put()
  [PATCH] handle errors returned by platform_get_irq*()
  [PATCH] driver core: platform_get_irq*(): return -ENXIO on error
  ...
parents ba93c629 b3229087

Documentation/feature-removal-schedule.txt

+18 −0
Original line number Diff line number Diff line
@@ -196,3 +196,21 @@ Why: Board specific code doesn't build anymore since ~2.6.0 and no 
	users have complained indicating there is no more need for these

	boards.  This should really be considered a last call.

Who:	Ralf Baechle <ralf@linux-mips.org>



---------------------------



What:	USB driver API moves to EXPORT_SYMBOL_GPL

When:	Febuary 2008

Files:	include/linux/usb.h, drivers/usb/core/driver.c

Why:	The USB subsystem has changed a lot over time, and it has been

	possible to create userspace USB drivers using usbfs/libusb/gadgetfs

	that operate as fast as the USB bus allows.  Because of this, the USB

	subsystem will not be allowing closed source kernel drivers to

	register with it, after this grace period is over.  If anyone needs

	any help in converting their closed source drivers over to use the

	userspace filesystems, please contact the

	linux-usb-devel@lists.sourceforge.net mailing list, and the developers

	there will be glad to help you out.

Who:	Greg Kroah-Hartman <gregkh@suse.de>



---------------------------

arch/arm/common/locomo.c

+2 −0
Original line number Diff line number Diff line
@@ -788,6 +788,8 @@ static int locomo_probe(struct platform_device *dev) 
	if (!mem)

		return -EINVAL;

	irq = platform_get_irq(dev, 0);

	if (irq < 0)

		return -ENXIO;



	return __locomo_probe(&dev->dev, mem, irq);

}

arch/arm/common/sa1111.c

+2 −0
Original line number Diff line number Diff line
@@ -943,6 +943,8 @@ static int sa1111_probe(struct platform_device *pdev) 
	if (!mem)

		return -EINVAL;

	irq = platform_get_irq(pdev, 0);

	if (irq < 0)

		return -ENXIO;



	return __sa1111_probe(&pdev->dev, mem, irq);

}

arch/m68knommu/kernel/vmlinux.lds.S

+10 −0
Original line number Diff line number Diff line
@@ -269,6 +269,11 @@ SECTIONS { 
		*(__ksymtab_gpl)

		__stop___ksymtab_gpl = .;



		/* Kernel symbol table: GPL-future symbols */

		__start___ksymtab_gpl_future = .;

		*(__ksymtab_gpl_future)

		__stop___ksymtab_gpl_future = .;



		/* Kernel symbol table: Normal symbols */

		__start___kcrctab = .;

		*(__kcrctab)
@@ -279,6 +284,11 @@ SECTIONS { 
		*(__kcrctab_gpl)

		__stop___kcrctab_gpl = .;



		/* Kernel symbol table: GPL-future symbols */

		__start___kcrctab_gpl_future = .;

		*(__kcrctab_gpl_future)

		__stop___kcrctab_gpl_future = .;



		/* Kernel symbol table: strings */

		*(__ksymtab_strings)

arch/v850/kernel/vmlinux.lds.S

+8 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ 
		___start___ksymtab_gpl = .;				      \

			*(__ksymtab_gpl)				      \

		___stop___ksymtab_gpl = .;				      \

		/* Kernel symbol table: GPL-future symbols */		      \

		___start___ksymtab_gpl_future = .;			      \

			*(__ksymtab_gpl_future)				      \

		___stop___ksymtab_gpl_future = .;			      \

		/* Kernel symbol table: strings */			      \

			*(__ksymtab_strings)				      \

		/* Kernel symbol table: Normal symbols */		      \
@@ -74,6 +78,10 @@ 
		___start___kcrctab_gpl = .;				      \

			*(__kcrctab_gpl)				      \

		___stop___kcrctab_gpl = .;				      \

		/* Kernel symbol table: GPL-future symbols */		      \

		___start___kcrctab_gpl_future = .;			      \

			*(__kcrctab_gpl_future)				      \

		___stop___kcrctab_gpl_future = .;			      \

		/* Built-in module parameters */			      \

		. = ALIGN (4) ;						      \

		___start___param = .;					      \

CRA Git | Maintained and supported by SUSTech CRA and CCSE