From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnd Bergmann <arnd@arndb•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Tapasweni Pathak <tapaswenipathak@gmail•com>,
Haneen Mohammed <hamohammed.sa@gmail•com>
Subject: linux-next: manual merge of the y2038 tree with the staging tree
Date: Thu, 19 Mar 2015 17:29:29 +1100 [thread overview]
Message-ID: <20150319172929.51872f9d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
Hi Arnd,
Today's linux-next merge of the y2038 tree got a conflict in
drivers/staging/media/lirc/lirc_parallel.c between commit 8126e17f8925
("Staging: media: Remove parentheses around right side an assignment")
from the staging tree and commit 77f0cbce579d ("staging: media: lirc:
Replace timeval with ktime_t in lirc_parallel.c") from the y2038 tree.
I fixed it up (I used the y2038 tree version as that also removed the
extra parentheses) and can carry the fix as necessary (no action is
required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-03-19 6:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-19 6:29 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-06-06 10:19 linux-next: manual merge of the y2038 tree with the staging tree Stephen Rothwell
2015-11-01 14:44 Stephen Rothwell
2015-11-01 18:03 ` Greg KH
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=20150319172929.51872f9d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=hamohammed.sa@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tapaswenipathak@gmail$(echo .)com \
/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