Conflicting patches included into 2.1.110-3

Dominik Kubla (dominik.kubla@uni-mainz.de)
Tue, 21 Jul 1998 00:50:05 +0200 (MET DST)


This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
Send mail to mime@docserver.cac.washington.edu for more info.

---559023410-851401618-900975005=:2326
Content-Type: TEXT/PLAIN; charset=US-ASCII

Hi Linus,

looks like i have (totally unintentionally i assure you!) created some
confusion: while i sent you a patch which reverts changes made to
arch/alpha/kernel/alpha_ksyms.c in 2.1.109, and which you included in
2.1.110-2, Richard Henderson sent you the missing part of the patch
included in 2.1.109. So 2.1.110-3 includes two conflicting patches.
To fix this, _REMOVE_ the attached patch from the sources...

Sorry for generating the confusion, but at the time i sent you the patch
it was the only way to get 2.1.109 to work on an UDB.

Yours,
Dominik Kubla

-- 
The text above represents my personal opinion and does not represent the
official position of my employer on the issue(s) discussed.  Any official
statement by me on behalf of my employer will be marked as such.

---559023410-851401618-900975005=:2326 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="alpha_ksyms.patch" Content-Transfer-Encoding: BASE64 Content-ID: <Pine.SOL.3.95.980721005005.2326B@arthur.zdv.Uni-Mainz.DE> Content-Description:

ZGlmZiAtdSAtLXJlY3Vyc2l2ZSAtLW5ldy1maWxlIHYyLjEuMTA5L2xpbnV4 L2FyY2gvYWxwaGEva2VybmVsL2FscGhhX2tzeW1zLmMgbGludXgvYXJjaC9h bHBoYS9rZXJuZWwvYWxwaGFfa3N5bXMuYw0KLS0tIHYyLjEuMTA5L2xpbnV4 L2FyY2gvYWxwaGEva2VybmVsL2FscGhhX2tzeW1zLmMgICAgICBUaHUgSnVs IDE2IDE4OjA5OjIzIDE5OTgrKysgbGludXgvYXJjaC9hbHBoYS9rZXJuZWwv YWxwaGFfa3N5bXMuYyAgICAgICBTYXQgSnVsIDE4IDE0OjA0OjUyIDE5OTgN CkBAIC02NCw3ICs2NCw3IEBADQogRVhQT1JUX1NZTUJPTChfd3JpdGVsKTsN CiBFWFBPUlRfU1lNQk9MKF9tZW1jcHlfZnJvbWlvKTsNCiBFWFBPUlRfU1lN Qk9MKF9tZW1jcHlfdG9pbyk7DQotRVhQT1JUX1NZTUJPTChfbWVtc2V0X2Nf aW8pOw0KK0VYUE9SVF9TWU1CT0woX21lbXNldF9pbyk7DQogRVhQT1JUX1NZ TUJPTChpbnNiKTsNCiBFWFBPUlRfU1lNQk9MKGluc3cpOw0KIEVYUE9SVF9T WU1CT0woaW5zbCk7DQpAQCAtODcsNyArODcsNiBAQA0KIEVYUE9SVF9TWU1C T0wobWVtbW92ZSk7DQogRVhQT1JUX1NZTUJPTChfX21lbWNweSk7DQogRVhQ T1JUX1NZTUJPTChfX21lbXNldCk7DQotRVhQT1JUX1NZTUJPTChfX21lbXNl dHcpOw0KIEVYUE9SVF9TWU1CT0woX19jb25zdGFudF9jX21lbXNldCk7DQoN CiBFWFBPUlRfU1lNQk9MKGR1bXBfdGhyZWFkKTsNCg== ---559023410-851401618-900975005=:2326--

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.altern.org/andrebalsa/doc/lkml-faq.html