On Thu, Apr 30, 2020 at 02:25:06PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/base/dd.c
>
> between commits:
>
> ce68929f07de ("driver core: Revert default driver_deferred_probe_timeout
> value to 0")
>
Hi all,
Today's linux-next merge of the driver-core tree got a conflict in:
drivers/base/dd.c
between commits:
ce68929f07de ("driver core: Revert default driver_deferred_probe_timeout
value to 0")
4ccc03e28ec3 ("driver core: Use dev_warn() instead of dev_WARN() for
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
>
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
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
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)
Hi Greg,
On Wed, 19 Jun 2013 20:28:12 -0700 Greg KH wrote:
>
> Thanks, that helped out a lot. I've now merged this together, and
> pushed it out to my driver-core-next branch, can you verify that I got
> it all correct?
And I have refetched the driver-core tree for today's linux-next so it
On Thu, Jun 20, 2013 at 11:28 AM, Greg KH wrote:
> On Thu, Jun 20, 2013 at 09:22:13AM +0800, Ming Lei wrote:
>> Hi Stephen,
>>
>> Thanks for your help.
>>
>> On Thu, Jun 20, 2013 at 9:06 AM, Stephen Rothwell
>> wrote:
>>
>> >
>> > Try "git diff-tree --cc
On Thu, Jun 20, 2013 at 09:22:13AM +0800, Ming Lei wrote:
> Hi Stephen,
>
> Thanks for your help.
>
> On Thu, Jun 20, 2013 at 9:06 AM, Stephen Rothwell
> wrote:
>
> >
> > Try "git diff-tree --cc e4b00d75ee3ed3af9fac83970d21e27d1ad4aa8d"
>
> Greg, Stephen, so is sort of below generated patch
Hi Stephen,
Thanks for your help.
On Thu, Jun 20, 2013 at 9:06 AM, Stephen Rothwell wrote:
>
> Try "git diff-tree --cc e4b00d75ee3ed3af9fac83970d21e27d1ad4aa8d"
Greg, Stephen, so is sort of below generated patch what you expected?
If yes, I will send it out to you.
Hi Ming,
On Thu, 20 Jun 2013 08:23:30 +0800 Ming Lei wrote:
>
> Yes, I already merged the two branches together in my local repository,
> and there is one merge commit, but I don't know how to generate/format
> patch for this merge commit only:
>
> commit
On Thu, Jun 20, 2013 at 12:36 AM, Greg KH wrote:
>
> Can you merge the two branches together (driver-core-next and
> driver-core-linus) and send me the proper merge patch that I should be
> applying when doing that? Then I can push that out through the
Yes, I already merged the two branches
On Wed, Jun 19, 2013 at 11:04:04PM +0800, Ming Lei wrote:
> On Wed, Jun 19, 2013 at 10:39 PM, Greg KH wrote:
> > On Wed, Jun 19, 2013 at 02:58:39PM +0800, Ming Lei wrote:
> >> On Wed, Jun 19, 2013 at 1:32 PM, Stephen Rothwell
> >> wrote:
> >> > Hi Greg,
> >> >
> >> > Today's linux-next merge of
On Wed, Jun 19, 2013 at 10:39 PM, Greg KH wrote:
> On Wed, Jun 19, 2013 at 02:58:39PM +0800, Ming Lei wrote:
>> On Wed, Jun 19, 2013 at 1:32 PM, Stephen Rothwell
>> wrote:
>> > Hi Greg,
>> >
>> > Today's linux-next merge of the driver-core tree got a conflict in
>> >
On Wed, Jun 19, 2013 at 02:58:39PM +0800, Ming Lei wrote:
> On Wed, Jun 19, 2013 at 1:32 PM, Stephen Rothwell
> wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the driver-core tree got a conflict in
> > drivers/base/firmware_class.c between commit 875979368eb4 ("firmware
> > loader: fix
On Wed, Jun 19, 2013 at 3:12 PM, Stephen Rothwell wrote:
> Hi Greg,
>
> On Wed, 19 Jun 2013 15:32:25 +1000 Stephen Rothwell
> wrote:
>>
>> Today's linux-next merge of the driver-core tree got a conflict in
>> drivers/base/firmware_class.c between commit 875979368eb4 ("firmware
>> loader: fix
Hi Greg,
On Wed, 19 Jun 2013 15:32:25 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/firmware_class.c between commit 875979368eb4 ("firmware
> loader: fix use-after-free by double abort") from the driver-core.current
> tree
On Wed, Jun 19, 2013 at 1:32 PM, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/firmware_class.c between commit 875979368eb4 ("firmware
> loader: fix use-after-free by double abort") from the driver-core.current
> tree and
On Wed, Jun 19, 2013 at 1:32 PM, Stephen Rothwell s...@canb.auug.org.au wrote:
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/firmware_class.c between commit 875979368eb4 (firmware
loader: fix use-after-free by double abort) from the
Hi Greg,
On Wed, 19 Jun 2013 15:32:25 +1000 Stephen Rothwell s...@canb.auug.org.au
wrote:
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/firmware_class.c between commit 875979368eb4 (firmware
loader: fix use-after-free by double abort) from the
On Wed, Jun 19, 2013 at 3:12 PM, Stephen Rothwell s...@canb.auug.org.au wrote:
Hi Greg,
On Wed, 19 Jun 2013 15:32:25 +1000 Stephen Rothwell s...@canb.auug.org.au
wrote:
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/firmware_class.c between commit
On Wed, Jun 19, 2013 at 02:58:39PM +0800, Ming Lei wrote:
On Wed, Jun 19, 2013 at 1:32 PM, Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/firmware_class.c between commit 875979368eb4 (firmware
On Wed, Jun 19, 2013 at 10:39 PM, Greg KH g...@kroah.com wrote:
On Wed, Jun 19, 2013 at 02:58:39PM +0800, Ming Lei wrote:
On Wed, Jun 19, 2013 at 1:32 PM, Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
On Wed, Jun 19, 2013 at 11:04:04PM +0800, Ming Lei wrote:
On Wed, Jun 19, 2013 at 10:39 PM, Greg KH g...@kroah.com wrote:
On Wed, Jun 19, 2013 at 02:58:39PM +0800, Ming Lei wrote:
On Wed, Jun 19, 2013 at 1:32 PM, Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi Greg,
Today's
On Thu, Jun 20, 2013 at 12:36 AM, Greg KH g...@kroah.com wrote:
Can you merge the two branches together (driver-core-next and
driver-core-linus) and send me the proper merge patch that I should be
applying when doing that? Then I can push that out through the
Yes, I already merged the two
Hi Ming,
On Thu, 20 Jun 2013 08:23:30 +0800 Ming Lei ming@canonical.com wrote:
Yes, I already merged the two branches together in my local repository,
and there is one merge commit, but I don't know how to generate/format
patch for this merge commit only:
commit
Hi Stephen,
Thanks for your help.
On Thu, Jun 20, 2013 at 9:06 AM, Stephen Rothwell s...@canb.auug.org.au wrote:
Try git diff-tree --cc e4b00d75ee3ed3af9fac83970d21e27d1ad4aa8d
Greg, Stephen, so is sort of below generated patch what you expected?
If yes, I will send it out to you.
On Thu, Jun 20, 2013 at 09:22:13AM +0800, Ming Lei wrote:
Hi Stephen,
Thanks for your help.
On Thu, Jun 20, 2013 at 9:06 AM, Stephen Rothwell s...@canb.auug.org.au
wrote:
Try git diff-tree --cc e4b00d75ee3ed3af9fac83970d21e27d1ad4aa8d
Greg, Stephen, so is sort of below generated
On Thu, Jun 20, 2013 at 11:28 AM, Greg KH g...@kroah.com wrote:
On Thu, Jun 20, 2013 at 09:22:13AM +0800, Ming Lei wrote:
Hi Stephen,
Thanks for your help.
On Thu, Jun 20, 2013 at 9:06 AM, Stephen Rothwell s...@canb.auug.org.au
wrote:
Try git diff-tree --cc
Hi Greg,
On Wed, 19 Jun 2013 20:28:12 -0700 Greg KH g...@kroah.com wrote:
Thanks, that helped out a lot. I've now merged this together, and
pushed it out to my driver-core-next branch, can you verify that I got
it all correct?
And I have refetched the driver-core tree for today's linux-next
On Wed, Jun 19, 2013 at 03:32:25PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/firmware_class.c between commit 875979368eb4 ("firmware
> loader: fix use-after-free by double abort") from the driver-core.current
>
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/firmware_class.c between commit 875979368eb4 ("firmware
loader: fix use-after-free by double abort") from the driver-core.current
tree and commit fe304143b0c3 ("firmware: Avoid deadlock of usermodehelper
lock
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/firmware_class.c between commit 875979368eb4 (firmware
loader: fix use-after-free by double abort) from the driver-core.current
tree and commit fe304143b0c3 (firmware: Avoid deadlock of usermodehelper
lock at
On Wed, Jun 19, 2013 at 03:32:25PM +1000, Stephen Rothwell wrote:
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/firmware_class.c between commit 875979368eb4 (firmware
loader: fix use-after-free by double abort) from the driver-core.current
tree and
34 matches
Mail list logo
