All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Tejun Heo <tj@kernel.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the driver-core.current tree
Date: Mon, 9 Dec 2013 00:21:52 -0800	[thread overview]
Message-ID: <20131209082152.GA26809@kroah.com> (raw)
In-Reply-To: <20131209144712.57a50d7ed468ae8a4d57a0bf@canb.auug.org.au>

On Mon, Dec 09, 2013 at 02:47:12PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> fs/sysfs/file.c between commit a8b14744429f ("sysfs: give different
> locking key to regular and bin files") from the driver-core.current tree
> and commit 414985ae23c0 ("sysfs, kernfs: move file core code to
> fs/kernfs/file.c") (among others) from the driver-core tree.
> 
> I just dropped the driver-core.current tree commit as I don't see what
> needs to be done after the other changes in the driver-core tree.

Tejun said he would provide a merge fixup as we knew this was going to
be a problem :)

thanks,

greg k-h

  reply	other threads:[~2013-12-09  8:35 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-09  3:47 linux-next: manual merge of the driver-core tree with the driver-core.current tree Stephen Rothwell
2013-12-09  8:21 ` Greg KH [this message]
2013-12-10 14:50   ` [PATCH driver-core-next] sysfs: bail early from kernfs_file_mmap() to avoid spurious lockdep warning Tejun Heo
2013-12-11  0:03     ` Stephen Rothwell
2013-12-11  5:39     ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2026-01-07  4:29 linux-next: manual merge of the driver-core tree with the driver-core.current tree Stephen Rothwell
2026-01-07 14:38 ` Danilo Krummrich
2020-04-30  4:25 Stephen Rothwell
2020-04-30  8:15 ` Greg KH
2013-06-19  5:32 Stephen Rothwell
2013-06-19  5:55 ` Greg KH
2013-06-19  6:58 ` Ming Lei
2013-06-19 14:39   ` Greg KH
2013-06-19 15:04     ` Ming Lei
2013-06-19 16:36       ` Greg KH
2013-06-20  0:23         ` Ming Lei
2013-06-20  1:06           ` Stephen Rothwell
2013-06-20  1:22             ` Ming Lei
2013-06-20  3:28               ` Greg KH
2013-06-20  3:46                 ` Ming Lei
2013-06-20  3:49                 ` Stephen Rothwell
2013-06-19  7:12 ` Stephen Rothwell
2013-06-19  7:21   ` Ming Lei
2012-02-03  3:51 Stephen Rothwell
2012-02-03 15:07 ` Greg KH

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=20131209082152.GA26809@kroah.com \
    --to=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tj@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.