From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnd Bergmann <arnd@arndb•de>, Greg KH <greg@kroah•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Deepa Dinamani <deepa.kernel@gmail•com>
Subject: linux-next: manual merge of the y2038 tree with the staging tree
Date: Wed, 6 Jun 2018 20:19:27 +1000 [thread overview]
Message-ID: <20180606201927.7c4efad2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 964 bytes --]
Hi all,
Today's linux-next merge of the y2038 tree got conflicts in:
drivers/staging/lustre/lustre/llite/llite_lib.c
drivers/staging/lustre/lustre/llite/namei.c
drivers/staging/lustre/lustre/lmv/lmv_obd.c
drivers/staging/lustre/lustre/mdc/mdc_reint.c
drivers/staging/lustre/lustre/obdclass/obdo.c
between commit:
be65f9ed267f ("staging: lustre: delete the filesystem from the tree.")
from the staging tree and commit:
18a592632e61 ("lustre: Use long long type to print inode time")
from the y2038 tree.
I fixed it up (I removed the files) 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 --]
next reply other threads:[~2018-06-06 10:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-06 10:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-11-01 14:44 linux-next: manual merge of the y2038 tree with the staging tree Stephen Rothwell
2015-11-01 18:03 ` Greg KH
2015-03-19 6:29 Stephen Rothwell
2014-11-06 4:48 Stephen Rothwell
2014-11-06 4:51 ` Stephen Rothwell
2014-11-06 4:43 Stephen Rothwell
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=20180606201927.7c4efad2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=deepa.kernel@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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