linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: "Nicholas A. Bellinger" <nab@linux-iscsi.org>,
	Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: build failure after merge of the target-updates tree
Date: Thu, 8 Oct 2015 07:22:46 +1100	[thread overview]
Message-ID: <20151008072246.00d423ea@canb.auug.org.au> (raw)
In-Reply-To: <87bncaj23e.fsf@ashishki-desk.ger.corp.intel.com>

Hi Alexander,

On Wed, 07 Oct 2015 15:27:17 +0300 Alexander Shishkin <alexander.shishkin@linux.intel.com> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
> > Caused by commit
> >
> >   7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices")
> >
> > from the char-misc tree interacting with commit
> >
> >   f71933438300 ("configfs: remove old API")
> >
> > I have reverted the target-updated commit for today.  If there is a
> > better resolution (and I assume that there is), please let me know.
> 
> I'm going to follow up to this email with a fix that updates stm class
> code to the new api, I'm not sure whos branch it should go to, because
> it only works with Christoph's configfs patches in the -next.

Well, I will add it as a merge resolution patch in linux-next (instead
of the current revert) but someone will have to remember to send it to
Linus when the latter of these two trees is merged by him.  Unless one
of these trees can merge the other (or a non rebasing subset) ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

  reply	other threads:[~2015-10-07 20:22 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-07  3:49 linux-next: build failure after merge of the target-updates tree Stephen Rothwell
2015-10-07 12:27 ` [PATCH] stm class: Use per-attribute show and store methods in configfs policy Alexander Shishkin
2015-10-07 12:27 ` linux-next: build failure after merge of the target-updates tree Alexander Shishkin
2015-10-07 20:22   ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-06-03  8:16 Stephen Rothwell
2015-06-03 20:00 ` James Bottomley
2015-06-03 22:12   ` Nicholas A. Bellinger
2015-06-03 22:33     ` James Bottomley
2015-06-03 22:46       ` Nicholas A. Bellinger
2015-05-12  4:54 Stephen Rothwell
2014-10-03  5:46 Stephen Rothwell
2014-10-03  8:10 ` Nicholas A. Bellinger
2014-05-23  9:11 Stephen Rothwell
2014-05-23 17:38 ` Nicholas A. Bellinger
2014-01-20  5:25 Stephen Rothwell
2012-09-17  3:41 Stephen Rothwell
2012-09-18  0:57 ` Nicholas A. Bellinger
2012-02-10  0:50 Stephen Rothwell
2012-02-10  1:33 ` Nicholas A. Bellinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151008072246.00d423ea@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=arnd@arndb.de \
    --cc=greg@kroah.com \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=nab@linux-iscsi.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).