On Sun, Nov 14, 2010 at 7:14 PM, Daniel Vetter <daniel at ffwll.ch> wrote:
> On Sun, Nov 14, 2010 at 06:52:35PM +0100, Sedat Dilek wrote:
>> NOPE, linux-next is up-to-date what drm-next concerns.
>
> Sorry for wasting your time, I've totally forgotten about a patch in
> drm-intel-next
> (git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git),
> namely:
>
> commit d935cc61d466f6cc7514032835f4fc379cb7e2ca
> Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> Date: ? Thu Sep 16 15:13:11 2010 +0200
>
> ? ?drm_mm: add support for range-restricted fair-lru scans
>
> That one's necessary, too.
>
> Yours, Daniel
> --
> Daniel Vetter
> Mail: daniel at ffwll.ch
> Mobile: +41 (0)79 365 57 48
>
Hmm, I tried with your patches from ML plus missing patch and
extracted patches from ~danvet/drm/embed-gtt-space.
Sth. messed up....
Could be a "big.diff" is needed, *not* a chronological series.
I will do a big.diff from 0081..0089 and apply
0008-drm_mm-add-support-for-range-restricted-fair-lru-sca.patch first.
- Sedat -
sd at tbox:~/src/linux-2.6/linux-2.6.37-rc1$ grep ^+ debian/patches/series/base
+ linux-next/patch-v2.6.37-rc1-next-20101112
+ linux-next/0001-Remove-localversion-next.patch
+ for-linux-next/next-iwlwifi-fix-modular-legacy-build-errors.patch
+ mm-fixes/cgroup-Avoid-a-memset-by-using-vzalloc.patch
+ mm-fixes/kmemleak-remove-memset-by-using-kzalloc.patch
+ linux-2.6-block-for-2.6.38-core/linux-2.6-block-for-2.6.38-core.patch
+ tpm-fix/tpm-Autodetect-itpm-devices.patch
+
extracted-from-embed-gtt-space/0008-drm_mm-add-support-for-range-restricted-fair-lru-sca.patch
+
extracted-from-embed-gtt-space/0081-drm-nouveau-don-t-munge-in-drm_mm-internals.patch
+ extracted-from-embed-gtt-space/0082-drm-mm-track-free-areas-implicitly.patch
+
extracted-from-embed-gtt-space/0083-drm-mm-extract-node-insert-helper-functions.patch
+
extracted-from-embed-gtt-space/0084-drm-mm-add-api-for-embedding-struct-drm_mm_node.patch
+
extracted-from-embed-gtt-space/0085-drm-i915-embed-struct-drm_mm_node-into-struct-drm_i9.patch
+ extracted-from-embed-gtt-space/0086-drm-i915-kill-obj-gtt_offset.patch
+ extracted-from-embed-gtt-space/0087-drm-i915-kill-gtt_list.patch
+
extracted-from-embed-gtt-space/0088-drm-mm-add-helper-to-unwind-scan-state.patch
+
extracted-from-embed-gtt-space/0089-drm-i915-use-drm_mm_for_each_scanned_node_reverse-he.patch
+ debian/version.patch
+ debian/kernelvariables-2.6.37.patch
+ debian/doc-build-parallel.patch
+ bugfix/ia64/hardcode-arch-script-output.patch
+ bugfix/mips/disable-advansys.patch
+ bugfix/arm/disable-scsi_acard.patch
+ debian/mips-disable-werror.patch
+ bugfix/powerpc/lpar-console.patch
+ features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
+ debian/arch-sh4-fix-uimage-build.patch
+ bugfix/mips/mips-ide-flush-dcache.patch
+ bugfix/all/qla4xxx-Fix-build-on-some-architectures-lacking-64-bit-I-O.patch
+
bugfix/x86/Skip-looking-for-ioapic-overrides-when-ioapics-are-not-present.patch
sd at tbox:~/src/linux-2.6/linux-2.6.37-rc1$
sd at tbox:~/src/linux-2.6/linux-2.6.37-rc1$
sd at tbox:~/src/linux-2.6/linux-2.6.37-rc1$
sd at tbox:~/src/linux-2.6/linux-2.6.37-rc1$ LC_ALL=C fakeroot make -f
debian/rules.gen setup_i386_none_686 2>&1 | tee ../setup.log
make -f debian/rules.real setup-flavour ABINAME='' ARCH='i386'
COMPILER='gcc-4.4' FEATURESET='none' FLAVOUR='686'
INITRD_CMD='update-initramfs' KCONFIG='debian/config/config
debian/config/kernelarch-x86/config
debian/config/kernelarch-x86/config-arch-32
debian/config/i386/none/config.686' KERNEL_ARCH='x86'
LOCALVERSION='-686' LOCALVERSION_HEADERS='' LOCALVERSION_IMAGE='-686'
MAJOR='2.6' MODULES='True'
SOURCEVERSION='2.6.37~rc1-11~next~20101112.1~dileks.1' TYPE='plain'
UPSTREAMVERSION='2.6.37-rc1' VERSION='2.6.37'
make[1]: Entering directory `/home/sd/src/linux-2.6/linux-2.6.37-rc1'
rm -rf 'debian/build/source'
mkdir -p 'debian/build/source'
cp -al COPYING CREDITS Documentation Kbuild Kconfig MAINTAINERS
Makefile README REPORTING-BUGS arch block crypto drivers firmware fs
include init ipc kernel lib mm net samples scripts security sound
tools usr virt .gitignore .mailmap 'debian/build/source'
cd 'debian/build/source'; python
'/home/sd/src/linux-2.6/linux-2.6.37-rc1/debian/bin/patch.apply'
--overwrite-home='/home/sd/src/linux-2.6/linux-2.6.37-rc1/debian/patches'
/home/sd/src/linux-2.6/linux-2.6.37-rc1/debian/bin/patch.apply:81:
DeprecationWarning: functions overriding warnings.showwarning() must
support the 'line' argument
warn('No %s file, assuming Debian Linux %s' % (self._file, upstream))
Warning: No version.Debian file, assuming Debian Linux 2.6.37~rc1
5 out of 11 hunks FAILED -- saving rejects to file drivers/gpu/drm/drm_mm.c.rej
Error: Patch failed
--> Try to apply base.
(+) OK linux-next/patch-v2.6.37-rc1-next-20101112
(+) OK linux-next/0001-Remove-localversion-next.patch
(+) OK for-linux-next/next-iwlwifi-fix-modular-legacy-build-errors.patch
(+) OK mm-fixes/cgroup-Avoid-a-memset-by-using-vzalloc.patch
(+) OK mm-fixes/kmemleak-remove-memset-by-using-kzalloc.patch
(+) OK linux-2.6-block-for-2.6.38-core/linux-2.6-block-for-2.6.38-core.patch
(+) OK tpm-fix/tpm-Autodetect-itpm-devices.patch
(+) OK
extracted-from-embed-gtt-space/0008-drm_mm-add-support-for-range-restricted-fair-lru-sca.patch
(+) OK
extracted-from-embed-gtt-space/0081-drm-nouveau-don-t-munge-in-drm_mm-internals.patch
(+) FAIL
extracted-from-embed-gtt-space/0082-drm-mm-track-free-areas-implicitly.patch
make[1]: *** [debian/stamps/source] Error 1
make[1]: Leaving directory `/home/sd/src/linux-2.6/linux-2.6.37-rc1'
make: *** [setup_i386_none_686_real] Error 2
sd at tbox:~/src/linux-2.6/linux-2.6.37-rc1$
