From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Arnd Bergmann <arnd@arndb•de>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Deepa Dinamani <deepa.kernel@gmail•com>,
Tapasweni Pathak <tapaswenipathak@gmail•com>
Subject: Re: linux-next: manual merge of the y2038 tree with the staging tree
Date: Sun, 1 Nov 2015 10:03:59 -0800 [thread overview]
Message-ID: <20151101180359.GA13943@kroah.com> (raw)
In-Reply-To: <20151102014449.5ae120ab@canb.auug.org.au>
On Mon, Nov 02, 2015 at 01:44:49AM +1100, Stephen Rothwell wrote:
> Hi Arnd,
>
> Today's linux-next merge of the y2038 tree got conflicts in:
>
> drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
> drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
> drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
> drivers/staging/ft1000/ft1000.h
>
> between commit:
>
> 6512edec48b2 ("staging: ft1000: remove obsolete driver")
>
> from the staging tree and commit:
>
> 8b37bf430656 ("staging: ft1000: Replace timeval and time_t with time64_t")
>
> from the y2038 tree.
>
> I fixed it up (the former removed the files) and can carry the fix as
> necessary (no action is required).
Thanks for the fix, that sounds obviously correct :)
greg k-h
next prev parent reply other threads:[~2015-11-01 18:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-06-06 10:19 Stephen Rothwell
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=20151101180359.GA13943@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=deepa.kernel@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--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