Dear monstr@monstr.eu,
In message d4fd46d3b2d27747b728da37fad3ebca3732d837.1231154122.git.monstr@monstr.eu you wrote:
From: Michal Simek monstr@monstr.eu
Signed-off-by: Michal Simek monstr@monstr.eu
drivers/net/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Sorry, this doesn't apply either:
Applying: part_efi: Fix partition size calculation due to inclusive ending LBA. error: patch failed: disk/part_efi.c:163 error: disk/part_efi.c: patch does not apply Using index info to reconstruct a base tree... error: patch failed: disk/part_efi.c:163 error: disk/part_efi.c: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Patch failed at 0001.
Please rebase and repost. Thanks.
Best regards,
Wolfgang Denk