* linux-next: manual merge of the driver-core tree with the tip tree
@ 2014-03-13 0:07 Mark Brown
0 siblings, 0 replies; 12+ messages in thread
From: Mark Brown @ 2014-03-13 0:07 UTC (permalink / raw)
To: Greg KH, AKASHI Takahiro, Ard Biesheuvel; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 816 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in arch/x86/Kconfig between commit b4df597ae51f ("audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL") from the tip tree and commit 2b9c1f03278 ("x86: align x86 arch with generic CPU modalias handling") from the driver-core tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc arch/x86/Kconfig
index 81f8485bb6b7,7fab7e0b1a72..000000000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -127,7 -127,7 +127,8 @@@ config X8
select HAVE_DEBUG_STACKOVERFLOW
select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
select HAVE_CC_STACKPROTECTOR
+ select HAVE_ARCH_AUDITSYSCALL
+ select GENERIC_CPU_AUTOPROBE
config INSTRUCTION_DECODER
def_bool y
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the tip tree
2014-08-01 23:38 ` Kees Cook
2014-08-02 2:40 ` Greg KH
@ 2014-08-04 18:27 ` John Stultz
1 sibling, 0 replies; 12+ messages in thread
From: John Stultz @ 2014-08-04 18:27 UTC (permalink / raw)
To: Kees Cook
Cc: Greg KH, Stephen Rothwell, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra, Linux-Next, LKML, David Riley
On Fri, Aug 1, 2014 at 4:38 PM, Kees Cook <keescook@chromium.org> wrote:
> On Thu, Jul 31, 2014 at 8:20 PM, Greg KH <greg@kroah.com> wrote:
>> On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote:
>>> Hi Greg,
>>>
>>> Today's linux-next merge of the driver-core tree got a conflict in
>>> lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add
>>> udelay_test module to validate udelay") from the tip tree and commit
>>> 0a8adf584759 ("test: add firmware_class loader test") from the
>>> driver-core tree.
>>>
>>> I fixed it up (see below) and can carry the fix as necessary (no action
>>> is required).
>>
>> Looks good, thanks.
>
> For keeping things regularized, could this module instead be named
> "test_udelay", to match the rest of most of the test modules?
> (Starting with "test_".)
Sure. I'll spin up a patch to change it and will submit here shortly.
thanks
-john
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the tip tree
2014-08-01 23:38 ` Kees Cook
@ 2014-08-02 2:40 ` Greg KH
2014-08-04 18:27 ` John Stultz
1 sibling, 0 replies; 12+ messages in thread
From: Greg KH @ 2014-08-02 2:40 UTC (permalink / raw)
To: Kees Cook
Cc: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, Linux-Next, LKML, David Riley, John Stultz
On Fri, Aug 01, 2014 at 07:38:26PM -0400, Kees Cook wrote:
> On Thu, Jul 31, 2014 at 8:20 PM, Greg KH <greg@kroah.com> wrote:
> > On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the driver-core tree got a conflict in
> >> lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add
> >> udelay_test module to validate udelay") from the tip tree and commit
> >> 0a8adf584759 ("test: add firmware_class loader test") from the
> >> driver-core tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> >
> > Looks good, thanks.
>
> For keeping things regularized, could this module instead be named
> "test_udelay", to match the rest of most of the test modules?
> (Starting with "test_".)
Makes sense, want to send a patch to rename it?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the tip tree
2014-08-01 0:20 ` Greg KH
@ 2014-08-01 23:38 ` Kees Cook
2014-08-02 2:40 ` Greg KH
2014-08-04 18:27 ` John Stultz
0 siblings, 2 replies; 12+ messages in thread
From: Kees Cook @ 2014-08-01 23:38 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, Linux-Next, LKML, David Riley, John Stultz
On Thu, Jul 31, 2014 at 8:20 PM, Greg KH <greg@kroah.com> wrote:
> On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the driver-core tree got a conflict in
>> lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add
>> udelay_test module to validate udelay") from the tip tree and commit
>> 0a8adf584759 ("test: add firmware_class loader test") from the
>> driver-core tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Looks good, thanks.
For keeping things regularized, could this module instead be named
"test_udelay", to match the rest of most of the test modules?
(Starting with "test_".)
-Kees
--
Kees Cook
Chrome OS Security
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the tip tree
2014-07-31 7:07 Stephen Rothwell
@ 2014-08-01 0:20 ` Greg KH
2014-08-01 23:38 ` Kees Cook
0 siblings, 1 reply; 12+ messages in thread
From: Greg KH @ 2014-08-01 0:20 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Kees Cook, David Riley, John Stultz
On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add
> udelay_test module to validate udelay") from the tip tree and commit
> 0a8adf584759 ("test: add firmware_class loader test") from the
> driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the driver-core tree with the tip tree
@ 2014-07-31 7:07 Stephen Rothwell
2014-08-01 0:20 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2014-07-31 7:07 UTC (permalink / raw)
To: Greg KH, Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Kees Cook, David Riley, John Stultz
[-- Attachment #1: Type: text/plain, Size: 1410 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add
udelay_test module to validate udelay") from the tip tree and commit
0a8adf584759 ("test: add firmware_class loader test") from the
driver-core tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc lib/Kconfig.debug
index 7cc4e8aff5df,213cd9f7e957..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -1659,15 -1649,19 +1659,28 @@@ config TEST_BP
If unsure, say N.
+ config TEST_FIRMWARE
+ tristate "Test firmware loading via userspace interface"
+ default n
+ depends on FW_LOADER
+ help
+ This builds the "test_firmware" module that creates a userspace
+ interface for testing firmware loading. This can be used to
+ control the triggering of firmware loading without needing an
+ actual firmware-using device. The contents can be rechecked by
+ userspace.
+
+ If unsure, say N.
+
+config TEST_UDELAY
+ tristate "udelay test driver"
+ default n
+ help
+ This builds the "udelay_test" module that helps to make sure
+ that udelay() is working properly.
+
+ If unsure, say N.
+
source "samples/Kconfig"
source "lib/Kconfig.kgdb"
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the tip tree
2013-04-11 5:30 Stephen Rothwell
@ 2013-04-11 13:26 ` Greg KH
0 siblings, 0 replies; 12+ messages in thread
From: Greg KH @ 2013-04-11 13:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Sasha Levin, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
On Thu, Apr 11, 2013 at 03:30:23PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> kernel/rtmutex-tester.c between commit 8184004ed7a0
> ("locking/rtmutex/tester: Set correct permissions on sysfs files") from
> the tip tree and commit 928c0c1571b0 ("rtmutex-tester: fix mode of sysfs
> files") from the driver-core tree.
>
> Both patches do the same thing - I used the tip version and can carry the
> fix as necessary (no action is required).
Thanks for the heads up.
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the driver-core tree with the tip tree
@ 2013-04-11 5:30 Stephen Rothwell
2013-04-11 13:26 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2013-04-11 5:30 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Sasha Levin, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 510 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
kernel/rtmutex-tester.c between commit 8184004ed7a0
("locking/rtmutex/tester: Set correct permissions on sysfs files") from
the tip tree and commit 928c0c1571b0 ("rtmutex-tester: fix mode of sysfs
files") from the driver-core tree.
Both patches do the same thing - I used the tip version and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the tip tree
2012-11-29 4:24 Stephen Rothwell
@ 2012-11-29 5:19 ` Greg KH
0 siblings, 0 replies; 12+ messages in thread
From: Greg KH @ 2012-11-29 5:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Bill Pemberton, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
On Thu, Nov 29, 2012 at 03:24:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> lib/Makefile between commit e6459606b04e ("lib: Add early cpio decoder")
> from the tip tree and commit 610141ee651c ("lib: kobject_uevent is no
> longer dependant on CONFIG_HOTPLUG") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the driver-core tree with the tip tree
@ 2012-11-29 4:24 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2012-11-29 4:24 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Bill Pemberton, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 1060 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
lib/Makefile between commit e6459606b04e ("lib: Add early cpio decoder")
from the tip tree and commit 610141ee651c ("lib: kobject_uevent is no
longer dependant on CONFIG_HOTPLUG") from the driver-core tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc lib/Makefile
index e91b9df,66787b9..0000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -12,7 -12,7 +12,7 @@@ lib-y := ctype.o string.o vsprintf.o cm
idr.o int_sqrt.o extable.o \
sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \
proportions.o flex_proportions.o prio_heap.o ratelimit.o show_mem.o \
- is_single_threaded.o plist.o decompress.o earlycpio.o
- is_single_threaded.o plist.o decompress.o kobject_uevent.o
++ is_single_threaded.o plist.o decompress.o earlycpio.o kobject_uevent.o
lib-$(CONFIG_MMU) += ioremap.o
lib-$(CONFIG_SMP) += cpumask.o
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the tip tree
2011-12-28 4:57 Stephen Rothwell
@ 2012-01-04 22:52 ` Greg KH
0 siblings, 0 replies; 12+ messages in thread
From: Greg KH @ 2012-01-04 22:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Josh Triplett, Paul E. McKenney,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Kay Sievers
On Wed, Dec 28, 2011 at 03:57:07PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> include/linux/cpu.h between commit 2987557f52b9 ("driver-core/cpu: Expose
> hotpluggability to the rest of the kernel") from the tip tree and commit
> 8a25a2fd126c ("cpu: convert 'cpu' and 'machinecheck' sysdev_class to a
> regular subsystem") from the driver-core tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary
Looks fine, thanks.
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the driver-core tree with the tip tree
@ 2011-12-28 4:57 Stephen Rothwell
2012-01-04 22:52 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2011-12-28 4:57 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Josh Triplett, Paul E. McKenney,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Kay Sievers
[-- Attachment #1: Type: text/plain, Size: 1705 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
include/linux/cpu.h between commit 2987557f52b9 ("driver-core/cpu: Expose
hotpluggability to the rest of the kernel") from the tip tree and commit
8a25a2fd126c ("cpu: convert 'cpu' and 'machinecheck' sysdev_class to a
regular subsystem") from the driver-core tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/cpu.h
index 305c263,fc3da0d..0000000
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@@ -26,16 -26,15 +26,16 @@@ struct cpu
};
extern int register_cpu(struct cpu *cpu, int num);
- extern struct sys_device *get_cpu_sysdev(unsigned cpu);
+ extern struct device *get_cpu_device(unsigned cpu);
+extern bool cpu_is_hotpluggable(unsigned cpu);
- extern int cpu_add_sysdev_attr(struct sysdev_attribute *attr);
- extern void cpu_remove_sysdev_attr(struct sysdev_attribute *attr);
+ extern int cpu_add_dev_attr(struct device_attribute *attr);
+ extern void cpu_remove_dev_attr(struct device_attribute *attr);
- extern int cpu_add_sysdev_attr_group(struct attribute_group *attrs);
- extern void cpu_remove_sysdev_attr_group(struct attribute_group *attrs);
+ extern int cpu_add_dev_attr_group(struct attribute_group *attrs);
+ extern void cpu_remove_dev_attr_group(struct attribute_group *attrs);
- extern int sched_create_sysfs_power_savings_entries(struct sysdev_class *cls);
+ extern int sched_create_sysfs_power_savings_entries(struct device *dev);
#ifdef CONFIG_HOTPLUG_CPU
extern void unregister_cpu(struct cpu *cpu);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-08-04 18:27 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-13 0:07 linux-next: manual merge of the driver-core tree with the tip tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2014-07-31 7:07 Stephen Rothwell
2014-08-01 0:20 ` Greg KH
2014-08-01 23:38 ` Kees Cook
2014-08-02 2:40 ` Greg KH
2014-08-04 18:27 ` John Stultz
2013-04-11 5:30 Stephen Rothwell
2013-04-11 13:26 ` Greg KH
2012-11-29 4:24 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2011-12-28 4:57 Stephen Rothwell
2012-01-04 22:52 ` Greg KH
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).