The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/sg.c | 13 -------------
fs/compat_ioctl.c | 4 ----
fs/ioctl.c | 8 --------
include/linux/falloc.h | 7 -------
kernel/time/time.c | 4 ----
5 files changed, 36 deletions(-)
--- a/fs/compat_ioctl.c~linux-next-git-rejects
+++ a/fs/compat_ioctl.c
@@ -203,9 +203,6 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned i
#else
case FS_IOC_RESVSP:
case FS_IOC_RESVSP64:
-<<<<<<< HEAD
- goto found_handler;
-=======
error = ioctl_preallocate(f.file, 0, compat_ptr(arg));
goto out_fput;
case FS_IOC_UNRESVSP:
@@ -217,7 +214,6 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned i
error = ioctl_preallocate(f.file, FALLOC_FL_ZERO_RANGE,
compat_ptr(arg));
goto out_fput;
->>>>>>> linux-next/akpm-base
#endif
default:
--- a/drivers/scsi/sg.c~linux-next-git-rejects
+++ a/drivers/scsi/sg.c
@@ -435,21 +435,8 @@ sg_read(struct file *filp, char __user *
return PTR_ERR(old_hdr);
if (old_hdr->reply_len < 0) {
if (count >= SZ_SG_IO_HDR) {
-<<<<<<< HEAD
- sg_io_hdr_t *new_hdr;
- new_hdr = kmalloc(SZ_SG_IO_HDR, GFP_KERNEL);
- if (!new_hdr) {
- retval = -ENOMEM;
- goto free_old_hdr;
- }
- retval = get_sg_io_hdr(new_hdr, buf);
- req_pack_id = new_hdr->pack_id;
- kfree(new_hdr);
- if (retval) {
-=======
sg_io_hdr_t __user *p = (void __user *)buf;
if (get_user(req_pack_id, &p->pack_id)) {
->>>>>>> linux-next/akpm-base
retval = -EFAULT;
goto free_old_hdr;
}
--- a/fs/ioctl.c~linux-next-git-rejects
+++ a/fs/ioctl.c
@@ -495,11 +495,7 @@ int ioctl_preallocate(struct file *filp,
/* on ia32 l_start is on a 32-bit boundary */
#if defined CONFIG_COMPAT && defined(CONFIG_X86_64)
/* just account for different alignment */
-<<<<<<< HEAD
-int compat_ioctl_preallocate(struct file *file,
-=======
int compat_ioctl_preallocate(struct file *file, int mode,
->>>>>>> linux-next/akpm-base
struct space_resv_32 __user *argp)
{
struct inode *inode = file_inode(file);
@@ -521,11 +517,7 @@ int compat_ioctl_preallocate(struct file
return -EINVAL;
}
-<<<<<<< HEAD
- return vfs_fallocate(file, FALLOC_FL_KEEP_SIZE, sr.l_start, sr.l_len);
-=======
return vfs_fallocate(file, mode | FALLOC_FL_KEEP_SIZE, sr.l_start, sr.l_len);
->>>>>>> linux-next/akpm-base
}
#endif
--- a/include/linux/falloc.h~linux-next-git-rejects
+++ a/include/linux/falloc.h
@@ -45,12 +45,6 @@ struct space_resv_32 {
__s32 l_pad[4]; /* reserve area */
};
-<<<<<<< HEAD
-#define FS_IOC_RESVSP_32 _IOW ('X', 40, struct space_resv_32)
-#define FS_IOC_RESVSP64_32 _IOW ('X', 42, struct space_resv_32)
-
-int compat_ioctl_preallocate(struct file *, struct space_resv_32 __user *);
-=======
#define FS_IOC_RESVSP_32 _IOW ('X', 40, struct space_resv_32)
#define FS_IOC_UNRESVSP_32 _IOW ('X', 41, struct space_resv_32)
#define FS_IOC_RESVSP64_32 _IOW ('X', 42, struct space_resv_32)
@@ -58,7 +52,6 @@ int compat_ioctl_preallocate(struct file
#define FS_IOC_ZERO_RANGE_32 _IOW ('X', 57, struct space_resv_32)
int compat_ioctl_preallocate(struct file *, int mode, struct space_resv_32 __user *);
->>>>>>> linux-next/akpm-base
#endif
--- a/kernel/time/time.c~linux-next-git-rejects
+++ a/kernel/time/time.c
@@ -882,11 +882,7 @@ int get_timespec64(struct timespec64 *ts
ts->tv_sec = kts.tv_sec;
/* Zero out the padding for 32 bit systems or in compat mode */
-<<<<<<< HEAD
- if (in_compat_syscall())
-=======
if (!IS_ENABLED(CONFIG_64BIT) || in_compat_syscall())
->>>>>>> linux-next/akpm-base
kts.tv_nsec &= 0xFFFFFFFFUL;
ts->tv_nsec = kts.tv_nsec;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
lib-optimize-cpumask_local_spread-v3-fix.patch
usb-kcov-collect-coverage-from-hub_event-fix.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
bitops-introduce-the-for_each_set_clump8-macro-fix-fix.patch
m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup-fix.patch
m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup-fix-fix-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
