On Tue, Oct 09, 2018 at 03:59:45PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/dgnc/dgnc_tty.c
>
> between commits:
>
> b68166ef8fd9 ("dgnc: leave TIOC[GS]SOFTCAR to ldisc")
> e002c6f1ccb9 ("dgnc: don't b
Hi all,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/dgnc/dgnc_tty.c
between commits:
b68166ef8fd9 ("dgnc: leave TIOC[GS]SOFTCAR to ldisc")
e002c6f1ccb9 ("dgnc: don't bother with (empty) stub for TCXONC")
79273fc94ee9 ("dgnc: break-related ioctls won't
On Tue, Mar 13, 2018 at 03:22:40PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in:
>
> drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c
> drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
>
> between commit:
>
> 304e
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in:
drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c
drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
between commit:
304ec482f562 ("get rid of pointless includes of fs_struct.h")
from the vfs tree and commi
On Mon, Dec 04, 2017 at 01:06:49PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/most/video/video.c
>
> between commit:
>
> afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances")
>
> from the v
On Mon, Dec 04, 2017 at 12:58:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/most/cdev/cdev.c
>
> between commit:
>
> afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances")
>
> from the vfs
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/most/video/video.c
between commit:
afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances")
from the vfs tree and commit:
1b10a0316e2d ("staging: most: video: remove aim designators")
fr
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/most/cdev/cdev.c
between commit:
afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances")
from the vfs tree and commit:
1fd923f38610 ("staging: most: cdev: replace function prefix")
from
On Thu, Nov 09, 2017 at 03:01:26PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/pi433/pi433_if.c
>
> between commit:
>
> f81f0b5c9a30 ("pi433: sanitize ioctl")
>
> from the vfs tree and commit:
>
> 69af
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/pi433/pi433_if.c
between commit:
f81f0b5c9a30 ("pi433: sanitize ioctl")
from the vfs tree and commit:
69af5d92da20 ("Staging: pi433: Fix the position of brace after if")
from the staging tree.
I f
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/lustre/lustre/llite/statahead.c
between commit:
7126bc2e8d60 ("lustre: switch to use of ->d_init()")
from the vfs tree and commit:
3c8fb1b105cd ("staging: lustre: statahead: set sai_index_wait with
On Tue, Sep 20, 2016 at 03:03:27PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/lustre/lustre/llite/file.c
>
> between commit:
>
> 47b34458fc93 ("lustre: use %pD")
>
> from the vfs tree and commit:
>
>
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/lustre/lustre/llite/file.c
between commit:
47b34458fc93 ("lustre: use %pD")
from the vfs tree and commit:
bb5c7f2630de ("staging: lustre: changelog: fix comparison between signed and
unsigned")
fr
On Tue, May 03, 2016 at 04:44:22PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/lustre/lustre/llite/rw26.c
>
> between commit:
>
> c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO")
>
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/lustre/lustre/llite/rw26.c
between commit:
c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO")
from the vfs tree and commit:
8c7b0e1a6747 ("staging/lustre/llite: rename ccc_obje
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lustre/llite/llite_lib.c between commit
6a661bd6ffba ("lustre: get rid of playing with ->fs") from the vfs tree
and commit 9c234f6cb4c4 ("drivers: staging: lustre: Fix "'foo* bar'
should be 'foo *bar'" e
On Thu, Nov 27, 2014 at 08:31:01PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 27 Nov 2014 20:11:56 +1100 Stephen Rothwell
> wrote:
> >
> > diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
> > index 7b6b9e2e0102,3b0336029da3..
> > --- a/drivers/staging/lustre/lustre
Hi all,
On Thu, 27 Nov 2014 20:11:56 +1100 Stephen Rothwell
wrote:
>
> diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
> index 7b6b9e2e0102,3b0336029da3..
> --- a/drivers/staging/lustre/lustre/llite/llite_lib.c
> +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
> @@@ -
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in
drivers/staging/lustre/lustre/llite/dcache.c,
drivers/staging/lustre/lustre/llite/llite_internal.h,
drivers/staging/lustre/lustre/llite/llite_lib.c,
drivers/staging/lustre/lustre/llite/namei.c and
drivers/staging/lustre/lustre/
On Mon, Nov 03, 2014 at 01:29:14PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/lustre/lustre/llite/file.c between commit bc281d072ba9
> ("lustre: opened file can't have negative dentry") from the vfs tree
> and comm
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lustre/llite/namei.c between commits 8da673df2d77
("ll_get_child_fid(): callers already have the child") and ("kill
ll_unlink_generic()") from the vfs tree and commit 2a80f844158b
("Staging: lustre: lli
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lustre/llite/llite_lib.c between commit
94b5670e78ce ("move d_rcu from overlapping d_child to overlapping
d_alias") from the vfs tree and commit cf29a7b6eae8 ("Staging: lustre:
Fix checkpatch warning: Mi
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lustre/llite/file.c between commit bc281d072ba9
("lustre: opened file can't have negative dentry") from the vfs tree
and commit 57303e76c225 ("staging: lustre: Fix checkpatch.pl
spacing-related errors")
On Wed, Apr 10, 2013 at 03:54:51PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/vt6655/device_main.c between commit f805442e130c
> ("vt6655: slightly clean reading config file") from the vfs tree and
> commits 915006
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/vt6655/device_main.c between commit f805442e130c
("vt6655: slightly clean reading config file") from the vfs tree and
commits 915006cddc79 ("staging:vt6655:device_main: Whitespace cleanups")
and 5e0cc8a231be ("
On Thu, Apr 04, 2013 at 03:34:33PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in
> drivers/staging/dgrp/dgrp_dpa_ops.c, drivers/staging/dgrp/dgrp_mon_ops.c,
> drivers/staging/dgrp/dgrp_net_ops.c and
> drivers/staging/dgrp/dgrp_ports_ops
On Thu, Apr 04, 2013 at 03:40:17PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/dgrp/dgrp_specproc.c between commit 464b4fd02caa ("dgrp
> procfs fixes, part 2") and various other commits from the vfs tree and
> commi
On Thu, Apr 04, 2013 at 03:43:29PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in
> drivers/staging/ccg/f_fs.c and drivers/staging/ccg/rndis.c between
> commits 465bced2e3ed ("ccg: don't bother with fops->owner") and
> 4dfac87dca02 ("pro
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in
drivers/staging/ccg/f_fs.c and drivers/staging/ccg/rndis.c between
commits 465bced2e3ed ("ccg: don't bother with fops->owner") and
4dfac87dca02 ("procfs: new helper - PDE_DATA(inode)") from the vfs tree
and commit 515e6dd20b3f
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/dgrp/dgrp_specproc.c between commit 464b4fd02caa ("dgrp
procfs fixes, part 2") and various other commits from the vfs tree and
commit 433121c6ef51 ("staging: dgrp: cleanup sparse warnings") from the
staging tre
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in
drivers/staging/dgrp/dgrp_dpa_ops.c, drivers/staging/dgrp/dgrp_mon_ops.c,
drivers/staging/dgrp/dgrp_net_ops.c and
drivers/staging/dgrp/dgrp_ports_ops.c between commit 33633903f16f ("dgrp
procfs fixes, part 5: per-node files") f
On Mon, Sep 24, 2012 at 05:07:41PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/android/binder.c between commit 004223461eee ("new
> helper: __alloc_fd()") from the vfs tree and commits efde99cd281a
> ("Staging: andr
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/android/binder.c between commit 004223461eee ("new
helper: __alloc_fd()") from the vfs tree and commits efde99cd281a
("Staging: android: binder: Make task_get_unused_fd_flags function
static") and bf2023614201
33 matches
Mail list logo
