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

2017-05-04 Thread Greg KH 
On Mon, May 01, 2017 at 02:09:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/Makefile
> 
> between commit:
> 
>   f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
> 
> from the usb tree and commit:
> 
>   051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
>   abefd6741d54 ("staging: ccree: introduce CryptoCell HW driver")
> 
> from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

I'm the maintainer of both :)

Anyway, I knew this was going to happen, I'll take your fix when the
merge happens, thanks.

greg k-h

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

2017-05-04 Thread Greg KH 
On Mon, May 01, 2017 at 02:09:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/Makefile
> 
> between commit:
> 
>   f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
> 
> from the usb tree and commit:
> 
>   051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
>   abefd6741d54 ("staging: ccree: introduce CryptoCell HW driver")
> 
> from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

I'm the maintainer of both :)

Anyway, I knew this was going to happen, I'll take your fix when the
merge happens, thanks.

greg k-h

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

2017-04-30 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/Makefile

between commit:

  f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")

from the usb tree and commit:

  051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
  abefd6741d54 ("staging: ccree: introduce CryptoCell HW driver")

from the staging tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/Makefile
index 682127c20da5,422fae4ea0f3..
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -41,4 -42,5 +43,4 @@@ obj-$(CONFIG_MOST)+= most
  obj-$(CONFIG_KS7010)  += ks7010/
  obj-$(CONFIG_GREYBUS) += greybus/
  obj-$(CONFIG_BCM2835_VCHIQ)   += vc04_services/
- obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/
+ obj-$(CONFIG_CRYPTO_DEV_CCREE)+= ccree/
 -

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

2017-04-30 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/Makefile

between commit:

  f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")

from the usb tree and commit:

  051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
  abefd6741d54 ("staging: ccree: introduce CryptoCell HW driver")

from the staging tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/Makefile
index 682127c20da5,422fae4ea0f3..
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -41,4 -42,5 +43,4 @@@ obj-$(CONFIG_MOST)+= most
  obj-$(CONFIG_KS7010)  += ks7010/
  obj-$(CONFIG_GREYBUS) += greybus/
  obj-$(CONFIG_BCM2835_VCHIQ)   += vc04_services/
- obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/
+ obj-$(CONFIG_CRYPTO_DEV_CCREE)+= ccree/
 -

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

2013-06-18 Thread Greg KH 
On Tue, Jun 18, 2013 at 02:55:59PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/serqt_usb2/serqt_usb2.c between commit 1143832eca8f
> ("USB: serial: ports: add minor and port number") from the usb tree and
> commit d68edc2881b1 ("staging: serqt_usb2: Fixed coding style
> CamelCases") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix looks fine, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-06-18 Thread Greg KH 
On Tue, Jun 18, 2013 at 02:55:59PM +1000, Stephen Rothwell wrote:
 Hi Greg,
 
 Today's linux-next merge of the staging tree got a conflict in
 drivers/staging/serqt_usb2/serqt_usb2.c between commit 1143832eca8f
 (USB: serial: ports: add minor and port number) from the usb tree and
 commit d68edc2881b1 (staging: serqt_usb2: Fixed coding style
 CamelCases) from the staging tree.
 
 I fixed it up (see below) and can carry the fix as necessary (no action
 is required).

Fix looks fine, thanks.

greg k-h
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-06-17 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/serqt_usb2/serqt_usb2.c between commit 1143832eca8f
("USB: serial: ports: add minor and port number") from the usb tree and
commit d68edc2881b1 ("staging: serqt_usb2: Fixed coding style
CamelCases") from the staging tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/staging/serqt_usb2/serqt_usb2.c
index 880f5c0,39de5e0..000
--- a/drivers/staging/serqt_usb2/serqt_usb2.c
+++ b/drivers/staging/serqt_usb2/serqt_usb2.c
@@@ -870,10 -870,10 +870,10 @@@ static int qt_open(struct tty_struct *t
usb_clear_halt(serial->dev, port->read_urb->pipe);
port0->open_ports++;
  
-   result = qt_get_device(serial, >DeviceData);
+   result = qt_get_device(serial, >device_data);
  
/* Port specific setups */
-   result = qt_open_channel(serial, port->port_number, );
 -  result = qt_open_channel(serial, port->number, _data);
++  result = qt_open_channel(serial, port->port_number, _data);
if (result < 0) {
dev_dbg(>dev, "qt_open_channel failed\n");
return result;
@@@ -1239,23 -1245,25 +1239,23 @@@ static void qt_set_termios(struct tty_s
  
/* Now determine flow control */
if (cflag & CRTSCTS) {
 -  dev_dbg(>dev, "%s - Enabling HW flow control port %d\n",
 -  __func__, port->number);
 +  dev_dbg(>dev, "%s - Enabling HW flow control\n", 
__func__);
  
/* Enable RTS/CTS flow control */
-   status = BoxSetHW_FlowCtrl(port->serial, index, 1);
+   status = box_set_hw_flow_ctrl(port->serial, index, 1);
  
if (status < 0) {
-   dev_dbg(>dev, "BoxSetHW_FlowCtrl failed\n");
+   dev_dbg(>dev, "box_set_hw_flow_ctrl failed\n");
return;
}
} else {
/* Disable RTS/CTS flow control */
dev_dbg(>dev,
 -  "%s - disabling HW flow control port %d\n",
 -  __func__, port->number);
 +  "%s - disabling HW flow control\n", __func__);
  
-   status = BoxSetHW_FlowCtrl(port->serial, index, 0);
+   status = box_set_hw_flow_ctrl(port->serial, index, 0);
if (status < 0) {
-   dev_dbg(>dev, "BoxSetHW_FlowCtrl failed\n");
+   dev_dbg(>dev, "box_set_hw_flow_ctrl failed\n");
return;
}
  
@@@ -1324,12 -1332,12 +1324,12 @@@ static inline int qt_real_tiocmget(stru
int status;
unsigned int index;
  
 -  index = tty->index - serial->minor;
 +  index = port->port_number;
status =
-   BoxGetRegister(port->serial, index, MODEM_CONTROL_REGISTER, );
+   box_get_register(port->serial, index, MODEM_CONTROL_REGISTER, );
if (status >= 0) {
status =
-   BoxGetRegister(port->serial, index,
+   box_get_register(port->serial, index,
   MODEM_STATUS_REGISTER, );
  
}
@@@ -1363,9 -1371,9 +1363,9 @@@ static inline int qt_real_tiocmset(stru
int status;
unsigned int index;
  
 -  index = tty->index - serial->minor;
 +  index = port->port_number;
status =
-   BoxGetRegister(port->serial, index, MODEM_CONTROL_REGISTER, );
+   box_get_register(port->serial, index, MODEM_CONTROL_REGISTER, );
if (status < 0)
return -ESPIPE;
  


pgpN_pQeyeEEz.pgp
Description: PGP signature

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

2013-06-17 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/serqt_usb2/serqt_usb2.c between commit 1143832eca8f
(USB: serial: ports: add minor and port number) from the usb tree and
commit d68edc2881b1 (staging: serqt_usb2: Fixed coding style
CamelCases) from the staging tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/staging/serqt_usb2/serqt_usb2.c
index 880f5c0,39de5e0..000
--- a/drivers/staging/serqt_usb2/serqt_usb2.c
+++ b/drivers/staging/serqt_usb2/serqt_usb2.c
@@@ -870,10 -870,10 +870,10 @@@ static int qt_open(struct tty_struct *t
usb_clear_halt(serial-dev, port-read_urb-pipe);
port0-open_ports++;
  
-   result = qt_get_device(serial, port0-DeviceData);
+   result = qt_get_device(serial, port0-device_data);
  
/* Port specific setups */
-   result = qt_open_channel(serial, port-port_number, ChannelData);
 -  result = qt_open_channel(serial, port-number, channel_data);
++  result = qt_open_channel(serial, port-port_number, channel_data);
if (result  0) {
dev_dbg(port-dev, qt_open_channel failed\n);
return result;
@@@ -1239,23 -1245,25 +1239,23 @@@ static void qt_set_termios(struct tty_s
  
/* Now determine flow control */
if (cflag  CRTSCTS) {
 -  dev_dbg(port-dev, %s - Enabling HW flow control port %d\n,
 -  __func__, port-number);
 +  dev_dbg(port-dev, %s - Enabling HW flow control\n, 
__func__);
  
/* Enable RTS/CTS flow control */
-   status = BoxSetHW_FlowCtrl(port-serial, index, 1);
+   status = box_set_hw_flow_ctrl(port-serial, index, 1);
  
if (status  0) {
-   dev_dbg(port-dev, BoxSetHW_FlowCtrl failed\n);
+   dev_dbg(port-dev, box_set_hw_flow_ctrl failed\n);
return;
}
} else {
/* Disable RTS/CTS flow control */
dev_dbg(port-dev,
 -  %s - disabling HW flow control port %d\n,
 -  __func__, port-number);
 +  %s - disabling HW flow control\n, __func__);
  
-   status = BoxSetHW_FlowCtrl(port-serial, index, 0);
+   status = box_set_hw_flow_ctrl(port-serial, index, 0);
if (status  0) {
-   dev_dbg(port-dev, BoxSetHW_FlowCtrl failed\n);
+   dev_dbg(port-dev, box_set_hw_flow_ctrl failed\n);
return;
}
  
@@@ -1324,12 -1332,12 +1324,12 @@@ static inline int qt_real_tiocmget(stru
int status;
unsigned int index;
  
 -  index = tty-index - serial-minor;
 +  index = port-port_number;
status =
-   BoxGetRegister(port-serial, index, MODEM_CONTROL_REGISTER, mcr);
+   box_get_register(port-serial, index, MODEM_CONTROL_REGISTER, mcr);
if (status = 0) {
status =
-   BoxGetRegister(port-serial, index,
+   box_get_register(port-serial, index,
   MODEM_STATUS_REGISTER, msr);
  
}
@@@ -1363,9 -1371,9 +1363,9 @@@ static inline int qt_real_tiocmset(stru
int status;
unsigned int index;
  
 -  index = tty-index - serial-minor;
 +  index = port-port_number;
status =
-   BoxGetRegister(port-serial, index, MODEM_CONTROL_REGISTER, mcr);
+   box_get_register(port-serial, index, MODEM_CONTROL_REGISTER, mcr);
if (status  0)
return -ESPIPE;
  


pgpN_pQeyeEEz.pgp
Description: PGP signature

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

2012-09-19 Thread Greg KH 
On Wed, Sep 19, 2012 at 02:35:05PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/serqt_usb2/serqt_usb2.c between commit e8656b02ef35
> ("USB: serial: serqt_usb2: remove dbg() usage") from the usb tree and
> commit 623c2bb2c59a ("staging: serqt_usb2: fix dbg print when kzalloc
> failed to allocate qt_port") from the staging tree.
> 
> The former removes the line changed by the latter, so I just did that (no
> action is required).

That looks correct, thanks for doing this.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2012-09-19 Thread Greg KH 
On Wed, Sep 19, 2012 at 02:35:05PM +1000, Stephen Rothwell wrote:
 Hi Greg,
 
 Today's linux-next merge of the staging tree got a conflict in
 drivers/staging/serqt_usb2/serqt_usb2.c between commit e8656b02ef35
 (USB: serial: serqt_usb2: remove dbg() usage) from the usb tree and
 commit 623c2bb2c59a (staging: serqt_usb2: fix dbg print when kzalloc
 failed to allocate qt_port) from the staging tree.
 
 The former removes the line changed by the latter, so I just did that (no
 action is required).

That looks correct, thanks for doing this.

greg k-h
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2012-09-18 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/serqt_usb2/serqt_usb2.c between commit e8656b02ef35
("USB: serial: serqt_usb2: remove dbg() usage") from the usb tree and
commit 623c2bb2c59a ("staging: serqt_usb2: fix dbg print when kzalloc
failed to allocate qt_port") from the staging tree.

The former removes the line changed by the latter, so I just did that (no
action is required).
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgp2AmfkKf5SY.pgp
Description: PGP signature

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

2012-09-18 Thread Stephen Rothwell 
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/serqt_usb2/serqt_usb2.c between commit e8656b02ef35
(USB: serial: serqt_usb2: remove dbg() usage) from the usb tree and
commit 623c2bb2c59a (staging: serqt_usb2: fix dbg print when kzalloc
failed to allocate qt_port) from the staging tree.

The former removes the line changed by the latter, so I just did that (no
action is required).
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgp2AmfkKf5SY.pgp
Description: PGP signature