Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=9701
This commit is contained in:
parent
bf461b46de
commit
df6d9977be
|
@ -8,6 +8,7 @@ from debian_linux.config import ConfigCoreDump
|
||||||
|
|
||||||
class checker(object):
|
class checker(object):
|
||||||
def __init__(self, dir, arch, featureset, flavour):
|
def __init__(self, dir, arch, featureset, flavour):
|
||||||
|
self.arch, self.featureset, self.flavour = arch, featureset, flavour
|
||||||
self.config = ConfigCoreDump(fp = file("debian/config.defines.dump"))
|
self.config = ConfigCoreDump(fp = file("debian/config.defines.dump"))
|
||||||
self.filename_new = "%s/Module.symvers" % dir
|
self.filename_new = "%s/Module.symvers" % dir
|
||||||
abiname = self.config['abi',]['abiname']
|
abiname = self.config['abi',]['abiname']
|
||||||
|
@ -27,11 +28,11 @@ class checker(object):
|
||||||
add = set(add_info.keys())
|
add = set(add_info.keys())
|
||||||
change = set(change_info.keys())
|
change = set(change_info.keys())
|
||||||
remove = set(remove_info.keys())
|
remove = set(remove_info.keys())
|
||||||
add_ignore, change_ignore, remove_ignore = self._ignore(add_info, change_info, remove_info)
|
ignore = self._ignore(add_info, change_info, remove_info)
|
||||||
|
|
||||||
add_effective = add - add_ignore
|
add_effective = add - ignore
|
||||||
change_effective = change - change_ignore
|
change_effective = change - ignore
|
||||||
remove_effective = remove - remove_ignore
|
remove_effective = remove - ignore
|
||||||
|
|
||||||
if change_effective or remove_effective:
|
if change_effective or remove_effective:
|
||||||
out.write("ABI has changed! Refusing to continue.\n")
|
out.write("ABI has changed! Refusing to continue.\n")
|
||||||
|
@ -50,7 +51,7 @@ class checker(object):
|
||||||
t.sort()
|
t.sort()
|
||||||
for symbol in t:
|
for symbol in t:
|
||||||
info = []
|
info = []
|
||||||
if symbol in add_ignore:
|
if symbol in ignore:
|
||||||
info.append("ignored")
|
info.append("ignored")
|
||||||
for i in ('module', 'version', 'export'):
|
for i in ('module', 'version', 'export'):
|
||||||
info.append("%s: %s" % (i, add_info[symbol][i]))
|
info.append("%s: %s" % (i, add_info[symbol][i]))
|
||||||
|
@ -61,7 +62,7 @@ class checker(object):
|
||||||
t.sort()
|
t.sort()
|
||||||
for symbol in t:
|
for symbol in t:
|
||||||
info = []
|
info = []
|
||||||
if symbol in change_ignore:
|
if symbol in ignore:
|
||||||
info.append("ignored")
|
info.append("ignored")
|
||||||
s = change_info[symbol]
|
s = change_info[symbol]
|
||||||
changes = s['changes']
|
changes = s['changes']
|
||||||
|
@ -77,16 +78,20 @@ class checker(object):
|
||||||
t.sort()
|
t.sort()
|
||||||
for symbol in t:
|
for symbol in t:
|
||||||
info = []
|
info = []
|
||||||
if symbol in remove_ignore:
|
if symbol in ignore:
|
||||||
info.append("ignored")
|
info.append("ignored")
|
||||||
for i in ('module', 'version', 'export'):
|
for i in ('module', 'version', 'export'):
|
||||||
info.append("%s: %s" % (i, add_info[symbol][i]))
|
info.append("%s: %s" % (i, remove_info[symbol][i]))
|
||||||
out.write("%-48s %s\n" % (symbol, ", ".join(info)))
|
out.write("%-48s %s\n" % (symbol, ", ".join(info)))
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
def _ignore(self, add, change, remove):
|
def _ignore(self, add, change, remove):
|
||||||
return set(), set(), set()
|
config = self.config.merge('abi', self.arch, self.featureset, self.flavour)
|
||||||
|
ignores = config.get('ignore-changes', None)
|
||||||
|
if ignores is None:
|
||||||
|
return set()
|
||||||
|
return set(ignores.split())
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
sys.exit(checker(*sys.argv[1:])(sys.stdout))
|
sys.exit(checker(*sys.argv[1:])(sys.stdout))
|
||||||
|
|
|
@ -104,6 +104,59 @@ linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
|
||||||
|
|
||||||
-- Bastian Blank <waldi@debian.org> Fri, 26 Oct 2007 00:15:41 +0200
|
-- Bastian Blank <waldi@debian.org> Fri, 26 Oct 2007 00:15:41 +0200
|
||||||
|
|
||||||
|
linux-2.6 (2.6.22-6) unstable; urgency=low
|
||||||
|
|
||||||
|
[ Martin Michlmayr ]
|
||||||
|
* [mips] Add IP22 (SGI Indy) patches from Thomas Bogendoerfer:
|
||||||
|
- Disable EARLY PRINTK because it breaks serial.
|
||||||
|
- fix wrong argument order.
|
||||||
|
- wrong check for second HPC. Closes: #448488
|
||||||
|
|
||||||
|
[ maximilian attems ]
|
||||||
|
* Add stable release 2.6.22.11 - minus ipv6 abi breaker:
|
||||||
|
- libertas: fix endianness breakage
|
||||||
|
- libertas: more endianness breakage
|
||||||
|
- Fix ROSE module unload oops.
|
||||||
|
- Add get_unaligned to ieee80211_get_radiotap_len
|
||||||
|
- Fix ipv6 redirect processing, leads to TAHI failures.
|
||||||
|
- i915: fix vbl swap allocation size.
|
||||||
|
- Fix ESP host instance numbering.
|
||||||
|
- Fix TCP MD5 on big-endian.
|
||||||
|
- Fix zero length socket write() semantics.
|
||||||
|
- Fix sys_ipc() SEMCTL on sparc64.
|
||||||
|
- Fix TCP initial sequence number selection.
|
||||||
|
- lockdep: fix mismatched lockdep_depth/curr_chain_hash
|
||||||
|
- V4L: ivtv: fix udma yuv bug
|
||||||
|
- Fix TCP's ->fastpath_cnt_hit handling.
|
||||||
|
- hwmon/lm87: Fix a division by zero
|
||||||
|
- hwmon/lm87: Disable VID when it should be
|
||||||
|
- hwmon/w83627hf: Fix setting fan min right after driver load
|
||||||
|
- hwmon/w83627hf: Don't assume bank 0
|
||||||
|
- netdrvr: natsemi: Fix device removal bug
|
||||||
|
- Fix ieee80211 handling of bogus hdrlength field
|
||||||
|
- mac80211: filter locally-originated multicast frames
|
||||||
|
- POWERPC: Fix handling of stfiwx math emulation
|
||||||
|
- dm9601: Fix receive MTU
|
||||||
|
- firewire: fix unloading of fw-ohci while devices are attached
|
||||||
|
- Fix cls_u32 error return handling.
|
||||||
|
- ACPI: disable lower idle C-states across suspend/resume
|
||||||
|
* Add stable release 2.6.22.12-rc1:
|
||||||
|
- genirq: cleanup mismerge artifact
|
||||||
|
- genirq: suppress resend of level interrupts
|
||||||
|
- genirq: mark io_apic level interrupts to avoid resend
|
||||||
|
- IB/uverbs: Fix checking of userspace object ownership
|
||||||
|
- minixfs: limit minixfs printks on corrupted dir i_size (CVE-2006-6058)
|
||||||
|
- param_sysfs_builtin memchr argument fix
|
||||||
|
- x86: fix global_flush_tlb() bug
|
||||||
|
- dm snapshot: fix invalidation deadlock
|
||||||
|
- Revert "x86_64: allocate sparsemem memmap above 4G"
|
||||||
|
|
||||||
|
[ Bastian Blank ]
|
||||||
|
* Update vserver patch to 2.2.0.5.
|
||||||
|
- Ignore symbols from never to be merged patch.
|
||||||
|
|
||||||
|
-- maximilian attems <maks@debian.org> Sun, 4 Nov 2007 17:35:51 +0100
|
||||||
|
|
||||||
linux-2.6 (2.6.22-5) unstable; urgency=low
|
linux-2.6 (2.6.22-5) unstable; urgency=low
|
||||||
|
|
||||||
[ maximilian attems ]
|
[ maximilian attems ]
|
||||||
|
|
Loading…
Reference in New Issue