Subject: linux-next: manual merge of the y2038 tree with the staging tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 6 Nov 2014 15:43:11 +1100

Hi Arnd,

Today's linux-next merge of the y2038 tree got a conflict in
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c between commit
ecdd21c7b982 ("staging: ft1000: Whitespace neatening") from the staging
tree and commit 4115d2b27a50 ("staging: ft1000: Replace timeval and
time_t with time64_t") from the y2038 tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 11dbe369e18b,9a9655cdc64d..000000000000
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@@ -1019,29 -1055,19 +1019,29 @@@ static void ft1000_proc_drvmsg(struct n
  			info->CardReady = 1;
  			break;
  		case MEDIA_STATE:
 -			pmediamsg = (struct media_msg *) & cmdbuffer[0];
 +			pmediamsg = (struct media_msg *)&cmdbuffer[0];
  			if (info->ProgConStat != 0xFF) {
 -			if (pmediamsg->state) {
 -				DEBUG(1, "Media is up\n");
 -				if (info->mediastate == 0) {
 -					netif_carrier_on(dev);
 -					netif_wake_queue(dev);
 -					info->mediastate = 1;
 -					time = get_seconds();
 -					info->ConTm = time;
 +				if (pmediamsg->state) {
 +					pr_debug("Media is up\n");
 +					if (info->mediastate == 0) {
 +						netif_carrier_on(dev);
 +						netif_wake_queue(dev);
 +						info->mediastate = 1;
- 						do_gettimeofday(&tv);
- 						info->ConTm = tv.tv_sec;
++						time = get_seconds();
++						info->ConTm = time;
 +					}
 +				} else {
 +					pr_debug("Media is down\n");
 +					if (info->mediastate == 1) {
 +						info->mediastate = 0;
 +						netif_carrier_off(dev);
 +						netif_stop_queue(dev);
 +						info->ConTm = 0;
 +					}
  				}
 -			} else {
 -				DEBUG(1, "Media is down\n");
 +			}
 +			else {
 +				pr_debug("Media is down\n");
  				if (info->mediastate == 1) {
  					info->mediastate = 0;
  					netif_carrier_off(dev);