The patch titled kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long-fix has been removed from the -mm tree. Its filename was kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long-fix.patch This patch was dropped because it was folded into kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> kernel/time.c:578: error: conflicting types for 'jiffies_to_clock_t' include/linux/jiffies.h:306: note: previous declaration of 'jiffies_to_clock_t' was here Cc: John Stultz <john.stultz@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: hank <pyu@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/jiffies.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/jiffies.h~kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long-fix include/linux/jiffies.h --- a/include/linux/jiffies.h~kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long-fix +++ a/include/linux/jiffies.h @@ -303,7 +303,7 @@ extern void jiffies_to_timespec(const un extern unsigned long timeval_to_jiffies(const struct timeval *value); extern void jiffies_to_timeval(const unsigned long jiffies, struct timeval *value); -extern clock_t jiffies_to_clock_t(long x); +extern clock_t jiffies_to_clock_t(unsigned long x); extern unsigned long clock_t_to_jiffies(unsigned long x); extern u64 jiffies_64_to_clock_t(u64 x); extern u64 nsec_to_clock_t(u64 x); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch headers_check-is-broken.patch samples-hidraw-is-busted.patch linux-next.patch linux-next-git-rejects.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch cris-fix-a-build-error-in-kernel-forkc.patch kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver-fix.patch drivers-video-backlight-aat2870_blc-make-it-buildable-as-a-module.patch pci-enumerate-the-pci-device-only-removed-out-pci-hierarchy-of-os-when-re-scanning-pci-fix.patch drivers-cdrom-cdromc-relax-check-on-dvd-manufacturer-value.patch drivers-staging-speakup-devsynthc-fix-buffer-size-is-not-provably-correct-error.patch drivers-staging-dt3155v4l-dt3155v4lc-needs-slabh.patch drivers-staging-solo6x10-corec-needs-slabh.patch drivers-staging-solo6x10-p2mc-needs-slabh.patch staging-more-missing-slabh-inclusions.patch slab-use-numa_no_node.patch mm.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch lib-hexdumpc-make-hex2bin-return-the-updated-src-address.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix-fix.patch ipc-introduce-shm_rmid_forced-sysctl-testing.patch scatterlist-new-helper-functions.patch scatterlist-new-helper-functions-update-fix.patch kexec-remove-kmsg_dump_kexec.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch memblock-add-input-size-checking-to-memblock_find_region.patch memblock-add-input-size-checking-to-memblock_find_region-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html