$ git clean -d -x $ git reset $ git reset --hard $ git diff $ git pull remote: Counting objects: 89, done. Compressing objects: Unpacking 71 objects * refs/heads/origin: not updating to non-fast forward branch 'master' of git://kernel.ubuntu.com/ubuntu/ubuntu-hardy old...new: f13ea0d...9371d05 Trying really trivial in-index merge... fatal: Merge requires file-level merging Nope. Merging HEAD with 9371d05d26492631d39f9bfb6f9e98527ebf70d5 Merging: f13ea0d UBUNTU: SAUCE: Update lpia patches from moblin tree 9371d05 UBUNTU: ACPI: Add DMI check to disable power state check in power transition found 1 common ancestor(s): ac07a8b UBUNTU: Start new release Ubuntu-2.6.24-22.44 Removing debian/abi/2.6.24-21.43/abiname Removing debian/abi/2.6.24-21.43/amd64/generic Removing debian/abi/2.6.24-21.43/amd64/server Removing debian/abi/2.6.24-21.43/amd64/server.modules Removing debian/abi/2.6.24-21.43/hppa/hppa32 Removing debian/abi/2.6.24-21.43/hppa/hppa64 Removing debian/abi/2.6.24-21.43/i386/386 Removing debian/abi/2.6.24-21.43/i386/generic Removing debian/abi/2.6.24-21.43/i386/server Removing debian/abi/2.6.24-21.43/i386/virtual Removing debian/abi/2.6.24-21.43/ia64/itanium Removing debian/abi/2.6.24-21.43/ia64/mckinley Removing debian/abi/2.6.24-21.43/ia64/mckinley.modules Removing debian/abi/2.6.24-21.43/powerpc/powerpc Removing debian/abi/2.6.24-21.43/powerpc/powerpc-smp Removing debian/abi/2.6.24-21.43/powerpc/powerpc64-smp Removing debian/abi/2.6.24-21.43/sparc/sparc64 Removing debian/abi/2.6.24-21.43/sparc/sparc64-smp Auto-merging debian/binary-custom.d/lpia/patchset/0001-dabney_thermal.patch merge: warning: conflicts during merge CONFLICT (content): Merge conflict in debian/binary-custom.d/lpia/patchset/0001-dabney_thermal.patch Removing debian/binary-custom.d/rt/patchset/0043-02-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0044-03-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0045-04-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0046-05-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0047-06-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0048-07-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0049-08-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0050-09-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0051-10-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0052-11-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0053-12-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0054-13-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0055-14-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0056-15-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0057-16-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0058-17-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0059-18-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0060-ftrace-nop-calls.patch Removing debian/binary-custom.d/rt/patchset/0061-ftrace-move-memory-management-to-generic.patch Removing debian/binary-custom.d/rt/patchset/0062-ftrace-direct-calls.patch Removing debian/binary-custom.d/rt/patchset/0063-ftrace-filter-functions.patch Removing debian/binary-custom.d/rt/patchset/0064-ftrace-alloc-pages.patch Removing debian/binary-custom.d/rt/patchset/0065-ftrace-debug-use-preempt-disable-notrace.patch Removing debian/binary-custom.d/rt/patchset/0066-ftrace-irqsoff-smp-processor-id-fix.patch Removing debian/binary-custom.d/rt/patchset/0067-ftrace-lockdep-notrace-annotations.patch Removing debian/binary-custom.d/rt/patchset/0068-ftrace-dont-use-raw-irq-save.patch Removing debian/binary-custom.d/rt/patchset/0069-ftrace-max-update-fixes.patch Removing debian/binary-custom.d/rt/patchset/0070-ftrace-latest-updates.patch Removing debian/binary-custom.d/rt/patchset/0071-ftrace-flip-fix.patch Removing debian/binary-custom.d/rt/patchset/0073-tracer-use-sched-clock.patch Removing debian/binary-custom.d/rt/patchset/0074-tracer-event-trace.patch Removing debian/binary-custom.d/rt/patchset/0082-ppc-add-mcount.patch Removing debian/binary-custom.d/rt/patchset/0083-ppc-mcount-dummy-functions.patch Removing debian/binary-custom.d/rt/patchset/0084-ppc-mark-notrace-mainline.patch Removing debian/binary-custom.d/rt/patchset/0085-ppc-add-ppc32-mcount.patch Removing debian/binary-custom.d/rt/patchset/0086-ppc-select-mcount.patch Removing debian/binary-custom.d/rt/patchset/0115-latency-tracing-prctl-api-hack.patch Removing debian/binary-custom.d/rt/patchset/0116-ftrace-eventtrace-fixup.patch Removing debian/binary-custom.d/rt/patchset/0207-preempt-realtime-ftrace.patch Removing debian/binary-custom.d/rt/patchset/0417-ppc32_notrace_init_functions.patch Automatic merge failed; fix conflicts and then commit the result. $ $ git diff diff --cc debian/binary-custom.d/lpia/patchset/0001-dabney_thermal.patch index e7b43cc,855aed2..0000000 --- a/debian/binary-custom.d/lpia/patchset/0001-dabney_thermal.patch +++ b/debian/binary-custom.d/lpia/patchset/0001-dabney_thermal.patch @@@ -1562,17 -1562,17 +1562,31 @@@ index 826a52f..c83b76c 10064 /* -------------------------------------------------------------------------- Video Management -------------------------------------------------------------------------- */ ++<<<<<<< HEAD/debian/binary-custom.d/lpia/patchset/0001-dabney_thermal.patch +@@ -653,6 +703,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) + + if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){ + unsigned long tmp; ++ int result; + static int count = 0; + char *name; + name = kzalloc(MAX_NAME_LEN, GFP_KERNEL); +@@ -666,8 +717,25 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) + device->backlight->props.max_brightness = max_level; + device->backlight->props.brightness = (int)tmp; ++======= + @@ -664,6 +714,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) + kfree(obj); + + if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){ + + int result; + static int count = 0; + char *name; + name = kzalloc(MAX_NAME_LEN, GFP_KERNEL); + @@ -676,8 +727,25 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) + device->backlight->props.max_brightness = device->brightness->count-3; + device->backlight->props.brightness = acpi_video_get_brightness(device->backlight); ++>>>>>>> 9371d05d26492631d39f9bfb6f9e98527ebf70d5/debian/binary-custom.d/lpia/patchset/0001-dabney_thermal.patch backlight_update_status(device->backlight); - kfree(name); [?1l>$