linux-next: manual merge of the kbuild tree with the arm-soc tree

linux-next: manual merge of the kbuild tree with the arm-soc tree

[Stephen Rothwell]

Hi Michal,

Today's linux-next merge of the kbuild tree got a conflict in
arch/arm/mach-at91/Makefile between commit 91a55d4f6900 ("ARM: at91:
introduce OLD_IRQ_AT91 Kconfig option") from the arm-soc tree and
commit ac84eb47cc19 ("kbuild: remove unnecessary variable
initializaions") from the kbuild tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/mach-at91/Makefile
index ac99d87ffefe,75033839fc08..000000000000
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@@ -2,13 -2,12 +2,10 @@@
  # Makefile for the linux kernel.
  #
  
 -obj-y		:= irq.o gpio.o setup.o sysirq_mask.o
 +obj-y		:= gpio.o setup.o sysirq_mask.o
- obj-m		:=
- obj-n		:=
- obj-		:=
  
 +obj-$(CONFIG_OLD_IRQ_AT91)	+= irq.o
  obj-$(CONFIG_OLD_CLK_AT91)	+= clock.o
 -obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o
 -obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o
 -obj-$(CONFIG_AT91_SAM9_TIME)	+= at91sam926x_time.o
  obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o
  
  # CPU-specific support
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141007/92bcb303/attachment.sig>

linux-next: manual merge of the kbuild tree with the arm-soc tree

[Nicolas Ferre]

On 07/10/2014 03:39, Stephen Rothwell :
> Hi Michal,
> 
> Today's linux-next merge of the kbuild tree got a conflict in
> arch/arm/mach-at91/Makefile between commit 91a55d4f6900 ("ARM: at91:
> introduce OLD_IRQ_AT91 Kconfig option") from the arm-soc tree and
> commit ac84eb47cc19 ("kbuild: remove unnecessary variable
> initializaions") from the kbuild tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix is good. Thanks Stephen.

Bye,
-- 
Nicolas Ferre

linux-next: manual merge of the kbuild tree with the arm-soc tree

[Stephen Rothwell]

Hi Michal,

Today's linux-next merge of the kbuild tree got a conflict in
scripts/Kbuild.include between commit 9fb5e5372208 ("dts, kbuild:
Factor out dtbs install rules to Makefile.dtbinst") from the arm-soc
tree and commit 1846dfbde3e8 ("kbuild: remove redundant -rR flag of
hdr-inst") from the kbuild tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc scripts/Kbuild.include
index 5374b1bdf02f,353dcf09dd18..000000000000
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@@ -180,11 -180,17 +180,23 @@@ build := -f $(srctree)/scripts/Makefile
  modbuiltin := -f $(srctree)/scripts/Makefile.modbuiltin obj
  
  ###
 +# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.dtbinst obj=
 +# Usage:
 +# $(Q)$(MAKE) $(dtbinst)=dir
 +dtbinst := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.dtbinst obj
 +
++###
+ # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=
+ # Usage:
+ # $(Q)$(MAKE) $(clean)=dir
+ clean := -f $(srctree)/scripts/Makefile.clean obj
+ 
+ ###
+ # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.headersinst obj=
+ # Usage:
+ # $(Q)$(MAKE) $(hdr-inst)=dir
+ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
+ 
  # Prefix -I with $(srctree) if it is not an absolute path.
  # skip if -I has no parameter
  addtree = $(if $(patsubst -I%,%,$(1)), \
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141205/195124df/attachment-0001.sig>

linux-next: manual merge of the kbuild tree with the arm-soc tree

[Stephen Rothwell]

Hi Michal,

Today's linux-next merge of the kbuild tree got a conflict in
scripts/Kbuild.include between commit 9fb5e5372208 ("dts, kbuild:
Factor out dtbs install rules to Makefile.dtbinst") from the arm-soc
tree and commit 371fdc77af44 ("kbuild: collect shorthands into
scripts/Kbuild.include") from the kbuild tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc scripts/Kbuild.include
index 5374b1bdf02f,0f909814edfc..000000000000
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@@ -180,11 -180,17 +180,23 @@@ build := -f $(srctree)/scripts/Makefile
  modbuiltin := -f $(srctree)/scripts/Makefile.modbuiltin obj
  
  ###
 +# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.dtbinst obj=
 +# Usage:
 +# $(Q)$(MAKE) $(dtbinst)=dir
 +dtbinst := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.dtbinst obj
 +
++###
+ # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=
+ # Usage:
+ # $(Q)$(MAKE) $(clean)=dir
+ clean := -f $(srctree)/scripts/Makefile.clean obj
+ 
+ ###
+ # Shorthand for $(Q)$(MAKE) -rR -f scripts/Makefile.headersinst obj=
+ # Usage:
+ # $(Q)$(MAKE) $(hdr-inst)=dir
+ hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
+ 
  # Prefix -I with $(srctree) if it is not an absolute path.
  # skip if -I has no parameter
  addtree = $(if $(patsubst -I%,%,$(1)), \
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141128/124d572e/attachment.sig>