Hello community,
here is the log from the commit of package kernel-source
checked in at Sat Mar 22 11:58:04 CET 2008.
--------
--- kernel-source/kernel-debug.changes 2008-03-20 18:40:28.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2008-03-22 08:41:10.000000000 +0100
@@ -1,0 +2,19 @@
+Thu Mar 20 22:58:55 CET 2008 - gregkh@suse.de
+
+- fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the
+ code is not upstream and we aren't allowed to add non-GPL exports to
+ our kernel tree.
+
+-------------------------------------------------------------------
+Thu Mar 20 22:26:39 CET 2008 - gregkh@suse.de
+
+- update to 2.6.25-rc6-git5
+- refresh patches to apply cleanly
+
+-------------------------------------------------------------------
+Thu Mar 20 21:36:04 CET 2008 - gregkh@suse.de
+
+- update to 2.6.25-rc6-git4
+- refresh patches to apply cleanly
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-kdump.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.l20160/_old 2008-03-22 11:49:30.000000000 +0100
+++ /var/tmp/diff_new_pack.l20160/_new 2008-03-22 11:49:30.000000000 +0100
@@ -44,7 +44,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.25
-Release: 8
+Release: 9
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -180,7 +180,7 @@
-Source Timestamp: 2008-03-20 11:15:04 +0100
+Source Timestamp: 2008-03-20 22:57:18 +0100
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
@@ -259,7 +259,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <
-Source Timestamp: 2008-03-20 11:15:04 +0100
+Source Timestamp: 2008-03-20 22:57:18 +0100
%install
rm -rf %buildroot
@@ -40,6 +40,16 @@
%defattr(-, root, root)
/etc/dummy
%changelog
+* Thu Mar 20 2008 gregkh@suse.de
+- fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the
+ code is not upstream and we aren't allowed to add non-GPL exports to
+ our kernel tree.
+* Thu Mar 20 2008 gregkh@suse.de
+- update to 2.6.25-rc6-git5
+- refresh patches to apply cleanly
+* Thu Mar 20 2008 gregkh@suse.de
+- update to 2.6.25-rc6-git4
+- refresh patches to apply cleanly
* Thu Mar 20 2008 agruen@suse.de
- scripts/tar-up.sh: Rename --kbuild option to --source-timestamp.
For generating the source timestamp, use HEAD as the branch
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.l20160/_old 2008-03-22 11:49:30.000000000 +0100
+++ /var/tmp/diff_new_pack.l20160/_new 2008-03-22 11:49:30.000000000 +0100
@@ -44,7 +44,7 @@
Name: kernel-kdump
Summary: kernel for kdump
Version: 2.6.25
-Release: 8
+Release: 9
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -179,7 +179,7 @@
-Source Timestamp: 2008-03-20 11:15:04 +0100
+Source Timestamp: 2008-03-20 22:57:18 +0100
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
@@ -258,7 +258,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-03-20 11:15:04 +0100
+Source Timestamp: 2008-03-20 22:57:18 +0100
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
@@ -270,7 +270,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs < %_builddir/%{name}-%{version}/.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <minimum_to_wake = (minimum - (b - buf));
if (!input_available_p(tty, 0)) {
@@ -68,7 +68,7 @@
break;
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
-@@ -4021,6 +4021,31 @@ void vcs_scr_writew(struct vc_data *vc,
+@@ -4021,6 +4021,31 @@
}
}
@@ -102,7 +102,7 @@
*/
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
-@@ -1929,4 +1929,8 @@ if FB || SGI_NEWPORT_CONSOLE
+@@ -1943,4 +1943,8 @@
source "drivers/video/logo/Kconfig"
endif
@@ -113,7 +113,7 @@
endmenu
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
-@@ -14,6 +14,7 @@ fb-objs := $(f
+@@ -14,6 +14,7 @@
obj-$(CONFIG_VT) += console/
obj-$(CONFIG_LOGO) += logo/
obj-y += backlight/ display/
@@ -2557,7 +2557,7 @@
/*
* Accelerated handlers.
-@@ -47,6 +50,13 @@ static void bit_bmove(struct vc_data *vc
+@@ -47,6 +50,13 @@
{
struct fb_copyarea area;
@@ -2571,7 +2571,7 @@
area.sx = sx * vc->vc_font.width;
area.sy = sy * vc->vc_font.height;
area.dx = dx * vc->vc_font.width;
-@@ -63,6 +73,13 @@ static void bit_clear(struct vc_data *vc
+@@ -63,6 +73,13 @@
int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
struct fb_fillrect region;
@@ -2585,7 +2585,7 @@
region.color = attr_bgcol_ec(bgshift, vc, info);
region.dx = sx * vc->vc_font.width;
region.dy = sy * vc->vc_font.height;
-@@ -160,6 +177,13 @@ static void bit_putcs(struct vc_data *vc
+@@ -160,6 +177,13 @@
image.height = vc->vc_font.height;
image.depth = 1;
@@ -2599,7 +2599,7 @@
if (attribute) {
buf = kmalloc(cellsize, GFP_KERNEL);
if (!buf)
-@@ -213,6 +237,13 @@ static void bit_clear_margins(struct vc_
+@@ -213,6 +237,13 @@
unsigned int bs = info->var.yres - bh;
struct fb_fillrect region;
@@ -2613,7 +2613,7 @@
region.color = attr_bgcol_ec(bgshift, vc, info);
region.rop = ROP_COPY;
-@@ -379,6 +410,14 @@ static void bit_cursor(struct vc_data *v
+@@ -379,6 +410,14 @@
cursor.image.depth = 1;
cursor.rop = ROP_XOR;
@@ -2640,7 +2640,7 @@
#ifdef FBCONDEBUG
# define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
-@@ -105,7 +108,11 @@ enum {
+@@ -105,7 +108,11 @@
static struct display fb_display[MAX_NR_CONSOLES];
@@ -2652,7 +2652,7 @@
static signed char con2fb_map_boot[MAX_NR_CONSOLES];
#ifndef MODULE
static int logo_height;
-@@ -580,6 +587,10 @@ static int fbcon_takeover(int show_logo)
+@@ -580,6 +587,10 @@
for (i = first_fb_vc; i <= last_fb_vc; i++)
con2fb_map[i] = info_idx;
@@ -2663,7 +2663,7 @@
err = take_over_console(&fb_con, first_fb_vc, last_fb_vc,
fbcon_is_default);
-@@ -1182,6 +1193,16 @@ static void fbcon_init(struct vc_data *v
+@@ -1182,6 +1193,16 @@
new_rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
new_cols /= vc->vc_font.width;
new_rows /= vc->vc_font.height;
@@ -2680,7 +2680,7 @@
vc_resize(vc, new_cols, new_rows);
/*
-@@ -1874,6 +1895,10 @@ static int fbcon_scroll(struct vc_data *
+@@ -1874,6 +1895,10 @@
fbcon_softback_note(vc, t, count);
if (logo_shown >= 0)
goto redraw_up;
@@ -2691,7 +2691,7 @@
switch (p->scrollmode) {
case SCROLL_MOVE:
fbcon_redraw_blit(vc, info, p, t, b - t - count,
-@@ -1965,6 +1990,10 @@ static int fbcon_scroll(struct vc_data *
+@@ -1965,6 +1990,10 @@
count = vc->vc_rows;
if (logo_shown >= 0)
goto redraw_down;
@@ -2702,7 +2702,7 @@
switch (p->scrollmode) {
case SCROLL_MOVE:
fbcon_redraw_blit(vc, info, p, b - 1, b - t - count,
-@@ -2113,6 +2142,14 @@ static void fbcon_bmove_rec(struct vc_da
+@@ -2113,6 +2142,14 @@
}
return;
}
@@ -2717,7 +2717,7 @@
ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
height, width);
}
-@@ -2221,6 +2258,10 @@ static int fbcon_switch(struct vc_data *
+@@ -2221,6 +2258,10 @@
info = registered_fb[con2fb_map[vc->vc_num]];
ops = info->fbcon_par;
@@ -2728,7 +2728,7 @@
if (softback_top) {
if (softback_lines)
fbcon_set_origin(vc);
-@@ -2350,6 +2391,12 @@ static void fbcon_generic_blank(struct v
+@@ -2350,6 +2391,12 @@
{
struct fb_event event;
@@ -2741,7 +2741,7 @@
if (blank) {
unsigned short charmask = vc->vc_hi_font_mask ?
0x1ff : 0xff;
-@@ -2550,6 +2597,12 @@ static int fbcon_do_set_font(struct vc_d
+@@ -2550,6 +2597,12 @@
cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres);
rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
@@ -2793,7 +2793,7 @@
const u_char *fontdata;
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
-@@ -174,7 +174,10 @@ static int vesafb_setcolreg(unsigned reg
+@@ -174,7 +174,10 @@
return err;
}
@@ -2805,7 +2805,7 @@
.owner = THIS_MODULE,
.fb_setcolreg = vesafb_setcolreg,
.fb_pan_display = vesafb_pan_display,
-@@ -258,6 +261,9 @@ static int __init vesafb_probe(struct pl
+@@ -258,6 +261,9 @@
* option to simply use size_total as that
* wastes plenty of kernel address space. */
size_remap = size_vmode * 2;
@@ -2817,7 +2817,7 @@
if (size_remap < size_vmode)
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
-@@ -106,6 +106,9 @@ struct vc_data {
+@@ -106,6 +106,9 @@
struct vc_data **vc_display_fg; /* [!] Ptr to var holding fg console for this display */
unsigned long vc_uni_pagedir;
unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */
@@ -2829,7 +2829,7 @@
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
-@@ -835,6 +835,14 @@ struct fb_info {
+@@ -835,6 +835,14 @@
void *fbcon_par; /* fbcon use-only private area */
/* From here on everything is device dependent */
void *par;
@@ -2846,7 +2846,7 @@
#ifdef MODULE
--- a/kernel/panic.c
+++ b/kernel/panic.c
-@@ -109,6 +109,12 @@ NORET_TYPE void panic(const char * fmt,
+@@ -109,6 +109,12 @@
* We can't use the "normal" timers since we just panicked..
*/
printk(KERN_EMERG "Rebooting in %d seconds..",panic_timeout);
@@ -2859,7 +2859,7 @@
for (i = 0; i < panic_timeout*1000; ) {
touch_nmi_watchdog();
i += panic_blink(i);
-@@ -133,6 +139,12 @@ NORET_TYPE void panic(const char * fmt,
+@@ -133,6 +139,12 @@
disabled_wait(caller);
#endif
local_irq_enable();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/dm-raid45-2.6.24-20080602a.patch new/patches.suse/dm-raid45-2.6.24-20080602a.patch
--- old/patches.suse/dm-raid45-2.6.24-20080602a.patch 2008-03-05 19:19:44.000000000 +0100
+++ new/patches.suse/dm-raid45-2.6.24-20080602a.patch 2008-03-21 22:53:41.000000000 +0100
@@ -494,12 +494,12 @@
+ mempool_free(obj, cl->objs_pool);
+}
+
-+EXPORT_SYMBOL(dm_mem_cache_client_create);
-+EXPORT_SYMBOL(dm_mem_cache_client_destroy);
-+EXPORT_SYMBOL(dm_mem_cache_alloc);
-+EXPORT_SYMBOL(dm_mem_cache_free);
-+EXPORT_SYMBOL(dm_mem_cache_grow);
-+EXPORT_SYMBOL(dm_mem_cache_shrink);
++EXPORT_SYMBOL_GPL(dm_mem_cache_client_create);
++EXPORT_SYMBOL_GPL(dm_mem_cache_client_destroy);
++EXPORT_SYMBOL_GPL(dm_mem_cache_alloc);
++EXPORT_SYMBOL_GPL(dm_mem_cache_free);
++EXPORT_SYMBOL_GPL(dm_mem_cache_grow);
++EXPORT_SYMBOL_GPL(dm_mem_cache_shrink);
+
+MODULE_DESCRIPTION(DM_NAME " dm memory cache");
+MODULE_AUTHOR("Heinz Mauelshagen ");
@@ -5965,28 +5965,28 @@
+ rh->wake(rh->wake_context);
+}
+
-+EXPORT_SYMBOL(rh_bio_to_region);
-+EXPORT_SYMBOL(rh_sector_to_region);
-+EXPORT_SYMBOL(rh_region_to_sector);
-+EXPORT_SYMBOL(rh_init);
-+EXPORT_SYMBOL(rh_exit);
-+EXPORT_SYMBOL(rh_state);
-+EXPORT_SYMBOL(rh_update_states);
-+EXPORT_SYMBOL(rh_flush);
-+EXPORT_SYMBOL(rh_inc);
-+EXPORT_SYMBOL(rh_inc_pending);
-+EXPORT_SYMBOL(rh_dec);
-+EXPORT_SYMBOL(rh_delay);
-+EXPORT_SYMBOL(rh_delay_by_region);
-+EXPORT_SYMBOL(rh_recovery_prepare);
-+EXPORT_SYMBOL(rh_recovery_start);
-+EXPORT_SYMBOL(rh_recovery_end);
-+EXPORT_SYMBOL(rh_stop_recovery);
-+EXPORT_SYMBOL(rh_start_recovery);
-+EXPORT_SYMBOL(rh_reg_get_context);
-+EXPORT_SYMBOL(rh_reg_set_context);
-+EXPORT_SYMBOL(rh_get_region_key);
-+EXPORT_SYMBOL(rh_get_region_size);
++EXPORT_SYMBOL_GPL(rh_bio_to_region);
++EXPORT_SYMBOL_GPL(rh_sector_to_region);
++EXPORT_SYMBOL_GPL(rh_region_to_sector);
++EXPORT_SYMBOL_GPL(rh_init);
++EXPORT_SYMBOL_GPL(rh_exit);
++EXPORT_SYMBOL_GPL(rh_state);
++EXPORT_SYMBOL_GPL(rh_update_states);
++EXPORT_SYMBOL_GPL(rh_flush);
++EXPORT_SYMBOL_GPL(rh_inc);
++EXPORT_SYMBOL_GPL(rh_inc_pending);
++EXPORT_SYMBOL_GPL(rh_dec);
++EXPORT_SYMBOL_GPL(rh_delay);
++EXPORT_SYMBOL_GPL(rh_delay_by_region);
++EXPORT_SYMBOL_GPL(rh_recovery_prepare);
++EXPORT_SYMBOL_GPL(rh_recovery_start);
++EXPORT_SYMBOL_GPL(rh_recovery_end);
++EXPORT_SYMBOL_GPL(rh_stop_recovery);
++EXPORT_SYMBOL_GPL(rh_start_recovery);
++EXPORT_SYMBOL_GPL(rh_reg_get_context);
++EXPORT_SYMBOL_GPL(rh_reg_set_context);
++EXPORT_SYMBOL_GPL(rh_get_region_key);
++EXPORT_SYMBOL_GPL(rh_get_region_size);
+
+MODULE_DESCRIPTION(DM_NAME " region hash");
+MODULE_AUTHOR("Heinz Mauelshagen ");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/nfs4acl-ext3.diff new/patches.suse/nfs4acl-ext3.diff
--- old/patches.suse/nfs4acl-ext3.diff 2008-03-06 17:36:47.000000000 +0100
+++ new/patches.suse/nfs4acl-ext3.diff 2008-03-21 22:53:41.000000000 +0100
@@ -2084,7 +2084,7 @@
+ *acl = x.acl;
+ return -ENOMEM;
+}
-+EXPORT_SYMBOL(nfs4acl_apply_masks);
++EXPORT_SYMBOL_GPL(nfs4acl_apply_masks);
--- /dev/null
+++ b/fs/nfs4acl_xattr.c
@@ -0,0 +1,154 @@
@@ -2204,7 +2204,7 @@
+ }
+ return size;
+}
-+EXPORT_SYMBOL(nfs4acl_xattr_size);
++EXPORT_SYMBOL_GPL(nfs4acl_xattr_size);
+
+void
+nfs4acl_to_xattr(const struct nfs4acl *acl, void *buffer)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiser4-exports new/patches.suse/reiser4-exports
--- old/patches.suse/reiser4-exports 2008-03-12 18:17:15.000000000 +0100
+++ new/patches.suse/reiser4-exports 2008-03-21 22:53:42.000000000 +0100
@@ -15,11 +15,11 @@
---
mm/filemap.c | 4 ++++
- 1 file changed, 4 insertions(+)
+ 1 files changed, 4 insertions(+)
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -137,6 +137,7 @@ void __remove_from_page_cache(struct pag
+@@ -137,6 +137,7 @@
dec_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE);
}
}
@@ -27,7 +27,7 @@
void remove_from_page_cache(struct page *page)
{
-@@ -148,6 +149,7 @@ void remove_from_page_cache(struct page
+@@ -148,6 +149,7 @@
__remove_from_page_cache(page);
write_unlock_irq(&mapping->tree_lock);
}
@@ -35,7 +35,7 @@
static int sync_page(void *word)
{
-@@ -495,6 +497,7 @@ int add_to_page_cache_lru(struct page *p
+@@ -495,6 +497,7 @@
lru_cache_add(page);
return ret;
}
@@ -43,7 +43,7 @@
#ifdef CONFIG_NUMA
struct page *__page_cache_alloc(gfp_t gfp)
-@@ -753,6 +756,7 @@ unsigned find_get_pages(struct address_s
+@@ -756,6 +759,7 @@
read_unlock_irq(&mapping->tree_lock);
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiser4-sync_inodes new/patches.suse/reiser4-sync_inodes
--- old/patches.suse/reiser4-sync_inodes 2008-03-06 17:36:48.000000000 +0100
+++ new/patches.suse/reiser4-sync_inodes 2008-03-21 22:53:42.000000000 +0100
@@ -46,7 +46,7 @@
+ spin_unlock(&inode_lock);
return; /* Leave any unwritten inodes on s_io */
}
-+EXPORT_SYMBOL(generic_sync_sb_inodes);
++EXPORT_SYMBOL_GPL(generic_sync_sb_inodes);
+
+static void
+sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/stack-unwind new/patches.suse/stack-unwind
--- old/patches.suse/stack-unwind 2008-03-12 18:17:15.000000000 +0100
+++ new/patches.suse/stack-unwind 2008-03-21 22:53:42.000000000 +0100
@@ -1914,7 +1914,7 @@
+#undef CASES
+#undef FRAME_REG
+}
-+EXPORT_SYMBOL(unwind);
++EXPORT_SYMBOL_GPL(unwind);
+
+int unwind_init_frame_info(struct unwind_frame_info *info,
+ struct task_struct *tsk,
@@ -1926,7 +1926,7 @@
+
+ return 0;
+}
-+EXPORT_SYMBOL(unwind_init_frame_info);
++EXPORT_SYMBOL_GPL(unwind_init_frame_info);
+
+/*
+ * Prepare to unwind a blocked task.
@@ -1940,7 +1940,7 @@
+
+ return 0;
+}
-+EXPORT_SYMBOL(unwind_init_blocked);
++EXPORT_SYMBOL_GPL(unwind_init_blocked);
+
+/*
+ * Prepare to unwind the currently running thread.
@@ -1955,7 +1955,7 @@
+
+ return arch_unwind_init_running(info, callback, arg);
+}
-+EXPORT_SYMBOL(unwind_init_running);
++EXPORT_SYMBOL_GPL(unwind_init_running);
+
+/*
+ * Unwind until the return pointer is in user-land (or until an error
@@ -1973,7 +1973,7 @@
+
+ return 0;
+}
-+EXPORT_SYMBOL(unwind_to_user);
++EXPORT_SYMBOL_GPL(unwind_to_user);
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -468,6 +468,24 @@ config FRAME_POINTER
++++++ patches.uml.tar.bz2 ++++++
++++++ patches.xen.tar.bz2 ++++++
++++ 13060 lines of diff (skipped)
++++++ series.conf ++++++
--- kernel-source/series.conf 2008-03-20 18:39:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2008-03-22 08:40:33.000000000 +0100
@@ -28,7 +28,7 @@
# Send separate patches upstream if you find a problem...
########################################################
patches.kernel.org/patch-2.6.25-rc6
- patches.kernel.org/patch-2.6.25-rc6-git3
+ patches.kernel.org/patch-2.6.25-rc6-git5
########################################################
# Build fixes that apply to the vanilla kernel too.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org