# Will go away when VServer supports NetNS in mainline. Currently, it must be
# updated every time the PL kernel is updated.
-%define vini_pl_patch 551
+%define vini_pl_patch 561
%define specrelease 1
Patch010: linux-2.6-010-e1000e.patch
Patch020: linux-2.6-020-build-id.patch
+Patch030: linux-2.6-030-netns.patch
# These are patches picked up from Fedora/RHEL
Patch100: linux-2.6-100-build-nonintconfig.patch
Patch530: linux-2.6-530-built-by-support.patch
Patch540: linux-2.6-540-oom-kill.patch
Patch550: linux-2.6-550-raise-default-nfile-ulimit.patch
+Patch560: linux-2.6-560-mmconf.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
%ApplyPatch 20
# NetNS patch for VINI
-%if 0%{?_with_netns}
+%if 0%{?with_netns}
%ApplyPatch 30
%endif
%ApplyPatch 530
%ApplyPatch 540
%ApplyPatch 550
+%ApplyPatch 560
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
# break with later patches.
-%if 0%{?_with_netns}
+%if 0%{?with_netns}
%ApplyPatch %vini_pl_patch
%endif