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

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

[Mark Brown]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rtl8188eu/include/phy.h between Linus' tree and commit
"staging: rtl8188eu: using unique names is good" from the staging tree.

It looks like the patch is already applied so I skipped it.

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]

Re: linux-next: manual merge of the staging tree with the tree

[Greg KH]

On Wed, Dec 02, 2015 at 08:17:43PM +0000, Mark Brown wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rtl8188eu/include/phy.h between Linus' tree and commit
> "staging: rtl8188eu: using unique names is good" from the staging tree.
> 
> It looks like the patch is already applied so I skipped it.

Sounds good thanks.

Note, the "Subject" here looks a bit odd :)

greg k-h

Re: linux-next: manual merge of the staging tree with the tree

[Mark Brown]

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

On Wed, Dec 02, 2015 at 02:07:50PM -0800, Greg KH wrote:
> On Wed, Dec 02, 2015 at 08:17:43PM +0000, Mark Brown wrote:

> > Hi Greg,

> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/staging/rtl8188eu/include/phy.h between Linus' tree and commit
> > "staging: rtl8188eu: using unique names is good" from the staging tree.

> > It looks like the patch is already applied so I skipped it.

> Sounds good thanks.

> Note, the "Subject" here looks a bit odd :)

Well, I couldn't entirely figure out what it was a merge issue with.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: linux-next: manual merge of the staging tree with the tree

[Greg KH]

On Fri, Aug 01, 2014 at 04:21:42PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> MAINTAINERS between commit 7eea35fe3df8 ("[media] MAINTAINERS: Update
> go7007 pattern") from the v4l-dvb tree and commit 0d317b91d6d8
> ("staging: frontier: remove driver") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

greg k-h

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
MAINTAINERS between commit 7eea35fe3df8 ("[media] MAINTAINERS: Update
go7007 pattern") from the v4l-dvb tree and commit 0d317b91d6d8
("staging: frontier: remove driver") from the staging tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc MAINTAINERS
index 10390ced5206,6d2c52ea407d..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8685,11 -8542,11 +8661,6 @@@ M:	Marek Belisko <marek.belisko@gmail.c
  S:	Odd Fixes
  F:	drivers/staging/ft1000/
  
- STAGING - FRONTIER TRANZPORT AND ALPHATRACK
- M:	David Täht <d@teklibre.com>
- S:	Odd Fixes
- F:	drivers/staging/frontier/
 -STAGING - GO7007 MPEG CODEC
 -M:	Hans Verkuil <hans.verkuil@cisco.com>
 -S:	Maintained
 -F:	drivers/staging/media/go7007/
--
  STAGING - INDUSTRIAL IO
  M:	Jonathan Cameron <jic23@kernel.org>
  L:	linux-iio@vger.kernel.org

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the staging tree with the tree

[Greg KH]

On Fri, Jul 11, 2014 at 03:21:30PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/dgrp/dgrp_tty.c between commit e359a4e38d22 ("tty:
> Remove tty_hung_up_p() tests from tty drivers' open()") from the tty
> tree and commit 19b1e7695be8 ("staging: dgrp: remove driver") from the
> staging tree.
> 
> I fixed it up (by just removing the file) and can carry the fix as
> necessary (no action is required).

That sounds fine, thanks.

greg k-h

Re: linux-next: manual merge of the staging tree with the tree

[Sachin Kamat]

Hi Stephen,

On Fri, Jul 11, 2014 at 11:40 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Sachin,
>
> On Fri, 11 Jul 2014 11:02:21 +0530 Sachin Kamat <spk.linux@gmail.com> wrote:
>>
>> I wonder if the subject line "manual merge of the staging tree with the tree" is
>> missing the name of the second tree (in this case probably should have been
>> "...with the tty tree"?)
>
> Yep, I have to fill in in manually and sometimes I forget :-(

Ah OK. I thought it was automated and probably a typo in the script.
Never mind :)

-- 
Regards,
Sachin.

Re: linux-next: manual merge of the staging tree with the tree

[Stephen Rothwell]

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

Hi Sachin,

On Fri, 11 Jul 2014 11:02:21 +0530 Sachin Kamat <spk.linux@gmail.com> wrote:
>
> I wonder if the subject line "manual merge of the staging tree with the tree" is
> missing the name of the second tree (in this case probably should have been
> "...with the tty tree"?)

Yep, I have to fill in in manually and sometimes I forget :-(

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the staging tree with the tree

[Sachin Kamat]

Hi Stephen,

I wonder if the subject line "manual merge of the staging tree with the tree" is
missing the name of the second tree (in this case probably should have been
"...with the tty tree"?)



On Fri, Jul 11, 2014 at 10:51 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/dgrp/dgrp_tty.c between commit e359a4e38d22 ("tty:
> Remove tty_hung_up_p() tests from tty drivers' open()") from the tty
> tree and commit 19b1e7695be8 ("staging: dgrp: remove driver") from the
> staging tree.
>
> I fixed it up (by just removing the file) and can carry the fix as
> necessary (no action is required).
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au



-- 
Regards,
Sachin.

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/dgrp/dgrp_tty.c between commit e359a4e38d22 ("tty:
Remove tty_hung_up_p() tests from tty drivers' open()") from the tty
tree and commit 19b1e7695be8 ("staging: dgrp: remove driver") from the
staging tree.

I fixed it up (by just removing the file) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the staging tree with the tree

[Grant Likely]

On Thu, 20 Mar 2014 14:09:33 -0300, Mauro Carvalho Chehab <m.chehab@samsung.com> wrote:
> Em Thu, 20 Mar 2014 15:44:01 +0000
> Grant Likely <grant.likely@secretlab.ca> escreveu:
> 
> > On Thu, 13 Mar 2014 10:17:56 +0100, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote:
> > > Hi Mark,
> > > 
> > > On Thursday 13 March 2014 00:50:26 Mark Brown wrote:
> > > > Hi Greg,
> > > > 
> > > > Today's linux-next merge of the staging tree got a conflict in
> > > > drivers/media/v4l2-core/v4l2-of.c between commit b9db140c1e4644d
> > > > ("[media] v4l: of: Support empty port nodes") from the v4l tree and
> > > > commit fd9fdb78a9bf ("[media] of: move graph helpers from
> > > > drivers/media/v4l2-core to drivers/of") from the staging tree.
> > > > 
> > > > I fixed it up by essentially dropping the support for empty port nodes
> > > > since there were more context differences than I was comfortable with
> > > > in the changes in the new code.
> > > 
> > > If I'm not mistaken the move of drivers/media/v4l2-core/v4l2-of.c to 
> > > drivers/of/of-graph.c has been canceled for v3.15 and related patches should 
> > > be dropped from the for-next branches in the very near future (the v4l tree 
> > > has already been rebased).
> > 
> > I had not actually asked Mauro to revert,
> 
> See:
> 	https://lkml.org/lkml/2014/3/10/283
> 
> There, you literally answered me that:
> 	"All trees containing the branch would need to be reverted."

"would" being the operative word. I then went on to say that because it
is messy, I would be okay with leaving it as is if my concerns are
addressed.

Sorry for the confusion.

g.

> and:
> 	"It means any tree containing that branch *must* be rewound."
> 
> That's what I (unhappily) did.
> 
> I won't reapply this series, but, instead, I'll simply wait for the
> staging tree to be merged before sending those patches upstream,
> before sending the topic branch with exynos 5 patches that depend on it.
> 
> This way, I can add Stephen patch on such topic branch, to avoid
> compilation breakages after merged.
> 
> > but the branch is still in rmk's
> > tree and linux-next. I do not think it needs to be cancelled.
> 
> > I do still have issues about it as a generic pattern, but I'm happy with
> > the discussion so far and the documentation will be sorted before the
> > next kernel is released.
> > 
> > g.
> 
> Regards,
> Mauro

Re: linux-next: manual merge of the staging tree with the tree

[Mauro Carvalho Chehab]

Em Thu, 20 Mar 2014 15:44:01 +0000
Grant Likely <grant.likely@secretlab.ca> escreveu:

> On Thu, 13 Mar 2014 10:17:56 +0100, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote:
> > Hi Mark,
> > 
> > On Thursday 13 March 2014 00:50:26 Mark Brown wrote:
> > > Hi Greg,
> > > 
> > > Today's linux-next merge of the staging tree got a conflict in
> > > drivers/media/v4l2-core/v4l2-of.c between commit b9db140c1e4644d
> > > ("[media] v4l: of: Support empty port nodes") from the v4l tree and
> > > commit fd9fdb78a9bf ("[media] of: move graph helpers from
> > > drivers/media/v4l2-core to drivers/of") from the staging tree.
> > > 
> > > I fixed it up by essentially dropping the support for empty port nodes
> > > since there were more context differences than I was comfortable with
> > > in the changes in the new code.
> > 
> > If I'm not mistaken the move of drivers/media/v4l2-core/v4l2-of.c to 
> > drivers/of/of-graph.c has been canceled for v3.15 and related patches should 
> > be dropped from the for-next branches in the very near future (the v4l tree 
> > has already been rebased).
> 
> I had not actually asked Mauro to revert,

See:
	https://lkml.org/lkml/2014/3/10/283

There, you literally answered me that:
	"All trees containing the branch would need to be reverted."
and:
	"It means any tree containing that branch *must* be rewound."

That's what I (unhappily) did.

I won't reapply this series, but, instead, I'll simply wait for the
staging tree to be merged before sending those patches upstream,
before sending the topic branch with exynos 5 patches that depend on it.

This way, I can add Stephen patch on such topic branch, to avoid
compilation breakages after merged.

> but the branch is still in rmk's
> tree and linux-next. I do not think it needs to be cancelled.

> I do still have issues about it as a generic pattern, but I'm happy with
> the discussion so far and the documentation will be sorted before the
> next kernel is released.
> 
> g.

Regards,
Mauro

Re: linux-next: manual merge of the staging tree with the tree

[Grant Likely]

On Thu, 13 Mar 2014 10:17:56 +0100, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote:
> Hi Mark,
> 
> On Thursday 13 March 2014 00:50:26 Mark Brown wrote:
> > Hi Greg,
> > 
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/media/v4l2-core/v4l2-of.c between commit b9db140c1e4644d
> > ("[media] v4l: of: Support empty port nodes") from the v4l tree and
> > commit fd9fdb78a9bf ("[media] of: move graph helpers from
> > drivers/media/v4l2-core to drivers/of") from the staging tree.
> > 
> > I fixed it up by essentially dropping the support for empty port nodes
> > since there were more context differences than I was comfortable with
> > in the changes in the new code.
> 
> If I'm not mistaken the move of drivers/media/v4l2-core/v4l2-of.c to 
> drivers/of/of-graph.c has been canceled for v3.15 and related patches should 
> be dropped from the for-next branches in the very near future (the v4l tree 
> has already been rebased).

I had not actually asked Mauro to revert, but the branch is still in rmk's
tree and linux-next. I do not think it needs to be cancelled.

I do still have issues about it as a generic pattern, but I'm happy with
the discussion so far and the documentation will be sorted before the
next kernel is released.

g.

Re: linux-next: manual merge of the staging tree with the tree

[Laurent Pinchart]

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

Hi Mark,

On Thursday 13 March 2014 00:50:26 Mark Brown wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/media/v4l2-core/v4l2-of.c between commit b9db140c1e4644d
> ("[media] v4l: of: Support empty port nodes") from the v4l tree and
> commit fd9fdb78a9bf ("[media] of: move graph helpers from
> drivers/media/v4l2-core to drivers/of") from the staging tree.
> 
> I fixed it up by essentially dropping the support for empty port nodes
> since there were more context differences than I was comfortable with
> in the changes in the new code.

If I'm not mistaken the move of drivers/media/v4l2-core/v4l2-of.c to 
drivers/of/of-graph.c has been canceled for v3.15 and related patches should 
be dropped from the for-next branches in the very near future (the v4l tree 
has already been rebased).

-- 
Regards,

Laurent Pinchart

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

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

[Mark Brown]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/media/v4l2-core/v4l2-of.c between commit b9db140c1e4644d
("[media] v4l: of: Support empty port nodes") from the v4l tree and
commit fd9fdb78a9bf ("[media] of: move graph helpers from
drivers/media/v4l2-core to drivers/of") from the staging tree.

I fixed it up by essentially dropping the support for empty port nodes
since there were more context differences than I was comfortable with
in the changes in the new code.

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the staging tree with the tree

[Greg KH]

On Wed, Mar 12, 2014 at 01:32:59AM +0000, Mark Brown wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in drivers/staging/cxt1e1/linux.c between commit 084b6e7765b95 ("staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()") from Linus' tree and commit aa562fa70931d ("staging: cxt1e1: Fix no spaces at the start of a line in linux.c") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Known issue, was reported previously and fixed up in linux-next and I
will handle it when I merge my trees together...

thanks,

greg k-h

Re: linux-next: manual merge of the staging tree with the tree

[Greg KH]

On Wed, Mar 12, 2014 at 01:27:01AM +0000, Mark Brown wrote:
> Hi Greg,

You should look at the Subject: you are generating, I think something is
missing :)

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

[Mark Brown]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in  between commit f080a51bef2ca ("USB: complain if userspace resets an active endpoint") from the usb tree and commit 9b6f0c4b98171f2a3 ("usbcore: rename struct dev_state to struct usb_dev_state") from the staging tree.

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

diff --cc drivers/usb/core/devio.c
index 12401ee4ba0e,2a8afe6754b8..000000000000
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@@ -1125,21 -1043,7 +1125,21 @@@ static int proc_bulk(struct usb_dev_sta
        return ret;
  }
  
 +static void check_reset_of_active_ep(struct usb_device *udev,
 +              unsigned int epnum, char *ioctl_name)
 +{
 +      struct usb_host_endpoint **eps;
 +      struct usb_host_endpoint *ep;
 +
 +      eps = (epnum & USB_DIR_IN) ? udev->ep_in : udev->ep_out;
 +      ep = eps[epnum & 0x0f];
 +      if (ep && !list_empty(&ep->urb_list))
 +              dev_warn(&udev->dev, "Process %d (%s) called USBDEVFS_%s for active endpoint 0x%02x\n",
 +                              task_pid_nr(current), current->comm,
 +                              ioctl_name, epnum);
 +}
 +
- static int proc_resetep(struct dev_state *ps, void __user *arg)
+ static int proc_resetep(struct usb_dev_state *ps, void __user *arg)
  {
        unsigned int ep;
        int ret;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Mark Brown]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in drivers/staging/cxt1e1/linux.c between commit 084b6e7765b95 ("staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()") from Linus' tree and commit aa562fa70931d ("staging: cxt1e1: Fix no spaces at the start of a line in linux.c") from the staging tree.

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

diff --cc drivers/staging/cxt1e1/linux.c
index 79206cb3fb94,549efd1fa965..000000000000
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@@ -861,79 -867,77 +867,79 @@@ c4_ioctl(struct net_device *ndev, struc
  #endif
  
  #if 0
-     pr_info("c4_ioctl: iocmd %x, dir %x type %x nr %x iolen %d.\n", iocmd,
-             _IOC_DIR (iocmd), _IOC_TYPE (iocmd), _IOC_NR (iocmd),
-             _IOC_SIZE (iocmd));
+ 	pr_info("c4_ioctl: iocmd %x, dir %x type %x nr %x iolen %d.\n", iocmd,
+ 		_IOC_DIR(iocmd), _IOC_TYPE(iocmd), _IOC_NR(iocmd),
+ 		_IOC_SIZE(iocmd));
  #endif
-     iolen = _IOC_SIZE (iocmd);
-     if (iolen > sizeof(arg))
-         return -EFAULT;
-     data = ifr->ifr_data + sizeof (iocmd);
-     if (copy_from_user (&arg, data, iolen))
-         return -EFAULT;
- 
-     ret = 0;
-     switch (iocmd)
-     {
-     case SBE_IOC_PORT_GET:
-         //pr_info(">> SBE_IOC_PORT_GET Ioctl...\n");
-         ret = do_get_port (ndev, data);
-         break;
-     case SBE_IOC_PORT_SET:
-         //pr_info(">> SBE_IOC_PORT_SET Ioctl...\n");
-         ret = do_set_port (ndev, data);
-         break;
-     case SBE_IOC_CHAN_GET:
-         //pr_info(">> SBE_IOC_CHAN_GET Ioctl...\n");
-         ret = do_get_chan (ndev, data);
-         break;
-     case SBE_IOC_CHAN_SET:
-         //pr_info(">> SBE_IOC_CHAN_SET Ioctl...\n");
-         ret = do_set_chan (ndev, data);
-         break;
-     case C4_DEL_CHAN:
-         //pr_info(">> C4_DEL_CHAN Ioctl...\n");
-         ret = do_del_chan (ndev, data);
-         break;
-     case SBE_IOC_CHAN_NEW:
-         ret = do_create_chan (ndev, data);
-         break;
-     case SBE_IOC_CHAN_GET_STAT:
-         ret = do_get_chan_stats (ndev, data);
-         break;
-     case SBE_IOC_LOGLEVEL:
-         ret = do_set_loglevel (ndev, data);
-         break;
-     case SBE_IOC_RESET_DEV:
-         ret = do_reset (ndev, data);
-         break;
-     case SBE_IOC_CHAN_DEL_STAT:
-         ret = do_reset_chan_stats (ndev, data);
-         break;
-     case C4_LOOP_PORT:
-         ret = do_port_loop (ndev, data);
-         break;
-     case C4_RW_FRMR:
-         ret = do_framer_rw (ndev, data);
-         break;
-     case C4_RW_MSYC:
-         ret = do_musycc_rw (ndev, data);
-         break;
-     case C4_RW_PLD:
-         ret = do_pld_rw (ndev, data);
-         break;
-     case SBE_IOC_IID_GET:
-         ret = (iolen == sizeof (struct sbe_iid_info)) ? c4_get_iidinfo (ci, &arg.u.iip) : -EFAULT;
-         if (ret == 0)               /* no error, copy data */
-             if (copy_to_user (data, &arg, iolen))
-                 return -EFAULT;
-         break;
-     default:
-         //pr_info(">> c4_ioctl: EINVAL - unknown iocmd <%x>\n", iocmd);
-         ret = -EINVAL;
-         break;
-     }
-     return mkret (ret);
+ 	iolen = _IOC_SIZE(iocmd);
++	if (iolen > sizeof(arg))
++		return -EFAULT;
+ 	data = ifr->ifr_data + sizeof(iocmd);
+ 	if (copy_from_user(&arg, data, iolen))
+ 		return -EFAULT;
+ 
+ 	ret = 0;
+ 	switch (iocmd) {
+ 	case SBE_IOC_PORT_GET:
+ 		//pr_info(">> SBE_IOC_PORT_GET Ioctl...\n");
+ 		ret = do_get_port(ndev, data);
+ 		break;
+ 	case SBE_IOC_PORT_SET:
+ 		//pr_info(">> SBE_IOC_PORT_SET Ioctl...\n");
+ 		ret = do_set_port(ndev, data);
+ 		break;
+ 	case SBE_IOC_CHAN_GET:
+ 		//pr_info(">> SBE_IOC_CHAN_GET Ioctl...\n");
+ 		ret = do_get_chan(ndev, data);
+ 		break;
+ 	case SBE_IOC_CHAN_SET:
+ 		//pr_info(">> SBE_IOC_CHAN_SET Ioctl...\n");
+ 		ret = do_set_chan(ndev, data);
+ 		break;
+ 	case C4_DEL_CHAN:
+ 		//pr_info(">> C4_DEL_CHAN Ioctl...\n");
+ 		ret = do_del_chan(ndev, data);
+ 		break;
+ 	case SBE_IOC_CHAN_NEW:
+ 		ret = do_create_chan(ndev, data);
+ 		break;
+ 	case SBE_IOC_CHAN_GET_STAT:
+ 		ret = do_get_chan_stats(ndev, data);
+ 		break;
+ 	case SBE_IOC_LOGLEVEL:
+ 		ret = do_set_loglevel(ndev, data);
+ 		break;
+ 	case SBE_IOC_RESET_DEV:
+ 		ret = do_reset(ndev, data);
+ 		break;
+ 	case SBE_IOC_CHAN_DEL_STAT:
+ 		ret = do_reset_chan_stats(ndev, data);
+ 		break;
+ 	case C4_LOOP_PORT:
+ 		ret = do_port_loop(ndev, data);
+ 		break;
+ 	case C4_RW_FRMR:
+ 		ret = do_framer_rw(ndev, data);
+ 		break;
+ 	case C4_RW_MSYC:
+ 		ret = do_musycc_rw(ndev, data);
+ 		break;
+ 	case C4_RW_PLD:
+ 		ret = do_pld_rw(ndev, data);
+ 		break;
+ 	case SBE_IOC_IID_GET:
+ 		ret = (iolen == sizeof(struct sbe_iid_info)) ?
+ 		       c4_get_iidinfo(ci, &arg.u.iip) : -EFAULT;
+ 		if (ret == 0)               /* no error, copy data */
+ 			if (copy_to_user(data, &arg, iolen))
+ 				return -EFAULT;
+ 		break;
+ 	default:
+ 		//pr_info(">> c4_ioctl: EINVAL - unknown iocmd <%x>\n", iocmd);
+ 		ret = -EINVAL;
+ 		break;
+ 	}
+ 	return mkret(ret);
  }
  
  static const struct net_device_ops c4_ops = {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Mark Brown]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in arch/arm/boot/dts/imx53-qsb.dts between various commits from the arm-soc tree and commit 17b5001b5143e3b ("imx-drm: convert to componentised device support") from the staging tree.

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

diff --cc arch/arm/boot/dts/imx53-qsb.dts
index dec4b073ceb1,8b254289344f..000000000000
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 2dca98b79f48..50823d0f05bf 100644
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -17,7 +17,7 @@
                reg = <0x70000000 0x40000000>;
        };
 
-       display@di0 {
+       display0: display@di0 {
                compatible = "fsl,imx-parallel-display";
                crtcs = <&ipu 0>;
                interface-pix-fmt = "rgb565";
@@ -68,6 +68,12 @@
                };
        };
 
+       imx-drm {
+               compatible = "fsl,imx-drm";
+               crtcs = <&ipu 0>;
+               connectors = <&display0>;
+       };
+
        leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the staging tree with the tree

[Greg KH]

On Wed, Nov 10, 2010 at 01:24:08PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/intel_sst/intel_sst_app_interface.c between commits from
> the staging.current tree and commit
> d0f40c5041f9c48afbd8f7fbf8a5faa9e5dbd39a ("Staging: intel_sst: Use
> pr_fmt, fix misspellings") from the staging tree.
> 
> I have just ignored the changes from the staging tree for today.

Thanks, that works, when these patches go to Linus I'll handle the
merge.

greg k-h

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/intel_sst/intel_sst_app_interface.c between commits from
the staging.current tree and commit
d0f40c5041f9c48afbd8f7fbf8a5faa9e5dbd39a ("Staging: intel_sst: Use
pr_fmt, fix misspellings") from the staging tree.

I have just ignored the changes from the staging tree for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the staging tree with the tree

[Stephen Rothwell]

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

Hi Greg,

On Thu, 19 Mar 2009 08:53:31 -0700 Greg KH <greg@kroah.com> wrote:
>
> > Yes, sorry, Linus took that patch and I didn't have a chance to update
> > my tree yet.  Give me an hour or so to get it merged up properly.

Hey, not really a problem, I was just letting you know.

> Now merged up properly and pushed out.

Thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the staging tree with the tree

[Greg KH]

On Thu, Mar 19, 2009 at 08:32:45AM -0700, Greg KH wrote:
> On Thu, Mar 19, 2009 at 09:12:47PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > Today's linux-next merge of the staging tree got conflicts due to the
> > removal of the benet driver from staging in Linus' tree.
> 
> Yes, sorry, Linus took that patch and I didn't have a chance to update
> my tree yet.  Give me an hour or so to get it merged up properly.

Now merged up properly and pushed out.

thanks,

greg k-h

Re: linux-next: manual merge of the staging tree with the tree

[Greg KH]

On Thu, Mar 19, 2009 at 09:12:47PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts due to the
> removal of the benet driver from staging in Linus' tree.

Yes, sorry, Linus took that patch and I didn't have a chance to update
my tree yet.  Give me an hour or so to get it merged up properly.

thanks,

greg k-h

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got conflicts due to the
removal of the benet driver from staging in Linus' tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]