The patch titled cris: fix the prototype of sync_serial_ioctl() has been removed from the -mm tree. Its filename was cris-fix-the-prototype-of-sync_serial_ioctl.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cris: fix the prototype of sync_serial_ioctl() From: WANG Cong <xiyou.wangcong@xxxxxxxxx> arch/cris/arch-v10/drivers/sync_serial.c:961: error: conflicting types for 'sync_serial_ioctl' Reported-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Signed-off-by: WANG Cong <xiyou.wangcong@xxxxxxxxx> Cc: Mikael Starvik <starvik@xxxxxxxx> Cc: Jesper Nilsson <jesper.nilsson@xxxxxxxx> Cc: <stable@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/cris/arch-v10/drivers/sync_serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/cris/arch-v10/drivers/sync_serial.c~cris-fix-the-prototype-of-sync_serial_ioctl arch/cris/arch-v10/drivers/sync_serial.c --- a/arch/cris/arch-v10/drivers/sync_serial.c~cris-fix-the-prototype-of-sync_serial_ioctl +++ a/arch/cris/arch-v10/drivers/sync_serial.c @@ -158,7 +158,7 @@ static int sync_serial_open(struct inode static int sync_serial_release(struct inode *inode, struct file *file); static unsigned int sync_serial_poll(struct file *filp, poll_table *wait); -static int sync_serial_ioctl(struct file *file, +static long sync_serial_ioctl(struct file *file, unsigned int cmd, unsigned long arg); static ssize_t sync_serial_write(struct file *file, const char *buf, size_t count, loff_t *ppos); _ Patches currently in -mm which might be from xiyou.wangcong@xxxxxxxxx are origin.patch kexec-remove-kmsg_dump_kexec.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