public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the staging tree with the  tree
@ 2014-03-12  1:27 Mark Brown
  2014-03-12  1:48 ` Greg KH
  0 siblings, 1 reply; 19+ messages in thread
From: Mark Brown @ 2014-03-12  1:27 UTC (permalink / raw)
  To: Greg KH, Olof Johansson, Arnd Bergmann, Russell King
  Cc: linux-next, linux-kernel

[-- 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 --]

^ permalink raw reply related	[flat|nested] 19+ messages in thread
* linux-next: manual merge of the staging tree with the  tree
@ 2015-12-02 20:17 Mark Brown
  2015-12-02 22:07 ` Greg KH
  0 siblings, 1 reply; 19+ messages in thread
From: Mark Brown @ 2015-12-02 20:17 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel

[-- 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 --]

^ permalink raw reply	[flat|nested] 19+ messages in thread
* linux-next: manual merge of the staging tree with the  tree
@ 2014-08-01  6:21 Stephen Rothwell
  2014-08-01  7:38 ` Greg KH
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2014-08-01  6:21 UTC (permalink / raw)
  To: Greg KH, Mauro Carvalho Chehab
  Cc: linux-next, linux-kernel, Joe Perches, Kristina Martšenko

[-- 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 --]

^ permalink raw reply	[flat|nested] 19+ messages in thread
* linux-next: manual merge of the staging tree with the  tree
@ 2014-07-11  5:21 Stephen Rothwell
  2014-07-12 16:53 ` Greg KH
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2014-07-11  5:21 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Peter Hurley, Kristina Martšenko

[-- 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 --]

^ permalink raw reply	[flat|nested] 19+ messages in thread
* linux-next: manual merge of the staging tree with the  tree
@ 2014-03-13  0:50 Mark Brown
  2014-03-13  9:17 ` Laurent Pinchart
  0 siblings, 1 reply; 19+ messages in thread
From: Mark Brown @ 2014-03-13  0:50 UTC (permalink / raw)
  To: Greg KH, Philipp Zabel, Laurent Pinchart, Mauro Carvalho Chehab
  Cc: linux-next, linux-kernel

[-- 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 --]

^ permalink raw reply	[flat|nested] 19+ messages in thread
* linux-next: manual merge of the staging tree with the  tree
@ 2014-03-12  1:37 Mark Brown
  0 siblings, 0 replies; 19+ messages in thread
From: Mark Brown @ 2014-03-12  1:37 UTC (permalink / raw)
  To: Greg KH, Valentina Manea, Alan Stern; +Cc: linux-next, linux-kernel

[-- 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 --]

^ permalink raw reply	[flat|nested] 19+ messages in thread
* linux-next: manual merge of the staging tree with the  tree
@ 2014-03-12  1:32 Mark Brown
  2014-03-12  1:49 ` Greg KH
  0 siblings, 1 reply; 19+ messages in thread
From: Mark Brown @ 2014-03-12  1:32 UTC (permalink / raw)
  To: Greg KH, Salva Peiró, Daeseok Youn; +Cc: linux-next, linux-kernel

[-- 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 --]

^ permalink raw reply	[flat|nested] 19+ messages in thread
* linux-next: manual merge of the staging tree with the  tree
@ 2010-11-10  2:24 Stephen Rothwell
  2010-11-10 18:40 ` Greg KH
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2010-11-10  2:24 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Joe Perches, Dan Carpenter

[-- 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 --]

^ permalink raw reply	[flat|nested] 19+ messages in thread
end of thread, other threads:[~2015-12-03  0:07 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-12  1:27 linux-next: manual merge of the staging tree with the tree Mark Brown
2014-03-12  1:48 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2015-12-02 20:17 Mark Brown
2015-12-02 22:07 ` Greg KH
2015-12-03  0:07   ` Mark Brown
2014-08-01  6:21 Stephen Rothwell
2014-08-01  7:38 ` Greg KH
2014-07-11  5:21 Stephen Rothwell
2014-07-12 16:53 ` Greg KH
2014-03-13  0:50 Mark Brown
2014-03-13  9:17 ` Laurent Pinchart
2014-03-20 15:44   ` Grant Likely
2014-03-20 17:09     ` Mauro Carvalho Chehab
2014-03-20 18:51       ` Grant Likely
2014-03-12  1:37 Mark Brown
2014-03-12  1:32 Mark Brown
2014-03-12  1:49 ` Greg KH
2010-11-10  2:24 Stephen Rothwell
2010-11-10 18:40 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox