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

Hi Greg, On Tue, 28 Apr 2020 14:15:45 +0200 Greg KH wrote: > > This should now all be resolved in my staging.next branch. Yep, thanks. -- Cheers, Stephen Rothwell pgp7yFb9_JAiu.pgp Description: OpenPGP digital signature

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

On Fri, Apr 24, 2020 at 08:45:55AM +0200, Greg KH wrote: > On Fri, Apr 24, 2020 at 03:15:46PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the staging tree got a conflict in: > > > > drivers/staging/vt6656/main_usb.c > > > > between commit: > > > >

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

On Tue, Apr 9, 2019 at 6:40 PM Andy Shevchenko wrote: > > On Mon, Apr 08, 2019 at 01:01:51PM +0100, Jonathan Cameron wrote: > > On Mon, 8 Apr 2019 13:34:37 +0300 > > Andy Shevchenko wrote: > > > On Mon, Apr 08, 2019 at 11:14:39AM +0100, Jonathan Cameron wrote: > > > > On Mon, 8 Apr 2019 13:01:21

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

On Mon, Apr 08, 2019 at 01:01:51PM +0100, Jonathan Cameron wrote: > On Mon, 8 Apr 2019 13:34:37 +0300 > Andy Shevchenko wrote: > > On Mon, Apr 08, 2019 at 11:14:39AM +0100, Jonathan Cameron wrote: > > > On Mon, 8 Apr 2019 13:01:21 +0300 > > > Andy Shevchenko wrote: > > > > On Mon, Apr 08, 2019

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

On Mon, 8 Apr 2019 13:34:37 +0300 Andy Shevchenko wrote: > On Mon, Apr 08, 2019 at 11:14:39AM +0100, Jonathan Cameron wrote: > > On Mon, 8 Apr 2019 13:01:21 +0300 > > Andy Shevchenko wrote: > > > On Mon, Apr 08, 2019 at 09:14:58AM +0100, Jonathan Cameron wrote: > > > > On Mon, 8 Apr 2019

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

On Mon, Apr 08, 2019 at 11:14:39AM +0100, Jonathan Cameron wrote: > On Mon, 8 Apr 2019 13:01:21 +0300 > Andy Shevchenko wrote: > > On Mon, Apr 08, 2019 at 09:14:58AM +0100, Jonathan Cameron wrote: > > > On Mon, 8 Apr 2019 13:02:12 +1000 > > > Stephen Rothwell wrote: > > > > Today's linux-next

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

On Mon, 8 Apr 2019 13:01:21 +0300 Andy Shevchenko wrote: > On Mon, Apr 08, 2019 at 09:14:58AM +0100, Jonathan Cameron wrote: > > On Mon, 8 Apr 2019 13:02:12 +1000 > > Stephen Rothwell wrote: > > > > > Hi all, > > > > > > Today's linux-next merge of the staging tree got a conflict in: > > >

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

On Mon, Apr 08, 2019 at 09:14:58AM +0100, Jonathan Cameron wrote: > On Mon, 8 Apr 2019 13:02:12 +1000 > Stephen Rothwell wrote: > > > Hi all, > > > > Today's linux-next merge of the staging tree got a conflict in: > > > > drivers/iio/industrialio-buffer.c > > > > between commit: > > > >

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

On Mon, 8 Apr 2019 13:02:12 +1000 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/iio/industrialio-buffer.c > > between commit: > > 20ea39ef9f2f ("iio: Fix scan mask selection") > > from the staging.current tree and

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

Hi all, Today's linux-next merge of the staging tree got a conflict in: drivers/iio/industrialio-buffer.c between commit: 20ea39ef9f2f ("iio: Fix scan mask selection") from the staging.current tree and commit: 3862828a903d ("iio: buffer: Switch to bitmap_zalloc()") from the staging

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

On Mon, Dec 04, 2017 at 12:50:45PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/iio/adc/meson_saradc.c > > between commit: > > d85eed9f5763 ("iio: adc: meson-saradc: initialize the bandgap correctly on > older

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

On Mon, Dec 04, 2017 at 12:50:45PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/iio/adc/meson_saradc.c > > between commit: > > d85eed9f5763 ("iio: adc: meson-saradc: initialize the bandgap correctly on > older

RE: linux-next: manual merge of the staging tree with the staging.current tree

ernel.org>; Xingyu Chen <xingyu.c...@amlogic.com>; > Jonathan Cameron <jonathan.came...@huawei.com>; Martin Blumenstingl > <martin.blumensti...@googlemail.com> > Subject: Re: linux-next: manual merge of the staging tree with the > staging.current tree > > On Mo

RE: linux-next: manual merge of the staging tree with the staging.current tree

> -Original Message- > From: Greg KH [mailto:g...@kroah.com] > Sent: 04 December 2017 09:10 > To: Stephen Rothwell > Cc: Linux-Next Mailing List ; Linux Kernel Mailing > List ; Xingyu Chen ; > Jonathan Cameron ; Martin Blumenstingl > > Subject: R

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

On Mon, Dec 04, 2017 at 12:50:45PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/iio/adc/meson_saradc.c > > between commit: > > d85eed9f5763 ("iio: adc: meson-saradc: initialize the bandgap correctly on > older

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

On Mon, Dec 04, 2017 at 12:50:45PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/iio/adc/meson_saradc.c > > between commit: > > d85eed9f5763 ("iio: adc: meson-saradc: initialize the bandgap correctly on > older

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/iio/adc/meson_saradc.c between commit: d85eed9f5763 ("iio: adc: meson-saradc: initialize the bandgap correctly on older SoCs") from the staging.current tree and commit: 930df4d853a8 ("iio: adc:

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/iio/adc/meson_saradc.c between commit: d85eed9f5763 ("iio: adc: meson-saradc: initialize the bandgap correctly on older SoCs") from the staging.current tree and commit: 930df4d853a8 ("iio: adc:

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

On Wed, Jul 19, 2017 at 10:30:43AM +0200, Marcus Wolf wrote: > Hi Greg, > > I am surprised and happy about getting all the feedback and ideas how to > improve. Wow! > > Can you tell me, how this is going on? Do I need to collect all those patches, > evaluate and test them or is it done

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

On Wed, Jul 19, 2017 at 10:30:43AM +0200, Marcus Wolf wrote: > Hi Greg, > > I am surprised and happy about getting all the feedback and ideas how to > improve. Wow! > > Can you tell me, how this is going on? Do I need to collect all those patches, > evaluate and test them or is it done

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

Hi Greg, I am surprised and happy about getting all the feedback and ideas how to improve. Wow! Can you tell me, how this is going on? Do I need to collect all those patches, evaluate and test them or is it done automatically? Do you perhaps need diffrent kind of help from me? Concerning

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

Hi Greg, I am surprised and happy about getting all the feedback and ideas how to improve. Wow! Can you tell me, how this is going on? Do I need to collect all those patches, evaluate and test them or is it done automatically? Do you perhaps need diffrent kind of help from me? Concerning

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

On Wed, Jul 19, 2017 at 01:07:28PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got conflicts in: > > drivers/staging/Kconfig > drivers/staging/Makefile > > between commit: > > dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to

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

On Wed, Jul 19, 2017 at 01:07:28PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got conflicts in: > > drivers/staging/Kconfig > drivers/staging/Makefile > > between commit: > > dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to

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

Hi Greg, Today's linux-next merge of the staging tree got conflicts in: drivers/staging/Kconfig drivers/staging/Makefile between commit: dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging") from the staging.current tree and commit: 874bcba65f9a ("staging: pi433: New

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

Hi Greg, Today's linux-next merge of the staging tree got conflicts in: drivers/staging/Kconfig drivers/staging/Makefile between commit: dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging") from the staging.current tree and commit: 874bcba65f9a ("staging: pi433: New

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/greybus/timesync_platform.c between commit: b17c1bba9cec ("staging: greybus: timesync: validate platform state callback") from the staging.current tree and commit: bdfb95c4baab ("staging: greybus:

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/greybus/timesync_platform.c between commit: b17c1bba9cec ("staging: greybus: timesync: validate platform state callback") from the staging.current tree and commit: bdfb95c4baab ("staging: greybus:

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

On 14/06/16 06:04, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/iio/industrialio-trigger.c > > between commit: > > 995438233579 ("iio: Fix error handling in iio_trigger_attach_poll_func") > > from the staging.current

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

On 14/06/16 06:04, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/iio/industrialio-trigger.c > > between commit: > > 995438233579 ("iio: Fix error handling in iio_trigger_attach_poll_func") > > from the staging.current

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/iio/industrialio-trigger.c between commit: 995438233579 ("iio: Fix error handling in iio_trigger_attach_poll_func") from the staging.current tree and commit: ef2d71d6b7fb ("iio: triggers: Make trigger ops

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/iio/industrialio-trigger.c between commit: 995438233579 ("iio: Fix error handling in iio_trigger_attach_poll_func") from the staging.current tree and commit: ef2d71d6b7fb ("iio: triggers: Make trigger ops

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

On 27 April 2016 05:54:00 BST, Stephen Rothwell wrote: >Hi Greg, > >Today's linux-next merge of the staging tree got a conflict in: > > drivers/iio/magnetometer/ak8975.c > >between commit: > > 05be8d4101d9 ("iio: ak8975: fix maybe-uninitialized warning") > >from the

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

On 27 April 2016 05:54:00 BST, Stephen Rothwell wrote: >Hi Greg, > >Today's linux-next merge of the staging tree got a conflict in: > > drivers/iio/magnetometer/ak8975.c > >between commit: > > 05be8d4101d9 ("iio: ak8975: fix maybe-uninitialized warning") > >from the staging.current tree and

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/iio/magnetometer/ak8975.c between commit: 05be8d4101d9 ("iio: ak8975: fix maybe-uninitialized warning") from the staging.current tree and commit: 97eacb9166f4 ("iio:ak8975: add mounting matrix support")

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/iio/magnetometer/ak8975.c between commit: 05be8d4101d9 ("iio: ak8975: fix maybe-uninitialized warning") from the staging.current tree and commit: 97eacb9166f4 ("iio:ak8975: add mounting matrix support")

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

On Tue, Apr 05, 2016 at 01:03:26PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/iio/gyro/bmg160_core.c > > between commit: > > b475c59b113d ("iio: gyro: bmg160: fix buffer read values") > > from the

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

On Tue, Apr 05, 2016 at 01:03:26PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/iio/gyro/bmg160_core.c > > between commit: > > b475c59b113d ("iio: gyro: bmg160: fix buffer read values") > > from the

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/iio/gyro/bmg160_core.c between commit: b475c59b113d ("iio: gyro: bmg160: fix buffer read values") from the staging.current tree and commit: 7e3d1eb123d8 ("iio: accel: bmg160: optimize transfers in trigger

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/iio/gyro/bmg160_core.c between commit: b475c59b113d ("iio: gyro: bmg160: fix buffer read values") from the staging.current tree and commit: 7e3d1eb123d8 ("iio: accel: bmg160: optimize transfers in trigger

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

On Mon, Feb 01, 2016 at 02:45:21PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/panel/panel.c > > between commit: > > b64a1cbef6df ("Revert "Staging: panel: usleep_range is preferred over > udelay"") > >

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/panel/panel.c between commit: b64a1cbef6df ("Revert "Staging: panel: usleep_range is preferred over udelay"") from the staging.current tree and commit: df44f1504b4d ("staging: panel: remove

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

On Mon, Feb 01, 2016 at 02:45:21PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/panel/panel.c > > between commit: > > b64a1cbef6df ("Revert "Staging: panel: usleep_range is preferred over > udelay"") > >

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/panel/panel.c between commit: b64a1cbef6df ("Revert "Staging: panel: usleep_range is preferred over udelay"") from the staging.current tree and commit: df44f1504b4d ("staging: panel: remove

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

On Thu, May 01, 2014 at 02:37:26PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/iio/adc/Kconfig between commit bbc28134e915 ("iio: adc: Nothing > in ADC should be a bool CONFIG") from the staging.current tree and commit >

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/iio/adc/Kconfig between commit bbc28134e915 ("iio: adc: Nothing in ADC should be a bool CONFIG") from the staging.current tree and commit 9ef080ec0c5e ("iio: adc: Fix exynos_adc dependencies") from the staging tree.

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/iio/adc/Kconfig between commit bbc28134e915 (iio: adc: Nothing in ADC should be a bool CONFIG) from the staging.current tree and commit 9ef080ec0c5e (iio: adc: Fix exynos_adc dependencies) from the staging tree. I

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

On Thu, May 01, 2014 at 02:37:26PM +1000, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/iio/adc/Kconfig between commit bbc28134e915 (iio: adc: Nothing in ADC should be a bool CONFIG) from the staging.current tree and commit

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

On Thu, Apr 17, 2014 at 02:31:37PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got conflicts in > drivers/staging/rtl8723au/core/rtw_ieee80211.c, > drivers/staging/rtl8723au/core/rtw_mlme_ext.c, > drivers/staging/rtl8723au/core/rtw_p2p.c and >

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

On Thu, Apr 17, 2014 at 02:31:37PM +1000, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the staging tree got conflicts in drivers/staging/rtl8723au/core/rtw_ieee80211.c, drivers/staging/rtl8723au/core/rtw_mlme_ext.c, drivers/staging/rtl8723au/core/rtw_p2p.c and

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

Hi Greg, Today's linux-next merge of the staging tree got conflicts in drivers/staging/rtl8723au/core/rtw_ieee80211.c, drivers/staging/rtl8723au/core/rtw_mlme_ext.c, drivers/staging/rtl8723au/core/rtw_p2p.c and drivers/staging/rtl8723au/core/rtw_wlan_util.c between commit f5d197b614d8 ("staging:

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

Hi Greg, Today's linux-next merge of the staging tree got conflicts in drivers/staging/rtl8723au/core/rtw_ieee80211.c, drivers/staging/rtl8723au/core/rtw_mlme_ext.c, drivers/staging/rtl8723au/core/rtw_p2p.c and drivers/staging/rtl8723au/core/rtw_wlan_util.c between commit f5d197b614d8 (staging:

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

On Thu, Mar 06, 2014 at 04:06:49PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/cxt1e1/linux.c between commit 084b6e7765b9 > ("staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()") > from the

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

On Thu, Mar 06, 2014 at 04:06:49PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/cxt1e1/linux.c between commit 084b6e7765b9 (staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()) from the

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

On Thu, Mar 06, 2014 at 04:06:49PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/cxt1e1/linux.c between commit 084b6e7765b9 > ("staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()") > from the

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/cxt1e1/linux.c between commit 084b6e7765b9 ("staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()") from the staging.current tree and commit 922b81b835c4 ("staging: cxt1e1: remove space between

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/cxt1e1/linux.c between commit 084b6e7765b9 (staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()) from the staging.current tree and commit 922b81b835c4 (staging: cxt1e1: remove space between

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

On Thu, Mar 06, 2014 at 04:06:49PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/cxt1e1/linux.c between commit 084b6e7765b9 (staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()) from the

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in include/linux/hid-sensor-ids.h between commit 751d17e23a9f ("iio: hid-sensors: Fix power and report state") from the staging.current tree and commit 64528d03d723 ("iio: hid-sensors: accelerometer: Add sensitivity") from the

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in include/linux/hid-sensor-ids.h between commit 751d17e23a9f (iio: hid-sensors: Fix power and report state) from the staging.current tree and commit 64528d03d723 (iio: hid-sensors: accelerometer: Add sensitivity) from the

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

On Wed, Nov 27, 2013 at 01:01:44PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got conflicts in > drivers/staging/tidspbridge/pmgr/cmm.c, > drivers/staging/tidspbridge/pmgr/dbll.c, > drivers/staging/tidspbridge/pmgr/dev.c, >

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

Hi Greg, Today's linux-next merge of the staging tree got conflicts in drivers/staging/tidspbridge/pmgr/cmm.c, drivers/staging/tidspbridge/pmgr/dbll.c, drivers/staging/tidspbridge/pmgr/dev.c, drivers/staging/tidspbridge/pmgr/dmm.c and drivers/staging/tidspbridge/pmgr/dspapi.c between commit

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

Hi Greg, Today's linux-next merge of the staging tree got conflicts in drivers/staging/tidspbridge/pmgr/cmm.c, drivers/staging/tidspbridge/pmgr/dbll.c, drivers/staging/tidspbridge/pmgr/dev.c, drivers/staging/tidspbridge/pmgr/dmm.c and drivers/staging/tidspbridge/pmgr/dspapi.c between commit

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

On Wed, Nov 27, 2013 at 01:01:44PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the staging tree got conflicts in drivers/staging/tidspbridge/pmgr/cmm.c, drivers/staging/tidspbridge/pmgr/dbll.c, drivers/staging/tidspbridge/pmgr/dev.c,

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

Stephen Rothwell wrote: >Hi Greg, > >Today's linux-next merge of the staging tree got a conflict in >drivers/iio/industrialio-buffer.c between commit d66e0452bf6b ("iio: >Fix >crash when scan_bytes is computed with active_scan_mask == NUL") from >the >staging.current tree and commit

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

Thanks Stephen. Sorry Greg, I meant to mention these two would occur but clean forgot when sending that pull request. Both are are correctly merged by Stephen. Jonathan Stephen Rothwell wrote: >Hi Greg, > >Today's linux-next merge of the staging tree got a conflict in

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/iio/industrialio-event.c between commit cadc2125e140 ("iio: fix: Keep a reference to the IIO device for open file descriptors") from the staging.current tree and commit a646fbf0fd11 ("iio: use anon_inode_getfd () with

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/iio/industrialio-buffer.c between commit d66e0452bf6b ("iio: Fix crash when scan_bytes is computed with active_scan_mask == NUL") from the staging.current tree and commit 705ee2c98a37 ("iio:buffer: Simplify

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/iio/industrialio-buffer.c between commit d66e0452bf6b (iio: Fix crash when scan_bytes is computed with active_scan_mask == NUL) from the staging.current tree and commit 705ee2c98a37 (iio:buffer: Simplify

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/iio/industrialio-event.c between commit cadc2125e140 (iio: fix: Keep a reference to the IIO device for open file descriptors) from the staging.current tree and commit a646fbf0fd11 (iio: use anon_inode_getfd () with

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

Thanks Stephen. Sorry Greg, I meant to mention these two would occur but clean forgot when sending that pull request. Both are are correctly merged by Stephen. Jonathan Stephen Rothwell s...@canb.auug.org.au wrote: Hi Greg, Today's linux-next merge of the staging tree got a conflict in

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

Stephen Rothwell s...@canb.auug.org.au wrote: Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/iio/industrialio-buffer.c between commit d66e0452bf6b (iio: Fix crash when scan_bytes is computed with active_scan_mask == NUL) from the staging.current tree and commit

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

On 2012-10-25 03:19, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/comedi/drivers/amplc_dio200.c between commit dfb2540e91e1 ("staging: comedi: amplc_dio200: fix possible NULL deref during detach") from the staging.current tree

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

On 2012-10-25 03:19, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/comedi/drivers/amplc_dio200.c between commit dfb2540e91e1 (staging: comedi: amplc_dio200: fix possible NULL deref during detach) from the staging.current tree and

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/comedi/drivers/amplc_dio200.c between commit dfb2540e91e1 ("staging: comedi: amplc_dio200: fix possible NULL deref during detach") from the staging.current tree and commit 71b3e9e8dc21 ("staging: comedi:

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

Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/comedi/drivers/amplc_dio200.c between commit dfb2540e91e1 (staging: comedi: amplc_dio200: fix possible NULL deref during detach) from the staging.current tree and commit 71b3e9e8dc21 (staging: comedi: