linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Al Viro <viro@zeniv.linux.org.uk>,
	"Martin K. Petersen" <martin.petersen@oracle.com>
Subject: Re: linux-next: manual merge of the y2038 tree with the scsi tree
Date: Tue, 3 Dec 2019 14:00:52 +1100	[thread overview]
Message-ID: <20191203140052.0ed8810d@canb.auug.org.au> (raw)
In-Reply-To: <20191107153757.4999749b@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]

Hi all,

This is now a conflict between the scsi tree and Linus' tree.

On Thu, 7 Nov 2019 15:37:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the y2038 tree got a conflict in:
> 
>   drivers/scsi/sg.c
> 
> between commits:
> 
>   a16a47416d3f ("scsi: sg: sg_ioctl(): fix copyout handling")
>   c35a5cfb4150 ("scsi: sg: sg_read(): simplify reading ->pack_id of userland sg_io_hdr_t")
>   d9fc5617bcb6 ("scsi: sg: sg_new_write(): don't bother with access_ok")
> 
> from the scsi tree and commits:
> 
>   98aaaec4a150 ("compat_ioctl: reimplement SG_IO handling")
>   fd6c3d5accea ("compat_ioctl: move SG_GET_REQUEST_TABLE handling")
> 
> from the y2038 tree.
> 
> I fixed it up (I used one side for some conflicts and the other for
> others - see the final file attached) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.


-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2019-12-03  3:00 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-07  4:37 linux-next: manual merge of the y2038 tree with the scsi tree Stephen Rothwell
2019-12-03  3:00 ` Stephen Rothwell [this message]
2019-12-03  3:14   ` James Bottomley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191203140052.0ed8810d@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=arnd@arndb.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).