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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 922 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mfd/db8500-prcmu.c between commit 5073e7b57041 ("mfd:
db8500-prcmu: Add ux500_wdt mfd_cell") from the mfd tree and commit
520f7bd73354 ("irqchip: Move ARM gic.h to
include/linux/irqchip/arm-gic.h") from the arm-soc 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 drivers/mfd/db8500-prcmu.c
index e42a417,42f3afc..0000000
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@@ -32,8 -33,6 +33,7 @@@
  #include <linux/regulator/db8500-prcmu.h>
  #include <linux/regulator/machine.h>
  #include <linux/cpufreq.h>
 +#include <linux/platform_data/ux500_wdt.h>
- #include <asm/hardware/gic.h>
  #include <mach/hardware.h>
  #include <mach/irqs.h>
  #include <mach/db8500-regs.h>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mfd/db8500-prcmu.c between commit 5073e7b57041 ("mfd:
db8500-prcmu: Add ux500_wdt mfd_cell") from the mfd tree and commit
520f7bd73354 ("irqchip: Move ARM gic.h to
include/linux/irqchip/arm-gic.h") from the arm-soc 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 drivers/mfd/db8500-prcmu.c
index e42a417,42f3afc..0000000
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@@ -32,8 -33,6 +33,7 @@@
  #include <linux/regulator/db8500-prcmu.h>
  #include <linux/regulator/machine.h>
  #include <linux/cpufreq.h>
 +#include <linux/platform_data/ux500_wdt.h>
- #include <asm/hardware/gic.h>
  #include <mach/hardware.h>
  #include <mach/irqs.h>
  #include <mach/db8500-regs.h>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130204/4814b64b/attachment.sig>

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 922 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mfd/db8500-prcmu.c between commit 5073e7b57041 ("mfd:
db8500-prcmu: Add ux500_wdt mfd_cell") from the mfd tree and commit
520f7bd73354 ("irqchip: Move ARM gic.h to
include/linux/irqchip/arm-gic.h") from the arm-soc 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 drivers/mfd/db8500-prcmu.c
index e42a417,42f3afc..0000000
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@@ -32,8 -33,6 +33,7 @@@
  #include <linux/regulator/db8500-prcmu.h>
  #include <linux/regulator/machine.h>
  #include <linux/cpufreq.h>
 +#include <linux/platform_data/ux500_wdt.h>
- #include <asm/hardware/gic.h>
  #include <mach/hardware.h>
  #include <mach/irqs.h>
  #include <mach/db8500-regs.h>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 496 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-exynos/mach-universal_c210.c between commit 555183096fc7
("regulator: max8998: Use arrays for specifying voltages in platform
data") from the mfd tree and commit ca9143501c30 ("ARM: EXYNOS: Remove
unused board files") from the arm-soc tree.

I just removed the file 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 --]

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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-exynos/mach-universal_c210.c between commit 555183096fc7
("regulator: max8998: Use arrays for specifying voltages in platform
data") from the mfd tree and commit ca9143501c30 ("ARM: EXYNOS: Remove
unused board files") from the arm-soc tree.

I just removed the file and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130628/027e21d6/attachment.sig>

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 496 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-exynos/mach-universal_c210.c between commit 555183096fc7
("regulator: max8998: Use arrays for specifying voltages in platform
data") from the mfd tree and commit ca9143501c30 ("ARM: EXYNOS: Remove
unused board files") from the arm-soc tree.

I just removed the file 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 --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/am33xx.dtsi between commit a82279dd6d3e ("arm: am33xx:
add TSC/ADC mfd device support") from the mfd tree and commit
15e8246bd61b ("ARM: dts: AM33XX: Add ELM node") from the arm-soc 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 arch/arm/boot/dts/am33xx.dtsi
index 37ef320,0d4df90..0000000
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -404,24 -494,14 +494,32 @@@
  			ti,hwmods = "wkup_m3";
  		};
  
 +		tscadc: tscadc@44e0d000 {
 +			compatible = "ti,am3359-tscadc";
 +			reg = <0x44e0d000 0x1000>;
 +			interrupt-parent = <&intc>;
 +			interrupts = <16>;
 +			ti,hwmods = "adc_tsc";
 +			status = "disabled";
 +
 +			tsc {
 +				compatible = "ti,am3359-tsc";
 +			};
 +			am335x_adc: adc {
 +				#io-channel-cells = <1>;
 +				compatible = "ti,am3359-adc";
 +			};
 +
 +		};
 +
+ 		elm: elm@48080000 {
+ 			compatible = "ti,am3352-elm";
+ 			reg = <0x48080000 0x2000>;
+ 			interrupts = <4>;
+ 			ti,hwmods = "elm";
+ 			status = "disabled";
+ 		};
+ 
  		gpmc: gpmc@50000000 {
  			compatible = "ti,am3352-gpmc";
  			ti,hwmods = "gpmc";

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/am33xx.dtsi between commit a82279dd6d3e ("arm: am33xx:
add TSC/ADC mfd device support") from the mfd tree and commit
15e8246bd61b ("ARM: dts: AM33XX: Add ELM node") from the arm-soc 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/boot/dts/am33xx.dtsi
index 37ef320,0d4df90..0000000
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -404,24 -494,14 +494,32 @@@
  			ti,hwmods = "wkup_m3";
  		};
  
 +		tscadc: tscadc at 44e0d000 {
 +			compatible = "ti,am3359-tscadc";
 +			reg = <0x44e0d000 0x1000>;
 +			interrupt-parent = <&intc>;
 +			interrupts = <16>;
 +			ti,hwmods = "adc_tsc";
 +			status = "disabled";
 +
 +			tsc {
 +				compatible = "ti,am3359-tsc";
 +			};
 +			am335x_adc: adc {
 +				#io-channel-cells = <1>;
 +				compatible = "ti,am3359-adc";
 +			};
 +
 +		};
 +
+ 		elm: elm at 48080000 {
+ 			compatible = "ti,am3352-elm";
+ 			reg = <0x48080000 0x2000>;
+ 			interrupts = <4>;
+ 			ti,hwmods = "elm";
+ 			status = "disabled";
+ 		};
+ 
  		gpmc: gpmc at 50000000 {
  			compatible = "ti,am3352-gpmc";
  			ti,hwmods = "gpmc";
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130621/c7462e4f/attachment.sig>

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/am33xx.dtsi between commit a82279dd6d3e ("arm: am33xx:
add TSC/ADC mfd device support") from the mfd tree and commit
15e8246bd61b ("ARM: dts: AM33XX: Add ELM node") from the arm-soc 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 arch/arm/boot/dts/am33xx.dtsi
index 37ef320,0d4df90..0000000
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -404,24 -494,14 +494,32 @@@
  			ti,hwmods = "wkup_m3";
  		};
  
 +		tscadc: tscadc@44e0d000 {
 +			compatible = "ti,am3359-tscadc";
 +			reg = <0x44e0d000 0x1000>;
 +			interrupt-parent = <&intc>;
 +			interrupts = <16>;
 +			ti,hwmods = "adc_tsc";
 +			status = "disabled";
 +
 +			tsc {
 +				compatible = "ti,am3359-tsc";
 +			};
 +			am335x_adc: adc {
 +				#io-channel-cells = <1>;
 +				compatible = "ti,am3359-adc";
 +			};
 +
 +		};
 +
+ 		elm: elm@48080000 {
+ 			compatible = "ti,am3352-elm";
+ 			reg = <0x48080000 0x2000>;
+ 			interrupts = <4>;
+ 			ti,hwmods = "elm";
+ 			status = "disabled";
+ 		};
+ 
  		gpmc: gpmc@50000000 {
  			compatible = "ti,am3352-gpmc";
  			ti,hwmods = "gpmc";

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Gupta, Pekon]

> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/am33xx.dtsi between commit a82279dd6d3e ("arm:
> am33xx:
> add TSC/ADC mfd device support") from the mfd tree and commit
> 15e8246bd61b ("ARM: dts: AM33XX: Add ELM node") from the arm-soc 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 arch/arm/boot/dts/am33xx.dtsi
> index 37ef320,0d4df90..0000000
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@@ -404,24 -494,14 +494,32 @@@
>   			ti,hwmods = "wkup_m3";
>   		};
> 
>  +		tscadc: tscadc@44e0d000 {
>  +			compatible = "ti,am3359-tscadc";
>  +			reg = <0x44e0d000 0x1000>;
>  +			interrupt-parent = <&intc>;
>  +			interrupts = <16>;
>  +			ti,hwmods = "adc_tsc";
>  +			status = "disabled";
>  +
>  +			tsc {
>  +				compatible = "ti,am3359-tsc";
>  +			};
>  +			am335x_adc: adc {
>  +				#io-channel-cells = <1>;
>  +				compatible = "ti,am3359-adc";
>  +			};
>  +
>  +		};
>  +
> + 		elm: elm@48080000 {
> + 			compatible = "ti,am3352-elm";
> + 			reg = <0x48080000 0x2000>;
> + 			interrupts = <4>;
> + 			ti,hwmods = "elm";
> + 			status = "disabled";
> + 		};
> +
[Pekon]: Thanks.. Yes this is ok based on commit "15e8246bd61b ("ARM: dts: AM33XX: Add ELM node")


>   		gpmc: gpmc@50000000 {
>   			compatible = "ti,am3352-gpmc";
>   			ti,hwmods = "gpmc";

with regards, pekon

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

[Gupta, Pekon]

> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/am33xx.dtsi between commit a82279dd6d3e ("arm:
> am33xx:
> add TSC/ADC mfd device support") from the mfd tree and commit
> 15e8246bd61b ("ARM: dts: AM33XX: Add ELM node") from the arm-soc 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/boot/dts/am33xx.dtsi
> index 37ef320,0d4df90..0000000
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@@ -404,24 -494,14 +494,32 @@@
>   			ti,hwmods = "wkup_m3";
>   		};
> 
>  +		tscadc: tscadc at 44e0d000 {
>  +			compatible = "ti,am3359-tscadc";
>  +			reg = <0x44e0d000 0x1000>;
>  +			interrupt-parent = <&intc>;
>  +			interrupts = <16>;
>  +			ti,hwmods = "adc_tsc";
>  +			status = "disabled";
>  +
>  +			tsc {
>  +				compatible = "ti,am3359-tsc";
>  +			};
>  +			am335x_adc: adc {
>  +				#io-channel-cells = <1>;
>  +				compatible = "ti,am3359-adc";
>  +			};
>  +
>  +		};
>  +
> + 		elm: elm at 48080000 {
> + 			compatible = "ti,am3352-elm";
> + 			reg = <0x48080000 0x2000>;
> + 			interrupts = <4>;
> + 			ti,hwmods = "elm";
> + 			status = "disabled";
> + 		};
> +
[Pekon]: Thanks.. Yes this is ok based on commit "15e8246bd61b ("ARM: dts: AM33XX: Add ELM node")


>   		gpmc: gpmc at 50000000 {
>   			compatible = "ti,am3352-gpmc";
>   			ti,hwmods = "gpmc";

with regards, pekon

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

[Gupta, Pekon]

> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/am33xx.dtsi between commit a82279dd6d3e ("arm:
> am33xx:
> add TSC/ADC mfd device support") from the mfd tree and commit
> 15e8246bd61b ("ARM: dts: AM33XX: Add ELM node") from the arm-soc 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 arch/arm/boot/dts/am33xx.dtsi
> index 37ef320,0d4df90..0000000
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@@ -404,24 -494,14 +494,32 @@@
>   			ti,hwmods = "wkup_m3";
>   		};
> 
>  +		tscadc: tscadc@44e0d000 {
>  +			compatible = "ti,am3359-tscadc";
>  +			reg = <0x44e0d000 0x1000>;
>  +			interrupt-parent = <&intc>;
>  +			interrupts = <16>;
>  +			ti,hwmods = "adc_tsc";
>  +			status = "disabled";
>  +
>  +			tsc {
>  +				compatible = "ti,am3359-tsc";
>  +			};
>  +			am335x_adc: adc {
>  +				#io-channel-cells = <1>;
>  +				compatible = "ti,am3359-adc";
>  +			};
>  +
>  +		};
>  +
> + 		elm: elm@48080000 {
> + 			compatible = "ti,am3352-elm";
> + 			reg = <0x48080000 0x2000>;
> + 			interrupts = <4>;
> + 			ti,hwmods = "elm";
> + 			status = "disabled";
> + 		};
> +
[Pekon]: Thanks.. Yes this is ok based on commit "15e8246bd61b ("ARM: dts: AM33XX: Add ELM node")


>   		gpmc: gpmc@50000000 {
>   			compatible = "ti,am3352-gpmc";
>   			ti,hwmods = "gpmc";

with regards, pekon

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2174 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
pm_lats and early_device code") from the arm-soc 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 arch/arm/mach-omap2/usb-host.c
index 940aad4,99f04de..0000000
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@@ -37,14 -37,11 +37,6 @@@
  #define	USBHS_UHH_HWMODNAME	"usb_host_hs"
  #define USBHS_TLL_HWMODNAME	"usb_tll_hs"
  
- static struct omap_device_pm_latency omap_uhhtll_latency[] = {
- 	  {
- 		.deactivate_func = omap_device_idle_hwmods,
- 		.activate_func	 = omap_device_enable_hwmods,
- 		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
- 	  },
- };
- 
 -static struct usbhs_omap_platform_data		usbhs_data;
 -static struct usbtll_omap_platform_data		usbtll_data;
 -static struct ehci_hcd_omap_platform_data	ehci_data;
 -static struct ohci_hcd_omap_platform_data	ohci_data;
 -
  /* MUX settings for EHCI pins */
  /*
   * setup_ehci_io_mux - initialize IO pad mux for USBHOST
@@@ -511,9 -522,7 +503,7 @@@ void __init usbhs_init(struct usbhs_oma
  	}
  
  	pdev = omap_device_build(OMAP_USBTLL_DEVICE, bus_id, tll_hwm,
- 				pdata, sizeof(*pdata),
- 				omap_uhhtll_latency,
- 				ARRAY_SIZE(omap_uhhtll_latency), false);
 -				 &usbtll_data, sizeof(usbtll_data));
++				 pdata, sizeof(*pdata));
  	if (IS_ERR(pdev)) {
  		pr_err("Could not build hwmod device %s\n",
  		       USBHS_TLL_HWMODNAME);
@@@ -521,9 -530,7 +511,7 @@@
  	}
  
  	pdev = omap_device_build(OMAP_USBHS_DEVICE, bus_id, uhh_hwm,
- 				pdata, sizeof(*pdata),
- 				omap_uhhtll_latency,
- 				ARRAY_SIZE(omap_uhhtll_latency), false);
 -				&usbhs_data, sizeof(usbhs_data));
++				pdata, sizeof(*pdata));
  	if (IS_ERR(pdev)) {
  		pr_err("Could not build hwmod devices %s\n",
  		       USBHS_UHH_HWMODNAME);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
pm_lats and early_device code") from the arm-soc 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-omap2/usb-host.c
index 940aad4,99f04de..0000000
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@@ -37,14 -37,11 +37,6 @@@
  #define	USBHS_UHH_HWMODNAME	"usb_host_hs"
  #define USBHS_TLL_HWMODNAME	"usb_tll_hs"
  
- static struct omap_device_pm_latency omap_uhhtll_latency[] = {
- 	  {
- 		.deactivate_func = omap_device_idle_hwmods,
- 		.activate_func	 = omap_device_enable_hwmods,
- 		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
- 	  },
- };
- 
 -static struct usbhs_omap_platform_data		usbhs_data;
 -static struct usbtll_omap_platform_data		usbtll_data;
 -static struct ehci_hcd_omap_platform_data	ehci_data;
 -static struct ohci_hcd_omap_platform_data	ohci_data;
 -
  /* MUX settings for EHCI pins */
  /*
   * setup_ehci_io_mux - initialize IO pad mux for USBHOST
@@@ -511,9 -522,7 +503,7 @@@ void __init usbhs_init(struct usbhs_oma
  	}
  
  	pdev = omap_device_build(OMAP_USBTLL_DEVICE, bus_id, tll_hwm,
- 				pdata, sizeof(*pdata),
- 				omap_uhhtll_latency,
- 				ARRAY_SIZE(omap_uhhtll_latency), false);
 -				 &usbtll_data, sizeof(usbtll_data));
++				 pdata, sizeof(*pdata));
  	if (IS_ERR(pdev)) {
  		pr_err("Could not build hwmod device %s\n",
  		       USBHS_TLL_HWMODNAME);
@@@ -521,9 -530,7 +511,7 @@@
  	}
  
  	pdev = omap_device_build(OMAP_USBHS_DEVICE, bus_id, uhh_hwm,
- 				pdata, sizeof(*pdata),
- 				omap_uhhtll_latency,
- 				ARRAY_SIZE(omap_uhhtll_latency), false);
 -				&usbhs_data, sizeof(usbhs_data));
++				pdata, sizeof(*pdata));
  	if (IS_ERR(pdev)) {
  		pr_err("Could not build hwmod devices %s\n",
  		       USBHS_UHH_HWMODNAME);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130211/6a734a75/attachment.sig>

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

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 2174 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
pm_lats and early_device code") from the arm-soc 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 arch/arm/mach-omap2/usb-host.c
index 940aad4,99f04de..0000000
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@@ -37,14 -37,11 +37,6 @@@
  #define	USBHS_UHH_HWMODNAME	"usb_host_hs"
  #define USBHS_TLL_HWMODNAME	"usb_tll_hs"
  
- static struct omap_device_pm_latency omap_uhhtll_latency[] = {
- 	  {
- 		.deactivate_func = omap_device_idle_hwmods,
- 		.activate_func	 = omap_device_enable_hwmods,
- 		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
- 	  },
- };
- 
 -static struct usbhs_omap_platform_data		usbhs_data;
 -static struct usbtll_omap_platform_data		usbtll_data;
 -static struct ehci_hcd_omap_platform_data	ehci_data;
 -static struct ohci_hcd_omap_platform_data	ohci_data;
 -
  /* MUX settings for EHCI pins */
  /*
   * setup_ehci_io_mux - initialize IO pad mux for USBHOST
@@@ -511,9 -522,7 +503,7 @@@ void __init usbhs_init(struct usbhs_oma
  	}
  
  	pdev = omap_device_build(OMAP_USBTLL_DEVICE, bus_id, tll_hwm,
- 				pdata, sizeof(*pdata),
- 				omap_uhhtll_latency,
- 				ARRAY_SIZE(omap_uhhtll_latency), false);
 -				 &usbtll_data, sizeof(usbtll_data));
++				 pdata, sizeof(*pdata));
  	if (IS_ERR(pdev)) {
  		pr_err("Could not build hwmod device %s\n",
  		       USBHS_TLL_HWMODNAME);
@@@ -521,9 -530,7 +511,7 @@@
  	}
  
  	pdev = omap_device_build(OMAP_USBHS_DEVICE, bus_id, uhh_hwm,
- 				pdata, sizeof(*pdata),
- 				omap_uhhtll_latency,
- 				ARRAY_SIZE(omap_uhhtll_latency), false);
 -				&usbhs_data, sizeof(usbhs_data));
++				pdata, sizeof(*pdata));
  	if (IS_ERR(pdev)) {
  		pr_err("Could not build hwmod devices %s\n",
  		       USBHS_UHH_HWMODNAME);

[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

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

[Tony Lindgren]

* Stephen Rothwell <sfr@canb.auug.org.au> [130210 22:11]:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
> pm_lats and early_device code") from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks again.

Samuel, up to you, but I suggest you just drop these patches for
now if still possible unless other patches are based on these.

All OMAP USB people, doing these things should be pretty trivial,
just follow these steps:

1. Do all the platform data and header changes first so we can
   put them into a shared minimal topic branch either in the
   USB tree or arm-soc tree

2. Modify the USB driver(s) based on #1 and have them merged into
   the USB tree

3. Add new arch/arm related pdata and .dts entries based on #1
   so we can merge it via arm-soc tree

4. Remove all the old crap later on to avoid extra dependencies
   between these branches

Regards,

Tony

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

[Tony Lindgren]

* Stephen Rothwell <sfr@canb.auug.org.au> [130210 22:11]:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
> pm_lats and early_device code") from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks again.

Samuel, up to you, but I suggest you just drop these patches for
now if still possible unless other patches are based on these.

All OMAP USB people, doing these things should be pretty trivial,
just follow these steps:

1. Do all the platform data and header changes first so we can
   put them into a shared minimal topic branch either in the
   USB tree or arm-soc tree

2. Modify the USB driver(s) based on #1 and have them merged into
   the USB tree

3. Add new arch/arm related pdata and .dts entries based on #1
   so we can merge it via arm-soc tree

4. Remove all the old crap later on to avoid extra dependencies
   between these branches

Regards,

Tony

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

[Tony Lindgren]

* Stephen Rothwell <sfr@canb.auug.org.au> [130210 22:11]:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
> pm_lats and early_device code") from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks again.

Samuel, up to you, but I suggest you just drop these patches for
now if still possible unless other patches are based on these.

All OMAP USB people, doing these things should be pretty trivial,
just follow these steps:

1. Do all the platform data and header changes first so we can
   put them into a shared minimal topic branch either in the
   USB tree or arm-soc tree

2. Modify the USB driver(s) based on #1 and have them merged into
   the USB tree

3. Add new arch/arm related pdata and .dts entries based on #1
   so we can merge it via arm-soc tree

4. Remove all the old crap later on to avoid extra dependencies
   between these branches

Regards,

Tony

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

[Olof Johansson]

On Mon, Feb 11, 2013 at 10:52 AM, Tony Lindgren <tony@atomide.com> wrote:
> * Stephen Rothwell <sfr@canb.auug.org.au> [130210 22:11]:
>> Hi all,
>>
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
>> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
>> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
>> pm_lats and early_device code") from the arm-soc tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Thanks again.
>
> Samuel, up to you, but I suggest you just drop these patches for
> now if still possible unless other patches are based on these.

Yes, as I replied on the original patch series last night, please sort
this out so we can avoid these nagging merge conflicts. Tony's steps
in the previous email is the right way to handle these kind of things.


-Olof

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

[Olof Johansson]

On Mon, Feb 11, 2013 at 10:52 AM, Tony Lindgren <tony@atomide.com> wrote:
> * Stephen Rothwell <sfr@canb.auug.org.au> [130210 22:11]:
>> Hi all,
>>
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
>> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
>> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
>> pm_lats and early_device code") from the arm-soc tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Thanks again.
>
> Samuel, up to you, but I suggest you just drop these patches for
> now if still possible unless other patches are based on these.

Yes, as I replied on the original patch series last night, please sort
this out so we can avoid these nagging merge conflicts. Tony's steps
in the previous email is the right way to handle these kind of things.


-Olof

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

[Roger Quadros]

On 02/11/2013 08:52 PM, Tony Lindgren wrote:
> * Stephen Rothwell <sfr@canb.auug.org.au> [130210 22:11]:
>> Hi all,
>>
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
>> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
>> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
>> pm_lats and early_device code") from the arm-soc tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
> 
> Thanks again.
> 
> Samuel, up to you, but I suggest you just drop these patches for
> now if still possible unless other patches are based on these.
> 

Samuel, please feel free to drop the 20 patches you pulled from me recently.

I have another set patches that would depend on them and I think it is better if
both sets go through usb and arm-soc trees. This would avoid some confusion.

Once you confirm I can add your Acked-by's to them and send fresh pull requests
to Tony & Greg. Thanks.

> All OMAP USB people, doing these things should be pretty trivial,
> just follow these steps:
> 
> 1. Do all the platform data and header changes first so we can
>    put them into a shared minimal topic branch either in the
>    USB tree or arm-soc tree
> 
> 2. Modify the USB driver(s) based on #1 and have them merged into
>    the USB tree
> 
> 3. Add new arch/arm related pdata and .dts entries based on #1
>    so we can merge it via arm-soc tree
> 
> 4. Remove all the old crap later on to avoid extra dependencies
>    between these branches
> 
Thanks Tony.

cheers,
-roger

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

[Roger Quadros]

On 02/11/2013 08:52 PM, Tony Lindgren wrote:
> * Stephen Rothwell <sfr@canb.auug.org.au> [130210 22:11]:
>> Hi all,
>>
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
>> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
>> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
>> pm_lats and early_device code") from the arm-soc tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
> 
> Thanks again.
> 
> Samuel, up to you, but I suggest you just drop these patches for
> now if still possible unless other patches are based on these.
> 

Samuel, please feel free to drop the 20 patches you pulled from me recently.

I have another set patches that would depend on them and I think it is better if
both sets go through usb and arm-soc trees. This would avoid some confusion.

Once you confirm I can add your Acked-by's to them and send fresh pull requests
to Tony & Greg. Thanks.

> All OMAP USB people, doing these things should be pretty trivial,
> just follow these steps:
> 
> 1. Do all the platform data and header changes first so we can
>    put them into a shared minimal topic branch either in the
>    USB tree or arm-soc tree
> 
> 2. Modify the USB driver(s) based on #1 and have them merged into
>    the USB tree
> 
> 3. Add new arch/arm related pdata and .dts entries based on #1
>    so we can merge it via arm-soc tree
> 
> 4. Remove all the old crap later on to avoid extra dependencies
>    between these branches
> 
Thanks Tony.

cheers,
-roger

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

[Roger Quadros]

On 02/11/2013 08:52 PM, Tony Lindgren wrote:
> * Stephen Rothwell <sfr@canb.auug.org.au> [130210 22:11]:
>> Hi all,
>>
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
>> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
>> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
>> pm_lats and early_device code") from the arm-soc tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
> 
> Thanks again.
> 
> Samuel, up to you, but I suggest you just drop these patches for
> now if still possible unless other patches are based on these.
> 

Samuel, please feel free to drop the 20 patches you pulled from me recently.

I have another set patches that would depend on them and I think it is better if
both sets go through usb and arm-soc trees. This would avoid some confusion.

Once you confirm I can add your Acked-by's to them and send fresh pull requests
to Tony & Greg. Thanks.

> All OMAP USB people, doing these things should be pretty trivial,
> just follow these steps:
> 
> 1. Do all the platform data and header changes first so we can
>    put them into a shared minimal topic branch either in the
>    USB tree or arm-soc tree
> 
> 2. Modify the USB driver(s) based on #1 and have them merged into
>    the USB tree
> 
> 3. Add new arch/arm related pdata and .dts entries based on #1
>    so we can merge it via arm-soc tree
> 
> 4. Remove all the old crap later on to avoid extra dependencies
>    between these branches
> 
Thanks Tony.

cheers,
-roger

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

[Samuel Ortiz]

Hi Roger,

On Tue, Feb 12, 2013 at 04:46:51PM +0200, Roger Quadros wrote:
> On 02/11/2013 08:52 PM, Tony Lindgren wrote:
> > * Stephen Rothwell <sfr@canb.auug.org.au> [130210 22:11]:
> >> Hi all,
> >>
> >> Today's linux-next merge of the arm-soc tree got a conflict in
> >> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
> >> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
> >> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
> >> pm_lats and early_device code") from the arm-soc tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> > 
> > Thanks again.
> > 
> > Samuel, up to you, but I suggest you just drop these patches for
> > now if still possible unless other patches are based on these.
> > 
> 
> Samuel, please feel free to drop the 20 patches you pulled from me recently.
> 
> I have another set patches that would depend on them and I think it is better if
> both sets go through usb and arm-soc trees. This would avoid some confusion.
> 
> Once you confirm I can add your Acked-by's to them and send fresh pull requests
> to Tony & Greg. Thanks.
I dropped all those patches from my mfd for-next tree now.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

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

[Samuel Ortiz]

Hi Roger,

On Tue, Feb 12, 2013 at 04:46:51PM +0200, Roger Quadros wrote:
> On 02/11/2013 08:52 PM, Tony Lindgren wrote:
> > * Stephen Rothwell <sfr@canb.auug.org.au> [130210 22:11]:
> >> Hi all,
> >>
> >> Today's linux-next merge of the arm-soc tree got a conflict in
> >> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd:
> >> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree
> >> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete
> >> pm_lats and early_device code") from the arm-soc tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> > 
> > Thanks again.
> > 
> > Samuel, up to you, but I suggest you just drop these patches for
> > now if still possible unless other patches are based on these.
> > 
> 
> Samuel, please feel free to drop the 20 patches you pulled from me recently.
> 
> I have another set patches that would depend on them and I think it is better if
> both sets go through usb and arm-soc trees. This would avoid some confusion.
> 
> Once you confirm I can add your Acked-by's to them and send fresh pull requests
> to Tony & Greg. Thanks.
I dropped all those patches from my mfd for-next tree now.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mfd/ab5500-core.c between commit 9ea969f0d79d ("mfd: Mark const
init data with __initconst instead of __initdata for ab5500") from the
mfd tree and commit f76facc2354b ("mfd/ab5500: delete AB5500 support")
from the arm-soc tree.

The latter removes the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mfd/ab5500-core.c between commit 9ea969f0d79d ("mfd: Mark const
init data with __initconst instead of __initdata for ab5500") from the
mfd tree and commit f76facc2354b ("mfd/ab5500: delete AB5500 support")
from the arm-soc tree.

The latter removes the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120501/7717e97c/attachment.sig>

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mfd/ab5500-core.c between commit 9ea969f0d79d ("mfd: Mark const
init data with __initconst instead of __initdata for ab5500") from the
mfd tree and commit f76facc2354b ("mfd/ab5500: delete AB5500 support")
from the arm-soc tree.

The latter removes the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Linus Walleij]

On Tue, May 1, 2012 at 7:34 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/mfd/ab5500-core.c between commit 9ea969f0d79d ("mfd: Mark const
> init data with __initconst instead of __initdata for ab5500") from the
> mfd tree and commit f76facc2354b ("mfd/ab5500: delete AB5500 support")
> from the arm-soc tree.
>
> The latter removes the file, so I did that.

That's correct, thanks!

Linus Walleij

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

[Linus Walleij]

On Tue, May 1, 2012 at 7:34 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/mfd/ab5500-core.c between commit 9ea969f0d79d ("mfd: Mark const
> init data with __initconst instead of __initdata for ab5500") from the
> mfd tree and commit f76facc2354b ("mfd/ab5500: delete AB5500 support")
> from the arm-soc tree.
>
> The latter removes the file, so I did that.

That's correct, thanks!

Linus Walleij

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-generic.c between commit aa1d7775696c ("mfd:
Convert twl6040 to i2c driver, and separate it from twl core") from the
mfd tree and commit 93651b85bbd1 ("ARM: OMAP2+: board-generic: Remove i2c
static init") from the arm-soc tree.

The latter seems to supercede the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-generic.c between commit aa1d7775696c ("mfd:
Convert twl6040 to i2c driver, and separate it from twl core") from the
mfd tree and commit 93651b85bbd1 ("ARM: OMAP2+: board-generic: Remove i2c
static init") from the arm-soc tree.

The latter seems to supercede the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120417/d853f3fa/attachment.sig>

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-generic.c between commit aa1d7775696c ("mfd:
Convert twl6040 to i2c driver, and separate it from twl core") from the
mfd tree and commit 93651b85bbd1 ("ARM: OMAP2+: board-generic: Remove i2c
static init") from the arm-soc tree.

The latter seems to supercede the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]