upgrading with int'l patch

kees (kees@schoen.nl)
Sat, 27 Mar 1999 14:12:18 +0100 (MET)

Messages sorted by: [ date ][ thread ][ subject ][ author ]
Next message: Alan Cox: "Re: PCI 64 bit board on PCI 32 bit connector."
Previous message: Ruediger Oertel: "Re: [patch] __volatile__ needed in get_cycles()?"

Hello friends,
I'm tried to upgrade my source tree to 2.2.4. As almost always, after I do
the patch I scan the tree for *.rej files. There was one:
../net/ipv4/ip_output.c.
The reason for the reject was a area of code that the international patch
had inserted with #ifdef CONFIG_NET_SECURITY. The 2.2.4 patch overlaps
pieces of code here.
I like to alert other people for this and assume that the best way is to
keep the source tree clean and apply the (appropriate) international patch
as last.
Regards
Kees

-
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.tux.org/lkml/

Next message: Alan Cox: "Re: PCI 64 bit board on PCI 32 bit connector."
Previous message: Ruediger Oertel: "Re: [patch] __volatile__ needed in get_cycles()?"