linux-next: please clean up the mali-dp tree

Hi, Now that a rebased copy of the mali-dp tree has been merged into the drm tree, please clean up the mali-dp tree as it is causing conflicts. -- Cheers, Stephen Rothwell pgpPThBmE24nb.pgp Description: OpenPGP digital signature

Re: linux-next: please clean up the v4l-dvb-next tree

Hi Mauro, On Tue, 19 Feb 2019 21:10:33 -0300 Mauro Carvalho Chehab wrote: > > Yeah, it had some branches that got already merged. > > Just updated it to be in sync with v4l-dvb tree. > > Sorry for the mess. No worries and thanks. -- Cheers, Stephen Rothwell pgp8aAePpaHMj.pgp Description:

Re: linux-next: please clean up the v4l-dvb-next tree

Em Wed, 20 Feb 2019 10:57:03 +1100 Stephen Rothwell escreveu: > Hi Mauro, > > It seems most (if not all) of the commits in the v4l-dvb-next tree are > also in the v4l-dvb tree and are now causing lots of conflicts when I > merge them both. Please clean it up. > Yeah, it had some branches that

linux-next: please clean up the v4l-dvb-next tree

Hi Mauro, It seems most (if not all) of the commits in the v4l-dvb-next tree are also in the v4l-dvb tree and are now causing lots of conflicts when I merge them both. Please clean it up. -- Cheers, Stephen Rothwell pgpsRe5JlxQKk.pgp Description: OpenPGP digital signature

Re: linux-next: please clean up the clockevents tree

On 20/12/2018 06:15, Stephen Rothwell wrote: > Hi Daniel, > > It looks like all the changes in the clockevents tree appear as other > commits in other tree(s). Could you please reset your tree to somewhere > in your upstream tree as it is beginning to produce conflicts. Done. --

linux-next: please clean up the clockevents tree

Hi Daniel, It looks like all the changes in the clockevents tree appear as other commits in other tree(s). Could you please reset your tree to somewhere in your upstream tree as it is beginning to produce conflicts. -- Cheers, Stephen Rothwell pgpBNGIoL6Ql8.pgp Description: OpenPGP digital si

Re: linux-next: please clean up the ipvs-next tree

On Mon, Aug 06, 2018 at 12:49:28PM +1000, Stephen Rothwell wrote: > Hi Simon, > > The ipvs-next tree appears to contain a set of patches that have been > merged into the net-next tree as different commits (some of them > slightly different). This is just causing conflicts. Thanks Stephen, I'll fi

linux-next: please clean up the ipvs-next tree

Hi Simon, The ipvs-next tree appears to contain a set of patches that have been merged into the net-next tree as different commits (some of them slightly different). This is just causing conflicts. -- Cheers, Stephen Rothwell pgpIl_KCDzubv.pgp Description: OpenPGP digital signature

Re: linux-next: please clean up the coresight tree

On Tue, 31 Jul 2018 at 23:45, Stephen Rothwell wrote: > > Hi Mathieu, > > All but the last 9 commits in the coresight tree have been merged into > the char-misc tree as different commits (they were sent to Greg as a > patch series rather than a merge request). Can you please rebase your > tree in

linux-next: please clean up the coresight tree

Hi Mathieu, All but the last 9 commits in the coresight tree have been merged into the char-misc tree as different commits (they were sent to Greg as a patch series rather than a merge request). Can you please rebase your tree into commit ccff2dfaceac ("coresight: tpiu: Fix disabling timeouts") f

Re: linux-next: please clean up the alpine tree

Hi Stephen, On Fri, Mar 23, 2018 at 08:33:15AM +1100, Stephen Rothwell wrote: > > The alpine tree > (git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/for-next) > only contains commits that have been upstreamed as different commits. > It also hasn't been updated since late Ma

linux-next: please clean up the alpine tree

Hi Antoine, The alpine tree (git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/for-next) only contains commits that have been upstreamed as different commits. It also hasn't been updated since late March 2017. Please clean it up (it takes some time to merge - presumably just

Re: linux-next: please clean up the nfs-anna tree

On 03/20/2018 08:11 PM, Stephen Rothwell wrote: > Hi all, > > It only seems to contain commits that have been upsreamed as different > commits and is causing conflicts: > > CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/transport.c > CONFLICT (content): Merge conflict in net/sunrpc/x

linux-next: please clean up the nfs-anna tree

Hi all, It only seems to contain commits that have been upsreamed as different commits and is causing conflicts: CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/transport.c CONFLICT (content): Merge conflict in net/sunrpc/xprt.c -- Cheers, Stephen Rothwell pgpWMaCiaoXYn.pgp Descript

Re: linux-next: please clean up the clockevents tree

Hi Daniel, On Wed, 14 Mar 2018 07:56:00 +0100 Daniel Lezcano wrote: > > On 14/03/2018 00:02, Stephen Rothwell wrote: > > Hi Daniel, > > > > The clockevents tree appears to only contain an old version of patches > > that have been committed upstream. As such, it is only causing conflicts. > > P

linux-next: please clean up the clockevents tree

Hi Daniel, The clockevents tree appears to only contain an old version of patches that have been committed upstream. As such, it is only causing conflicts. Please resync with your upstream tree. -- Cheers, Stephen Rothwell pgpMJOgR6ztsr.pgp Description: OpenPGP digital signature

Re: linux-next: please clean up the clockevents tree

Hi Daniel, On Mon, 10 Jul 2017 12:36:02 +0200 Daniel Lezcano wrote: > > It is fixed now. Thanks. -- Cheers, Stephen Rothwell

Re: linux-next: please clean up the clockevents tree

On 10/07/2017 05:30, Stephen Rothwell wrote: > Hi Daniel, > > Please clean up the clockevents tree > (git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next) > as all its commits have been merged into other tree(s) as different > commits (so all it is doing is adding lots of conflic

linux-next: please clean up the clockevents tree

Hi Daniel, Please clean up the clockevents tree (git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next) as all its commits have been merged into other tree(s) as different commits (so all it is doing is adding lots of conflicts :-(). -- Cheers, Stephen Rothwell

Re: linux-next: please clean up the thermal-soc tree

Hi Eduardo, On Mon, 5 Sep 2016 06:03:35 -0700 Eduardo Valentin wrote: > > On Mon, Aug 22, 2016 at 11:43:46AM +1000, Stephen Rothwell wrote: > > Hi Eduardo, > > > > The thermal-soc tree now shares quite a few patches (but not commits) > > with the thermal tree. These are causing a few unnecessar

Re: linux-next: please clean up the thermal-soc tree

Stephen, On Mon, Aug 22, 2016 at 11:43:46AM +1000, Stephen Rothwell wrote: > Hi Eduardo, > > The thermal-soc tree now shares quite a few patches (but not commits) > with the thermal tree. These are causing a few unnecessary conflicts, > so please clean it up. I had to be out for several weeks a

linux-next: please clean up the thermal-soc tree

Hi Eduardo, The thermal-soc tree now shares quite a few patches (but not commits) with the thermal tree. These are causing a few unnecessary conflicts, so please clean it up. -- Cheers, Stephen Rothwell

Re: linux-next: please clean up the samsung-krzk tree

On Tue, Aug 09, 2016 at 09:55:05AM +1000, Stephen Rothwell wrote: > Hi Krzysztof, > > The samsung-krzk tree > (git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next) > contains just these: > > 253256f64294 Merge branch 'next/soc' into for-next > b148ebe425aa Merge branch 'next/def

linux-next: please clean up the samsung-krzk tree

Hi Krzysztof, The samsung-krzk tree (git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next) contains just these: 253256f64294 Merge branch 'next/soc' into for-next b148ebe425aa Merge branch 'next/defconfig64' into for-next d11d19d93a01 Merge branch 'next/defconfig64' into for-next

Re: linux-next: please clean up the livepatching tree

On Fri, 5 Aug 2016, Takashi Iwai wrote: > > Exactly to avoid Linus' tree being polluted by the extra merge commits. > > > > My workflow is really simple -- development happens in (a lot of) topic > > branches, and each and every time any of the topic branches is updated by > > a new commit, tha

Re: linux-next: please clean up the livepatching tree

On Wed, 03 Aug 2016 11:29:02 +0200, Jiri Kosina wrote: > > On Wed, 3 Aug 2016, Stephen Rothwell wrote: > > > > This is a part we keep discussing from time to time, and I still don't > > > understand why it bothers you so much. The only reason is to keep the > > > branch non-rebasing, because it

Re: linux-next: please clean up the fscache tree

Stephen Rothwell wrote: > The fscache tree > (git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache) > only contains 2 commits: > > b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering > failed > 3c9b3b74606d FS-Cache: Increase reference of parent aft

Re: linux-next: please clean up the livepatching tree

On Wed, 3 Aug 2016, Stephen Rothwell wrote: > > This is a part we keep discussing from time to time, and I still don't > > understand why it bothers you so much. The only reason is to keep the > > branch non-rebasing, because it has downstreams. Code-wise, it's > > always equivalent to what end

Re: linux-next: please clean up the livepatching tree

Hi Jiri, On Wed, 3 Aug 2016 01:41:17 +0200 (CEST) Jiri Kosina wrote: > > On Wed, 3 Aug 2016, Stephen Rothwell wrote: > > > The livepatching tree > > (git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next) > > today consists of only lots of merges > > This is a part we kee

linux-next: please clean up the fscache tree

Hi David, The fscache tree (git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache) only contains 2 commits: b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed 3c9b3b74606d FS-Cache: Increase reference of parent after registering, netfs succes

Re: linux-next: please clean up the livepatching tree

Hi Stephen On Wed, 3 Aug 2016, Stephen Rothwell wrote: > The livepatching tree > (git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next) > today consists of only lots of merges This is a part we keep discussing from time to time, and I still don't understand why it bothers

linux-next: please clean up the livepatching tree

Hi Jiri, The livepatching tree (git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next) today consists of only lots of merges (and a patch that is also reverted). Please just reset it to somewhere in Linus' tree. -- Cheers, Stephen Rothwell

Re: linux-next: please clean up the hid tree

Hi Jiri, On Wed, 13 Jul 2016 11:21:36 +0200 (CEST) Jiri Kosina wrote: > > On Wed, 13 Jul 2016, Stephen Rothwell wrote: > > > The hid tree > > (git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next) > > seems to be based on v3.19 and constists of a large number of merges > > (of st

Re: linux-next: please clean up the hid tree

On Wed, 13 Jul 2016, Stephen Rothwell wrote: > Hi Jiri, > > The hid tree > (git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next) > seems to be based on v3.19 and constists of a large number of merges > (of stuff that is now in Linus' tree) and ends with one particulary > large re

Re: linux-next: please clean up the hid tree

Hi Jiri, On Wed, 13 Jul 2016 09:28:09 +1000 Stephen Rothwell wrote: > > The hid tree > (git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next) > seems to be based on v3.19 and constists of a large number of merges > (of stuff that is now in Linus' tree) and ends with one particula

linux-next: please clean up the hid tree

Hi Jiri, The hid tree (git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next) seems to be based on v3.19 and constists of a large number of merges (of stuff that is now in Linus' tree) and ends with one particulary large revert (of a merge). Please just rebase it onto (e.g.) v4.7-r

Re: linux-next: please clean up the lightnvm tree

Hi Matias, On Fri, 8 Jul 2016 06:30:59 +0200 Matias Bjørling wrote: > > Thanks Stephen. Updated the for-next. I will make sure they are taken > off if applied directly to the block tree in the future. Tnanks. -- Cheers, Stephen Rothwell

Re: linux-next: please clean up the lightnvm tree

On 07/08/2016 06:22 AM, Stephen Rothwell wrote: Hi Matias, I noticed that the commits in the lightnvm tree have been applied to the block tree as a series of patches (i.e. effectively rebased). Could you please remove all the duplicate patches from the lightnvm tree (which I think is the whole t

linux-next: please clean up the lightnvm tree

Hi Matias, I noticed that the commits in the lightnvm tree have been applied to the block tree as a series of patches (i.e. effectively rebased). Could you please remove all the duplicate patches from the lightnvm tree (which I think is the whole tree, curretly) before they start causing merge con

linux-next: please clean up the ceph tree

Hi Sage, It appears that the ceph tree was completely rebased before asking Linus to merge it (to remove its first commit (ebfadc523e06 "[DO NOT MERGE] rbd: bump RBD_MAX_PARENT_CHAIN_LEN to 128")). Please clean it up as it is starting to produce comflicts in linux-next (against Linus' tree so far

Re: linux-next: please clean up the clockevents tree

Hi Daniel, On Wed, 13 May 2015 09:46:42 +0200 Daniel Lezcano wrote: > > I updated the branch. Let me know if everything is all right now. Looks good. Thanks. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpX1xYfUxkMS.pgp Description: OpenPGP digital signature

Re: linux-next: please clean up the clockevents tree

On 05/13/2015 07:19 AM, Stephen Rothwell wrote: Hi Daniel, All the commits in the clockevents tree have appeared upstream (as different commits, unfortunately). Please clean up your tree it is just causing unnecessary conflicts. Hi Stephen, I updated the branch. Let me know if everything is

linux-next: please clean up the clockevents tree

Hi Daniel, All the commits in the clockevents tree have appeared upstream (as different commits, unfortunately). Please clean up your tree it is just causing unnecessary conflicts. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpnviYYoEWcc.pgp Description: OpenPGP digi

linux-next: please clean up the audit tree

Hi Eric, The last commit to the audit tree (git://git.infradead.org/users/eparis/audit.git#master) is from April and it is now causing more and more conflicts with other trees in linux-next. Please have a look at it and clean it up. -- Cheers, Stephen Rothwells...@canb.auug.

linux-next: please clean up

Hi all, As your work is merged by upstream trees, please clean up your linux-next included branches. A big thanks to those who already do this in a timely fashion. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpaaDtRS04nC.pgp Description: PGP signature

linux-next: please clean up the msm tree

Hi David, Since all of the patches in the msm tree have been merged into the arm-soc tree (but as different commits :-(), can you please clean up the msm tree. It is causing unneeded conflicts in linux-next. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpFnCGBVKTsK.pgp